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

94 files changed, 16101 insertions, 16101 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,
diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c
index 8b87c387f1..9e7836181c 100644
--- a/epan/dissectors/packet-acp133.c
+++ b/epan/dissectors/packet-acp133.c
@@ -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,
diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c
index 1a3fe9f58e..2a86dd0d7e 100644
--- a/epan/dissectors/packet-acse.c
+++ b/epan/dissectors/packet-acse.c
@@ -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,
diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c
index 3326a97de9..dcad43094f 100644
--- a/epan/dissectors/packet-ansi_map.c
+++ b/epan/dissectors/packet-ansi_map.c
@@ -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 }},
 
diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c
index ad979417c0..8ba90aecc1 100644
--- a/epan/dissectors/packet-ansi_tcap.c
+++ b/epan/dissectors/packet-ansi_tcap.c
@@ -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 }},
 
diff --git a/epan/dissectors/packet-c1222.c b/epan/dissectors/packet-c1222.c
index 18ca98570c..c39e2f2467 100644
--- a/epan/dissectors/packet-c1222.c
+++ b/epan/dissectors/packet-c1222.c
@@ -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,
diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c
index 7c77267eb3..e38a8af430 100644
--- a/epan/dissectors/packet-camel.c
+++ b/epan/dissectors/packet-camel.c
@@ -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,
diff --git a/epan/dissectors/packet-cdt.c b/epan/dissectors/packet-cdt.c
index 3474b71d8d..cc418ac0bb 100644
--- a/epan/dissectors/packet-cdt.c
+++ b/epan/dissectors/packet-cdt.c
@@ -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,
diff --git a/epan/dissectors/packet-charging_ase.c b/epan/dissectors/packet-charging_ase.c
index 5650e0ea83..8f3ff3ce44 100644
--- a/epan/dissectors/packet-charging_ase.c
+++ b/epan/dissectors/packet-charging_ase.c
@@ -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,
diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c
index 18c35139e2..df2820dcb7 100644
--- a/epan/dissectors/packet-cmip.c
+++ b/epan/dissectors/packet-cmip.c
@@ -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,
diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c
index 2c234c592a..96e6b5d5da 100644
--- a/epan/dissectors/packet-cmp.c
+++ b/epan/dissectors/packet-cmp.c
@@ -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,
diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c
index 0b5a4a2cd7..f960e03655 100644
--- a/epan/dissectors/packet-cms.c
+++ b/epan/dissectors/packet-cms.c
@@ -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,
diff --git a/epan/dissectors/packet-credssp.c b/epan/dissectors/packet-credssp.c
index c89f0d3c69..52ac249e5e 100644
--- a/epan/dissectors/packet-credssp.c
+++ b/epan/dissectors/packet-credssp.c
@@ -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,
diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c
index cd70492258..0c88a4a46b 100644
--- a/epan/dissectors/packet-crmf.c
+++ b/epan/dissectors/packet-crmf.c
@@ -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 }},
 
diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c
index 4aebdbedea..6ccb48dadb 100644
--- a/epan/dissectors/packet-dap.c
+++ b/epan/dissectors/packet-dap.c
@@ -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,
-      { "modifyEntryArgument", "dap.modifyEntryArgument",
+      { "modifyEntryArgument", "dap.modifyEntryArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ModifyEntryArgumentData", HFILL }},
     { &hf_dap_modify_entry_information,
@@ -6088,19 +6088,19 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, VALS(dap_ModifyEntryInformation_vals), 0,
         "ModifyEntryInformation", HFILL }},
     { &hf_dap_unsignedModifyEntryResult,
-      { "unsignedModifyEntryResult", "dap.unsignedModifyEntryResult",
+      { "unsignedModifyEntryResult", "dap.unsignedModifyEntryResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ModifyEntryResultData", HFILL }},
     { &hf_dap_signedModifyEntryResult,
-      { "signedModifyEntryResult", "dap.signedModifyEntryResult",
+      { "signedModifyEntryResult", "dap.signedModifyEntryResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_modifyEntryResult,
-      { "modifyEntryResult", "dap.modifyEntryResult",
+      { "modifyEntryResult", "dap.modifyEntryResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ModifyEntryResultData", HFILL }},
     { &hf_dap_addAttribute,
-      { "addAttribute", "dap.addAttribute",
+      { "addAttribute", "dap.addAttribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Attribute", HFILL }},
     { &hf_dap_removeAttribute,
@@ -6108,15 +6108,15 @@ void proto_register_dap(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "AttributeType", HFILL }},
     { &hf_dap_addValues,
-      { "addValues", "dap.addValues",
+      { "addValues", "dap.addValues_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Attribute", HFILL }},
     { &hf_dap_removeValues,
-      { "removeValues", "dap.removeValues",
+      { "removeValues", "dap.removeValues_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Attribute", HFILL }},
     { &hf_dap_alterValues,
-      { "alterValues", "dap.alterValues",
+      { "alterValues", "dap.alterValues_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeTypeAndValue", HFILL }},
     { &hf_dap_resetValue,
@@ -6140,27 +6140,27 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, VALS(dap_ModifyDNInformation_vals), 0,
         "ModifyDNInformation", HFILL }},
     { &hf_dap_unsignedModifyDNResult,
-      { "unsignedModifyDNResult", "dap.unsignedModifyDNResult",
+      { "unsignedModifyDNResult", "dap.unsignedModifyDNResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ModifyDNResultData", HFILL }},
     { &hf_dap_signedModifyDNResult,
-      { "signedModifyDNResult", "dap.signedModifyDNResult",
+      { "signedModifyDNResult", "dap.signedModifyDNResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_modifyDNResult,
-      { "modifyDNResult", "dap.modifyDNResult",
+      { "modifyDNResult", "dap.modifyDNResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ModifyDNResultData", HFILL }},
     { &hf_dap_unsignedAbandoned,
-      { "unsignedAbandoned", "dap.unsignedAbandoned",
+      { "unsignedAbandoned", "dap.unsignedAbandoned_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AbandonedData", HFILL }},
     { &hf_dap_signedAbandoned,
-      { "signedAbandoned", "dap.signedAbandoned",
+      { "signedAbandoned", "dap.signedAbandoned_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_abandoned,
-      { "abandoned", "dap.abandoned",
+      { "abandoned", "dap.abandoned_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AbandonedData", HFILL }},
     { &hf_dap_abandon_failed_problem,
@@ -6172,15 +6172,15 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, VALS(ros_InvokeId_vals), 0,
         "InvokeId", HFILL }},
     { &hf_dap_unsignedAbandonFailedError,
-      { "unsignedAbandonFailedError", "dap.unsignedAbandonFailedError",
+      { "unsignedAbandonFailedError", "dap.unsignedAbandonFailedError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AbandonFailedErrorData", HFILL }},
     { &hf_dap_signedAbandonFailedError,
-      { "signedAbandonFailedError", "dap.signedAbandonFailedError",
+      { "signedAbandonFailedError", "dap.signedAbandonFailedError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_abandonFailedError,
-      { "abandonFailedError", "dap.abandonFailedError",
+      { "abandonFailedError", "dap.abandonFailedError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AbandonFailedErrorData", HFILL }},
     { &hf_dap_problems,
@@ -6188,7 +6188,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_problems_item,
-      { "problems item", "dap.problems_item",
+      { "problems item", "dap.problems_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_attribute_error_problem,
@@ -6196,19 +6196,19 @@ void proto_register_dap(void) {
         FT_INT32, BASE_DEC, VALS(dap_AttributeProblem_vals), 0,
         "AttributeProblem", HFILL }},
     { &hf_dap_value,
-      { "value", "dap.value",
+      { "value", "dap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeValue", HFILL }},
     { &hf_dap_unsignedAttributeError,
-      { "unsignedAttributeError", "dap.unsignedAttributeError",
+      { "unsignedAttributeError", "dap.unsignedAttributeError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeErrorData", HFILL }},
     { &hf_dap_signedAttributeError,
-      { "signedAttributeError", "dap.signedAttributeError",
+      { "signedAttributeError", "dap.signedAttributeError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_attributeError,
-      { "attributeError", "dap.attributeError",
+      { "attributeError", "dap.attributeError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeErrorData", HFILL }},
     { &hf_dap_name_error_problem,
@@ -6220,31 +6220,31 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
         "Name", HFILL }},
     { &hf_dap_unsignedNameError,
-      { "unsignedNameError", "dap.unsignedNameError",
+      { "unsignedNameError", "dap.unsignedNameError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NameErrorData", HFILL }},
     { &hf_dap_signedNameError,
-      { "signedNameError", "dap.signedNameError",
+      { "signedNameError", "dap.signedNameError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_nameError,
-      { "nameError", "dap.nameError",
+      { "nameError", "dap.nameError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NameErrorData", HFILL }},
     { &hf_dap_candidate,
-      { "candidate", "dap.candidate",
+      { "candidate", "dap.candidate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ContinuationReference", HFILL }},
     { &hf_dap_unsignedReferral,
-      { "unsignedReferral", "dap.unsignedReferral",
+      { "unsignedReferral", "dap.unsignedReferral_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReferralData", HFILL }},
     { &hf_dap_signedReferral,
-      { "signedReferral", "dap.signedReferral",
+      { "signedReferral", "dap.signedReferral_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_referral,
-      { "referral", "dap.referral",
+      { "referral", "dap.referral_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReferralData", HFILL }},
     { &hf_dap_security_error_problem,
@@ -6252,19 +6252,19 @@ void proto_register_dap(void) {
         FT_INT32, BASE_DEC, VALS(dap_SecurityProblem_vals), 0,
         "SecurityProblem", HFILL }},
     { &hf_dap_spkmInfo,
-      { "spkmInfo", "dap.spkmInfo",
+      { "spkmInfo", "dap.spkmInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_unsignedSecurityError,
-      { "unsignedSecurityError", "dap.unsignedSecurityError",
+      { "unsignedSecurityError", "dap.unsignedSecurityError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecurityErrorData", HFILL }},
     { &hf_dap_signedSecurityError,
-      { "signedSecurityError", "dap.signedSecurityError",
+      { "signedSecurityError", "dap.signedSecurityError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_securityErrorData,
-      { "securityError", "dap.securityError",
+      { "securityError", "dap.securityError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecurityErrorData", HFILL }},
     { &hf_dap_service_error_problem,
@@ -6272,15 +6272,15 @@ void proto_register_dap(void) {
         FT_INT32, BASE_DEC, VALS(dap_ServiceProblem_vals), 0,
         "ServiceProblem", HFILL }},
     { &hf_dap_unsignedServiceError,
-      { "unsignedServiceError", "dap.unsignedServiceError",
+      { "unsignedServiceError", "dap.unsignedServiceError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ServiceErrorData", HFILL }},
     { &hf_dap_signedServiceError,
-      { "signedServiceError", "dap.signedServiceError",
+      { "signedServiceError", "dap.signedServiceError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_serviceError,
-      { "serviceError", "dap.serviceError",
+      { "serviceError", "dap.serviceError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ServiceErrorData", HFILL }},
     { &hf_dap_update_error_problem,
@@ -6296,15 +6296,15 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, VALS(dap_T_attributeInfo_item_vals), 0,
         NULL, HFILL }},
     { &hf_dap_unsignedUpdateError,
-      { "unsignedUpdateError", "dap.unsignedUpdateError",
+      { "unsignedUpdateError", "dap.unsignedUpdateError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UpdateErrorData", HFILL }},
     { &hf_dap_signedUpdateError,
-      { "signedUpdateError", "dap.signedUpdateError",
+      { "signedUpdateError", "dap.signedUpdateError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_updateError,
-      { "updateError", "dap.updateError",
+      { "updateError", "dap.updateError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UpdateErrorData", HFILL }},
     { &hf_dap_ServiceControlOptions_preferChaining,
diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c
index d163d24c02..196ec7e553 100644
--- a/epan/dissectors/packet-disp.c
+++ b/epan/dissectors/packet-disp.c
@@ -1627,15 +1627,15 @@ void proto_register_disp(void) {
 /*--- Included file: packet-disp-hfarr.c ---*/
 #line 1 "../../asn1/disp/packet-disp-hfarr.c"
     { &hf_disp_EstablishParameter_PDU,
-      { "EstablishParameter", "disp.EstablishParameter",
+      { "EstablishParameter", "disp.EstablishParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_ModificationParameter_PDU,
-      { "ModificationParameter", "disp.ModificationParameter",
+      { "ModificationParameter", "disp.ModificationParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_ShadowingAgreementInfo_PDU,
-      { "ShadowingAgreementInfo", "disp.ShadowingAgreementInfo",
+      { "ShadowingAgreementInfo", "disp.ShadowingAgreementInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_modifiedSecondaryShadows,
@@ -1643,11 +1643,11 @@ void proto_register_disp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_SupplierAndConsumers", HFILL }},
     { &hf_disp_modifiedSecondaryShadows_item,
-      { "SupplierAndConsumers", "disp.SupplierAndConsumers",
+      { "SupplierAndConsumers", "disp.SupplierAndConsumers_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_shadowSubject,
-      { "shadowSubject", "disp.shadowSubject",
+      { "shadowSubject", "disp.shadowSubject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UnitOfReplication", HFILL }},
     { &hf_disp_updateMode,
@@ -1655,7 +1655,7 @@ void proto_register_disp(void) {
         FT_UINT32, BASE_DEC, VALS(disp_UpdateMode_vals), 0,
         NULL, HFILL }},
     { &hf_disp_master,
-      { "master", "disp.master",
+      { "master", "disp.master_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AccessPoint", HFILL }},
     { &hf_disp_secondaryShadows,
@@ -1663,7 +1663,7 @@ void proto_register_disp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_disp_area,
-      { "area", "disp.area",
+      { "area", "disp.area_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AreaSpecification", HFILL }},
     { &hf_disp_replication_attributes,
@@ -1671,7 +1671,7 @@ void proto_register_disp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "AttributeSelection", HFILL }},
     { &hf_disp_knowledge,
-      { "knowledge", "disp.knowledge",
+      { "knowledge", "disp.knowledge_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_subordinates,
@@ -1687,7 +1687,7 @@ void proto_register_disp(void) {
         FT_UINT32, BASE_DEC, VALS(disp_T_supplyContexts_vals), 0,
         NULL, HFILL }},
     { &hf_disp_allContexts,
-      { "allContexts", "disp.allContexts",
+      { "allContexts", "disp.allContexts_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_selectedContexts,
@@ -1703,7 +1703,7 @@ void proto_register_disp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DistinguishedName", HFILL }},
     { &hf_disp_replicationArea,
-      { "replicationArea", "disp.replicationArea",
+      { "replicationArea", "disp.replicationArea_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SubtreeSpecification", HFILL }},
     { &hf_disp_knowledgeType,
@@ -1715,7 +1715,7 @@ void proto_register_disp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_disp_AttributeSelection_item,
-      { "ClassAttributeSelection", "disp.ClassAttributeSelection",
+      { "ClassAttributeSelection", "disp.ClassAttributeSelection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_class,
@@ -1727,7 +1727,7 @@ void proto_register_disp(void) {
         FT_UINT32, BASE_DEC, VALS(disp_ClassAttributes_vals), 0,
         NULL, HFILL }},
     { &hf_disp_allAttributes,
-      { "allAttributes", "disp.allAttributes",
+      { "allAttributes", "disp.allAttributes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_include,
@@ -1747,7 +1747,7 @@ void proto_register_disp(void) {
         FT_UINT32, BASE_DEC, VALS(disp_SupplierUpdateMode_vals), 0,
         "SupplierUpdateMode", HFILL }},
     { &hf_disp_consumerInitiated,
-      { "consumerInitiated", "disp.consumerInitiated",
+      { "consumerInitiated", "disp.consumerInitiated_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ConsumerUpdateMode", HFILL }},
     { &hf_disp_onChange,
@@ -1755,11 +1755,11 @@ void proto_register_disp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_disp_scheduled,
-      { "scheduled", "disp.scheduled",
+      { "scheduled", "disp.scheduled_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SchedulingParameters", HFILL }},
     { &hf_disp_periodic,
-      { "periodic", "disp.periodic",
+      { "periodic", "disp.periodic_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PeriodicStrategy", HFILL }},
     { &hf_disp_othertimes,
@@ -1779,7 +1779,7 @@ void proto_register_disp(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_disp_agreementID,
-      { "agreementID", "disp.agreementID",
+      { "agreementID", "disp.agreementID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_lastUpdate,
@@ -1795,27 +1795,27 @@ void proto_register_disp(void) {
         FT_UINT32, BASE_DEC, VALS(disp_StandardUpdate_vals), 0,
         "StandardUpdate", HFILL }},
     { &hf_disp_other,
-      { "other", "disp.other",
+      { "other", "disp.other_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EXTERNAL", HFILL }},
     { &hf_disp_securityParameters,
-      { "securityParameters", "disp.securityParameters",
+      { "securityParameters", "disp.securityParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_unsignedCoordinateShadowUpdateArgument,
-      { "unsignedCoordinateShadowUpdateArgument", "disp.unsignedCoordinateShadowUpdateArgument",
+      { "unsignedCoordinateShadowUpdateArgument", "disp.unsignedCoordinateShadowUpdateArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CoordinateShadowUpdateArgumentData", HFILL }},
     { &hf_disp_signedCoordinateShadowUpdateArgument,
-      { "signedCoordinateShadowUpdateArgument", "disp.signedCoordinateShadowUpdateArgument",
+      { "signedCoordinateShadowUpdateArgument", "disp.signedCoordinateShadowUpdateArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_coordinateShadowUpdateArgument,
-      { "coordinateShadowUpdateArgument", "disp.coordinateShadowUpdateArgument",
+      { "coordinateShadowUpdateArgument", "disp.coordinateShadowUpdateArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CoordinateShadowUpdateArgumentData", HFILL }},
     { &hf_disp_algorithmIdentifier,
-      { "algorithmIdentifier", "disp.algorithmIdentifier",
+      { "algorithmIdentifier", "disp.algorithmIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_encrypted,
@@ -1823,7 +1823,7 @@ void proto_register_disp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_disp_null,
-      { "null", "disp.null",
+      { "null", "disp.null_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_information,
@@ -1843,19 +1843,19 @@ void proto_register_disp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Attribute", HFILL }},
     { &hf_disp_notification_item,
-      { "Attribute", "disp.Attribute",
+      { "Attribute", "disp.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_unsignedInformation,
-      { "unsignedInformation", "disp.unsignedInformation",
+      { "unsignedInformation", "disp.unsignedInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InformationData", HFILL }},
     { &hf_disp_signedInformation,
-      { "signedInformation", "disp.signedInformation",
+      { "signedInformation", "disp.signedInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_information_data,
-      { "information", "disp.information",
+      { "information", "disp.information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InformationData", HFILL }},
     { &hf_disp_requestedStrategy,
@@ -1867,15 +1867,15 @@ void proto_register_disp(void) {
         FT_UINT32, BASE_DEC, VALS(disp_T_standard_vals), 0,
         NULL, HFILL }},
     { &hf_disp_unsignedRequestShadowUpdateArgument,
-      { "unsignedRequestShadowUpdateArgument", "disp.unsignedRequestShadowUpdateArgument",
+      { "unsignedRequestShadowUpdateArgument", "disp.unsignedRequestShadowUpdateArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RequestShadowUpdateArgumentData", HFILL }},
     { &hf_disp_signedRequestShadowUpdateArgument,
-      { "signedRequestShadowUpdateArgument", "disp.signedRequestShadowUpdateArgument",
+      { "signedRequestShadowUpdateArgument", "disp.signedRequestShadowUpdateArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_requestShadowUpdateArgument,
-      { "requestShadowUpdateArgument", "disp.requestShadowUpdateArgument",
+      { "requestShadowUpdateArgument", "disp.requestShadowUpdateArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RequestShadowUpdateArgumentData", HFILL }},
     { &hf_disp_updateTime,
@@ -1883,7 +1883,7 @@ void proto_register_disp(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "Time", HFILL }},
     { &hf_disp_updateWindow,
-      { "updateWindow", "disp.updateWindow",
+      { "updateWindow", "disp.updateWindow_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_updatedInfo,
@@ -1891,15 +1891,15 @@ void proto_register_disp(void) {
         FT_UINT32, BASE_DEC, VALS(disp_RefreshInformation_vals), 0,
         "RefreshInformation", HFILL }},
     { &hf_disp_unsignedUpdateShadowArgument,
-      { "unsignedUpdateShadowArgument", "disp.unsignedUpdateShadowArgument",
+      { "unsignedUpdateShadowArgument", "disp.unsignedUpdateShadowArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UpdateShadowArgumentData", HFILL }},
     { &hf_disp_signedUpdateShadowArgument,
-      { "signedUpdateShadowArgument", "disp.signedUpdateShadowArgument",
+      { "signedUpdateShadowArgument", "disp.signedUpdateShadowArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_updateShadowArgument,
-      { "updateShadowArgument", "disp.updateShadowArgument",
+      { "updateShadowArgument", "disp.updateShadowArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UpdateShadowArgumentData", HFILL }},
     { &hf_disp_start,
@@ -1911,11 +1911,11 @@ void proto_register_disp(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "Time", HFILL }},
     { &hf_disp_noRefresh,
-      { "noRefresh", "disp.noRefresh",
+      { "noRefresh", "disp.noRefresh_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_total,
-      { "total", "disp.total",
+      { "total", "disp.total_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TotalRefresh", HFILL }},
     { &hf_disp_incremental,
@@ -1923,11 +1923,11 @@ void proto_register_disp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "IncrementalRefresh", HFILL }},
     { &hf_disp_otherStrategy,
-      { "otherStrategy", "disp.otherStrategy",
+      { "otherStrategy", "disp.otherStrategy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EXTERNAL", HFILL }},
     { &hf_disp_sDSE,
-      { "sDSE", "disp.sDSE",
+      { "sDSE", "disp.sDSE_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SDSEContent", HFILL }},
     { &hf_disp_subtree,
@@ -1935,7 +1935,7 @@ void proto_register_disp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_Subtree", HFILL }},
     { &hf_disp_subtree_item,
-      { "Subtree", "disp.Subtree",
+      { "Subtree", "disp.Subtree_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_sDSEType,
@@ -1955,7 +1955,7 @@ void proto_register_disp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_Attribute", HFILL }},
     { &hf_disp_attributes_item,
-      { "Attribute", "disp.Attribute",
+      { "Attribute", "disp.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_attValIncomplete,
@@ -1971,7 +1971,7 @@ void proto_register_disp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RelativeDistinguishedName", HFILL }},
     { &hf_disp_IncrementalRefresh_item,
-      { "IncrementalStepRefresh", "disp.IncrementalStepRefresh",
+      { "IncrementalStepRefresh", "disp.IncrementalStepRefresh_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_sDSEChanges,
@@ -1979,15 +1979,15 @@ void proto_register_disp(void) {
         FT_UINT32, BASE_DEC, VALS(disp_T_sDSEChanges_vals), 0,
         NULL, HFILL }},
     { &hf_disp_add,
-      { "add", "disp.add",
+      { "add", "disp.add_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SDSEContent", HFILL }},
     { &hf_disp_remove,
-      { "remove", "disp.remove",
+      { "remove", "disp.remove_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_modify,
-      { "modify", "disp.modify",
+      { "modify", "disp.modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ContentChange", HFILL }},
     { &hf_disp_subordinateUpdates,
@@ -1995,7 +1995,7 @@ void proto_register_disp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_SubordinateChanges", HFILL }},
     { &hf_disp_subordinateUpdates_item,
-      { "SubordinateChanges", "disp.SubordinateChanges",
+      { "SubordinateChanges", "disp.SubordinateChanges_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_rename,
@@ -2019,7 +2019,7 @@ void proto_register_disp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_Attribute", HFILL }},
     { &hf_disp_replace_item,
-      { "Attribute", "disp.Attribute",
+      { "Attribute", "disp.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_changes,
@@ -2035,7 +2035,7 @@ void proto_register_disp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RelativeDistinguishedName", HFILL }},
     { &hf_disp_subordinate_changes,
-      { "changes", "disp.changes",
+      { "changes", "disp.changes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IncrementalStepRefresh", HFILL }},
     { &hf_disp_problem,
@@ -2043,15 +2043,15 @@ void proto_register_disp(void) {
         FT_INT32, BASE_DEC, VALS(disp_ShadowProblem_vals), 0,
         "ShadowProblem", HFILL }},
     { &hf_disp_unsignedShadowError,
-      { "unsignedShadowError", "disp.unsignedShadowError",
+      { "unsignedShadowError", "disp.unsignedShadowError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ShadowErrorData", HFILL }},
     { &hf_disp_signedShadowError,
-      { "signedShadowError", "disp.signedShadowError",
+      { "signedShadowError", "disp.signedShadowError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_shadowError,
-      { "shadowError", "disp.shadowError",
+      { "shadowError", "disp.shadowError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ShadowErrorData", HFILL }},
 
diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c
index 8f389d5b16..ffc3fe1290 100644
--- a/epan/dissectors/packet-dop.c
+++ b/epan/dissectors/packet-dop.c
@@ -2205,47 +2205,47 @@ void proto_register_dop(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_SupplierInformation_PDU,
-      { "SupplierInformation", "dop.SupplierInformation",
+      { "SupplierInformation", "dop.SupplierInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_ConsumerInformation_PDU,
-      { "ConsumerInformation", "dop.ConsumerInformation",
+      { "ConsumerInformation", "dop.ConsumerInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_SupplierAndConsumers_PDU,
-      { "SupplierAndConsumers", "dop.SupplierAndConsumers",
+      { "SupplierAndConsumers", "dop.SupplierAndConsumers_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_HierarchicalAgreement_PDU,
-      { "HierarchicalAgreement", "dop.HierarchicalAgreement",
+      { "HierarchicalAgreement", "dop.HierarchicalAgreement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_SuperiorToSubordinate_PDU,
-      { "SuperiorToSubordinate", "dop.SuperiorToSubordinate",
+      { "SuperiorToSubordinate", "dop.SuperiorToSubordinate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_SubordinateToSuperior_PDU,
-      { "SubordinateToSuperior", "dop.SubordinateToSuperior",
+      { "SubordinateToSuperior", "dop.SubordinateToSuperior_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_SuperiorToSubordinateModification_PDU,
-      { "SuperiorToSubordinateModification", "dop.SuperiorToSubordinateModification",
+      { "SuperiorToSubordinateModification", "dop.SuperiorToSubordinateModification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_NonSpecificHierarchicalAgreement_PDU,
-      { "NonSpecificHierarchicalAgreement", "dop.NonSpecificHierarchicalAgreement",
+      { "NonSpecificHierarchicalAgreement", "dop.NonSpecificHierarchicalAgreement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_NHOBSuperiorToSubordinate_PDU,
-      { "NHOBSuperiorToSubordinate", "dop.NHOBSuperiorToSubordinate",
+      { "NHOBSuperiorToSubordinate", "dop.NHOBSuperiorToSubordinate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_NHOBSubordinateToSuperior_PDU,
-      { "NHOBSubordinateToSuperior", "dop.NHOBSubordinateToSuperior",
+      { "NHOBSubordinateToSuperior", "dop.NHOBSubordinateToSuperior_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_ACIItem_PDU,
-      { "ACIItem", "dop.ACIItem",
+      { "ACIItem", "dop.ACIItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_ae_title,
@@ -2253,7 +2253,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
         "Name", HFILL }},
     { &hf_dop_address,
-      { "address", "dop.address",
+      { "address", "dop.address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PresentationAddress", HFILL }},
     { &hf_dop_protocolInformation,
@@ -2261,11 +2261,11 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_ProtocolInformation", HFILL }},
     { &hf_dop_protocolInformation_item,
-      { "ProtocolInformation", "dop.ProtocolInformation",
+      { "ProtocolInformation", "dop.ProtocolInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_agreementID,
-      { "agreementID", "dop.agreementID",
+      { "agreementID", "dop.agreementID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OperationalBindingID", HFILL }},
     { &hf_dop_supplier_is_master,
@@ -2273,7 +2273,7 @@ void proto_register_dop(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_dop_non_supplying_master,
-      { "non-supplying-master", "dop.non_supplying_master",
+      { "non-supplying-master", "dop.non_supplying_master_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AccessPoint", HFILL }},
     { &hf_dop_consumers,
@@ -2281,7 +2281,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_AccessPoint", HFILL }},
     { &hf_dop_consumers_item,
-      { "AccessPoint", "dop.AccessPoint",
+      { "AccessPoint", "dop.AccessPoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_bindingType,
@@ -2289,11 +2289,11 @@ void proto_register_dop(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_bindingID,
-      { "bindingID", "dop.bindingID",
+      { "bindingID", "dop.bindingID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OperationalBindingID", HFILL }},
     { &hf_dop_accessPoint,
-      { "accessPoint", "dop.accessPoint",
+      { "accessPoint", "dop.accessPoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_establishInitiator,
@@ -2301,43 +2301,43 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, VALS(dop_EstablishArgumentInitiator_vals), 0,
         "EstablishArgumentInitiator", HFILL }},
     { &hf_dop_establishSymmetric,
-      { "symmetric", "dop.symmetric",
+      { "symmetric", "dop.symmetric_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EstablishSymmetric", HFILL }},
     { &hf_dop_establishRoleAInitiates,
-      { "roleA-initiates", "dop.roleA_initiates",
+      { "roleA-initiates", "dop.roleA_initiates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EstablishRoleAInitiates", HFILL }},
     { &hf_dop_establishRoleBInitiates,
-      { "roleB-initiates", "dop.roleB_initiates",
+      { "roleB-initiates", "dop.roleB_initiates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EstablishRoleBInitiates", HFILL }},
     { &hf_dop_agreement,
-      { "agreement", "dop.agreement",
+      { "agreement", "dop.agreement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_valid,
-      { "valid", "dop.valid",
+      { "valid", "dop.valid_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Validity", HFILL }},
     { &hf_dop_securityParameters,
-      { "securityParameters", "dop.securityParameters",
+      { "securityParameters", "dop.securityParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_unsignedEstablishOperationalBindingArgument,
-      { "unsignedEstablishOperationalBindingArgument", "dop.unsignedEstablishOperationalBindingArgument",
+      { "unsignedEstablishOperationalBindingArgument", "dop.unsignedEstablishOperationalBindingArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EstablishOperationalBindingArgumentData", HFILL }},
     { &hf_dop_signedEstablishOperationalBindingArgument,
-      { "signedEstablishOperationalBindingArgument", "dop.signedEstablishOperationalBindingArgument",
+      { "signedEstablishOperationalBindingArgument", "dop.signedEstablishOperationalBindingArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_establishOperationalBindingArgument,
-      { "establishOperationalBindingArgument", "dop.establishOperationalBindingArgument",
+      { "establishOperationalBindingArgument", "dop.establishOperationalBindingArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EstablishOperationalBindingArgumentData", HFILL }},
     { &hf_dop_algorithmIdentifier,
-      { "algorithmIdentifier", "dop.algorithmIdentifier",
+      { "algorithmIdentifier", "dop.algorithmIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_encrypted,
@@ -2357,7 +2357,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, VALS(dop_T_validFrom_vals), 0,
         NULL, HFILL }},
     { &hf_dop_now,
-      { "now", "dop.now",
+      { "now", "dop.now_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_time,
@@ -2369,7 +2369,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, VALS(dop_T_validUntil_vals), 0,
         NULL, HFILL }},
     { &hf_dop_explicitTermination,
-      { "explicitTermination", "dop.explicitTermination",
+      { "explicitTermination", "dop.explicitTermination_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_utcTime,
@@ -2385,15 +2385,15 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, VALS(dop_T_initiator_vals), 0,
         NULL, HFILL }},
     { &hf_dop_symmetric,
-      { "symmetric", "dop.symmetric",
+      { "symmetric", "dop.symmetric_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_roleA_replies,
-      { "roleA-replies", "dop.roleA_replies",
+      { "roleA-replies", "dop.roleA_replies_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_roleB_replies,
-      { "roleB-replies", "dop.roleB_replies",
+      { "roleB-replies", "dop.roleB_replies_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_performer,
@@ -2409,7 +2409,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_Attribute", HFILL }},
     { &hf_dop_notification_item,
-      { "Attribute", "dop.Attribute",
+      { "Attribute", "dop.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_modifyInitiator,
@@ -2417,51 +2417,51 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, VALS(dop_ModifyArgumentInitiator_vals), 0,
         "ModifyArgumentInitiator", HFILL }},
     { &hf_dop_modifySymmetric,
-      { "symmetric", "dop.symmetric",
+      { "symmetric", "dop.symmetric_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ModifySymmetric", HFILL }},
     { &hf_dop_modifyRoleAInitiates,
-      { "roleA-initiates", "dop.roleA_initiates",
+      { "roleA-initiates", "dop.roleA_initiates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ModifyRoleAInitiates", HFILL }},
     { &hf_dop_modifyRoleBInitiates,
-      { "roleB-initiates", "dop.roleB_initiates",
+      { "roleB-initiates", "dop.roleB_initiates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ModifyRoleBInitiates", HFILL }},
     { &hf_dop_newBindingID,
-      { "newBindingID", "dop.newBindingID",
+      { "newBindingID", "dop.newBindingID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OperationalBindingID", HFILL }},
     { &hf_dop_argumentNewAgreement,
-      { "newAgreement", "dop.newAgreement",
+      { "newAgreement", "dop.newAgreement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ArgumentNewAgreement", HFILL }},
     { &hf_dop_unsignedModifyOperationalBindingArgument,
-      { "unsignedModifyOperationalBindingArgument", "dop.unsignedModifyOperationalBindingArgument",
+      { "unsignedModifyOperationalBindingArgument", "dop.unsignedModifyOperationalBindingArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ModifyOperationalBindingArgumentData", HFILL }},
     { &hf_dop_signedModifyOperationalBindingArgument,
-      { "signedModifyOperationalBindingArgument", "dop.signedModifyOperationalBindingArgument",
+      { "signedModifyOperationalBindingArgument", "dop.signedModifyOperationalBindingArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_modifyOperationalBindingArgument,
-      { "modifyOperationalBindingArgument", "dop.modifyOperationalBindingArgument",
+      { "modifyOperationalBindingArgument", "dop.modifyOperationalBindingArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ModifyOperationalBindingArgumentData", HFILL }},
     { &hf_dop_null,
-      { "null", "dop.null",
+      { "null", "dop.null_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_protectedModifyResult,
-      { "protected", "dop.protected",
+      { "protected", "dop.protected_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProtectedModifyResult", HFILL }},
     { &hf_dop_modifyOperationalBindingResultData,
-      { "modifyOperationalBindingResultData", "dop.modifyOperationalBindingResultData",
+      { "modifyOperationalBindingResultData", "dop.modifyOperationalBindingResultData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_resultNewAgreement,
-      { "newAgreement", "dop.newAgreement",
+      { "newAgreement", "dop.newAgreement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ResultNewAgreement", HFILL }},
     { &hf_dop_terminateInitiator,
@@ -2469,15 +2469,15 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, VALS(dop_TerminateArgumentInitiator_vals), 0,
         "TerminateArgumentInitiator", HFILL }},
     { &hf_dop_terminateSymmetric,
-      { "symmetric", "dop.symmetric",
+      { "symmetric", "dop.symmetric_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminateSymmetric", HFILL }},
     { &hf_dop_terminateRoleAInitiates,
-      { "roleA-initiates", "dop.roleA_initiates",
+      { "roleA-initiates", "dop.roleA_initiates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminateRoleAInitiates", HFILL }},
     { &hf_dop_terminateRoleBInitiates,
-      { "roleB-initiates", "dop.roleB_initiates",
+      { "roleB-initiates", "dop.roleB_initiates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminateRoleBInitiates", HFILL }},
     { &hf_dop_terminateAtTime,
@@ -2485,23 +2485,23 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, VALS(dop_Time_vals), 0,
         "Time", HFILL }},
     { &hf_dop_unsignedTerminateOperationalBindingArgument,
-      { "unsignedTerminateOperationalBindingArgument", "dop.unsignedTerminateOperationalBindingArgument",
+      { "unsignedTerminateOperationalBindingArgument", "dop.unsignedTerminateOperationalBindingArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminateOperationalBindingArgumentData", HFILL }},
     { &hf_dop_signedTerminateOperationalBindingArgument,
-      { "signedTerminateOperationalBindingArgument", "dop.signedTerminateOperationalBindingArgument",
+      { "signedTerminateOperationalBindingArgument", "dop.signedTerminateOperationalBindingArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_terminateOperationalBindingArgument,
-      { "terminateOperationalBindingArgument", "dop.terminateOperationalBindingArgument",
+      { "terminateOperationalBindingArgument", "dop.terminateOperationalBindingArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminateOperationalBindingArgumentData", HFILL }},
     { &hf_dop_protectedTerminateResult,
-      { "protected", "dop.protected",
+      { "protected", "dop.protected_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProtectedTerminateResult", HFILL }},
     { &hf_dop_terminateOperationalBindingResultData,
-      { "terminateOperationalBindingResultData", "dop.terminateOperationalBindingResultData",
+      { "terminateOperationalBindingResultData", "dop.terminateOperationalBindingResultData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_terminateAtGeneralizedTime,
@@ -2513,7 +2513,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, VALS(dop_T_problem_vals), 0,
         NULL, HFILL }},
     { &hf_dop_agreementProposal,
-      { "agreementProposal", "dop.agreementProposal",
+      { "agreementProposal", "dop.agreementProposal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_retryAt,
@@ -2537,7 +2537,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_Attribute", HFILL }},
     { &hf_dop_entryInfo_item,
-      { "Attribute", "dop.Attribute",
+      { "Attribute", "dop.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_immediateSuperiorInfo,
@@ -2545,11 +2545,11 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_Attribute", HFILL }},
     { &hf_dop_immediateSuperiorInfo_item,
-      { "Attribute", "dop.Attribute",
+      { "Attribute", "dop.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_DITcontext_item,
-      { "Vertex", "dop.Vertex",
+      { "Vertex", "dop.Vertex_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_admPointInfo,
@@ -2557,7 +2557,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_Attribute", HFILL }},
     { &hf_dop_admPointInfo_item,
-      { "Attribute", "dop.Attribute",
+      { "Attribute", "dop.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_subentries,
@@ -2565,7 +2565,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_SubentryInfo", HFILL }},
     { &hf_dop_subentries_item,
-      { "SubentryInfo", "dop.SubentryInfo",
+      { "SubentryInfo", "dop.SubentryInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_accessPoints,
@@ -2577,7 +2577,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_Attribute", HFILL }},
     { &hf_dop_info_item,
-      { "Attribute", "dop.Attribute",
+      { "Attribute", "dop.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_alias,
@@ -2601,11 +2601,11 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, VALS(dop_T_itemOrUserFirst_vals), 0,
         NULL, HFILL }},
     { &hf_dop_itemFirst,
-      { "itemFirst", "dop.itemFirst",
+      { "itemFirst", "dop.itemFirst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_protectedItems,
-      { "protectedItems", "dop.protectedItems",
+      { "protectedItems", "dop.protectedItems_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_itemPermissions,
@@ -2613,15 +2613,15 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_ItemPermission", HFILL }},
     { &hf_dop_itemPermissions_item,
-      { "ItemPermission", "dop.ItemPermission",
+      { "ItemPermission", "dop.ItemPermission_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_userFirst,
-      { "userFirst", "dop.userFirst",
+      { "userFirst", "dop.userFirst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_userClasses,
-      { "userClasses", "dop.userClasses",
+      { "userClasses", "dop.userClasses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_userPermissions,
@@ -2629,15 +2629,15 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_UserPermission", HFILL }},
     { &hf_dop_userPermissions_item,
-      { "UserPermission", "dop.UserPermission",
+      { "UserPermission", "dop.UserPermission_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_entry,
-      { "entry", "dop.entry",
+      { "entry", "dop.entry_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_allUserAttributeTypes,
-      { "allUserAttributeTypes", "dop.allUserAttributeTypes",
+      { "allUserAttributeTypes", "dop.allUserAttributeTypes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_attributeType,
@@ -2657,7 +2657,7 @@ void proto_register_dop(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_allUserAttributeTypesAndValues,
-      { "allUserAttributeTypesAndValues", "dop.allUserAttributeTypesAndValues",
+      { "allUserAttributeTypesAndValues", "dop.allUserAttributeTypesAndValues_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_attributeValue,
@@ -2665,7 +2665,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_AttributeTypeAndValue", HFILL }},
     { &hf_dop_attributeValue_item,
-      { "AttributeTypeAndValue", "dop.AttributeTypeAndValue",
+      { "AttributeTypeAndValue", "dop.AttributeTypeAndValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_selfValue,
@@ -2685,7 +2685,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_MaxValueCount", HFILL }},
     { &hf_dop_maxValueCount_item,
-      { "MaxValueCount", "dop.MaxValueCount",
+      { "MaxValueCount", "dop.MaxValueCount_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_maxImmSub,
@@ -2697,7 +2697,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_RestrictedValue", HFILL }},
     { &hf_dop_restrictedBy_item,
-      { "RestrictedValue", "dop.RestrictedValue",
+      { "RestrictedValue", "dop.RestrictedValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_contexts,
@@ -2705,7 +2705,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_ContextAssertion", HFILL }},
     { &hf_dop_contexts_item,
-      { "ContextAssertion", "dop.ContextAssertion",
+      { "ContextAssertion", "dop.ContextAssertion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_classes,
@@ -2725,11 +2725,11 @@ void proto_register_dop(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "AttributeType", HFILL }},
     { &hf_dop_allUsers,
-      { "allUsers", "dop.allUsers",
+      { "allUsers", "dop.allUsers_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_thisEntry,
-      { "thisEntry", "dop.thisEntry",
+      { "thisEntry", "dop.thisEntry_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_name,
@@ -2737,7 +2737,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_NameAndOptionalUID", HFILL }},
     { &hf_dop_name_item,
-      { "NameAndOptionalUID", "dop.NameAndOptionalUID",
+      { "NameAndOptionalUID", "dop.NameAndOptionalUID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_userGroup,
@@ -2745,7 +2745,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_NameAndOptionalUID", HFILL }},
     { &hf_dop_userGroup_item,
-      { "NameAndOptionalUID", "dop.NameAndOptionalUID",
+      { "NameAndOptionalUID", "dop.NameAndOptionalUID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_subtree,
@@ -2753,7 +2753,7 @@ void proto_register_dop(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_SubtreeSpecification", HFILL }},
     { &hf_dop_subtree_item,
-      { "SubtreeSpecification", "dop.SubtreeSpecification",
+      { "SubtreeSpecification", "dop.SubtreeSpecification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_grantsAndDenials,
@@ -2761,7 +2761,7 @@ void proto_register_dop(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_basicLevels,
-      { "basicLevels", "dop.basicLevels",
+      { "basicLevels", "dop.basicLevels_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dop_level,
@@ -2777,7 +2777,7 @@ void proto_register_dop(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_dop_other,
-      { "other", "dop.other",
+      { "other", "dop.other_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EXTERNAL", HFILL }},
     { &hf_dop_DSEType_root,
diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c
index 5e00a0bc02..139ae1f9d8 100644
--- a/epan/dissectors/packet-dsp.c
+++ b/epan/dissectors/packet-dsp.c
@@ -1994,7 +1994,7 @@ void proto_register_dsp(void) {
 /*--- Included file: packet-dsp-hfarr.c ---*/
 #line 1 "../../asn1/dsp/packet-dsp-hfarr.c"
     { &hf_dsp_AccessPoint_PDU,
-      { "AccessPoint", "dsp.AccessPoint",
+      { "AccessPoint", "dsp.AccessPoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_MasterAndShadowAccessPoints_PDU,
@@ -2002,11 +2002,11 @@ void proto_register_dsp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_DitBridgeKnowledge_PDU,
-      { "DitBridgeKnowledge", "dsp.DitBridgeKnowledge",
+      { "DitBridgeKnowledge", "dsp.DitBridgeKnowledge_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_chainedArgument,
-      { "chainedArgument", "dsp.chainedArgument",
+      { "chainedArgument", "dsp.chainedArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainingArguments", HFILL }},
     { &hf_dsp_readArgument,
@@ -2014,19 +2014,19 @@ void proto_register_dsp(void) {
         FT_UINT32, BASE_DEC, VALS(dap_ReadArgument_vals), 0,
         NULL, HFILL }},
     { &hf_dsp_unsignedChainedReadArgument,
-      { "unsignedChainedReadArgument", "dsp.unsignedChainedReadArgument",
+      { "unsignedChainedReadArgument", "dsp.unsignedChainedReadArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedReadArgumentData", HFILL }},
     { &hf_dsp_signedChainedReadArgument,
-      { "signedChainedReadArgument", "dsp.signedChainedReadArgument",
+      { "signedChainedReadArgument", "dsp.signedChainedReadArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_chainedReadArgument,
-      { "chainedReadArgument", "dsp.chainedReadArgument",
+      { "chainedReadArgument", "dsp.chainedReadArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedReadArgumentData", HFILL }},
     { &hf_dsp_algorithmIdentifier,
-      { "algorithmIdentifier", "dsp.algorithmIdentifier",
+      { "algorithmIdentifier", "dsp.algorithmIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_encrypted,
@@ -2034,7 +2034,7 @@ void proto_register_dsp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_dsp_chainedResults,
-      { "chainedResults", "dsp.chainedResults",
+      { "chainedResults", "dsp.chainedResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainingResults", HFILL }},
     { &hf_dsp_readResult,
@@ -2042,15 +2042,15 @@ void proto_register_dsp(void) {
         FT_UINT32, BASE_DEC, VALS(dap_ReadResult_vals), 0,
         NULL, HFILL }},
     { &hf_dsp_unsignedChainedReadResult,
-      { "unsignedChainedReadResult", "dsp.unsignedChainedReadResult",
+      { "unsignedChainedReadResult", "dsp.unsignedChainedReadResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedReadResultData", HFILL }},
     { &hf_dsp_signedChainedReadResult,
-      { "signedChainedReadResult", "dsp.signedChainedReadResult",
+      { "signedChainedReadResult", "dsp.signedChainedReadResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_chainedReadResult,
-      { "chainedReadResult", "dsp.chainedReadResult",
+      { "chainedReadResult", "dsp.chainedReadResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedReadResultData", HFILL }},
     { &hf_dsp_compareArgument,
@@ -2058,15 +2058,15 @@ void proto_register_dsp(void) {
         FT_UINT32, BASE_DEC, VALS(dap_CompareArgument_vals), 0,
         NULL, HFILL }},
     { &hf_dsp_unsignedChainedCompareArgument,
-      { "unsignedChainedCompareArgument", "dsp.unsignedChainedCompareArgument",
+      { "unsignedChainedCompareArgument", "dsp.unsignedChainedCompareArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedCompareArgumentData", HFILL }},
     { &hf_dsp_signedChainedCompareArgument,
-      { "signedChainedCompareArgument", "dsp.signedChainedCompareArgument",
+      { "signedChainedCompareArgument", "dsp.signedChainedCompareArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_chainedCompareArgument,
-      { "chainedCompareArgument", "dsp.chainedCompareArgument",
+      { "chainedCompareArgument", "dsp.chainedCompareArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedCompareArgumentData", HFILL }},
     { &hf_dsp_compareResult,
@@ -2074,15 +2074,15 @@ void proto_register_dsp(void) {
         FT_UINT32, BASE_DEC, VALS(dap_CompareResult_vals), 0,
         NULL, HFILL }},
     { &hf_dsp_unsignedChainedCompareResult,
-      { "unsignedChainedCompareResult", "dsp.unsignedChainedCompareResult",
+      { "unsignedChainedCompareResult", "dsp.unsignedChainedCompareResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedCompareResultData", HFILL }},
     { &hf_dsp_signedChainedCompareResult,
-      { "signedChainedCompareResult", "dsp.signedChainedCompareResult",
+      { "signedChainedCompareResult", "dsp.signedChainedCompareResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_chainedCompareResult,
-      { "chainedCompareResult", "dsp.chainedCompareResult",
+      { "chainedCompareResult", "dsp.chainedCompareResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedCompareResultData", HFILL }},
     { &hf_dsp_listArgument,
@@ -2090,15 +2090,15 @@ void proto_register_dsp(void) {
         FT_UINT32, BASE_DEC, VALS(dap_ListArgument_vals), 0,
         NULL, HFILL }},
     { &hf_dsp_unsignedChainedListArgument,
-      { "unsignedChainedListArgument", "dsp.unsignedChainedListArgument",
+      { "unsignedChainedListArgument", "dsp.unsignedChainedListArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedListArgumentData", HFILL }},
     { &hf_dsp_signedChainedListArgument,
-      { "signedChainedListArgument", "dsp.signedChainedListArgument",
+      { "signedChainedListArgument", "dsp.signedChainedListArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_chainedListArgument,
-      { "chainedListArgument", "dsp.chainedListArgument",
+      { "chainedListArgument", "dsp.chainedListArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedListArgumentData", HFILL }},
     { &hf_dsp_listResult,
@@ -2106,15 +2106,15 @@ void proto_register_dsp(void) {
         FT_UINT32, BASE_DEC, VALS(dap_ListResult_vals), 0,
         NULL, HFILL }},
     { &hf_dsp_unsignedChainedListResult,
-      { "unsignedChainedListResult", "dsp.unsignedChainedListResult",
+      { "unsignedChainedListResult", "dsp.unsignedChainedListResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedListResultData", HFILL }},
     { &hf_dsp_signedChainedListResult,
-      { "signedChainedListResult", "dsp.signedChainedListResult",
+      { "signedChainedListResult", "dsp.signedChainedListResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_chainedListResult,
-      { "chainedListResult", "dsp.chainedListResult",
+      { "chainedListResult", "dsp.chainedListResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedListResultData", HFILL }},
     { &hf_dsp_searchArgument,
@@ -2122,15 +2122,15 @@ void proto_register_dsp(void) {
         FT_UINT32, BASE_DEC, VALS(dap_SearchArgument_vals), 0,
         NULL, HFILL }},
     { &hf_dsp_unsignedChainedSearchArgument,
-      { "unsignedChainedSearchArgument", "dsp.unsignedChainedSearchArgument",
+      { "unsignedChainedSearchArgument", "dsp.unsignedChainedSearchArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedSearchArgumentData", HFILL }},
     { &hf_dsp_signedChainedSearchArgument,
-      { "signedChainedSearchArgument", "dsp.signedChainedSearchArgument",
+      { "signedChainedSearchArgument", "dsp.signedChainedSearchArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_chainedSearchArgument,
-      { "chainedSearchArgument", "dsp.chainedSearchArgument",
+      { "chainedSearchArgument", "dsp.chainedSearchArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedSearchArgumentData", HFILL }},
     { &hf_dsp_searchResult,
@@ -2138,15 +2138,15 @@ void proto_register_dsp(void) {
         FT_UINT32, BASE_DEC, VALS(dap_SearchResult_vals), 0,
         NULL, HFILL }},
     { &hf_dsp_unsignedChainedSearchResult,
-      { "unsignedChainedSearchResult", "dsp.unsignedChainedSearchResult",
+      { "unsignedChainedSearchResult", "dsp.unsignedChainedSearchResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedSearchResultData", HFILL }},
     { &hf_dsp_signedChainedSearchResult,
-      { "signedChainedSearchResult", "dsp.signedChainedSearchResult",
+      { "signedChainedSearchResult", "dsp.signedChainedSearchResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_chainedSearchResult,
-      { "chainedSearchResult", "dsp.chainedSearchResult",
+      { "chainedSearchResult", "dsp.chainedSearchResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedSearchResultData", HFILL }},
     { &hf_dsp_addEntryArgument,
@@ -2154,15 +2154,15 @@ void proto_register_dsp(void) {
         FT_UINT32, BASE_DEC, VALS(dap_AddEntryArgument_vals), 0,
         NULL, HFILL }},
     { &hf_dsp_unsignedChainedAddEntryArgument,
-      { "unsignedChainedAddEntryArgument", "dsp.unsignedChainedAddEntryArgument",
+      { "unsignedChainedAddEntryArgument", "dsp.unsignedChainedAddEntryArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedAddEntryArgumentData", HFILL }},
     { &hf_dsp_signedChainedAddEntryArgument,
-      { "signedChainedAddEntryArgument", "dsp.signedChainedAddEntryArgument",
+      { "signedChainedAddEntryArgument", "dsp.signedChainedAddEntryArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_chainedAddEntryArgument,
-      { "chainedAddEntryArgument", "dsp.chainedAddEntryArgument",
+      { "chainedAddEntryArgument", "dsp.chainedAddEntryArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedAddEntryArgumentData", HFILL }},
     { &hf_dsp_addEntryResult,
@@ -2170,15 +2170,15 @@ void proto_register_dsp(void) {
         FT_UINT32, BASE_DEC, VALS(dap_AddEntryResult_vals), 0,
         NULL, HFILL }},
     { &hf_dsp_unsignedChainedAddEntryResult,
-      { "unsignedChainedAddEntryResult", "dsp.unsignedChainedAddEntryResult",
+      { "unsignedChainedAddEntryResult", "dsp.unsignedChainedAddEntryResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedAddEntryResultData", HFILL }},
     { &hf_dsp_signedChainedAddEntryResult,
-      { "signedChainedAddEntryResult", "dsp.signedChainedAddEntryResult",
+      { "signedChainedAddEntryResult", "dsp.signedChainedAddEntryResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_chainedAddEntryResult,
-      { "chainedAddEntryResult", "dsp.chainedAddEntryResult",
+      { "chainedAddEntryResult", "dsp.chainedAddEntryResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedAddEntryResultData", HFILL }},
     { &hf_dsp_removeEntryArgument,
@@ -2186,15 +2186,15 @@ void proto_register_dsp(void) {
         FT_UINT32, BASE_DEC, VALS(dap_RemoveEntryArgument_vals), 0,
         NULL, HFILL }},
     { &hf_dsp_unsignedChainedRemoveEntryArgument,
-      { "unsignedChainedRemoveEntryArgument", "dsp.unsignedChainedRemoveEntryArgument",
+      { "unsignedChainedRemoveEntryArgument", "dsp.unsignedChainedRemoveEntryArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedRemoveEntryArgumentData", HFILL }},
     { &hf_dsp_signedChainedRemoveEntryArgument,
-      { "signedChainedRemoveEntryArgument", "dsp.signedChainedRemoveEntryArgument",
+      { "signedChainedRemoveEntryArgument", "dsp.signedChainedRemoveEntryArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_chainedRemoveEntryArgument,
-      { "chainedRemoveEntryArgument", "dsp.chainedRemoveEntryArgument",
+      { "chainedRemoveEntryArgument", "dsp.chainedRemoveEntryArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedRemoveEntryArgumentData", HFILL }},
     { &hf_dsp_removeEntryResult,
@@ -2202,15 +2202,15 @@ void proto_register_dsp(void) {
         FT_UINT32, BASE_DEC, VALS(dap_RemoveEntryResult_vals), 0,
         NULL, HFILL }},
     { &hf_dsp_unsignedChainedRemoveEntryResult,
-      { "unsignedChainedRemoveEntryResult", "dsp.unsignedChainedRemoveEntryResult",
+      { "unsignedChainedRemoveEntryResult", "dsp.unsignedChainedRemoveEntryResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedRemoveEntryResultData", HFILL }},
     { &hf_dsp_signedChainedRemoveEntryResult,
-      { "signedChainedRemoveEntryResult", "dsp.signedChainedRemoveEntryResult",
+      { "signedChainedRemoveEntryResult", "dsp.signedChainedRemoveEntryResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_chainedRemoveEntryResult,
-      { "chainedRemoveEntryResult", "dsp.chainedRemoveEntryResult",
+      { "chainedRemoveEntryResult", "dsp.chainedRemoveEntryResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedRemoveEntryResultData", HFILL }},
     { &hf_dsp_modifyEntryArgument,
@@ -2218,15 +2218,15 @@ void proto_register_dsp(void) {
         FT_UINT32, BASE_DEC, VALS(dap_ModifyEntryArgument_vals), 0,
         NULL, HFILL }},
     { &hf_dsp_unsignedChainedModifyEntryArgument,
-      { "unsignedChainedModifyEntryArgument", "dsp.unsignedChainedModifyEntryArgument",
+      { "unsignedChainedModifyEntryArgument", "dsp.unsignedChainedModifyEntryArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedModifyEntryArgumentData", HFILL }},
     { &hf_dsp_signedChainedModifyEntryArgument,
-      { "signedChainedModifyEntryArgument", "dsp.signedChainedModifyEntryArgument",
+      { "signedChainedModifyEntryArgument", "dsp.signedChainedModifyEntryArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_chainedModifyEntryArgument,
-      { "chainedModifyEntryArgument", "dsp.chainedModifyEntryArgument",
+      { "chainedModifyEntryArgument", "dsp.chainedModifyEntryArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedModifyEntryArgumentData", HFILL }},
     { &hf_dsp_modifyEntryResult,
@@ -2234,31 +2234,31 @@ void proto_register_dsp(void) {
         FT_UINT32, BASE_DEC, VALS(dap_ModifyEntryResult_vals), 0,
         NULL, HFILL }},
     { &hf_dsp_unsignedChainedModifyEntryResult,
-      { "unsignedChainedModifyEntryResult", "dsp.unsignedChainedModifyEntryResult",
+      { "unsignedChainedModifyEntryResult", "dsp.unsignedChainedModifyEntryResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedModifyEntryResultData", HFILL }},
     { &hf_dsp_signedChainedModifyEntryResult,
-      { "signedChainedModifyEntryResult", "dsp.signedChainedModifyEntryResult",
+      { "signedChainedModifyEntryResult", "dsp.signedChainedModifyEntryResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_chainedModifyEntryResult,
-      { "chainedModifyEntryResult", "dsp.chainedModifyEntryResult",
+      { "chainedModifyEntryResult", "dsp.chainedModifyEntryResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedModifyEntryResultData", HFILL }},
     { &hf_dsp_modifyDNArgument,
-      { "modifyDNArgument", "dsp.modifyDNArgument",
+      { "modifyDNArgument", "dsp.modifyDNArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_unsignedChainedModifyDNArgument,
-      { "unsignedChainedModifyDNArgument", "dsp.unsignedChainedModifyDNArgument",
+      { "unsignedChainedModifyDNArgument", "dsp.unsignedChainedModifyDNArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedModifyDNArgumentData", HFILL }},
     { &hf_dsp_signedChainedModifyDNArgument,
-      { "signedChainedModifyDNArgument", "dsp.signedChainedModifyDNArgument",
+      { "signedChainedModifyDNArgument", "dsp.signedChainedModifyDNArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_chainedModifyDNArgument,
-      { "chainedModifyDNArgument", "dsp.chainedModifyDNArgument",
+      { "chainedModifyDNArgument", "dsp.chainedModifyDNArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedModifyDNArgumentData", HFILL }},
     { &hf_dsp_modifyDNResult,
@@ -2266,19 +2266,19 @@ void proto_register_dsp(void) {
         FT_UINT32, BASE_DEC, VALS(dap_ModifyDNResult_vals), 0,
         NULL, HFILL }},
     { &hf_dsp_unsignedChainedModifyDNResult,
-      { "unsignedChainedModifyDNResult", "dsp.unsignedChainedModifyDNResult",
+      { "unsignedChainedModifyDNResult", "dsp.unsignedChainedModifyDNResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedModifyDNResultData", HFILL }},
     { &hf_dsp_signedChainedModifyDNResult,
-      { "signedChainedModifyDNResult", "dsp.signedChainedModifyDNResult",
+      { "signedChainedModifyDNResult", "dsp.signedChainedModifyDNResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_chainedModifyDNResult,
-      { "chainedModifyDNResult", "dsp.chainedModifyDNResult",
+      { "chainedModifyDNResult", "dsp.chainedModifyDNResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChainedModifyDNResultData", HFILL }},
     { &hf_dsp_reference,
-      { "reference", "dsp.reference",
+      { "reference", "dsp.reference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ContinuationReference", HFILL }},
     { &hf_dsp_contextPrefix,
@@ -2286,7 +2286,7 @@ void proto_register_dsp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DistinguishedName", HFILL }},
     { &hf_dsp_securityParameters,
-      { "securityParameters", "dsp.securityParameters",
+      { "securityParameters", "dsp.securityParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_performer,
@@ -2302,19 +2302,19 @@ void proto_register_dsp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Attribute", HFILL }},
     { &hf_dsp_notification_item,
-      { "Attribute", "dsp.Attribute",
+      { "Attribute", "dsp.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_unsignedDSAReferral,
-      { "unsignedDSAReferral", "dsp.unsignedDSAReferral",
+      { "unsignedDSAReferral", "dsp.unsignedDSAReferral_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DSAReferralData", HFILL }},
     { &hf_dsp_signedDSAReferral,
-      { "signedDSAReferral", "dsp.signedDSAReferral",
+      { "signedDSAReferral", "dsp.signedDSAReferral_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_dsaReferral,
-      { "dsaReferral", "dsp.dsaReferral",
+      { "dsaReferral", "dsp.dsaReferral_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DSAReferralData", HFILL }},
     { &hf_dsp_originator,
@@ -2326,7 +2326,7 @@ void proto_register_dsp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DistinguishedName", HFILL }},
     { &hf_dsp_operationProgress,
-      { "operationProgress", "dsp.operationProgress",
+      { "operationProgress", "dsp.operationProgress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_traceInformation,
@@ -2382,11 +2382,11 @@ void proto_register_dsp(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_dsp_searchRuleId,
-      { "searchRuleId", "dsp.searchRuleId",
+      { "searchRuleId", "dsp.searchRuleId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_chainedRelaxation,
-      { "chainedRelaxation", "dsp.chainedRelaxation",
+      { "chainedRelaxation", "dsp.chainedRelaxation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MRMapping", HFILL }},
     { &hf_dsp_relatedEntry,
@@ -2422,7 +2422,7 @@ void proto_register_dsp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_CrossReference", HFILL }},
     { &hf_dsp_crossReferences_item,
-      { "CrossReference", "dsp.CrossReference",
+      { "CrossReference", "dsp.CrossReference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_alreadySearched,
@@ -2430,7 +2430,7 @@ void proto_register_dsp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Exclusions", HFILL }},
     { &hf_dsp_accessPoint,
-      { "accessPoint", "dsp.accessPoint",
+      { "accessPoint", "dsp.accessPoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AccessPointInformation", HFILL }},
     { &hf_dsp_nameResolutionPhase,
@@ -2442,7 +2442,7 @@ void proto_register_dsp(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_dsp_TraceInformation_item,
-      { "TraceItem", "dsp.TraceItem",
+      { "TraceItem", "dsp.TraceItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_dsa,
@@ -2458,7 +2458,7 @@ void proto_register_dsp(void) {
         FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
         "Name", HFILL }},
     { &hf_dsp_address,
-      { "address", "dsp.address",
+      { "address", "dsp.address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PresentationAddress", HFILL }},
     { &hf_dsp_protocolInformation,
@@ -2466,7 +2466,7 @@ void proto_register_dsp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_ProtocolInformation", HFILL }},
     { &hf_dsp_protocolInformation_item,
-      { "ProtocolInformation", "dsp.ProtocolInformation",
+      { "ProtocolInformation", "dsp.ProtocolInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_labeledURI,
@@ -2482,7 +2482,7 @@ void proto_register_dsp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_dsp_MasterAndShadowAccessPoints_item,
-      { "MasterOrShadowAccessPoint", "dsp.MasterOrShadowAccessPoint",
+      { "MasterOrShadowAccessPoint", "dsp.MasterOrShadowAccessPoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_category,
@@ -2514,7 +2514,7 @@ void proto_register_dsp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_AccessPointInformation", HFILL }},
     { &hf_dsp_accessPoints_item,
-      { "AccessPointInformation", "dsp.AccessPointInformation",
+      { "AccessPointInformation", "dsp.AccessPointInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_returnToDUA,
@@ -2522,7 +2522,7 @@ void proto_register_dsp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_dsp_basicLevels,
-      { "basicLevels", "dsp.basicLevels",
+      { "basicLevels", "dsp.basicLevels_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dsp_level,
@@ -2538,7 +2538,7 @@ void proto_register_dsp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_dsp_other,
-      { "other", "dsp.other",
+      { "other", "dsp.other_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EXTERNAL", HFILL }},
 
diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c
index 14c2be911b..f5e56bf5c0 100644
--- a/epan/dissectors/packet-ess.c
+++ b/epan/dissectors/packet-ess.c
@@ -1141,7 +1141,7 @@ void proto_register_ess(void) {
 /*--- Included file: packet-ess-hfarr.c ---*/
 #line 1 "../../asn1/ess/packet-ess-hfarr.c"
     { &hf_ess_ReceiptRequest_PDU,
-      { "ReceiptRequest", "ess.ReceiptRequest",
+      { "ReceiptRequest", "ess.ReceiptRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_ContentIdentifier_PDU,
@@ -1149,11 +1149,11 @@ void proto_register_ess(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_Receipt_PDU,
-      { "Receipt", "ess.Receipt",
+      { "Receipt", "ess.Receipt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_ContentHints_PDU,
-      { "ContentHints", "ess.ContentHints",
+      { "ContentHints", "ess.ContentHints_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_MsgSigDigest_PDU,
@@ -1161,27 +1161,27 @@ void proto_register_ess(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_ContentReference_PDU,
-      { "ContentReference", "ess.ContentReference",
+      { "ContentReference", "ess.ContentReference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_ess_ESSSecurityLabel_PDU,
-      { "ESSSecurityLabel", "ess.ESSSecurityLabel",
+      { "ESSSecurityLabel", "ess.ESSSecurityLabel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_RestrictiveTag_PDU,
-      { "RestrictiveTag", "ess.RestrictiveTag",
+      { "RestrictiveTag", "ess.RestrictiveTag_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_EnumeratedTag_PDU,
-      { "EnumeratedTag", "ess.EnumeratedTag",
+      { "EnumeratedTag", "ess.EnumeratedTag_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_PermissiveTag_PDU,
-      { "PermissiveTag", "ess.PermissiveTag",
+      { "PermissiveTag", "ess.PermissiveTag_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_InformativeTag_PDU,
-      { "InformativeTag", "ess.InformativeTag",
+      { "InformativeTag", "ess.InformativeTag_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_EquivalentLabels_PDU,
@@ -1193,11 +1193,11 @@ void proto_register_ess(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_SigningCertificate_PDU,
-      { "SigningCertificate", "ess.SigningCertificate",
+      { "SigningCertificate", "ess.SigningCertificate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_SigningCertificateV2_PDU,
-      { "SigningCertificateV2", "ess.SigningCertificateV2",
+      { "SigningCertificateV2", "ess.SigningCertificateV2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_signedContentIdentifier,
@@ -1269,7 +1269,7 @@ void proto_register_ess(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "UTF8String_SIZE_1_MAX", HFILL }},
     { &hf_ess_SecurityCategories_item,
-      { "SecurityCategory", "ess.SecurityCategory",
+      { "SecurityCategory", "ess.SecurityCategory_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_type,
@@ -1277,7 +1277,7 @@ void proto_register_ess(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_value,
-      { "value", "ess.value",
+      { "value", "ess.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_restrictiveTagName,
@@ -1329,11 +1329,11 @@ void proto_register_ess(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_EquivalentLabels_item,
-      { "ESSSecurityLabel", "ess.ESSSecurityLabel",
+      { "ESSSecurityLabel", "ess.ESSSecurityLabel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_MLExpansionHistory_item,
-      { "MLData", "ess.MLData",
+      { "MLData", "ess.MLData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_mailListIdentifier,
@@ -1349,7 +1349,7 @@ void proto_register_ess(void) {
         FT_UINT32, BASE_DEC, VALS(ess_MLReceiptPolicy_vals), 0,
         NULL, HFILL }},
     { &hf_ess_issuerAndSerialNumber,
-      { "issuerAndSerialNumber", "ess.issuerAndSerialNumber",
+      { "issuerAndSerialNumber", "ess.issuerAndSerialNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_subjectKeyIdentifier,
@@ -1357,7 +1357,7 @@ void proto_register_ess(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_none,
-      { "none", "ess.none",
+      { "none", "ess.none_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_insteadOf,
@@ -1381,7 +1381,7 @@ void proto_register_ess(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ESSCertID", HFILL }},
     { &hf_ess_certs_item,
-      { "ESSCertID", "ess.ESSCertID",
+      { "ESSCertID", "ess.ESSCertID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_policies,
@@ -1389,7 +1389,7 @@ void proto_register_ess(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_PolicyInformation", HFILL }},
     { &hf_ess_policies_item,
-      { "PolicyInformation", "ess.PolicyInformation",
+      { "PolicyInformation", "ess.PolicyInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_certsV2,
@@ -1397,11 +1397,11 @@ void proto_register_ess(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ESSCertIDv2", HFILL }},
     { &hf_ess_certsV2_item,
-      { "ESSCertIDv2", "ess.ESSCertIDv2",
+      { "ESSCertIDv2", "ess.ESSCertIDv2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_hashAlgorithm,
-      { "hashAlgorithm", "ess.hashAlgorithm",
+      { "hashAlgorithm", "ess.hashAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_ess_certHash,
@@ -1409,7 +1409,7 @@ void proto_register_ess(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Hash", HFILL }},
     { &hf_ess_issuerSerial,
-      { "issuerSerial", "ess.issuerSerial",
+      { "issuerSerial", "ess.issuerSerial_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ess_issuer,
diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c
index 57b01cefdd..7f8265ebb3 100644
--- a/epan/dissectors/packet-ftam.c
+++ b/epan/dissectors/packet-ftam.c
@@ -4827,27 +4827,27 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, VALS(ftam_FSM_PDU_vals), 0,
         NULL, HFILL }},
     { &hf_ftam_f_initialize_request,
-      { "f-initialize-request", "ftam.f_initialize_request",
+      { "f-initialize-request", "ftam.f_initialize_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_initialize_response,
-      { "f-initialize-response", "ftam.f_initialize_response",
+      { "f-initialize-response", "ftam.f_initialize_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_terminate_request,
-      { "f-terminate-request", "ftam.f_terminate_request",
+      { "f-terminate-request", "ftam.f_terminate_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_terminate_response,
-      { "f-terminate-response", "ftam.f_terminate_response",
+      { "f-terminate-response", "ftam.f_terminate_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_u_abort_request,
-      { "f-u-abort-request", "ftam.f_u_abort_request",
+      { "f-u-abort-request", "ftam.f_u_abort_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_p_abort_request,
-      { "f-p-abort-request", "ftam.f_p_abort_request",
+      { "f-p-abort-request", "ftam.f_p_abort_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_protocol_Version,
@@ -4875,7 +4875,7 @@ void proto_register_ftam(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_shared_ASE_information,
-      { "shared-ASE-information", "ftam.shared_ASE_information",
+      { "shared-ASE-information", "ftam.shared_ASE_information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_ftam_quality_of_Service,
@@ -4931,111 +4931,111 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_select_request,
-      { "f-select-request", "ftam.f_select_request",
+      { "f-select-request", "ftam.f_select_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_select_response,
-      { "f-select-response", "ftam.f_select_response",
+      { "f-select-response", "ftam.f_select_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_deselect_request,
-      { "f-deselect-request", "ftam.f_deselect_request",
+      { "f-deselect-request", "ftam.f_deselect_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_deselect_response,
-      { "f-deselect-response", "ftam.f_deselect_response",
+      { "f-deselect-response", "ftam.f_deselect_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_create_request,
-      { "f-create-request", "ftam.f_create_request",
+      { "f-create-request", "ftam.f_create_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_create_response,
-      { "f-create-response", "ftam.f_create_response",
+      { "f-create-response", "ftam.f_create_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_delete_request,
-      { "f-delete-request", "ftam.f_delete_request",
+      { "f-delete-request", "ftam.f_delete_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_delete_response,
-      { "f-delete-response", "ftam.f_delete_response",
+      { "f-delete-response", "ftam.f_delete_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_read_attrib_request,
-      { "f-read-attrib-request", "ftam.f_read_attrib_request",
+      { "f-read-attrib-request", "ftam.f_read_attrib_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_read_attrib_response,
-      { "f-read-attrib-response", "ftam.f_read_attrib_response",
+      { "f-read-attrib-response", "ftam.f_read_attrib_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_Change_attrib_reques,
-      { "f-Change-attrib-reques", "ftam.f_Change_attrib_reques",
+      { "f-Change-attrib-reques", "ftam.f_Change_attrib_reques_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "F_CHANGE_ATTRIB_request", HFILL }},
     { &hf_ftam_f_Change_attrib_respon,
-      { "f-Change-attrib-respon", "ftam.f_Change_attrib_respon",
+      { "f-Change-attrib-respon", "ftam.f_Change_attrib_respon_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "F_CHANGE_ATTRIB_response", HFILL }},
     { &hf_ftam_f_open_request,
-      { "f-open-request", "ftam.f_open_request",
+      { "f-open-request", "ftam.f_open_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_open_response,
-      { "f-open-response", "ftam.f_open_response",
+      { "f-open-response", "ftam.f_open_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_close_request,
-      { "f-close-request", "ftam.f_close_request",
+      { "f-close-request", "ftam.f_close_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_close_response,
-      { "f-close-response", "ftam.f_close_response",
+      { "f-close-response", "ftam.f_close_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_begin_group_request,
-      { "f-begin-group-request", "ftam.f_begin_group_request",
+      { "f-begin-group-request", "ftam.f_begin_group_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_begin_group_response,
-      { "f-begin-group-response", "ftam.f_begin_group_response",
+      { "f-begin-group-response", "ftam.f_begin_group_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_end_group_request,
-      { "f-end-group-request", "ftam.f_end_group_request",
+      { "f-end-group-request", "ftam.f_end_group_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_end_group_response,
-      { "f-end-group-response", "ftam.f_end_group_response",
+      { "f-end-group-response", "ftam.f_end_group_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_recover_request,
-      { "f-recover-request", "ftam.f_recover_request",
+      { "f-recover-request", "ftam.f_recover_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_recover_response,
-      { "f-recover-response", "ftam.f_recover_response",
+      { "f-recover-response", "ftam.f_recover_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_locate_request,
-      { "f-locate-request", "ftam.f_locate_request",
+      { "f-locate-request", "ftam.f_locate_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_locate_response,
-      { "f-locate-response", "ftam.f_locate_response",
+      { "f-locate-response", "ftam.f_locate_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_erase_request,
-      { "f-erase-request", "ftam.f_erase_request",
+      { "f-erase-request", "ftam.f_erase_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_erase_response,
-      { "f-erase-response", "ftam.f_erase_response",
+      { "f-erase-response", "ftam.f_erase_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_select_attributes,
-      { "attributes", "ftam.attributes",
+      { "attributes", "ftam.attributes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Select_Attributes", HFILL }},
     { &hf_ftam_requested_access,
@@ -5043,7 +5043,7 @@ void proto_register_ftam(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Access_Request", HFILL }},
     { &hf_ftam_access_passwords,
-      { "access-passwords", "ftam.access_passwords",
+      { "access-passwords", "ftam.access_passwords_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_path_access_passwords,
@@ -5051,7 +5051,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_concurrency_control,
-      { "concurrency-control", "ftam.concurrency_control",
+      { "concurrency-control", "ftam.concurrency_control_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_referent_indicator,
@@ -5063,7 +5063,7 @@ void proto_register_ftam(void) {
         FT_INT32, BASE_DEC, VALS(ftam_Override_vals), 0,
         NULL, HFILL }},
     { &hf_ftam_initial_attributes,
-      { "initial-attributes", "ftam.initial_attributes",
+      { "initial-attributes", "ftam.initial_attributes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Create_Attributes", HFILL }},
     { &hf_ftam_create_password,
@@ -5079,11 +5079,11 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_read_attributes,
-      { "attributes", "ftam.attributes",
+      { "attributes", "ftam.attributes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Read_Attributes", HFILL }},
     { &hf_ftam_attributes,
-      { "attributes", "ftam.attributes",
+      { "attributes", "ftam.attributes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Change_Attributes", HFILL }},
     { &hf_ftam_processing_mode,
@@ -5095,7 +5095,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, VALS(ftam_T_open_contents_type_vals), 0,
         "T_open_contents_type", HFILL }},
     { &hf_ftam_unknown,
-      { "unknown", "ftam.unknown",
+      { "unknown", "ftam.unknown_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_proposed,
@@ -5199,43 +5199,43 @@ void proto_register_ftam(void) {
         FT_INT32, BASE_DEC, VALS(ftam_FADU_Lock_U_vals), 0,
         NULL, HFILL }},
     { &hf_ftam_f_read_request,
-      { "f-read-request", "ftam.f_read_request",
+      { "f-read-request", "ftam.f_read_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_write_request,
-      { "f-write-request", "ftam.f_write_request",
+      { "f-write-request", "ftam.f_write_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_data_end_request,
-      { "f-data-end-request", "ftam.f_data_end_request",
+      { "f-data-end-request", "ftam.f_data_end_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_transfer_end_request,
-      { "f-transfer-end-request", "ftam.f_transfer_end_request",
+      { "f-transfer-end-request", "ftam.f_transfer_end_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_transfer_end_response,
-      { "f-transfer-end-response", "ftam.f_transfer_end_response",
+      { "f-transfer-end-response", "ftam.f_transfer_end_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_cancel_request,
-      { "f-cancel-request", "ftam.f_cancel_request",
+      { "f-cancel-request", "ftam.f_cancel_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_cancel_response,
-      { "f-cancel-response", "ftam.f_cancel_response",
+      { "f-cancel-response", "ftam.f_cancel_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_restart_request,
-      { "f-restart-request", "ftam.f_restart_request",
+      { "f-restart-request", "ftam.f_restart_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_restart_response,
-      { "f-restart-response", "ftam.f_restart_response",
+      { "f-restart-response", "ftam.f_restart_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_read_access_context,
-      { "access-context", "ftam.access_context",
+      { "access-context", "ftam.access_context_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_transfer_number,
@@ -5339,7 +5339,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam__untag_item_01,
-      { "_untag item", "ftam._untag_item",
+      { "_untag item", "ftam._untag_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Charging_item", HFILL }},
     { &hf_ftam_resource_identifier,
@@ -5403,7 +5403,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, VALS(ftam_Access_Control_Attribute_vals), 0,
         "Access_Control_Attribute", HFILL }},
     { &hf_ftam__untag_item_02,
-      { "_untag item", "ftam._untag_item",
+      { "_untag item", "ftam._untag_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Diagnostic_item", HFILL }},
     { &hf_ftam_diagnostic_type,
@@ -5443,7 +5443,7 @@ void proto_register_ftam(void) {
         FT_INT32, BASE_DEC, VALS(ftam_T_begin_end_vals), 0,
         NULL, HFILL }},
     { &hf_ftam_single_name,
-      { "single-name", "ftam.single_name",
+      { "single-name", "ftam.single_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Node_Name", HFILL }},
     { &hf_ftam_name_list,
@@ -5451,7 +5451,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Node_Name", HFILL }},
     { &hf_ftam_name_list_item,
-      { "Node-Name", "ftam.Node_Name",
+      { "Node-Name", "ftam.Node_Name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_fadu_number,
@@ -5515,7 +5515,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, VALS(ftam_Object_Size_Attribute_vals), 0,
         "Object_Size_Attribute", HFILL }},
     { &hf_ftam_no_value_available,
-      { "no-value-available", "ftam.no_value_available",
+      { "no-value-available", "ftam.no_value_available_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_actual_values3,
@@ -5523,11 +5523,11 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_Access_Control_Element", HFILL }},
     { &hf_ftam_actual_values3_item,
-      { "Access-Control-Element", "ftam.Access_Control_Element",
+      { "Access-Control-Element", "ftam.Access_Control_Element_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_actual_values1,
-      { "actual-values", "ftam.actual_values",
+      { "actual-values", "ftam.actual_values_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_actual_values1", HFILL }},
     { &hf_ftam_insert_values,
@@ -5535,7 +5535,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_Access_Control_Element", HFILL }},
     { &hf_ftam_insert_values_item,
-      { "Access-Control-Element", "ftam.Access_Control_Element",
+      { "Access-Control-Element", "ftam.Access_Control_Element_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_delete_values,
@@ -5543,7 +5543,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_Access_Control_Element", HFILL }},
     { &hf_ftam_delete_values_item,
-      { "Access-Control-Element", "ftam.Access_Control_Element",
+      { "Access-Control-Element", "ftam.Access_Control_Element_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_action_list,
@@ -5551,7 +5551,7 @@ void proto_register_ftam(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Access_Request", HFILL }},
     { &hf_ftam_concurrency_access,
-      { "concurrency-access", "ftam.concurrency_access",
+      { "concurrency-access", "ftam.concurrency_access_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_identity,
@@ -5559,7 +5559,7 @@ void proto_register_ftam(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "User_Identity", HFILL }},
     { &hf_ftam_passwords,
-      { "passwords", "ftam.passwords",
+      { "passwords", "ftam.passwords_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Access_Passwords", HFILL }},
     { &hf_ftam_location,
@@ -5603,15 +5603,15 @@ void proto_register_ftam(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "Account", HFILL }},
     { &hf_ftam_document_type,
-      { "document-type", "ftam.document_type",
+      { "document-type", "ftam.document_type_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_document_type", HFILL }},
     { &hf_ftam_parameter,
-      { "parameter", "ftam.parameter",
+      { "parameter", "ftam.parameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_constraint_set_and_abstract_Syntax,
-      { "constraint-set-and-abstract-Syntax", "ftam.constraint_set_and_abstract_Syntax",
+      { "constraint-set-and-abstract-Syntax", "ftam.constraint_set_and_abstract_Syntax_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_constraint_set_and_abstract_Syntax", HFILL }},
     { &hf_ftam_constraint_set_name,
@@ -5643,11 +5643,11 @@ void proto_register_ftam(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "GraphicString", HFILL }},
     { &hf_ftam_abstract_Syntax_not_supported,
-      { "abstract-Syntax-not-supported", "ftam.abstract_Syntax_not_supported",
+      { "abstract-Syntax-not-supported", "ftam.abstract_Syntax_not_supported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_actual_values4,
-      { "actual-values", "ftam.actual_values",
+      { "actual-values", "ftam.actual_values_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EXTERNAL", HFILL }},
     { &hf_ftam_actual_values6,
@@ -5659,131 +5659,131 @@ void proto_register_ftam(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "GraphicString", HFILL }},
     { &hf_ftam_f_Change_prefix_request,
-      { "f-Change-prefix-request", "ftam.f_Change_prefix_request",
+      { "f-Change-prefix-request", "ftam.f_Change_prefix_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_Change_prefix_response,
-      { "f-Change-prefix-response", "ftam.f_Change_prefix_response",
+      { "f-Change-prefix-response", "ftam.f_Change_prefix_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_list_request,
-      { "f-list-request", "ftam.f_list_request",
+      { "f-list-request", "ftam.f_list_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_list_response,
-      { "f-list-response", "ftam.f_list_response",
+      { "f-list-response", "ftam.f_list_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_group_select_request,
-      { "f-group-select-request", "ftam.f_group_select_request",
+      { "f-group-select-request", "ftam.f_group_select_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_group_select_response,
-      { "f-group-select-response", "ftam.f_group_select_response",
+      { "f-group-select-response", "ftam.f_group_select_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_group_delete_request,
-      { "f-group-delete-request", "ftam.f_group_delete_request",
+      { "f-group-delete-request", "ftam.f_group_delete_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_group_delete_response,
-      { "f-group-delete-response", "ftam.f_group_delete_response",
+      { "f-group-delete-response", "ftam.f_group_delete_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_group_move_request,
-      { "f-group-move-request", "ftam.f_group_move_request",
+      { "f-group-move-request", "ftam.f_group_move_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_group_move_response,
-      { "f-group-move-response", "ftam.f_group_move_response",
+      { "f-group-move-response", "ftam.f_group_move_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_group_copy_request,
-      { "f-group-copy-request", "ftam.f_group_copy_request",
+      { "f-group-copy-request", "ftam.f_group_copy_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_group_copy_response,
-      { "f-group-copy-response", "ftam.f_group_copy_response",
+      { "f-group-copy-response", "ftam.f_group_copy_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_group_list_request,
-      { "f-group-list-request", "ftam.f_group_list_request",
+      { "f-group-list-request", "ftam.f_group_list_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_group_list_response,
-      { "f-group-list-response", "ftam.f_group_list_response",
+      { "f-group-list-response", "ftam.f_group_list_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_group_Change_attrib_request,
-      { "f-group-Change-attrib-request", "ftam.f_group_Change_attrib_request",
+      { "f-group-Change-attrib-request", "ftam.f_group_Change_attrib_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_group_Change_attrib_response,
-      { "f-group-Change-attrib-response", "ftam.f_group_Change_attrib_response",
+      { "f-group-Change-attrib-response", "ftam.f_group_Change_attrib_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_select_another_request,
-      { "f-select-another-request", "ftam.f_select_another_request",
+      { "f-select-another-request", "ftam.f_select_another_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_select_another_response,
-      { "f-select-another-response", "ftam.f_select_another_response",
+      { "f-select-another-response", "ftam.f_select_another_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_create_directory_request,
-      { "f-create-directory-request", "ftam.f_create_directory_request",
+      { "f-create-directory-request", "ftam.f_create_directory_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_create_directory_response,
-      { "f-create-directory-response", "ftam.f_create_directory_response",
+      { "f-create-directory-response", "ftam.f_create_directory_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_link_request,
-      { "f-link-request", "ftam.f_link_request",
+      { "f-link-request", "ftam.f_link_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_link_response,
-      { "f-link-response", "ftam.f_link_response",
+      { "f-link-response", "ftam.f_link_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_unlink_request,
-      { "f-unlink-request", "ftam.f_unlink_request",
+      { "f-unlink-request", "ftam.f_unlink_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_unlink_response,
-      { "f-unlink-response", "ftam.f_unlink_response",
+      { "f-unlink-response", "ftam.f_unlink_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_read_link_attrib_request,
-      { "f-read-link-attrib-request", "ftam.f_read_link_attrib_request",
+      { "f-read-link-attrib-request", "ftam.f_read_link_attrib_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_read_link_attrib_response,
-      { "f-read-link-attrib-response", "ftam.f_read_link_attrib_response",
+      { "f-read-link-attrib-response", "ftam.f_read_link_attrib_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_Change_link_attrib_request,
-      { "f-Change-link-attrib-request", "ftam.f_Change_link_attrib_request",
+      { "f-Change-link-attrib-request", "ftam.f_Change_link_attrib_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_Change_Iink_attrib_response,
-      { "f-Change-Iink-attrib-response", "ftam.f_Change_Iink_attrib_response",
+      { "f-Change-Iink-attrib-response", "ftam.f_Change_Iink_attrib_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "F_CHANGE_LINK_ATTRIB_response", HFILL }},
     { &hf_ftam_f_move_request,
-      { "f-move-request", "ftam.f_move_request",
+      { "f-move-request", "ftam.f_move_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_move_response,
-      { "f-move-response", "ftam.f_move_response",
+      { "f-move-response", "ftam.f_move_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_copy_request,
-      { "f-copy-request", "ftam.f_copy_request",
+      { "f-copy-request", "ftam.f_copy_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_f_copy_response,
-      { "f-copy-response", "ftam.f_copy_response",
+      { "f-copy-response", "ftam.f_copy_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_reset,
@@ -5831,7 +5831,7 @@ void proto_register_ftam(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_ftam_shared_ASE_infonnation,
-      { "shared-ASE-infonnation", "ftam.shared_ASE_infonnation",
+      { "shared-ASE-infonnation", "ftam.shared_ASE_infonnation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Shared_ASE_Information", HFILL }},
     { &hf_ftam_target_object,
@@ -5843,11 +5843,11 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, VALS(ftam_Pathname_Attribute_vals), 0,
         "Pathname_Attribute", HFILL }},
     { &hf_ftam_read_link_attributes,
-      { "attributes", "ftam.attributes",
+      { "attributes", "ftam.attributes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Read_Attributes", HFILL }},
     { &hf_ftam_Attribute_Extension_Names_item,
-      { "Attribute-Extension-Set-Name", "ftam.Attribute_Extension_Set_Name",
+      { "Attribute-Extension-Set-Name", "ftam.Attribute_Extension_Set_Name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_extension_set_identifier,
@@ -5863,7 +5863,7 @@ void proto_register_ftam(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_Attribute_Extensions_item,
-      { "Attribute-Extension-Set", "ftam.Attribute_Extension_Set",
+      { "Attribute-Extension-Set", "ftam.Attribute_Extension_Set_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_extension_set_attributes,
@@ -5871,7 +5871,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension_Attribute", HFILL }},
     { &hf_ftam_extension_set_attributes_item,
-      { "Extension-Attribute", "ftam.Extension_Attribute",
+      { "Extension-Attribute", "ftam.Extension_Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_extension_attribute_identifier,
@@ -5879,11 +5879,11 @@ void proto_register_ftam(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_extension_attribute,
-      { "extension-attribute", "ftam.extension_attribute",
+      { "extension-attribute", "ftam.extension_attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam__untag_item_03,
-      { "_untag item", "ftam._untag_item",
+      { "_untag item", "ftam._untag_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_root_directory,
@@ -5903,15 +5903,15 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, VALS(ftam_AND_Set_item_vals), 0,
         NULL, HFILL }},
     { &hf_ftam_pathname_Pattern,
-      { "pathname-Pattern", "ftam.pathname_Pattern",
+      { "pathname-Pattern", "ftam.pathname_Pattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_object_type_Pattern,
-      { "object-type-Pattern", "ftam.object_type_Pattern",
+      { "object-type-Pattern", "ftam.object_type_Pattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Integer_Pattern", HFILL }},
     { &hf_ftam_permitted_actions_Pattern,
-      { "permitted-actions-Pattern", "ftam.permitted_actions_Pattern",
+      { "permitted-actions-Pattern", "ftam.permitted_actions_Pattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Bitstring_Pattern", HFILL }},
     { &hf_ftam_contents_type_Pattern,
@@ -5919,67 +5919,67 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, VALS(ftam_Contents_Type_Pattern_vals), 0,
         NULL, HFILL }},
     { &hf_ftam_linked_Object_Pattern,
-      { "linked-Object-Pattern", "ftam.linked_Object_Pattern",
+      { "linked-Object-Pattern", "ftam.linked_Object_Pattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Pathname_Pattern", HFILL }},
     { &hf_ftam_child_objects_Pattern,
-      { "child-objects-Pattern", "ftam.child_objects_Pattern",
+      { "child-objects-Pattern", "ftam.child_objects_Pattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Pathname_Pattern", HFILL }},
     { &hf_ftam_primaty_pathname_Pattern,
-      { "primaty-pathname-Pattern", "ftam.primaty_pathname_Pattern",
+      { "primaty-pathname-Pattern", "ftam.primaty_pathname_Pattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Pathname_Pattern", HFILL }},
     { &hf_ftam_storage_account_Pattern,
-      { "storage-account-Pattern", "ftam.storage_account_Pattern",
+      { "storage-account-Pattern", "ftam.storage_account_Pattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "String_Pattern", HFILL }},
     { &hf_ftam_date_and_time_of_creation_Pattern,
-      { "date-and-time-of-creation-Pattern", "ftam.date_and_time_of_creation_Pattern",
+      { "date-and-time-of-creation-Pattern", "ftam.date_and_time_of_creation_Pattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Date_and_Time_Pattern", HFILL }},
     { &hf_ftam_date_and_time_of_last_modification_Pattern,
-      { "date-and-time-of-last-modification-Pattern", "ftam.date_and_time_of_last_modification_Pattern",
+      { "date-and-time-of-last-modification-Pattern", "ftam.date_and_time_of_last_modification_Pattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Date_and_Time_Pattern", HFILL }},
     { &hf_ftam_date_and_time_of_last_read_access_Pattern,
-      { "date-and-time-of-last-read-access-Pattern", "ftam.date_and_time_of_last_read_access_Pattern",
+      { "date-and-time-of-last-read-access-Pattern", "ftam.date_and_time_of_last_read_access_Pattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Date_and_Time_Pattern", HFILL }},
     { &hf_ftam_date_and_time_of_last_attribute_modification_Pattern,
-      { "date-and-time-of-last-attribute-modification-Pattern", "ftam.date_and_time_of_last_attribute_modification_Pattern",
+      { "date-and-time-of-last-attribute-modification-Pattern", "ftam.date_and_time_of_last_attribute_modification_Pattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Date_and_Time_Pattern", HFILL }},
     { &hf_ftam_identity_of_creator_Pattern,
-      { "identity-of-creator-Pattern", "ftam.identity_of_creator_Pattern",
+      { "identity-of-creator-Pattern", "ftam.identity_of_creator_Pattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "User_Identity_Pattern", HFILL }},
     { &hf_ftam_identity_of_last_modifier_Pattern,
-      { "identity-of-last-modifier-Pattern", "ftam.identity_of_last_modifier_Pattern",
+      { "identity-of-last-modifier-Pattern", "ftam.identity_of_last_modifier_Pattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "User_Identity_Pattern", HFILL }},
     { &hf_ftam_identity_of_last_reader_Pattern,
-      { "identity-of-last-reader-Pattern", "ftam.identity_of_last_reader_Pattern",
+      { "identity-of-last-reader-Pattern", "ftam.identity_of_last_reader_Pattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "User_Identity_Pattern", HFILL }},
     { &hf_ftam_identity_of_last_attribute_modifier_Pattern,
-      { "identity-of-last-attribute-modifier-Pattern", "ftam.identity_of_last_attribute_modifier_Pattern",
+      { "identity-of-last-attribute-modifier-Pattern", "ftam.identity_of_last_attribute_modifier_Pattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "User_Identity_Pattern", HFILL }},
     { &hf_ftam_object_availabiiity_Pattern,
-      { "object-availabiiity-Pattern", "ftam.object_availabiiity_Pattern",
+      { "object-availabiiity-Pattern", "ftam.object_availabiiity_Pattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Boolean_Pattern", HFILL }},
     { &hf_ftam_object_size_Pattern,
-      { "object-size-Pattern", "ftam.object_size_Pattern",
+      { "object-size-Pattern", "ftam.object_size_Pattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Integer_Pattern", HFILL }},
     { &hf_ftam_future_object_size_Pattern,
-      { "future-object-size-Pattern", "ftam.future_object_size_Pattern",
+      { "future-object-size-Pattern", "ftam.future_object_size_Pattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Integer_Pattern", HFILL }},
     { &hf_ftam_legal_quailfication_Pattern,
-      { "legal-quailfication-Pattern", "ftam.legal_quailfication_Pattern",
+      { "legal-quailfication-Pattern", "ftam.legal_quailfication_Pattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "String_Pattern", HFILL }},
     { &hf_ftam_attribute_extensions_pattern,
@@ -5999,11 +5999,11 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, VALS(ftam_T_pathname_value_item_vals), 0,
         NULL, HFILL }},
     { &hf_ftam_string_match,
-      { "string-match", "ftam.string_match",
+      { "string-match", "ftam.string_match_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "String_Pattern", HFILL }},
     { &hf_ftam_any_match,
-      { "any-match", "ftam.any_match",
+      { "any-match", "ftam.any_match_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_string_value,
@@ -6055,23 +6055,23 @@ void proto_register_ftam(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_ftam_document_type_Pattern,
-      { "document-type-Pattern", "ftam.document_type_Pattern",
+      { "document-type-Pattern", "ftam.document_type_Pattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Object_Identifier_Pattern", HFILL }},
     { &hf_ftam_constraint_set_abstract_Syntax_Pattern,
-      { "constraint-set-abstract-Syntax-Pattern", "ftam.constraint_set_abstract_Syntax_Pattern",
+      { "constraint-set-abstract-Syntax-Pattern", "ftam.constraint_set_abstract_Syntax_Pattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_constraint_set_abstract_Syntax_Pattern", HFILL }},
     { &hf_ftam_constraint_Set_Pattern,
-      { "constraint-Set-Pattern", "ftam.constraint_Set_Pattern",
+      { "constraint-Set-Pattern", "ftam.constraint_Set_Pattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Object_Identifier_Pattern", HFILL }},
     { &hf_ftam_abstract_Syntax_Pattern,
-      { "abstract-Syntax-Pattern", "ftam.abstract_Syntax_Pattern",
+      { "abstract-Syntax-Pattern", "ftam.abstract_Syntax_Pattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Object_Identifier_Pattern", HFILL }},
     { &hf_ftam_Attribute_Extensions_Pattern_item,
-      { "Attribute-Extensions-Pattern item", "ftam.Attribute_Extensions_Pattern_item",
+      { "Attribute-Extensions-Pattern item", "ftam.Attribute_Extensions_Pattern_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_extension_set_attribute_Patterns,
@@ -6079,7 +6079,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_extension_set_attribute_Patterns", HFILL }},
     { &hf_ftam_extension_set_attribute_Patterns_item,
-      { "extension-set-attribute-Patterns item", "ftam.extension_set_attribute_Patterns_item",
+      { "extension-set-attribute-Patterns item", "ftam.extension_set_attribute_Patterns_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_extension_set_attribute_Patterns_item", HFILL }},
     { &hf_ftam_attribute_extension_attribute_identifier,
@@ -6087,11 +6087,11 @@ void proto_register_ftam(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "T_attribute_extension_attribute_identifier", HFILL }},
     { &hf_ftam_extension_attribute_Pattern,
-      { "extension-attribute-Pattern", "ftam.extension_attribute_Pattern",
+      { "extension-attribute-Pattern", "ftam.extension_attribute_Pattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam__untag_item_04,
-      { "Read-Attributes", "ftam.Read_Attributes",
+      { "Read-Attributes", "ftam.Read_Attributes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_success_Object_count,
@@ -6115,7 +6115,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, VALS(ftam_Password_U_vals), 0,
         NULL, HFILL }},
     { &hf_ftam__untag_item_05,
-      { "_untag item", "ftam._untag_item",
+      { "_untag item", "ftam._untag_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Path_Access_Passwords_item", HFILL }},
     { &hf_ftam_ap,
diff --git a/epan/dissectors/packet-gnm.c b/epan/dissectors/packet-gnm.c
index 89e3cab144..f414904acf 100644
--- a/epan/dissectors/packet-gnm.c
+++ b/epan/dissectors/packet-gnm.c
@@ -2209,7 +2209,7 @@ void proto_register_gnm(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_SystemTimingSource_PDU,
-      { "SystemTimingSource", "gnm.SystemTimingSource",
+      { "SystemTimingSource", "gnm.SystemTimingSource_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_TpsInGtpList_PDU,
@@ -2281,7 +2281,7 @@ void proto_register_gnm(void) {
         FT_UINT32, BASE_DEC, VALS(gnm_AlarmSeverityCode_vals), 0,
         "AlarmSeverityCode", HFILL }},
     { &hf_gnm_AlarmSeverityAssignmentList_item,
-      { "AlarmSeverityAssignment", "gnm.AlarmSeverityAssignment",
+      { "AlarmSeverityAssignment", "gnm.AlarmSeverityAssignment_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_characteristicInfoType,
@@ -2293,15 +2293,15 @@ void proto_register_gnm(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_gnm_pointToPoint,
-      { "pointToPoint", "gnm.pointToPoint",
+      { "pointToPoint", "gnm.pointToPoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_pointToMultipoint,
-      { "pointToMultipoint", "gnm.pointToMultipoint",
+      { "pointToMultipoint", "gnm.pointToMultipoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_ConnectInformation_item,
-      { "ConnectInformation item", "gnm.ConnectInformation_item",
+      { "ConnectInformation item", "gnm.ConnectInformation_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_itemType,
@@ -2317,7 +2317,7 @@ void proto_register_gnm(void) {
         FT_UINT32, BASE_DEC, VALS(gnm_ConnectionTypeBi_vals), 0,
         "ConnectionTypeBi", HFILL }},
     { &hf_gnm_addleg,
-      { "addleg", "gnm.addleg",
+      { "addleg", "gnm.addleg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_administrativeState,
@@ -2325,7 +2325,7 @@ void proto_register_gnm(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_AdministrativeState_vals), 0,
         NULL, HFILL }},
     { &hf_gnm_namedCrossConnection,
-      { "namedCrossConnection", "gnm.namedCrossConnection",
+      { "namedCrossConnection", "gnm.namedCrossConnection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_userLabel,
@@ -2341,7 +2341,7 @@ void proto_register_gnm(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "AdditionalInformation", HFILL }},
     { &hf_gnm_none,
-      { "none", "gnm.none",
+      { "none", "gnm.none_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_single,
@@ -2357,19 +2357,19 @@ void proto_register_gnm(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
         NULL, HFILL }},
     { &hf_gnm_explicitPToP,
-      { "explicitPToP", "gnm.explicitPToP",
+      { "explicitPToP", "gnm.explicitPToP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_ptoTpPool,
-      { "ptoTpPool", "gnm.ptoTpPool",
+      { "ptoTpPool", "gnm.ptoTpPool_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_explicitPtoMP,
-      { "explicitPtoMP", "gnm.explicitPtoMP",
+      { "explicitPtoMP", "gnm.explicitPtoMP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_ptoMPools,
-      { "ptoMPools", "gnm.ptoMPools",
+      { "ptoMPools", "gnm.ptoMPools_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_notConnected,
@@ -2389,7 +2389,7 @@ void proto_register_gnm(void) {
         FT_UINT32, BASE_DEC, VALS(gnm_AlarmStatus_vals), 0,
         NULL, HFILL }},
     { &hf_gnm_CurrentProblemList_item,
-      { "CurrentProblem", "gnm.CurrentProblem",
+      { "CurrentProblem", "gnm.CurrentProblem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_DisconnectResult_item,
@@ -2457,7 +2457,7 @@ void proto_register_gnm(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "PrintableString", HFILL }},
     { &hf_gnm_logicalProblem,
-      { "logicalProblem", "gnm.logicalProblem",
+      { "logicalProblem", "gnm.logicalProblem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_resourceProblem,
@@ -2465,7 +2465,7 @@ void proto_register_gnm(void) {
         FT_UINT32, BASE_DEC, VALS(gnm_ResourceProblem_vals), 0,
         NULL, HFILL }},
     { &hf_gnm_holderEmpty,
-      { "holderEmpty", "gnm.holderEmpty",
+      { "holderEmpty", "gnm.holderEmpty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_inTheAcceptableList,
@@ -2477,7 +2477,7 @@ void proto_register_gnm(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "CircuitPackType", HFILL }},
     { &hf_gnm_unknownType,
-      { "unknownType", "gnm.unknownType",
+      { "unknownType", "gnm.unknownType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_ListOfCharacteristicInformation_item,
@@ -2537,7 +2537,7 @@ void proto_register_gnm(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
         NULL, HFILL }},
     { &hf_gnm_diverse,
-      { "diverse", "gnm.diverse",
+      { "diverse", "gnm.diverse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_downstream,
@@ -2557,7 +2557,7 @@ void proto_register_gnm(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
         "ObjectInstance", HFILL }},
     { &hf_gnm_null,
-      { "null", "gnm.null",
+      { "null", "gnm.null_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_fromTp_01,
@@ -2577,7 +2577,7 @@ void proto_register_gnm(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_toTps_item,
-      { "toTps item", "gnm.toTps_item",
+      { "toTps item", "gnm.toTps_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_tp,
@@ -2593,7 +2593,7 @@ void proto_register_gnm(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
         "ObjectInstance", HFILL }},
     { &hf_gnm_unknown,
-      { "unknown", "gnm.unknown",
+      { "unknown", "gnm.unknown_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_integerValue,
@@ -2609,7 +2609,7 @@ void proto_register_gnm(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
         "ObjectInstance", HFILL }},
     { &hf_gnm_notAvailable,
-      { "notAvailable", "gnm.notAvailable",
+      { "notAvailable", "gnm.notAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_relatedObject,
@@ -2621,7 +2621,7 @@ void proto_register_gnm(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
         NULL, HFILL }},
     { &hf_gnm_SignalRateAndMappingList_item,
-      { "SignalRateAndMappingList item", "gnm.SignalRateAndMappingList_item",
+      { "SignalRateAndMappingList item", "gnm.SignalRateAndMappingList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_signalRate,
@@ -2641,7 +2641,7 @@ void proto_register_gnm(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "CharacteristicInformation", HFILL }},
     { &hf_gnm_bundle,
-      { "bundle", "gnm.bundle",
+      { "bundle", "gnm.bundle_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_complex,
@@ -2649,11 +2649,11 @@ void proto_register_gnm(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Bundle", HFILL }},
     { &hf_gnm_complex_item,
-      { "Bundle", "gnm.Bundle",
+      { "Bundle", "gnm.Bundle_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_notApplicable,
-      { "notApplicable", "gnm.notApplicable",
+      { "notApplicable", "gnm.notApplicable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_softwareInstances,
@@ -2685,11 +2685,11 @@ void proto_register_gnm(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
         "ObjectInstance", HFILL }},
     { &hf_gnm_primaryTimingSource,
-      { "primaryTimingSource", "gnm.primaryTimingSource",
+      { "primaryTimingSource", "gnm.primaryTimingSource_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemTiming", HFILL }},
     { &hf_gnm_secondaryTimingSource,
-      { "secondaryTimingSource", "gnm.secondaryTimingSource",
+      { "secondaryTimingSource", "gnm.secondaryTimingSource_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemTiming", HFILL }},
     { &hf_gnm_toTpOrGTP,
@@ -2701,7 +2701,7 @@ void proto_register_gnm(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
         "ObjectInstance", HFILL }},
     { &hf_gnm_ToTPPools_item,
-      { "ToTPPools item", "gnm.ToTPPools_item",
+      { "ToTPPools item", "gnm.ToTPPools_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gnm_tpPoolId,
diff --git a/epan/dissectors/packet-goose.c b/epan/dissectors/packet-goose.c
index c3f0042a91..15241b8523 100644
--- a/epan/dissectors/packet-goose.c
+++ b/epan/dissectors/packet-goose.c
@@ -785,11 +785,11 @@ void proto_register_goose(void) {
 /*--- Included file: packet-goose-hfarr.c ---*/
 #line 1 "../../asn1/goose/packet-goose-hfarr.c"
     { &hf_goose_gseMngtPdu,
-      { "gseMngtPdu", "goose.gseMngtPdu",
+      { "gseMngtPdu", "goose.gseMngtPdu_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_goose_goosePdu,
-      { "goosePdu", "goose.goosePdu",
+      { "goosePdu", "goose.goosePdu_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IECGoosePdu", HFILL }},
     { &hf_goose_stateID,
@@ -809,39 +809,39 @@ void proto_register_goose(void) {
         FT_UINT32, BASE_DEC, VALS(goose_GSEMngtResponses_vals), 0,
         "GSEMngtResponses", HFILL }},
     { &hf_goose_getGoReference,
-      { "getGoReference", "goose.getGoReference",
+      { "getGoReference", "goose.getGoReference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetReferenceRequestPdu", HFILL }},
     { &hf_goose_getGOOSEElementNumber,
-      { "getGOOSEElementNumber", "goose.getGOOSEElementNumber",
+      { "getGOOSEElementNumber", "goose.getGOOSEElementNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetElementRequestPdu", HFILL }},
     { &hf_goose_getGsReference,
-      { "getGsReference", "goose.getGsReference",
+      { "getGsReference", "goose.getGsReference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetReferenceRequestPdu", HFILL }},
     { &hf_goose_getGSSEDataOffset,
-      { "getGSSEDataOffset", "goose.getGSSEDataOffset",
+      { "getGSSEDataOffset", "goose.getGSSEDataOffset_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetElementRequestPdu", HFILL }},
     { &hf_goose_gseMngtNotSupported,
-      { "gseMngtNotSupported", "goose.gseMngtNotSupported",
+      { "gseMngtNotSupported", "goose.gseMngtNotSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_goose_gseMngtResponses_GetGOReference,
-      { "getGoReference", "goose.getGoReference",
+      { "getGoReference", "goose.getGoReference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GSEMngtResponsePdu", HFILL }},
     { &hf_goose_gseMngtResponses_GetGOOSEElementNumber,
-      { "getGOOSEElementNumber", "goose.getGOOSEElementNumber",
+      { "getGOOSEElementNumber", "goose.getGOOSEElementNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GSEMngtResponsePdu", HFILL }},
     { &hf_goose_gseMngtResponses_GetGSReference,
-      { "getGsReference", "goose.getGsReference",
+      { "getGsReference", "goose.getGsReference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GSEMngtResponsePdu", HFILL }},
     { &hf_goose_gseMngtResponses_GetGSSEDataOffset,
-      { "getGSSEDataOffset", "goose.getGSSEDataOffset",
+      { "getGSSEDataOffset", "goose.getGSSEDataOffset_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GSEMngtResponsePdu", HFILL }},
     { &hf_goose_ident,
@@ -873,7 +873,7 @@ void proto_register_goose(void) {
         FT_UINT32, BASE_DEC, VALS(goose_PositiveNegative_vals), 0,
         "PositiveNegative", HFILL }},
     { &hf_goose_responsePositive,
-      { "responsePositive", "goose.responsePositive",
+      { "responsePositive", "goose.responsePositive_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_goose_datSet,
diff --git a/epan/dissectors/packet-gprscdr.c b/epan/dissectors/packet-gprscdr.c
index 2944eedd77..0bddd32567 100644
--- a/epan/dissectors/packet-gprscdr.c
+++ b/epan/dissectors/packet-gprscdr.c
@@ -2721,11 +2721,11 @@ proto_register_gprscdr(void)
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_gprscdr_networkSpecificCause,
-      { "networkSpecificCause", "gprscdr.networkSpecificCause",
+      { "networkSpecificCause", "gprscdr.networkSpecificCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ManagementExtension", HFILL }},
     { &hf_gprscdr_manufacturerSpecificCause,
-      { "manufacturerSpecificCause", "gprscdr.manufacturerSpecificCause",
+      { "manufacturerSpecificCause", "gprscdr.manufacturerSpecificCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ManagementExtension", HFILL }},
     { &hf_gprscdr_positionMethodFailureCause,
@@ -2761,7 +2761,7 @@ proto_register_gprscdr(void)
         FT_STRING, BASE_NONE, NULL, 0,
         "IA5String_SIZE_15_45", HFILL }},
     { &hf_gprscdr_ManagementExtensions_item,
-      { "ManagementExtension", "gprscdr.ManagementExtension",
+      { "ManagementExtension", "gprscdr.ManagementExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_iPAddress,
@@ -2797,31 +2797,31 @@ proto_register_gprscdr(void)
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_gprscdr_information,
-      { "information", "gprscdr.information",
+      { "information", "gprscdr.information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_sgsnPDPRecord,
-      { "sgsnPDPRecord", "gprscdr.sgsnPDPRecord",
+      { "sgsnPDPRecord", "gprscdr.sgsnPDPRecord_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SGSNPDPRecordV651", HFILL }},
     { &hf_gprscdr_ggsnPDPRecord,
-      { "ggsnPDPRecord", "gprscdr.ggsnPDPRecord",
+      { "ggsnPDPRecord", "gprscdr.ggsnPDPRecord_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_sgsnMMRecord,
-      { "sgsnMMRecord", "gprscdr.sgsnMMRecord",
+      { "sgsnMMRecord", "gprscdr.sgsnMMRecord_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_sgsnSMORecord,
-      { "sgsnSMORecord", "gprscdr.sgsnSMORecord",
+      { "sgsnSMORecord", "gprscdr.sgsnSMORecord_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SGSNSMORecordV651", HFILL }},
     { &hf_gprscdr_sgsnSMTRecord,
-      { "sgsnSMTRecord", "gprscdr.sgsnSMTRecord",
+      { "sgsnSMTRecord", "gprscdr.sgsnSMTRecord_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SGSNSMTRecordV651", HFILL }},
     { &hf_gprscdr_egsnPDPRecord,
-      { "egsnPDPRecord", "gprscdr.egsnPDPRecord",
+      { "egsnPDPRecord", "gprscdr.egsnPDPRecord_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_recordType,
@@ -2873,7 +2873,7 @@ proto_register_gprscdr(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ChangeOfCharConditionV651", HFILL }},
     { &hf_gprscdr_listOfTrafficVolumes_item,
-      { "ChangeOfCharConditionV651", "gprscdr.ChangeOfCharConditionV651",
+      { "ChangeOfCharConditionV651", "gprscdr.ChangeOfCharConditionV651_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_recordOpeningTime,
@@ -2925,7 +2925,7 @@ proto_register_gprscdr(void)
         FT_UINT32, BASE_DEC, VALS(gprscdr_ChChSelectionMode_vals), 0,
         NULL, HFILL }},
     { &hf_gprscdr_iMSsignalingContext,
-      { "iMSsignalingContext", "gprscdr.iMSsignalingContext",
+      { "iMSsignalingContext", "gprscdr.iMSsignalingContext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_externalChargingID,
@@ -2957,7 +2957,7 @@ proto_register_gprscdr(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_gprscdr_pSFurnishChargingInformation,
-      { "pSFurnishChargingInformation", "gprscdr.pSFurnishChargingInformation",
+      { "pSFurnishChargingInformation", "gprscdr.pSFurnishChargingInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_listOfServiceData,
@@ -2965,7 +2965,7 @@ proto_register_gprscdr(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ChangeOfServiceConditionV651", HFILL }},
     { &hf_gprscdr_listOfServiceData_item,
-      { "ChangeOfServiceConditionV651", "gprscdr.ChangeOfServiceConditionV651",
+      { "ChangeOfServiceConditionV651", "gprscdr.ChangeOfServiceConditionV651_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_servedIMEI,
@@ -3005,7 +3005,7 @@ proto_register_gprscdr(void)
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_cAMELInformationPDP,
-      { "cAMELInformationPDP", "gprscdr.cAMELInformationPDP",
+      { "cAMELInformationPDP", "gprscdr.cAMELInformationPDP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_rNCUnsentDownlinkVolume,
@@ -3041,7 +3041,7 @@ proto_register_gprscdr(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         "SmsTpDestinationNumber", HFILL }},
     { &hf_gprscdr_cAMELInformationSMS,
-      { "cAMELInformationSMS", "gprscdr.cAMELInformationSMS",
+      { "cAMELInformationSMS", "gprscdr.cAMELInformationSMS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_qosRequested,
@@ -3137,23 +3137,23 @@ proto_register_gprscdr(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_sgsnPDPRecord_01,
-      { "sgsnPDPRecord", "gprscdr.sgsnPDPRecord",
+      { "sgsnPDPRecord", "gprscdr.sgsnPDPRecord_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_sgsnSMORecord_01,
-      { "sgsnSMORecord", "gprscdr.sgsnSMORecord",
+      { "sgsnSMORecord", "gprscdr.sgsnSMORecord_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_sgsnSMTRecord_01,
-      { "sgsnSMTRecord", "gprscdr.sgsnSMTRecord",
+      { "sgsnSMTRecord", "gprscdr.sgsnSMTRecord_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_sGWRecord,
-      { "sGWRecord", "gprscdr.sGWRecord",
+      { "sGWRecord", "gprscdr.sGWRecord_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_pGWRecord,
-      { "pGWRecord", "gprscdr.pGWRecord",
+      { "pGWRecord", "gprscdr.pGWRecord_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_recordType_01,
@@ -3185,7 +3185,7 @@ proto_register_gprscdr(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ChangeOfCharCondition", HFILL }},
     { &hf_gprscdr_listOfTrafficVolumes_item_01,
-      { "ChangeOfCharCondition", "gprscdr.ChangeOfCharCondition",
+      { "ChangeOfCharCondition", "gprscdr.ChangeOfCharCondition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_causeForRecClosing_01,
@@ -3249,11 +3249,11 @@ proto_register_gprscdr(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ChangeOfServiceCondition", HFILL }},
     { &hf_gprscdr_listOfServiceData_item_01,
-      { "ChangeOfServiceCondition", "gprscdr.ChangeOfServiceCondition",
+      { "ChangeOfServiceCondition", "gprscdr.ChangeOfServiceCondition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_servedMNNAI,
-      { "servedMNNAI", "gprscdr.servedMNNAI",
+      { "servedMNNAI", "gprscdr.servedMNNAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SubscriptionID", HFILL }},
     { &hf_gprscdr_served3gpp2MEID,
@@ -3269,11 +3269,11 @@ proto_register_gprscdr(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ChangeLocation", HFILL }},
     { &hf_gprscdr_changeLocation_item,
-      { "ChangeLocation", "gprscdr.ChangeLocation",
+      { "ChangeLocation", "gprscdr.ChangeLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_cAMELInformationMM,
-      { "cAMELInformationMM", "gprscdr.cAMELInformationMM",
+      { "cAMELInformationMM", "gprscdr.cAMELInformationMM_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_cellPLMNId,
@@ -3285,7 +3285,7 @@ proto_register_gprscdr(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_flows,
-      { "flows", "gprscdr.flows",
+      { "flows", "gprscdr.flows_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_sCFAddress,
@@ -3349,7 +3349,7 @@ proto_register_gprscdr(void)
         FT_UINT32, BASE_DEC, VALS(gprscdr_ChangeCondition_vals), 0,
         NULL, HFILL }},
     { &hf_gprscdr_ePCQoSInformation,
-      { "ePCQoSInformation", "gprscdr.ePCQoSInformation",
+      { "ePCQoSInformation", "gprscdr.ePCQoSInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_serviceConditionChange_01,
@@ -3357,7 +3357,7 @@ proto_register_gprscdr(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_qoSInformationNeg_01,
-      { "qoSInformationNeg", "gprscdr.qoSInformationNeg",
+      { "qoSInformationNeg", "gprscdr.qoSInformationNeg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EPCQoSInformation", HFILL }},
     { &hf_gprscdr_servingNodeAddress_01,
@@ -3369,15 +3369,15 @@ proto_register_gprscdr(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_AFRecordInformation", HFILL }},
     { &hf_gprscdr_aFRecordInformation_item,
-      { "AFRecordInformation", "gprscdr.AFRecordInformation",
+      { "AFRecordInformation", "gprscdr.AFRecordInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_eventBasedChargingInformation,
-      { "eventBasedChargingInformation", "gprscdr.eventBasedChargingInformation",
+      { "eventBasedChargingInformation", "gprscdr.eventBasedChargingInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_timeQuotaMechanism,
-      { "timeQuotaMechanism", "gprscdr.timeQuotaMechanism",
+      { "timeQuotaMechanism", "gprscdr.timeQuotaMechanism_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_serviceSpecificInfo,
@@ -3385,7 +3385,7 @@ proto_register_gprscdr(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ServiceSpecificInfo", HFILL }},
     { &hf_gprscdr_serviceSpecificInfo_item,
-      { "ServiceSpecificInfo", "gprscdr.ServiceSpecificInfo",
+      { "ServiceSpecificInfo", "gprscdr.ServiceSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gprscdr_mCC_MNC,
diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index 5c6cc31357..c582e5c5de 100644
--- a/epan/dissectors/packet-gsm_map.c
+++ b/epan/dissectors/packet-gsm_map.c
@@ -20469,15 +20469,15 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_pcs_Extensions,
-      { "pcs-Extensions", "gsm_map.pcs_Extensions",
+      { "pcs-Extensions", "gsm_map.pcs_Extensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_slr_Arg_PCS_Extensions,
-      { "slr-Arg-PCS-Extensions", "gsm_map.slr_Arg_PCS_Extensions",
+      { "slr-Arg-PCS-Extensions", "gsm_map.slr_Arg_PCS_Extensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_PrivateExtensionList_item,
-      { "PrivateExtension", "gsm_map.PrivateExtension",
+      { "PrivateExtension", "gsm_map.PrivateExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_extId,
@@ -20485,11 +20485,11 @@ void proto_register_gsm_map(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_extType,
-      { "extType", "gsm_map.extType",
+      { "extType", "gsm_map.extType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_na_ESRK_Request,
-      { "na-ESRK-Request", "gsm_map.na_ESRK_Request",
+      { "na-ESRK-Request", "gsm_map.na_ESRK_Request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
@@ -20508,7 +20508,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_extensionContainer,
-      { "extensionContainer", "gsm_map.extensionContainer",
+      { "extensionContainer", "gsm_map.extensionContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ext_ProtocolId,
@@ -20528,7 +20528,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_imsi_WithLMSI,
-      { "imsi-WithLMSI", "gsm_map.imsi_WithLMSI",
+      { "imsi-WithLMSI", "gsm_map.imsi_WithLMSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lmsi,
@@ -20639,19 +20639,19 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MC_Bearers", HFILL }},
     { &hf_gsm_map_ss_longFTN_Supported,
-      { "longFTN-Supported", "gsm_map.ss.longFTN_Supported",
+      { "longFTN-Supported", "gsm_map.ss.longFTN_Supported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ss_forwardingInfo,
-      { "forwardingInfo", "gsm_map.ss.forwardingInfo",
+      { "forwardingInfo", "gsm_map.ss.forwardingInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ss_callBarringInfo,
-      { "callBarringInfo", "gsm_map.ss.callBarringInfo",
+      { "callBarringInfo", "gsm_map.ss.callBarringInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ss_ss_Data,
-      { "ss-Data", "gsm_map.ss.ss_Data",
+      { "ss-Data", "gsm_map.ss.ss_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ss_forwardingFeatureList,
@@ -20659,7 +20659,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ss_ForwardingFeatureList_item,
-      { "ForwardingFeature", "gsm_map.ss.ForwardingFeature",
+      { "ForwardingFeature", "gsm_map.ss.ForwardingFeature_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ss_ss_Status,
@@ -20683,7 +20683,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ss_CallBarringFeatureList_item,
-      { "CallBarringFeature", "gsm_map.ss.CallBarringFeature",
+      { "CallBarringFeature", "gsm_map.ss.CallBarringFeature_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ss_ss_SubscriptionOption,
@@ -20719,7 +20719,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MC_Bearers", HFILL }},
     { &hf_gsm_map_ss_CCBS_FeatureList_item,
-      { "CCBS-Feature", "gsm_map.ss.CCBS_Feature",
+      { "CCBS-Feature", "gsm_map.ss.CCBS_Feature_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ss_ccbs_Index,
@@ -20739,7 +20739,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_BasicServiceCode_vals), 0,
         "BasicServiceCode", HFILL }},
     { &hf_gsm_map_ss_genericServiceInfo,
-      { "genericServiceInfo", "gsm_map.ss.genericServiceInfo",
+      { "genericServiceInfo", "gsm_map.ss.genericServiceInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ss_ussd_DataCodingScheme,
@@ -20779,7 +20779,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ss_extensionContainer,
-      { "extensionContainer", "gsm_map.ss.extensionContainer",
+      { "extensionContainer", "gsm_map.ss.extensionContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ss_ccbs_RequestState,
@@ -20791,11 +20791,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ss_ccbs_Data,
-      { "ccbs-Data", "gsm_map.ss.ccbs_Data",
+      { "ccbs-Data", "gsm_map.ss.ccbs_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ss_ccbs_Feature,
-      { "ccbs-Feature", "gsm_map.ss.ccbs_Feature",
+      { "ccbs-Feature", "gsm_map.ss.ccbs_Feature_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ss_translatedB_Number,
@@ -20807,11 +20807,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ss_callInfo,
-      { "callInfo", "gsm_map.ss.callInfo",
+      { "callInfo", "gsm_map.ss.callInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ExternalSignalInfo", HFILL }},
     { &hf_gsm_map_ss_networkSignalInfo,
-      { "networkSignalInfo", "gsm_map.ss.networkSignalInfo",
+      { "networkSignalInfo", "gsm_map.ss.networkSignalInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ExternalSignalInfo", HFILL }},
     { &hf_gsm_map_ss_ServiceIndicator_clir_invoked,
@@ -20830,7 +20830,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_er_RoamingNotAllowedCause_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_er_extensionContainer,
-      { "extensionContainer", "gsm_map.er.extensionContainer",
+      { "extensionContainer", "gsm_map.er.extensionContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_er_additionalRoamingNotAllowedCause,
@@ -20842,15 +20842,15 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_er_CallBarringCause_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_er_extensibleCallBarredParam,
-      { "extensibleCallBarredParam", "gsm_map.er.extensibleCallBarredParam",
+      { "extensibleCallBarredParam", "gsm_map.er.extensibleCallBarredParam_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_er_unauthorisedMessageOriginator,
-      { "unauthorisedMessageOriginator", "gsm_map.er.unauthorisedMessageOriginator",
+      { "unauthorisedMessageOriginator", "gsm_map.er.unauthorisedMessageOriginator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_er_anonymousCallRejection,
-      { "anonymousCallRejection", "gsm_map.er.anonymousCallRejection",
+      { "anonymousCallRejection", "gsm_map.er.anonymousCallRejection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_er_cug_RejectCause,
@@ -20894,7 +20894,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_NetworkResource_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_er_extensibleSystemFailureParam,
-      { "extensibleSystemFailureParam", "gsm_map.er.extensibleSystemFailureParam",
+      { "extensibleSystemFailureParam", "gsm_map.er.extensibleSystemFailureParam_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_er_additionalNetworkResource,
@@ -20906,15 +20906,15 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_er_FailureCauseParam_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_er_unexpectedSubscriber,
-      { "unexpectedSubscriber", "gsm_map.er.unexpectedSubscriber",
+      { "unexpectedSubscriber", "gsm_map.er.unexpectedSubscriber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_er_shapeOfLocationEstimateNotSupported,
-      { "shapeOfLocationEstimateNotSupported", "gsm_map.er.shapeOfLocationEstimateNotSupported",
+      { "shapeOfLocationEstimateNotSupported", "gsm_map.er.shapeOfLocationEstimateNotSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_er_neededLcsCapabilityNotSupportedInServingNode,
-      { "neededLcsCapabilityNotSupportedInServingNode", "gsm_map.er.neededLcsCapabilityNotSupportedInServingNode",
+      { "neededLcsCapabilityNotSupportedInServingNode", "gsm_map.er.neededLcsCapabilityNotSupportedInServingNode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_er_unknownSubscriberDiagnostic,
@@ -20926,15 +20926,15 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_er_AbsentSubscriberReason_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_er_ccbs_Possible,
-      { "ccbs-Possible", "gsm_map.er.ccbs_Possible",
+      { "ccbs-Possible", "gsm_map.er.ccbs_Possible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_er_ccbs_Busy,
-      { "ccbs-Busy", "gsm_map.er.ccbs_Busy",
+      { "ccbs-Busy", "gsm_map.er.ccbs_Busy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_er_gprsConnectionSuspended,
-      { "gprsConnectionSuspended", "gsm_map.er.gprsConnectionSuspended",
+      { "gprsConnectionSuspended", "gsm_map.er.gprsConnectionSuspended_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_er_unauthorizedLCSClient_Diagnostic,
@@ -20961,11 +20961,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "AddressString", HFILL }},
     { &hf_gsm_map_sm_extensionContainer,
-      { "extensionContainer", "gsm_map.sm.extensionContainer",
+      { "extensionContainer", "gsm_map.sm.extensionContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_gprsSupportIndicator,
-      { "gprsSupportIndicator", "gsm_map.sm.gprsSupportIndicator",
+      { "gprsSupportIndicator", "gsm_map.sm.gprsSupportIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_sm_RP_MTI,
@@ -20981,7 +20981,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_sm_SM_DeliveryNotIntended_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_ip_sm_gwGuidanceIndicator,
-      { "ip-sm-gwGuidanceIndicator", "gsm_map.sm.ip_sm_gwGuidanceIndicator",
+      { "ip-sm-gwGuidanceIndicator", "gsm_map.sm.ip_sm_gwGuidanceIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_imsi,
@@ -20989,11 +20989,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_locationInfoWithLMSI,
-      { "locationInfoWithLMSI", "gsm_map.sm.locationInfoWithLMSI",
+      { "locationInfoWithLMSI", "gsm_map.sm.locationInfoWithLMSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_ip_sm_gwGuidance,
-      { "ip-sm-gwGuidance", "gsm_map.sm.ip_sm_gwGuidance",
+      { "ip-sm-gwGuidance", "gsm_map.sm.ip_sm_gwGuidance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IP_SM_GW_Guidance", HFILL }},
     { &hf_gsm_map_sm_minimumDeliveryTimeValue,
@@ -21013,7 +21013,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_gprsNodeIndicator,
-      { "gprsNodeIndicator", "gsm_map.sm.gprsNodeIndicator",
+      { "gprsNodeIndicator", "gsm_map.sm.gprsNodeIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_additional_Number,
@@ -21021,11 +21021,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_sm_Additional_Number_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_networkNodeDiameterAddress,
-      { "networkNodeDiameterAddress", "gsm_map.sm.networkNodeDiameterAddress",
+      { "networkNodeDiameterAddress", "gsm_map.sm.networkNodeDiameterAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_additionalNetworkNodeDiameterAddress,
-      { "additionalNetworkNodeDiameterAddress", "gsm_map.sm.additionalNetworkNodeDiameterAddress",
+      { "additionalNetworkNodeDiameterAddress", "gsm_map.sm.additionalNetworkNodeDiameterAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NetworkNodeDiameterAddress", HFILL }},
     { &hf_gsm_map_sm_thirdNumber,
@@ -21033,11 +21033,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_sm_Additional_Number_vals), 0,
         "Additional_Number", HFILL }},
     { &hf_gsm_map_sm_thirdNetworkNodeDiameterAddress,
-      { "thirdNetworkNodeDiameterAddress", "gsm_map.sm.thirdNetworkNodeDiameterAddress",
+      { "thirdNetworkNodeDiameterAddress", "gsm_map.sm.thirdNetworkNodeDiameterAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NetworkNodeDiameterAddress", HFILL }},
     { &hf_gsm_map_sm_imsNodeIndicator,
-      { "imsNodeIndicator", "gsm_map.sm.imsNodeIndicator",
+      { "imsNodeIndicator", "gsm_map.sm.imsNodeIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_msc_Number,
@@ -21061,7 +21061,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "SignalInfo", HFILL }},
     { &hf_gsm_map_sm_moreMessagesToSend,
-      { "moreMessagesToSend", "gsm_map.sm.moreMessagesToSend",
+      { "moreMessagesToSend", "gsm_map.sm.moreMessagesToSend_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_smDeliveryTimer,
@@ -21073,7 +21073,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Time", HFILL }},
     { &hf_gsm_map_sm_smsOverIP_OnlyIndicator,
-      { "smsOverIP-OnlyIndicator", "gsm_map.sm.smsOverIP_OnlyIndicator",
+      { "smsOverIP-OnlyIndicator", "gsm_map.sm.smsOverIP_OnlyIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_imsi_01,
@@ -21089,7 +21089,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_noSM_RP_DA,
-      { "noSM-RP-DA", "gsm_map.sm.noSM_RP_DA",
+      { "noSM-RP-DA", "gsm_map.sm.noSM_RP_DA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_msisdn_01,
@@ -21101,7 +21101,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_noSM_RP_OA,
-      { "noSM-RP-OA", "gsm_map.sm.noSM_RP_OA",
+      { "noSM-RP-OA", "gsm_map.sm.noSM_RP_OA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_sm_DeliveryOutcome,
@@ -21113,7 +21113,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_deliveryOutcomeIndicator,
-      { "deliveryOutcomeIndicator", "gsm_map.sm.deliveryOutcomeIndicator",
+      { "deliveryOutcomeIndicator", "gsm_map.sm.deliveryOutcomeIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_additionalSM_DeliveryOutcome,
@@ -21125,7 +21125,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "AbsentSubscriberDiagnosticSM", HFILL }},
     { &hf_gsm_map_sm_ip_sm_gw_Indicator,
-      { "ip-sm-gw-Indicator", "gsm_map.sm.ip_sm_gw_Indicator",
+      { "ip-sm-gw-Indicator", "gsm_map.sm.ip_sm_gw_Indicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_ip_sm_gw_sm_deliveryOutcome,
@@ -21149,11 +21149,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_sm_AlertReason_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_alertReasonIndicator,
-      { "alertReasonIndicator", "gsm_map.sm.alertReasonIndicator",
+      { "alertReasonIndicator", "gsm_map.sm.alertReasonIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_additionalAlertReasonIndicator,
-      { "additionalAlertReasonIndicator", "gsm_map.sm.additionalAlertReasonIndicator",
+      { "additionalAlertReasonIndicator", "gsm_map.sm.additionalAlertReasonIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_asciCallReference,
@@ -21165,7 +21165,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_ongoingCall,
-      { "ongoingCall", "gsm_map.sm.ongoingCall",
+      { "ongoingCall", "gsm_map.sm.ongoingCall_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_sm_additionalDispatcherList,
@@ -21216,7 +21216,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "AddressString", HFILL }},
     { &hf_gsm_map_om_extensionContainer,
-      { "extensionContainer", "gsm_map.om.extensionContainer",
+      { "extensionContainer", "gsm_map.om.extensionContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_om_traceReference2,
@@ -21224,7 +21224,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_om_traceDepthList,
-      { "traceDepthList", "gsm_map.om.traceDepthList",
+      { "traceDepthList", "gsm_map.om.traceDepthList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_om_traceNE_TypeList,
@@ -21232,11 +21232,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_om_traceInterfaceList,
-      { "traceInterfaceList", "gsm_map.om.traceInterfaceList",
+      { "traceInterfaceList", "gsm_map.om.traceInterfaceList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_om_traceEventList,
-      { "traceEventList", "gsm_map.om.traceEventList",
+      { "traceEventList", "gsm_map.om.traceEventList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_om_traceCollectionEntity,
@@ -21244,7 +21244,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "GSN_Address", HFILL }},
     { &hf_gsm_map_om_mdt_Configuration,
-      { "mdt-Configuration", "gsm_map.om.mdt_Configuration",
+      { "mdt-Configuration", "gsm_map.om.mdt_Configuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_om_jobType,
@@ -21252,7 +21252,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_om_JobType_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_om_areaScope,
-      { "areaScope", "gsm_map.om.areaScope",
+      { "areaScope", "gsm_map.om.areaScope_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_om_listOfMeasurements,
@@ -21504,7 +21504,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_om_traceSupportIndicator,
-      { "traceSupportIndicator", "gsm_map.om.traceSupportIndicator",
+      { "traceSupportIndicator", "gsm_map.om.traceSupportIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_om_TraceNE_TypeList_msc_s,
@@ -21879,19 +21879,19 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_extensionContainer,
-      { "extensionContainer", "gsm_map.ms.extensionContainer",
+      { "extensionContainer", "gsm_map.ms.extensionContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_vlr_Capability,
-      { "vlr-Capability", "gsm_map.ms.vlr_Capability",
+      { "vlr-Capability", "gsm_map.ms.vlr_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_informPreviousNetworkEntity,
-      { "informPreviousNetworkEntity", "gsm_map.ms.informPreviousNetworkEntity",
+      { "informPreviousNetworkEntity", "gsm_map.ms.informPreviousNetworkEntity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_cs_LCS_NotSupportedByUE,
-      { "cs-LCS-NotSupportedByUE", "gsm_map.ms.cs_LCS_NotSupportedByUE",
+      { "cs-LCS-NotSupportedByUE", "gsm_map.ms.cs_LCS_NotSupportedByUE_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_v_gmlc_Address,
@@ -21899,7 +21899,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "GSN_Address", HFILL }},
     { &hf_gsm_map_ms_add_info,
-      { "add-info", "gsm_map.ms.add_info",
+      { "add-info", "gsm_map.ms.add_info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_pagingArea,
@@ -21907,11 +21907,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_skipSubscriberDataUpdate,
-      { "skipSubscriberDataUpdate", "gsm_map.ms.skipSubscriberDataUpdate",
+      { "skipSubscriberDataUpdate", "gsm_map.ms.skipSubscriberDataUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_restorationIndicator,
-      { "restorationIndicator", "gsm_map.ms.restorationIndicator",
+      { "restorationIndicator", "gsm_map.ms.restorationIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_eplmn_List,
@@ -21919,7 +21919,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_mme_DiameterAddress,
-      { "mme-DiameterAddress", "gsm_map.ms.mme_DiameterAddress",
+      { "mme-DiameterAddress", "gsm_map.ms.mme_DiameterAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NetworkNodeDiameterAddress", HFILL }},
     { &hf_gsm_map_ms_supportedCamelPhases,
@@ -21927,7 +21927,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_solsaSupportIndicator,
-      { "solsaSupportIndicator", "gsm_map.ms.solsaSupportIndicator",
+      { "solsaSupportIndicator", "gsm_map.ms.solsaSupportIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_istSupportIndicator,
@@ -21939,7 +21939,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_SuperChargerInfo_vals), 0,
         "SuperChargerInfo", HFILL }},
     { &hf_gsm_map_ms_longFTN_Supported,
-      { "longFTN-Supported", "gsm_map.ms.longFTN_Supported",
+      { "longFTN-Supported", "gsm_map.ms.longFTN_Supported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_supportedLCS_CapabilitySets,
@@ -21955,19 +21955,19 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "SupportedRAT_Types", HFILL }},
     { &hf_gsm_map_ms_longGroupID_Supported,
-      { "longGroupID-Supported", "gsm_map.ms.longGroupID_Supported",
+      { "longGroupID-Supported", "gsm_map.ms.longGroupID_Supported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_mtRoamingForwardingSupported,
-      { "mtRoamingForwardingSupported", "gsm_map.ms.mtRoamingForwardingSupported",
+      { "mtRoamingForwardingSupported", "gsm_map.ms.mtRoamingForwardingSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_msisdn_lessOperation_Supported,
-      { "msisdn-lessOperation-Supported", "gsm_map.ms.msisdn_lessOperation_Supported",
+      { "msisdn-lessOperation-Supported", "gsm_map.ms.msisdn_lessOperation_Supported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_sendSubscriberData,
-      { "sendSubscriberData", "gsm_map.ms.sendSubscriberData",
+      { "sendSubscriberData", "gsm_map.ms.sendSubscriberData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_subscriberDataStored,
@@ -21979,11 +21979,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ms_add_Capability,
-      { "add-Capability", "gsm_map.ms.add_Capability",
+      { "add-Capability", "gsm_map.ms.add_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_pagingArea_Capability,
-      { "pagingArea-Capability", "gsm_map.ms.pagingArea_Capability",
+      { "pagingArea-Capability", "gsm_map.ms.pagingArea_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_imeisv,
@@ -22015,11 +22015,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_TypeOfUpdate_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_mtrf_SupportedAndAuthorized,
-      { "mtrf-SupportedAndAuthorized", "gsm_map.ms.mtrf_SupportedAndAuthorized",
+      { "mtrf-SupportedAndAuthorized", "gsm_map.ms.mtrf_SupportedAndAuthorized_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_mtrf_SupportedAndNotAuthorized,
-      { "mtrf-SupportedAndNotAuthorized", "gsm_map.ms.mtrf_SupportedAndNotAuthorized",
+      { "mtrf-SupportedAndNotAuthorized", "gsm_map.ms.mtrf_SupportedAndNotAuthorized_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_newMSC_Number,
@@ -22039,15 +22039,15 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ms_freezeTMSI,
-      { "freezeTMSI", "gsm_map.ms.freezeTMSI",
+      { "freezeTMSI", "gsm_map.ms.freezeTMSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_freezeP_TMSI,
-      { "freezeP-TMSI", "gsm_map.ms.freezeP_TMSI",
+      { "freezeP-TMSI", "gsm_map.ms.freezeP_TMSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_freezeM_TMSI,
-      { "freezeM-TMSI", "gsm_map.ms.freezeM_TMSI",
+      { "freezeM-TMSI", "gsm_map.ms.freezeM_TMSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_tmsi,
@@ -22059,7 +22059,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_segmentationProhibited,
-      { "segmentationProhibited", "gsm_map.ms.segmentationProhibited",
+      { "segmentationProhibited", "gsm_map.ms.segmentationProhibited_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_previous_LAI,
@@ -22087,11 +22087,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_TripletList_item,
-      { "AuthenticationTriplet", "gsm_map.ms.AuthenticationTriplet",
+      { "AuthenticationTriplet", "gsm_map.ms.AuthenticationTriplet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_QuintupletList_item,
-      { "AuthenticationQuintuplet", "gsm_map.ms.AuthenticationQuintuplet",
+      { "AuthenticationQuintuplet", "gsm_map.ms.AuthenticationQuintuplet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_rand,
@@ -22123,11 +22123,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_gsm_SecurityContextData,
-      { "gsm-SecurityContextData", "gsm_map.ms.gsm_SecurityContextData",
+      { "gsm-SecurityContextData", "gsm_map.ms.gsm_SecurityContextData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_umts_SecurityContextData,
-      { "umts-SecurityContextData", "gsm_map.ms.umts_SecurityContextData",
+      { "umts-SecurityContextData", "gsm_map.ms.umts_SecurityContextData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_cksn,
@@ -22155,11 +22155,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "GSN_Address", HFILL }},
     { &hf_gsm_map_ms_sgsn_Capability,
-      { "sgsn-Capability", "gsm_map.ms.sgsn_Capability",
+      { "sgsn-Capability", "gsm_map.ms.sgsn_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ps_LCS_NotSupportedByUE,
-      { "ps-LCS-NotSupportedByUE", "gsm_map.ms.ps_LCS_NotSupportedByUE",
+      { "ps-LCS-NotSupportedByUE", "gsm_map.ms.ps_LCS_NotSupportedByUE_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_eps_info,
@@ -22167,7 +22167,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_EPS_Info_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_servingNodeTypeIndicator,
-      { "servingNodeTypeIndicator", "gsm_map.ms.servingNodeTypeIndicator",
+      { "servingNodeTypeIndicator", "gsm_map.ms.servingNodeTypeIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_usedRAT_Type,
@@ -22175,23 +22175,23 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_Used_RAT_Type_vals), 0,
         "Used_RAT_Type", HFILL }},
     { &hf_gsm_map_ms_gprsSubscriptionDataNotNeeded,
-      { "gprsSubscriptionDataNotNeeded", "gsm_map.ms.gprsSubscriptionDataNotNeeded",
+      { "gprsSubscriptionDataNotNeeded", "gsm_map.ms.gprsSubscriptionDataNotNeeded_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_nodeTypeIndicator,
-      { "nodeTypeIndicator", "gsm_map.ms.nodeTypeIndicator",
+      { "nodeTypeIndicator", "gsm_map.ms.nodeTypeIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_areaRestricted,
-      { "areaRestricted", "gsm_map.ms.areaRestricted",
+      { "areaRestricted", "gsm_map.ms.areaRestricted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ue_reachableIndicator,
-      { "ue-reachableIndicator", "gsm_map.ms.ue_reachableIndicator",
+      { "ue-reachableIndicator", "gsm_map.ms.ue_reachableIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_epsSubscriptionDataNotNeeded,
-      { "epsSubscriptionDataNotNeeded", "gsm_map.ms.epsSubscriptionDataNotNeeded",
+      { "epsSubscriptionDataNotNeeded", "gsm_map.ms.epsSubscriptionDataNotNeeded_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ue_srvcc_Capability,
@@ -22207,11 +22207,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_SMSRegisterRequest_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_sms_Only,
-      { "sms-Only", "gsm_map.ms.sms_Only",
+      { "sms-Only", "gsm_map.ms.sms_Only_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_pdn_gw_update,
-      { "pdn-gw-update", "gsm_map.ms.pdn_gw_update",
+      { "pdn-gw-update", "gsm_map.ms.pdn_gw_update_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_isr_Information,
@@ -22223,7 +22223,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_pdn_gw_Identity,
-      { "pdn-gw-Identity", "gsm_map.ms.pdn_gw_Identity",
+      { "pdn-gw-Identity", "gsm_map.ms.pdn_gw_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_contextId,
@@ -22231,11 +22231,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_gprsEnhancementsSupportIndicator,
-      { "gprsEnhancementsSupportIndicator", "gsm_map.ms.gprsEnhancementsSupportIndicator",
+      { "gprsEnhancementsSupportIndicator", "gsm_map.ms.gprsEnhancementsSupportIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_smsCallBarringSupportIndicator,
-      { "smsCallBarringSupportIndicator", "gsm_map.ms.smsCallBarringSupportIndicator",
+      { "smsCallBarringSupportIndicator", "gsm_map.ms.smsCallBarringSupportIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_supportedFeatures,
@@ -22243,7 +22243,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_t_adsDataRetrieval,
-      { "t-adsDataRetrieval", "gsm_map.ms.t_adsDataRetrieval",
+      { "t-adsDataRetrieval", "gsm_map.ms.t_adsDataRetrieval_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_homogeneousSupportOfIMSVoiceOverPSSessions,
@@ -22251,19 +22251,19 @@ void proto_register_gsm_map(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_gsm_map_ms_cancellationTypeInitialAttach,
-      { "cancellationTypeInitialAttach", "gsm_map.ms.cancellationTypeInitialAttach",
+      { "cancellationTypeInitialAttach", "gsm_map.ms.cancellationTypeInitialAttach_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_additionalMsisdnSupport,
-      { "additionalMsisdnSupport", "gsm_map.ms.additionalMsisdnSupport",
+      { "additionalMsisdnSupport", "gsm_map.ms.additionalMsisdnSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_sgsn_mmeSeparationSupported,
-      { "sgsn-mmeSeparationSupported", "gsm_map.ms.sgsn_mmeSeparationSupported",
+      { "sgsn-mmeSeparationSupported", "gsm_map.ms.sgsn_mmeSeparationSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_mmeRegisteredforSMS,
-      { "mmeRegisteredforSMS", "gsm_map.ms.mmeRegisteredforSMS",
+      { "mmeRegisteredforSMS", "gsm_map.ms.mmeRegisteredforSMS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_EPLMN_List_item,
@@ -22271,7 +22271,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_an_APDU,
-      { "an-APDU", "gsm_map.ms.an_APDU",
+      { "an-APDU", "gsm_map.ms.an_APDU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AccessNetworkSignalInfo", HFILL }},
     { &hf_gsm_map_ms_integrityProtectionInfo,
@@ -22291,7 +22291,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_allowedUMTS_Algorithms,
-      { "allowedUMTS-Algorithms", "gsm_map.ms.allowedUMTS_Algorithms",
+      { "allowedUMTS-Algorithms", "gsm_map.ms.allowedUMTS_Algorithms_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_radioResourceInformation,
@@ -22319,11 +22319,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Codec", HFILL }},
     { &hf_gsm_map_ms_iuSupportedCodecsList,
-      { "iuSupportedCodecsList", "gsm_map.ms.iuSupportedCodecsList",
+      { "iuSupportedCodecsList", "gsm_map.ms.iuSupportedCodecsList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SupportedCodecsList", HFILL }},
     { &hf_gsm_map_ms_rab_ConfigurationIndicator,
-      { "rab-ConfigurationIndicator", "gsm_map.ms.rab_ConfigurationIndicator",
+      { "rab-ConfigurationIndicator", "gsm_map.ms.rab_ConfigurationIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_iuSelectedCodec,
@@ -22335,11 +22335,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "RadioResourceInformation", HFILL }},
     { &hf_gsm_map_ms_tracePropagationList,
-      { "tracePropagationList", "gsm_map.ms.tracePropagationList",
+      { "tracePropagationList", "gsm_map.ms.tracePropagationList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_aoipSupportedCodecsListAnchor,
-      { "aoipSupportedCodecsListAnchor", "gsm_map.ms.aoipSupportedCodecsListAnchor",
+      { "aoipSupportedCodecsListAnchor", "gsm_map.ms.aoipSupportedCodecsListAnchor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AoIPCodecsList", HFILL }},
     { &hf_gsm_map_ms_aoipSelectedCodecTarget,
@@ -22359,7 +22359,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "GlobalCellId", HFILL }},
     { &hf_gsm_map_ms_ho_NumberNotRequired,
-      { "ho-NumberNotRequired", "gsm_map.ms.ho_NumberNotRequired",
+      { "ho-NumberNotRequired", "gsm_map.ms.ho_NumberNotRequired_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_targetRNCId,
@@ -22367,7 +22367,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "RNCId", HFILL }},
     { &hf_gsm_map_ms_multipleBearerRequested,
-      { "multipleBearerRequested", "gsm_map.ms.multipleBearerRequested",
+      { "multipleBearerRequested", "gsm_map.ms.multipleBearerRequested_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_rab_Id,
@@ -22387,7 +22387,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Codec", HFILL }},
     { &hf_gsm_map_ms_uesbi_Iu,
-      { "uesbi-Iu", "gsm_map.ms.uesbi_Iu",
+      { "uesbi-Iu", "gsm_map.ms.uesbi_Iu_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_regionalSubscriptionData,
@@ -22411,11 +22411,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_BSSMAP_ServiceHandoverList_item,
-      { "BSSMAP-ServiceHandoverInfo", "gsm_map.ms.BSSMAP_ServiceHandoverInfo",
+      { "BSSMAP-ServiceHandoverInfo", "gsm_map.ms.BSSMAP_ServiceHandoverInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_RadioResourceList_item,
-      { "RadioResource", "gsm_map.ms.RadioResource",
+      { "RadioResource", "gsm_map.ms.RadioResource_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_handoverNumber,
@@ -22431,23 +22431,23 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_multipleBearerNotSupported,
-      { "multipleBearerNotSupported", "gsm_map.ms.multipleBearerNotSupported",
+      { "multipleBearerNotSupported", "gsm_map.ms.multipleBearerNotSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_selectedUMTS_Algorithms,
-      { "selectedUMTS-Algorithms", "gsm_map.ms.selectedUMTS_Algorithms",
+      { "selectedUMTS-Algorithms", "gsm_map.ms.selectedUMTS_Algorithms_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_chosenRadioResourceInformation,
-      { "chosenRadioResourceInformation", "gsm_map.ms.chosenRadioResourceInformation",
+      { "chosenRadioResourceInformation", "gsm_map.ms.chosenRadioResourceInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_iuAvailableCodecsList,
-      { "iuAvailableCodecsList", "gsm_map.ms.iuAvailableCodecsList",
+      { "iuAvailableCodecsList", "gsm_map.ms.iuAvailableCodecsList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CodecList", HFILL }},
     { &hf_gsm_map_ms_aoipAvailableCodecsListMap,
-      { "aoipAvailableCodecsListMap", "gsm_map.ms.aoipAvailableCodecsListMap",
+      { "aoipAvailableCodecsListMap", "gsm_map.ms.aoipAvailableCodecsListMap_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AoIPCodecsList", HFILL }},
     { &hf_gsm_map_ms_integrityProtectionAlgorithm,
@@ -22515,11 +22515,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "AoIPCodec", HFILL }},
     { &hf_gsm_map_ms_utranCodecList,
-      { "utranCodecList", "gsm_map.ms.utranCodecList",
+      { "utranCodecList", "gsm_map.ms.utranCodecList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CodecList", HFILL }},
     { &hf_gsm_map_ms_geranCodecList,
-      { "geranCodecList", "gsm_map.ms.geranCodecList",
+      { "geranCodecList", "gsm_map.ms.geranCodecList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CodecList", HFILL }},
     { &hf_gsm_map_ms_codec1_01,
@@ -22555,15 +22555,15 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Codec", HFILL }},
     { &hf_gsm_map_ms_RelocationNumberList_item,
-      { "RelocationNumber", "gsm_map.ms.RelocationNumber",
+      { "RelocationNumber", "gsm_map.ms.RelocationNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_immediateResponsePreferred,
-      { "immediateResponsePreferred", "gsm_map.ms.immediateResponsePreferred",
+      { "immediateResponsePreferred", "gsm_map.ms.immediateResponsePreferred_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_re_synchronisationInfo,
-      { "re-synchronisationInfo", "gsm_map.ms.re_synchronisationInfo",
+      { "re-synchronisationInfo", "gsm_map.ms.re_synchronisationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_requestingNodeType,
@@ -22579,7 +22579,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "NumberOfRequestedVectors", HFILL }},
     { &hf_gsm_map_ms_additionalVectorsAreForEPS,
-      { "additionalVectorsAreForEPS", "gsm_map.ms.additionalVectorsAreForEPS",
+      { "additionalVectorsAreForEPS", "gsm_map.ms.additionalVectorsAreForEPS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_auts,
@@ -22591,7 +22591,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_EPS_AuthenticationSetList_item,
-      { "EPC-AV", "gsm_map.ms.EPC_AV",
+      { "EPC-AV", "gsm_map.ms.EPC_AV_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_kasme,
@@ -22611,7 +22611,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_EquipmentStatus_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_bmuef,
-      { "bmuef", "gsm_map.ms.bmuef",
+      { "bmuef", "gsm_map.ms.bmuef_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UESBI_Iu", HFILL }},
     { &hf_gsm_map_ms_uesbi_IuA,
@@ -22623,7 +22623,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_CSG_SubscriptionDataList_item,
-      { "CSG-SubscriptionData", "gsm_map.ms.CSG_SubscriptionData",
+      { "CSG-SubscriptionData", "gsm_map.ms.CSG_SubscriptionData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_csg_Id,
@@ -22643,7 +22643,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_VPLMN_CSG_SubscriptionDataList_item,
-      { "CSG-SubscriptionData", "gsm_map.ms.CSG_SubscriptionData",
+      { "CSG-SubscriptionData", "gsm_map.ms.CSG_SubscriptionData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_LIPA_AllowedAPNList_item,
@@ -22659,11 +22659,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ambr,
-      { "ambr", "gsm_map.ms.ambr",
+      { "ambr", "gsm_map.ms.ambr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_apn_ConfigurationProfile,
-      { "apn-ConfigurationProfile", "gsm_map.ms.apn_ConfigurationProfile",
+      { "apn-ConfigurationProfile", "gsm_map.ms.apn_ConfigurationProfile_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_stn_sr,
@@ -22671,15 +22671,15 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ms_mps_CSPriority,
-      { "mps-CSPriority", "gsm_map.ms.mps_CSPriority",
+      { "mps-CSPriority", "gsm_map.ms.mps_CSPriority_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_mps_EPSPriority,
-      { "mps-EPSPriority", "gsm_map.ms.mps_EPSPriority",
+      { "mps-EPSPriority", "gsm_map.ms.mps_EPSPriority_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_subscribed_vsrvcc,
-      { "subscribed-vsrvcc", "gsm_map.ms.subscribed_vsrvcc",
+      { "subscribed-vsrvcc", "gsm_map.ms.subscribed_vsrvcc_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_defaultContext,
@@ -22687,7 +22687,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ContextId", HFILL }},
     { &hf_gsm_map_ms_completeDataListIncluded,
-      { "completeDataListIncluded", "gsm_map.ms.completeDataListIncluded",
+      { "completeDataListIncluded", "gsm_map.ms.completeDataListIncluded_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_epsDataList,
@@ -22695,7 +22695,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "EPS_DataList", HFILL }},
     { &hf_gsm_map_ms_EPS_DataList_item,
-      { "APN-Configuration", "gsm_map.ms.APN_Configuration",
+      { "APN-Configuration", "gsm_map.ms.APN_Configuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_pdn_Type,
@@ -22707,7 +22707,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "PDP_Address", HFILL }},
     { &hf_gsm_map_ms_eps_qos_Subscribed,
-      { "eps-qos-Subscribed", "gsm_map.ms.eps_qos_Subscribed",
+      { "eps-qos-Subscribed", "gsm_map.ms.eps_qos_Subscribed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_pdn_gw_AllocationType,
@@ -22715,7 +22715,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_PDN_GW_AllocationType_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_vplmnAddressAllowed,
-      { "vplmnAddressAllowed", "gsm_map.ms.vplmnAddressAllowed",
+      { "vplmnAddressAllowed", "gsm_map.ms.vplmnAddressAllowed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_chargingCharacteristics,
@@ -22743,7 +22743,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_allocation_Retention_Priority,
-      { "allocation-Retention-Priority", "gsm_map.ms.allocation_Retention_Priority",
+      { "allocation-Retention-Priority", "gsm_map.ms.allocation_Retention_Priority_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_max_RequestedBandwidth_UL,
@@ -22755,7 +22755,7 @@ void proto_register_gsm_map(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "Bandwidth", HFILL }},
     { &hf_gsm_map_ms_SpecificAPNInfoList_item,
-      { "SpecificAPNInfo", "gsm_map.ms.SpecificAPNInfo",
+      { "SpecificAPNInfo", "gsm_map.ms.SpecificAPNInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_priority_level,
@@ -22803,7 +22803,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_GPRSDataList_item,
-      { "PDP-Context", "gsm_map.ms.PDP_Context",
+      { "PDP-Context", "gsm_map.ms.PDP_Context_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_pdp_ContextId,
@@ -22855,15 +22855,15 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_gprs_CSI,
-      { "gprs-CSI", "gsm_map.ms.gprs_CSI",
+      { "gprs-CSI", "gsm_map.ms.gprs_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_mo_sms_CSI,
-      { "mo-sms-CSI", "gsm_map.ms.mo_sms_CSI",
+      { "mo-sms-CSI", "gsm_map.ms.mo_sms_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SMS_CSI", HFILL }},
     { &hf_gsm_map_ms_mt_sms_CSI,
-      { "mt-sms-CSI", "gsm_map.ms.mt_sms_CSI",
+      { "mt-sms-CSI", "gsm_map.ms.mt_sms_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SMS_CSI", HFILL }},
     { &hf_gsm_map_ms_mt_smsCAMELTDP_CriteriaList,
@@ -22871,7 +22871,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_mg_csi,
-      { "mg-csi", "gsm_map.ms.mg_csi",
+      { "mg-csi", "gsm_map.ms.mg_csi_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_gprs_CamelTDPDataList,
@@ -22883,15 +22883,15 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_notificationToCSE,
-      { "notificationToCSE", "gsm_map.ms.notificationToCSE",
+      { "notificationToCSE", "gsm_map.ms.notificationToCSE_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_csi_Active,
-      { "csi-Active", "gsm_map.ms.csi_Active",
+      { "csi-Active", "gsm_map.ms.csi_Active_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_GPRS_CamelTDPDataList_item,
-      { "GPRS-CamelTDPData", "gsm_map.ms.GPRS_CamelTDPData",
+      { "GPRS-CamelTDPData", "gsm_map.ms.GPRS_CamelTDPData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_gprs_TriggerDetectionPoint,
@@ -22911,7 +22911,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_DefaultGPRS_Handling_vals), 0,
         "DefaultGPRS_Handling", HFILL }},
     { &hf_gsm_map_ms_LSADataList_item,
-      { "LSAData", "gsm_map.ms.LSAData",
+      { "LSAData", "gsm_map.ms.LSAData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_lsaIdentity,
@@ -22923,7 +22923,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_lsaActiveModeIndicator,
-      { "lsaActiveModeIndicator", "gsm_map.ms.lsaActiveModeIndicator",
+      { "lsaActiveModeIndicator", "gsm_map.ms.lsaActiveModeIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_lsaOnlyAccessIndicator,
@@ -22959,11 +22959,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Ext_SS_InfoList", HFILL }},
     { &hf_gsm_map_ms_odb_Data,
-      { "odb-Data", "gsm_map.ms.odb_Data",
+      { "odb-Data", "gsm_map.ms.odb_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_roamingRestrictionDueToUnsupportedFeature,
-      { "roamingRestrictionDueToUnsupportedFeature", "gsm_map.ms.roamingRestrictionDueToUnsupportedFeature",
+      { "roamingRestrictionDueToUnsupportedFeature", "gsm_map.ms.roamingRestrictionDueToUnsupportedFeature_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_vbsSubscriptionData,
@@ -22975,7 +22975,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "VGCSDataList", HFILL }},
     { &hf_gsm_map_ms_vlrCamelSubscriptionInfo,
-      { "vlrCamelSubscriptionInfo", "gsm_map.ms.vlrCamelSubscriptionInfo",
+      { "vlrCamelSubscriptionInfo", "gsm_map.ms.vlrCamelSubscriptionInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_BearerServiceList_item,
@@ -22999,23 +22999,23 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_Ext_SS_Info_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_forwardingInfo,
-      { "forwardingInfo", "gsm_map.ms.forwardingInfo",
+      { "forwardingInfo", "gsm_map.ms.forwardingInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ext_ForwInfo", HFILL }},
     { &hf_gsm_map_ms_callBarringInfo,
-      { "callBarringInfo", "gsm_map.ms.callBarringInfo",
+      { "callBarringInfo", "gsm_map.ms.callBarringInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ext_CallBarInfo", HFILL }},
     { &hf_gsm_map_ms_cug_Info,
-      { "cug-Info", "gsm_map.ms.cug_Info",
+      { "cug-Info", "gsm_map.ms.cug_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ss_Data,
-      { "ss-Data", "gsm_map.ms.ss_Data",
+      { "ss-Data", "gsm_map.ms.ss_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ext_SS_Data", HFILL }},
     { &hf_gsm_map_ms_emlpp_Info,
-      { "emlpp-Info", "gsm_map.ms.emlpp_Info",
+      { "emlpp-Info", "gsm_map.ms.emlpp_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ss_Code,
@@ -23027,7 +23027,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Ext_ForwFeatureList", HFILL }},
     { &hf_gsm_map_ms_Ext_ForwFeatureList_item,
-      { "Ext-ForwFeature", "gsm_map.ms.Ext_ForwFeature",
+      { "Ext-ForwFeature", "gsm_map.ms.Ext_ForwFeature_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_basicService,
@@ -23063,7 +23063,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Ext_CallBarFeatureList", HFILL }},
     { &hf_gsm_map_ms_Ext_CallBarFeatureList_item,
-      { "Ext-CallBarringFeature", "gsm_map.ms.Ext_CallBarringFeature",
+      { "Ext-CallBarringFeature", "gsm_map.ms.Ext_CallBarringFeature_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_cug_SubscriptionList,
@@ -23075,7 +23075,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_CUG_SubscriptionList_item,
-      { "CUG-Subscription", "gsm_map.ms.CUG_Subscription",
+      { "CUG-Subscription", "gsm_map.ms.CUG_Subscription_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_cug_Index,
@@ -23095,7 +23095,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Ext_BasicServiceGroupList", HFILL }},
     { &hf_gsm_map_ms_CUG_FeatureList_item,
-      { "CUG-Feature", "gsm_map.ms.CUG_Feature",
+      { "CUG-Feature", "gsm_map.ms.CUG_Feature_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_Ext_BasicServiceGroupList_item,
@@ -23115,7 +23115,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ss_SS_SubscriptionOption_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_LCS_PrivacyExceptionList_item,
-      { "LCS-PrivacyClass", "gsm_map.ms.LCS_PrivacyClass",
+      { "LCS-PrivacyClass", "gsm_map.ms.LCS_PrivacyClass_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_notificationToMSUser,
@@ -23139,7 +23139,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ExternalClientList_item,
-      { "ExternalClient", "gsm_map.ms.ExternalClient",
+      { "ExternalClient", "gsm_map.ms.ExternalClient_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_PLMNClientList_item,
@@ -23147,11 +23147,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_LCSClientInternalID_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_Ext_ExternalClientList_item,
-      { "ExternalClient", "gsm_map.ms.ExternalClient",
+      { "ExternalClient", "gsm_map.ms.ExternalClient_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_clientIdentity,
-      { "clientIdentity", "gsm_map.ms.clientIdentity",
+      { "clientIdentity", "gsm_map.ms.clientIdentity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LCSClientExternalID", HFILL }},
     { &hf_gsm_map_ms_gmlc_Restriction,
@@ -23159,7 +23159,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_GMLC_Restriction_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ServiceTypeList_item,
-      { "ServiceType", "gsm_map.ms.ServiceType",
+      { "ServiceType", "gsm_map.ms.ServiceType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_serviceTypeIdentity,
@@ -23167,7 +23167,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_LCSServiceTypeID_vals), 0,
         "LCSServiceTypeID", HFILL }},
     { &hf_gsm_map_ms_MOLR_List_item,
-      { "MOLR-Class", "gsm_map.ms.MOLR_Class",
+      { "MOLR-Class", "gsm_map.ms.MOLR_Class_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ZoneCodeList_item,
@@ -23191,15 +23191,15 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "ZoneCode", HFILL }},
     { &hf_gsm_map_ms_vbsGroupIndication,
-      { "vbsGroupIndication", "gsm_map.ms.vbsGroupIndication",
+      { "vbsGroupIndication", "gsm_map.ms.vbsGroupIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_vgcsGroupIndication,
-      { "vgcsGroupIndication", "gsm_map.ms.vgcsGroupIndication",
+      { "vgcsGroupIndication", "gsm_map.ms.vgcsGroupIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_camelSubscriptionInfoWithdraw,
-      { "camelSubscriptionInfoWithdraw", "gsm_map.ms.camelSubscriptionInfoWithdraw",
+      { "camelSubscriptionInfoWithdraw", "gsm_map.ms.camelSubscriptionInfoWithdraw_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_gprsSubscriptionDataWithdraw,
@@ -23207,7 +23207,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_GPRSSubscriptionDataWithdraw_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_roamingRestrictedInSgsnDueToUnsuppportedFeature,
-      { "roamingRestrictedInSgsnDueToUnsuppportedFeature", "gsm_map.ms.roamingRestrictedInSgsnDueToUnsuppportedFeature",
+      { "roamingRestrictedInSgsnDueToUnsuppportedFeature", "gsm_map.ms.roamingRestrictedInSgsnDueToUnsuppportedFeature_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_lsaInformationWithdraw,
@@ -23215,11 +23215,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_LSAInformationWithdraw_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_gmlc_ListWithdraw,
-      { "gmlc-ListWithdraw", "gsm_map.ms.gmlc_ListWithdraw",
+      { "gmlc-ListWithdraw", "gsm_map.ms.gmlc_ListWithdraw_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_istInformationWithdraw,
-      { "istInformationWithdraw", "gsm_map.ms.istInformationWithdraw",
+      { "istInformationWithdraw", "gsm_map.ms.istInformationWithdraw_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_specificCSI_Withdraw,
@@ -23227,11 +23227,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_chargingCharacteristicsWithdraw,
-      { "chargingCharacteristicsWithdraw", "gsm_map.ms.chargingCharacteristicsWithdraw",
+      { "chargingCharacteristicsWithdraw", "gsm_map.ms.chargingCharacteristicsWithdraw_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_stn_srWithdraw,
-      { "stn-srWithdraw", "gsm_map.ms.stn_srWithdraw",
+      { "stn-srWithdraw", "gsm_map.ms.stn_srWithdraw_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_epsSubscriptionDataWithdraw,
@@ -23239,35 +23239,35 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_EPS_SubscriptionDataWithdraw_vals), 0,
         "EPS_SubscriptionDataWithdraw", HFILL }},
     { &hf_gsm_map_ms_apn_oi_replacementWithdraw,
-      { "apn-oi-replacementWithdraw", "gsm_map.ms.apn_oi_replacementWithdraw",
+      { "apn-oi-replacementWithdraw", "gsm_map.ms.apn_oi_replacementWithdraw_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_csg_SubscriptionDeleted,
-      { "csg-SubscriptionDeleted", "gsm_map.ms.csg_SubscriptionDeleted",
+      { "csg-SubscriptionDeleted", "gsm_map.ms.csg_SubscriptionDeleted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_subscribedPeriodicTAU_RAU_TimerWithdraw,
-      { "subscribedPeriodicTAU-RAU-TimerWithdraw", "gsm_map.ms.subscribedPeriodicTAU_RAU_TimerWithdraw",
+      { "subscribedPeriodicTAU-RAU-TimerWithdraw", "gsm_map.ms.subscribedPeriodicTAU_RAU_TimerWithdraw_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_subscribedPeriodicLAU_TimerWithdraw,
-      { "subscribedPeriodicLAU-TimerWithdraw", "gsm_map.ms.subscribedPeriodicLAU_TimerWithdraw",
+      { "subscribedPeriodicLAU-TimerWithdraw", "gsm_map.ms.subscribedPeriodicLAU_TimerWithdraw_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_subscribed_vsrvccWithdraw,
-      { "subscribed-vsrvccWithdraw", "gsm_map.ms.subscribed_vsrvccWithdraw",
+      { "subscribed-vsrvccWithdraw", "gsm_map.ms.subscribed_vsrvccWithdraw_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_vplmn_Csg_SubscriptionDeleted,
-      { "vplmn-Csg-SubscriptionDeleted", "gsm_map.ms.vplmn_Csg_SubscriptionDeleted",
+      { "vplmn-Csg-SubscriptionDeleted", "gsm_map.ms.vplmn_Csg_SubscriptionDeleted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_additionalMSISDN_Withdraw,
-      { "additionalMSISDN-Withdraw", "gsm_map.ms.additionalMSISDN_Withdraw",
+      { "additionalMSISDN-Withdraw", "gsm_map.ms.additionalMSISDN_Withdraw_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_allGPRSData,
-      { "allGPRSData", "gsm_map.ms.allGPRSData",
+      { "allGPRSData", "gsm_map.ms.allGPRSData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_contextIdList,
@@ -23275,7 +23275,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_allEPS_Data,
-      { "allEPS-Data", "gsm_map.ms.allEPS_Data",
+      { "allEPS-Data", "gsm_map.ms.allEPS_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ContextIdList_item,
@@ -23283,7 +23283,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_allLSAData,
-      { "allLSAData", "gsm_map.ms.allLSAData",
+      { "allLSAData", "gsm_map.ms.allLSAData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_lsaIdentityList,
@@ -23299,11 +23299,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_Ext_BasicServiceCode_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_o_CSI,
-      { "o-CSI", "gsm_map.ms.o_CSI",
+      { "o-CSI", "gsm_map.ms.o_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ss_CSI,
-      { "ss-CSI", "gsm_map.ms.ss_CSI",
+      { "ss-CSI", "gsm_map.ms.ss_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_o_BcsmCamelTDP_CriteriaList,
@@ -23311,15 +23311,15 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "O_BcsmCamelTDPCriteriaList", HFILL }},
     { &hf_gsm_map_ms_tif_CSI,
-      { "tif-CSI", "gsm_map.ms.tif_CSI",
+      { "tif-CSI", "gsm_map.ms.tif_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_m_CSI,
-      { "m-CSI", "gsm_map.ms.m_CSI",
+      { "m-CSI", "gsm_map.ms.m_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_vt_CSI,
-      { "vt-CSI", "gsm_map.ms.vt_CSI",
+      { "vt-CSI", "gsm_map.ms.vt_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_CSI", HFILL }},
     { &hf_gsm_map_ms_t_BCSM_CAMEL_TDP_CriteriaList,
@@ -23327,11 +23327,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_d_CSI,
-      { "d-CSI", "gsm_map.ms.d_CSI",
+      { "d-CSI", "gsm_map.ms.d_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_MT_smsCAMELTDP_CriteriaList_item,
-      { "MT-smsCAMELTDP-Criteria", "gsm_map.ms.MT_smsCAMELTDP_Criteria",
+      { "MT-smsCAMELTDP-Criteria", "gsm_map.ms.MT_smsCAMELTDP_Criteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_sms_TriggerDetectionPoint,
@@ -23351,7 +23351,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_DP_AnalysedInfoCriteriaList_item,
-      { "DP-AnalysedInfoCriterium", "gsm_map.ms.DP_AnalysedInfoCriterium",
+      { "DP-AnalysedInfoCriterium", "gsm_map.ms.DP_AnalysedInfoCriterium_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_dialledNumber,
@@ -23363,7 +23363,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_DefaultCallHandling_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ss_CamelData,
-      { "ss-CamelData", "gsm_map.ms.ss_CamelData",
+      { "ss-CamelData", "gsm_map.ms.ss_CamelData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ss_EventList,
@@ -23379,11 +23379,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_csiActive,
-      { "csiActive", "gsm_map.ms.csiActive",
+      { "csiActive", "gsm_map.ms.csiActive_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_O_BcsmCamelTDPDataList_item,
-      { "O-BcsmCamelTDPData", "gsm_map.ms.O_BcsmCamelTDPData",
+      { "O-BcsmCamelTDPData", "gsm_map.ms.O_BcsmCamelTDPData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_o_BcsmTriggerDetectionPoint,
@@ -23391,15 +23391,15 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_O_BcsmTriggerDetectionPoint_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_O_BcsmCamelTDPCriteriaList_item,
-      { "O-BcsmCamelTDP-Criteria", "gsm_map.ms.O_BcsmCamelTDP_Criteria",
+      { "O-BcsmCamelTDP-Criteria", "gsm_map.ms.O_BcsmCamelTDP_Criteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_T_BCSM_CAMEL_TDP_CriteriaList_item,
-      { "T-BCSM-CAMEL-TDP-Criteria", "gsm_map.ms.T_BCSM_CAMEL_TDP_Criteria",
+      { "T-BCSM-CAMEL-TDP-Criteria", "gsm_map.ms.T_BCSM_CAMEL_TDP_Criteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_destinationNumberCriteria,
-      { "destinationNumberCriteria", "gsm_map.ms.destinationNumberCriteria",
+      { "destinationNumberCriteria", "gsm_map.ms.destinationNumberCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_basicServiceCriteria,
@@ -23459,7 +23459,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SMS_CAMEL_TDP_DataList_item,
-      { "SMS-CAMEL-TDP-Data", "gsm_map.ms.SMS_CAMEL_TDP_Data",
+      { "SMS-CAMEL-TDP-Data", "gsm_map.ms.SMS_CAMEL_TDP_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_defaultSMS_Handling,
@@ -23479,7 +23479,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_T_BcsmCamelTDPDataList_item,
-      { "T-BcsmCamelTDPData", "gsm_map.ms.T_BcsmCamelTDPData",
+      { "T-BcsmCamelTDPData", "gsm_map.ms.T_BcsmCamelTDPData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_t_BcsmTriggerDetectionPoint,
@@ -23511,15 +23511,15 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ms_msNotReachable,
-      { "msNotReachable", "gsm_map.ms.msNotReachable",
+      { "msNotReachable", "gsm_map.ms.msNotReachable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_VBSDataList_item,
-      { "VoiceBroadcastData", "gsm_map.ms.VoiceBroadcastData",
+      { "VoiceBroadcastData", "gsm_map.ms.VoiceBroadcastData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_VGCSDataList_item,
-      { "VoiceGroupCallData", "gsm_map.ms.VoiceGroupCallData",
+      { "VoiceGroupCallData", "gsm_map.ms.VoiceGroupCallData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_groupId,
@@ -23543,11 +23543,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_broadcastInitEntitlement,
-      { "broadcastInitEntitlement", "gsm_map.ms.broadcastInitEntitlement",
+      { "broadcastInitEntitlement", "gsm_map.ms.broadcastInitEntitlement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_requestedInfo,
-      { "requestedInfo", "gsm_map.ms.requestedInfo",
+      { "requestedInfo", "gsm_map.ms.requestedInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_callPriority,
@@ -23555,11 +23555,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_EMLPP_Priority_vals), 0,
         "EMLPP_Priority", HFILL }},
     { &hf_gsm_map_ms_subscriberInfo,
-      { "subscriberInfo", "gsm_map.ms.subscriberInfo",
+      { "subscriberInfo", "gsm_map.ms.subscriberInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_locationInformation,
-      { "locationInformation", "gsm_map.ms.locationInformation",
+      { "locationInformation", "gsm_map.ms.locationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_subscriberState,
@@ -23567,7 +23567,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_SubscriberState_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_locationInformationGPRS,
-      { "locationInformationGPRS", "gsm_map.ms.locationInformationGPRS",
+      { "locationInformationGPRS", "gsm_map.ms.locationInformationGPRS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ps_SubscriberState,
@@ -23579,11 +23579,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_gprs_MS_Class,
-      { "gprs-MS-Class", "gsm_map.ms.gprs_MS_Class",
+      { "gprs-MS-Class", "gsm_map.ms.gprs_MS_Class_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GPRSMSClass", HFILL }},
     { &hf_gsm_map_ms_mnpInfoRes,
-      { "mnpInfoRes", "gsm_map.ms.mnpInfoRes",
+      { "mnpInfoRes", "gsm_map.ms.mnpInfoRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_imsVoiceOverPS_SessionsIndication,
@@ -23603,7 +23603,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_PS_SubscriberState_vals), 0,
         "PS_SubscriberState", HFILL }},
     { &hf_gsm_map_ms_locationInformationEPS,
-      { "locationInformationEPS", "gsm_map.ms.locationInformationEPS",
+      { "locationInformationEPS", "gsm_map.ms.locationInformationEPS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_timeZone,
@@ -23631,15 +23631,15 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_locationInformation_01,
-      { "locationInformation", "gsm_map.ms.locationInformation",
+      { "locationInformation", "gsm_map.ms.locationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_subscriberState_01,
-      { "subscriberState", "gsm_map.ms.subscriberState",
+      { "subscriberState", "gsm_map.ms.subscriberState_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_currentLocation,
-      { "currentLocation", "gsm_map.ms.currentLocation",
+      { "currentLocation", "gsm_map.ms.currentLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_requestedDomain,
@@ -23647,23 +23647,23 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_DomainType_vals), 0,
         "DomainType", HFILL }},
     { &hf_gsm_map_ms_imei_01,
-      { "imei", "gsm_map.ms.imei_null",
+      { "imei", "gsm_map.ms.imei_null_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ms_classmark,
-      { "ms-classmark", "gsm_map.ms.ms_classmark",
+      { "ms-classmark", "gsm_map.ms.ms_classmark_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_mnpRequestedInfo,
-      { "mnpRequestedInfo", "gsm_map.ms.mnpRequestedInfo",
+      { "mnpRequestedInfo", "gsm_map.ms.mnpRequestedInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_locationInformationEPS_Supported,
-      { "locationInformationEPS-Supported", "gsm_map.ms.locationInformationEPS_Supported",
+      { "locationInformationEPS-Supported", "gsm_map.ms.locationInformationEPS_Supported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_t_adsData,
-      { "t-adsData", "gsm_map.ms.t_adsData",
+      { "t-adsData", "gsm_map.ms.t_adsData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_requestedNodes,
@@ -23671,11 +23671,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_servingNodeIndication,
-      { "servingNodeIndication", "gsm_map.ms.servingNodeIndication",
+      { "servingNodeIndication", "gsm_map.ms.servingNodeIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_localTimeZoneRequest,
-      { "localTimeZoneRequest", "gsm_map.ms.localTimeZoneRequest",
+      { "localTimeZoneRequest", "gsm_map.ms.localTimeZoneRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ageOfLocationInformation,
@@ -23707,15 +23707,15 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_currentLocationRetrieved,
-      { "currentLocationRetrieved", "gsm_map.ms.currentLocationRetrieved",
+      { "currentLocationRetrieved", "gsm_map.ms.currentLocationRetrieved_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_sai_Present,
-      { "sai-Present", "gsm_map.ms.sai_Present",
+      { "sai-Present", "gsm_map.ms.sai_Present_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_userCSGInformation,
-      { "userCSGInformation", "gsm_map.ms.userCSGInformation",
+      { "userCSGInformation", "gsm_map.ms.userCSGInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_e_utranCellGlobalIdentity,
@@ -23747,11 +23747,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_1", HFILL }},
     { &hf_gsm_map_ms_assumedIdle,
-      { "assumedIdle", "gsm_map.ms.assumedIdle",
+      { "assumedIdle", "gsm_map.ms.assumedIdle_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_camelBusy,
-      { "camelBusy", "gsm_map.ms.camelBusy",
+      { "camelBusy", "gsm_map.ms.camelBusy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_netDetNotReachable,
@@ -23759,23 +23759,23 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_NotReachableReason_vals), 0,
         "NotReachableReason", HFILL }},
     { &hf_gsm_map_ms_notProvidedFromVLR,
-      { "notProvidedFromVLR", "gsm_map.ms.notProvidedFromVLR",
+      { "notProvidedFromVLR", "gsm_map.ms.notProvidedFromVLR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_notProvidedFromSGSNorMME,
-      { "notProvidedFromSGSNorMME", "gsm_map.ms.notProvidedFromSGSNorMME",
+      { "notProvidedFromSGSNorMME", "gsm_map.ms.notProvidedFromSGSNorMME_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ps_Detached,
-      { "ps-Detached", "gsm_map.ms.ps_Detached",
+      { "ps-Detached", "gsm_map.ms.ps_Detached_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ps_AttachedNotReachableForPaging,
-      { "ps-AttachedNotReachableForPaging", "gsm_map.ms.ps_AttachedNotReachableForPaging",
+      { "ps-AttachedNotReachableForPaging", "gsm_map.ms.ps_AttachedNotReachableForPaging_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ps_AttachedReachableForPaging,
-      { "ps-AttachedReachableForPaging", "gsm_map.ms.ps_AttachedReachableForPaging",
+      { "ps-AttachedReachableForPaging", "gsm_map.ms.ps_AttachedReachableForPaging_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ps_PDP_ActiveNotReachableForPaging,
@@ -23787,7 +23787,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PDP_ContextInfoList", HFILL }},
     { &hf_gsm_map_ms_PDP_ContextInfoList_item,
-      { "PDP-ContextInfo", "gsm_map.ms.PDP_ContextInfo",
+      { "PDP-ContextInfo", "gsm_map.ms.PDP_ContextInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_pdp_ContextIdentifier,
@@ -23795,7 +23795,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ContextId", HFILL }},
     { &hf_gsm_map_ms_pdp_ContextActive,
-      { "pdp-ContextActive", "gsm_map.ms.pdp_ContextActive",
+      { "pdp-ContextActive", "gsm_map.ms.pdp_ContextActive_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_apn_Subscribed,
@@ -23883,23 +23883,23 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_SubscriberIdentity_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_requestedSubscriptionInfo,
-      { "requestedSubscriptionInfo", "gsm_map.ms.requestedSubscriptionInfo",
+      { "requestedSubscriptionInfo", "gsm_map.ms.requestedSubscriptionInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_callForwardingData,
-      { "callForwardingData", "gsm_map.ms.callForwardingData",
+      { "callForwardingData", "gsm_map.ms.callForwardingData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_callBarringData,
-      { "callBarringData", "gsm_map.ms.callBarringData",
+      { "callBarringData", "gsm_map.ms.callBarringData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_odb_Info,
-      { "odb-Info", "gsm_map.ms.odb_Info",
+      { "odb-Info", "gsm_map.ms.odb_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_camel_SubscriptionInfo,
-      { "camel-SubscriptionInfo", "gsm_map.ms.camel_SubscriptionInfo",
+      { "camel-SubscriptionInfo", "gsm_map.ms.camel_SubscriptionInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_supportedVLR_CAMEL_Phases,
@@ -23923,23 +23923,23 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_cw_Data,
-      { "cw-Data", "gsm_map.ms.cw_Data",
+      { "cw-Data", "gsm_map.ms.cw_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CallWaitingData", HFILL }},
     { &hf_gsm_map_ms_ch_Data,
-      { "ch-Data", "gsm_map.ms.ch_Data",
+      { "ch-Data", "gsm_map.ms.ch_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CallHoldData", HFILL }},
     { &hf_gsm_map_ms_clip_Data,
-      { "clip-Data", "gsm_map.ms.clip_Data",
+      { "clip-Data", "gsm_map.ms.clip_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ClipData", HFILL }},
     { &hf_gsm_map_ms_clir_Data,
-      { "clir-Data", "gsm_map.ms.clir_Data",
+      { "clir-Data", "gsm_map.ms.clir_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ClirData", HFILL }},
     { &hf_gsm_map_ms_ect_data,
-      { "ect-data", "gsm_map.ms.ect_data",
+      { "ect-data", "gsm_map.ms.ect_data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EctData", HFILL }},
     { &hf_gsm_map_ms_cwFeatureList,
@@ -23947,7 +23947,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Ext_CwFeatureList", HFILL }},
     { &hf_gsm_map_ms_Ext_CwFeatureList_item,
-      { "Ext-CwFeature", "gsm_map.ms.Ext_CwFeature",
+      { "Ext-CwFeature", "gsm_map.ms.Ext_CwFeature_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_overrideCategory,
@@ -23959,11 +23959,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ss_CliRestrictionOption_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_requestedSS_Info,
-      { "requestedSS-Info", "gsm_map.ms.requestedSS_Info",
+      { "requestedSS-Info", "gsm_map.ms.requestedSS_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SS_ForBS_Code", HFILL }},
     { &hf_gsm_map_ms_odb,
-      { "odb", "gsm_map.ms.odb",
+      { "odb", "gsm_map.ms.odb_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_requestedCAMEL_SubscriptionInfo,
@@ -23971,11 +23971,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_RequestedCAMEL_SubscriptionInfo_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_supportedVLR_CAMEL_Phases_01,
-      { "supportedVLR-CAMEL-Phases", "gsm_map.ms.supportedVLR_CAMEL_Phases",
+      { "supportedVLR-CAMEL-Phases", "gsm_map.ms.supportedVLR_CAMEL_Phases_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_supportedSGSN_CAMEL_Phases_01,
-      { "supportedSGSN-CAMEL-Phases", "gsm_map.ms.supportedSGSN_CAMEL_Phases",
+      { "supportedSGSN-CAMEL-Phases", "gsm_map.ms.supportedSGSN_CAMEL_Phases_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_additionalRequestedCAMEL_SubscriptionInfo,
@@ -23983,35 +23983,35 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_AdditionalRequestedCAMEL_SubscriptionInfo_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_msisdn_BS_List_01,
-      { "msisdn-BS-List", "gsm_map.ms.msisdn_BS_List",
+      { "msisdn-BS-List", "gsm_map.ms.msisdn_BS_List_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_csg_SubscriptionDataRequested,
-      { "csg-SubscriptionDataRequested", "gsm_map.ms.csg_SubscriptionDataRequested",
+      { "csg-SubscriptionDataRequested", "gsm_map.ms.csg_SubscriptionDataRequested_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_cw_Info,
-      { "cw-Info", "gsm_map.ms.cw_Info",
+      { "cw-Info", "gsm_map.ms.cw_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_clip_Info,
-      { "clip-Info", "gsm_map.ms.clip_Info",
+      { "clip-Info", "gsm_map.ms.clip_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_clir_Info,
-      { "clir-Info", "gsm_map.ms.clir_Info",
+      { "clir-Info", "gsm_map.ms.clir_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_hold_Info,
-      { "hold-Info", "gsm_map.ms.hold_Info",
+      { "hold-Info", "gsm_map.ms.hold_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ect_Info,
-      { "ect-Info", "gsm_map.ms.ect_Info",
+      { "ect-Info", "gsm_map.ms.ect_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_MSISDN_BS_List_item,
-      { "MSISDN-BS", "gsm_map.ms.MSISDN_BS",
+      { "MSISDN-BS", "gsm_map.ms.MSISDN_BS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_password,
@@ -24023,7 +24023,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_t_CSI,
-      { "t-CSI", "gsm_map.ms.t_CSI",
+      { "t-CSI", "gsm_map.ms.t_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_vt_BCSM_CAMEL_TDP_CriteriaList,
@@ -24031,7 +24031,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_BCSM_CAMEL_TDP_CriteriaList", HFILL }},
     { &hf_gsm_map_ms_tif_CSI_NotificationToCSE,
-      { "tif-CSI-NotificationToCSE", "gsm_map.ms.tif_CSI_NotificationToCSE",
+      { "tif-CSI-NotificationToCSE", "gsm_map.ms.tif_CSI_NotificationToCSE_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_specificCSIDeletedList,
@@ -24039,7 +24039,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "SpecificCSI_Withdraw", HFILL }},
     { &hf_gsm_map_ms_o_IM_CSI,
-      { "o-IM-CSI", "gsm_map.ms.o_IM_CSI",
+      { "o-IM-CSI", "gsm_map.ms.o_IM_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "O_CSI", HFILL }},
     { &hf_gsm_map_ms_o_IM_BcsmCamelTDP_CriteriaList,
@@ -24047,11 +24047,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "O_BcsmCamelTDPCriteriaList", HFILL }},
     { &hf_gsm_map_ms_d_IM_CSI,
-      { "d-IM-CSI", "gsm_map.ms.d_IM_CSI",
+      { "d-IM-CSI", "gsm_map.ms.d_IM_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "D_CSI", HFILL }},
     { &hf_gsm_map_ms_vt_IM_CSI,
-      { "vt-IM-CSI", "gsm_map.ms.vt_IM_CSI",
+      { "vt-IM-CSI", "gsm_map.ms.vt_IM_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_CSI", HFILL }},
     { &hf_gsm_map_ms_vt_IM_BCSM_CAMEL_TDP_CriteriaList,
@@ -24059,23 +24059,23 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_BCSM_CAMEL_TDP_CriteriaList", HFILL }},
     { &hf_gsm_map_ms_modificationRequestFor_CF_Info,
-      { "modificationRequestFor-CF-Info", "gsm_map.ms.modificationRequestFor_CF_Info",
+      { "modificationRequestFor-CF-Info", "gsm_map.ms.modificationRequestFor_CF_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_modificationRequestFor_CB_Info,
-      { "modificationRequestFor-CB-Info", "gsm_map.ms.modificationRequestFor_CB_Info",
+      { "modificationRequestFor-CB-Info", "gsm_map.ms.modificationRequestFor_CB_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_modificationRequestFor_CSI,
-      { "modificationRequestFor-CSI", "gsm_map.ms.modificationRequestFor_CSI",
+      { "modificationRequestFor-CSI", "gsm_map.ms.modificationRequestFor_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_modificationRequestFor_ODB_data,
-      { "modificationRequestFor-ODB-data", "gsm_map.ms.modificationRequestFor_ODB_data",
+      { "modificationRequestFor-ODB-data", "gsm_map.ms.modificationRequestFor_ODB_data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_modificationRequestFor_IP_SM_GW_Data,
-      { "modificationRequestFor-IP-SM-GW-Data", "gsm_map.ms.modificationRequestFor_IP_SM_GW_Data",
+      { "modificationRequestFor-IP-SM-GW-Data", "gsm_map.ms.modificationRequestFor_IP_SM_GW_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_activationRequestForUE_reachability,
@@ -24083,27 +24083,27 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "RequestedServingNode", HFILL }},
     { &hf_gsm_map_ms_modificationRequestFor_CSG,
-      { "modificationRequestFor-CSG", "gsm_map.ms.modificationRequestFor_CSG",
+      { "modificationRequestFor-CSG", "gsm_map.ms.modificationRequestFor_CSG_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_modificationRequestFor_CW_Data,
-      { "modificationRequestFor-CW-Data", "gsm_map.ms.modificationRequestFor_CW_Data",
+      { "modificationRequestFor-CW-Data", "gsm_map.ms.modificationRequestFor_CW_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ModificationRequestFor_CW_Info", HFILL }},
     { &hf_gsm_map_ms_modificationRequestFor_CLIP_Data,
-      { "modificationRequestFor-CLIP-Data", "gsm_map.ms.modificationRequestFor_CLIP_Data",
+      { "modificationRequestFor-CLIP-Data", "gsm_map.ms.modificationRequestFor_CLIP_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ModificationRequestFor_CLIP_Info", HFILL }},
     { &hf_gsm_map_ms_modificationRequestFor_CLIR_Data,
-      { "modificationRequestFor-CLIR-Data", "gsm_map.ms.modificationRequestFor_CLIR_Data",
+      { "modificationRequestFor-CLIR-Data", "gsm_map.ms.modificationRequestFor_CLIR_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ModificationRequestFor_CLIR_Info", HFILL }},
     { &hf_gsm_map_ms_modificationRequestFor_HOLD_Data,
-      { "modificationRequestFor-HOLD-Data", "gsm_map.ms.modificationRequestFor_HOLD_Data",
+      { "modificationRequestFor-HOLD-Data", "gsm_map.ms.modificationRequestFor_HOLD_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ModificationRequestFor_CH_Info", HFILL }},
     { &hf_gsm_map_ms_modificationRequestFor_ECT_Data,
-      { "modificationRequestFor-ECT-Data", "gsm_map.ms.modificationRequestFor_ECT_Data",
+      { "modificationRequestFor-ECT-Data", "gsm_map.ms.modificationRequestFor_ECT_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ModificationRequestFor_ECT_Info", HFILL }},
     { &hf_gsm_map_ms_modifyNotificationToCSE,
@@ -24123,7 +24123,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "AddressString", HFILL }},
     { &hf_gsm_map_ms_odb_data,
-      { "odb-data", "gsm_map.ms.odb_data",
+      { "odb-data", "gsm_map.ms.odb_data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_requestedCamel_SubscriptionInfo,
@@ -24139,19 +24139,19 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_ModificationInstruction_vals), 0,
         "ModificationInstruction", HFILL }},
     { &hf_gsm_map_ms_ip_sm_gw_DiameterAddress,
-      { "ip-sm-gw-DiameterAddress", "gsm_map.ms.ip_sm_gw_DiameterAddress",
+      { "ip-sm-gw-DiameterAddress", "gsm_map.ms.ip_sm_gw_DiameterAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NetworkNodeDiameterAddress", HFILL }},
     { &hf_gsm_map_ms_forwardingInfoFor_CSE,
-      { "forwardingInfoFor-CSE", "gsm_map.ms.forwardingInfoFor_CSE",
+      { "forwardingInfoFor-CSE", "gsm_map.ms.forwardingInfoFor_CSE_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ext_ForwardingInfoFor_CSE", HFILL }},
     { &hf_gsm_map_ms_callBarringInfoFor_CSE,
-      { "callBarringInfoFor-CSE", "gsm_map.ms.callBarringInfoFor_CSE",
+      { "callBarringInfoFor-CSE", "gsm_map.ms.callBarringInfoFor_CSE_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ext_CallBarringInfoFor_CSE", HFILL }},
     { &hf_gsm_map_ms_allInformationSent,
-      { "allInformationSent", "gsm_map.ms.allInformationSent",
+      { "allInformationSent", "gsm_map.ms.allInformationSent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ue_reachable,
@@ -24171,19 +24171,19 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_temporaryEmptySubscriptiondataIndicator,
-      { "temporaryEmptySubscriptiondataIndicator", "gsm_map.ms.temporaryEmptySubscriptiondataIndicator",
+      { "temporaryEmptySubscriptiondataIndicator", "gsm_map.ms.temporaryEmptySubscriptiondataIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_naea_PreferredCI,
-      { "naea-PreferredCI", "gsm_map.ms.naea_PreferredCI",
+      { "naea-PreferredCI", "gsm_map.ms.naea_PreferredCI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_gprsSubscriptionData,
-      { "gprsSubscriptionData", "gsm_map.ms.gprsSubscriptionData",
+      { "gprsSubscriptionData", "gsm_map.ms.gprsSubscriptionData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_roamingRestrictedInSgsnDueToUnsupportedFeature,
-      { "roamingRestrictedInSgsnDueToUnsupportedFeature", "gsm_map.ms.roamingRestrictedInSgsnDueToUnsupportedFeature",
+      { "roamingRestrictedInSgsnDueToUnsupportedFeature", "gsm_map.ms.roamingRestrictedInSgsnDueToUnsupportedFeature_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_networkAccessMode,
@@ -24191,15 +24191,15 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_NetworkAccessMode_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_lsaInformation,
-      { "lsaInformation", "gsm_map.ms.lsaInformation",
+      { "lsaInformation", "gsm_map.ms.lsaInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_lmu_Indicator,
-      { "lmu-Indicator", "gsm_map.ms.lmu_Indicator",
+      { "lmu-Indicator", "gsm_map.ms.lmu_Indicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_lcsInformation,
-      { "lcsInformation", "gsm_map.ms.lcsInformation",
+      { "lcsInformation", "gsm_map.ms.lcsInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_istAlertTimer,
@@ -24211,7 +24211,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "AgeIndicator", HFILL }},
     { &hf_gsm_map_ms_mc_SS_Info,
-      { "mc-SS-Info", "gsm_map.ms.mc_SS_Info",
+      { "mc-SS-Info", "gsm_map.ms.mc_SS_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_cs_AllocationRetentionPriority,
@@ -24219,7 +24219,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_sgsn_CAMEL_SubscriptionInfo,
-      { "sgsn-CAMEL-SubscriptionInfo", "gsm_map.ms.sgsn_CAMEL_SubscriptionInfo",
+      { "sgsn-CAMEL-SubscriptionInfo", "gsm_map.ms.sgsn_CAMEL_SubscriptionInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_accessRestrictionData,
@@ -24231,11 +24231,11 @@ void proto_register_gsm_map(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_gsm_map_ms_eps_SubscriptionData,
-      { "eps-SubscriptionData", "gsm_map.ms.eps_SubscriptionData",
+      { "eps-SubscriptionData", "gsm_map.ms.eps_SubscriptionData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ue_ReachabilityRequestIndicator,
-      { "ue-ReachabilityRequestIndicator", "gsm_map.ms.ue_ReachabilityRequestIndicator",
+      { "ue-ReachabilityRequestIndicator", "gsm_map.ms.ue_ReachabilityRequestIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_subscribedPeriodicRAUTAUtimer,
@@ -24243,7 +24243,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_vplmnLIPAAllowed,
-      { "vplmnLIPAAllowed", "gsm_map.ms.vplmnLIPAAllowed",
+      { "vplmnLIPAAllowed", "gsm_map.ms.vplmnLIPAAllowed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_mdtUserConsent,
@@ -24263,11 +24263,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ms_psAndSMS_OnlyServiceProvision,
-      { "psAndSMS-OnlyServiceProvision", "gsm_map.ms.psAndSMS_OnlyServiceProvision",
+      { "psAndSMS-OnlyServiceProvision", "gsm_map.ms.psAndSMS_OnlyServiceProvision_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_smsInSGSNAllowed,
-      { "smsInSGSNAllowed", "gsm_map.ms.smsInSGSNAllowed",
+      { "smsInSGSNAllowed", "gsm_map.ms.smsInSGSNAllowed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedRAT_Types_utran,
@@ -24850,11 +24850,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_cug_OutgoingAccess,
-      { "cug-OutgoingAccess", "gsm_map.ch.cug_OutgoingAccess",
+      { "cug-OutgoingAccess", "gsm_map.ch.cug_OutgoingAccess_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_extensionContainer,
-      { "extensionContainer", "gsm_map.ch.extensionContainer",
+      { "extensionContainer", "gsm_map.ch.extensionContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_msisdn,
@@ -24862,7 +24862,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ch_cug_CheckInfo,
-      { "cug-CheckInfo", "gsm_map.ch.cug_CheckInfo",
+      { "cug-CheckInfo", "gsm_map.ch.cug_CheckInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_numberOfForwarding,
@@ -24874,7 +24874,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ch_InterrogationType_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_or_Interrogation,
-      { "or-Interrogation", "gsm_map.ch.or_Interrogation",
+      { "or-Interrogation", "gsm_map.ch.or_Interrogation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_or_Capability,
@@ -24898,15 +24898,15 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_Ext_BasicServiceCode_vals), 0,
         "Ext_BasicServiceCode", HFILL }},
     { &hf_gsm_map_ch_networkSignalInfo,
-      { "networkSignalInfo", "gsm_map.ch.networkSignalInfo",
+      { "networkSignalInfo", "gsm_map.ch.networkSignalInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ExternalSignalInfo", HFILL }},
     { &hf_gsm_map_ch_camelInfo,
-      { "camelInfo", "gsm_map.ch.camelInfo",
+      { "camelInfo", "gsm_map.ch.camelInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_suppressionOfAnnouncement,
-      { "suppressionOfAnnouncement", "gsm_map.ch.suppressionOfAnnouncement",
+      { "suppressionOfAnnouncement", "gsm_map.ch.suppressionOfAnnouncement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_alertingPattern,
@@ -24914,7 +24914,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_ccbs_Call,
-      { "ccbs-Call", "gsm_map.ch.ccbs_Call",
+      { "ccbs-Call", "gsm_map.ch.ccbs_Call_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_supportedCCBS_Phase,
@@ -24922,7 +24922,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_additionalSignalInfo,
-      { "additionalSignalInfo", "gsm_map.ch.additionalSignalInfo",
+      { "additionalSignalInfo", "gsm_map.ch.additionalSignalInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ext_ExternalSignalInfo", HFILL }},
     { &hf_gsm_map_ch_istSupportIndicator,
@@ -24930,7 +24930,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_IST_SupportIndicator_vals), 0,
         "IST_SupportIndicator", HFILL }},
     { &hf_gsm_map_ch_pre_pagingSupported,
-      { "pre-pagingSupported", "gsm_map.ch.pre_pagingSupported",
+      { "pre-pagingSupported", "gsm_map.ch.pre_pagingSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_callDiversionTreatmentIndicator,
@@ -24938,19 +24938,19 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_longFTN_Supported,
-      { "longFTN-Supported", "gsm_map.ch.longFTN_Supported",
+      { "longFTN-Supported", "gsm_map.ch.longFTN_Supported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_suppress_VT_CSI,
-      { "suppress-VT-CSI", "gsm_map.ch.suppress_VT_CSI",
+      { "suppress-VT-CSI", "gsm_map.ch.suppress_VT_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_suppressIncomingCallBarring,
-      { "suppressIncomingCallBarring", "gsm_map.ch.suppressIncomingCallBarring",
+      { "suppressIncomingCallBarring", "gsm_map.ch.suppressIncomingCallBarring_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_gsmSCF_InitiatedCall,
-      { "gsmSCF-InitiatedCall", "gsm_map.ch.gsmSCF_InitiatedCall",
+      { "gsmSCF-InitiatedCall", "gsm_map.ch.gsmSCF_InitiatedCall_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_basicServiceGroup2,
@@ -24958,7 +24958,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_Ext_BasicServiceCode_vals), 0,
         "Ext_BasicServiceCode", HFILL }},
     { &hf_gsm_map_ch_networkSignalInfo2,
-      { "networkSignalInfo2", "gsm_map.ch.networkSignalInfo2",
+      { "networkSignalInfo2", "gsm_map.ch.networkSignalInfo2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ExternalSignalInfo", HFILL }},
     { &hf_gsm_map_ch_suppressMTSS,
@@ -24966,7 +24966,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_mtRoamingRetrySupported,
-      { "mtRoamingRetrySupported", "gsm_map.ch.mtRoamingRetrySupported",
+      { "mtRoamingRetrySupported", "gsm_map.ch.mtRoamingRetrySupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_callPriority,
@@ -24982,11 +24982,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ch_ExtendedRoutingInfo_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_cugSubscriptionFlag,
-      { "cugSubscriptionFlag", "gsm_map.ch.cugSubscriptionFlag",
+      { "cugSubscriptionFlag", "gsm_map.ch.cugSubscriptionFlag_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_subscriberInfo,
-      { "subscriberInfo", "gsm_map.ch.subscriberInfo",
+      { "subscriberInfo", "gsm_map.ch.subscriberInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_ss_List,
@@ -24998,7 +24998,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_Ext_BasicServiceCode_vals), 0,
         "Ext_BasicServiceCode", HFILL }},
     { &hf_gsm_map_ch_forwardingInterrogationRequired,
-      { "forwardingInterrogationRequired", "gsm_map.ch.forwardingInterrogationRequired",
+      { "forwardingInterrogationRequired", "gsm_map.ch.forwardingInterrogationRequired_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_vmsc_Address,
@@ -25006,11 +25006,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ch_naea_PreferredCI,
-      { "naea-PreferredCI", "gsm_map.ch.naea_PreferredCI",
+      { "naea-PreferredCI", "gsm_map.ch.naea_PreferredCI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_ccbs_Indicators,
-      { "ccbs-Indicators", "gsm_map.ch.ccbs_Indicators",
+      { "ccbs-Indicators", "gsm_map.ch.ccbs_Indicators_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_numberPortabilityStatus,
@@ -25050,19 +25050,19 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ch_UnavailabilityCause_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_releaseResourcesSupported,
-      { "releaseResourcesSupported", "gsm_map.ch.releaseResourcesSupported",
+      { "releaseResourcesSupported", "gsm_map.ch.releaseResourcesSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_gsm_BearerCapability,
-      { "gsm-BearerCapability", "gsm_map.ch.gsm_BearerCapability",
+      { "gsm-BearerCapability", "gsm_map.ch.gsm_BearerCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ExternalSignalInfo", HFILL }},
     { &hf_gsm_map_ch_ccbs_Possible,
-      { "ccbs-Possible", "gsm_map.ch.ccbs_Possible",
+      { "ccbs-Possible", "gsm_map.ch.ccbs_Possible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_keepCCBS_CallIndicator,
-      { "keepCCBS-CallIndicator", "gsm_map.ch.keepCCBS_CallIndicator",
+      { "keepCCBS-CallIndicator", "gsm_map.ch.keepCCBS_CallIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_roamingNumber,
@@ -25070,7 +25070,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ch_forwardingData,
-      { "forwardingData", "gsm_map.ch.forwardingData",
+      { "forwardingData", "gsm_map.ch.forwardingData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_forwardedToNumber,
@@ -25106,7 +25106,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "SupportedCamelPhases", HFILL }},
     { &hf_gsm_map_ch_orNotSupportedInGMSC,
-      { "orNotSupportedInGMSC", "gsm_map.ch.orNotSupportedInGMSC",
+      { "orNotSupportedInGMSC", "gsm_map.ch.orNotSupportedInGMSC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_offeredCamel4CSIsInInterrogatingNode,
@@ -25118,7 +25118,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_mtrf_Indicator,
-      { "mtrf-Indicator", "gsm_map.ch.mtrf_Indicator",
+      { "mtrf-Indicator", "gsm_map.ch.mtrf_Indicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_oldMSC_Number,
@@ -25126,19 +25126,19 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ch_o_CSI,
-      { "o-CSI", "gsm_map.ch.o_CSI",
+      { "o-CSI", "gsm_map.ch.o_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_uu_Data,
-      { "uu-Data", "gsm_map.ch.uu_Data",
+      { "uu-Data", "gsm_map.ch.uu_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_allInformationSent,
-      { "allInformationSent", "gsm_map.ch.allInformationSent",
+      { "allInformationSent", "gsm_map.ch.allInformationSent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_d_csi,
-      { "d-csi", "gsm_map.ch.d_csi",
+      { "d-csi", "gsm_map.ch.d_csi_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_o_BcsmCamelTDPCriteriaList,
@@ -25146,7 +25146,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_mtRoamingRetry,
-      { "mtRoamingRetry", "gsm_map.ch.mtRoamingRetry",
+      { "mtRoamingRetry", "gsm_map.ch.mtRoamingRetry_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_uuIndicator,
@@ -25158,7 +25158,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_uusCFInteraction,
-      { "uusCFInteraction", "gsm_map.ch.uusCFInteraction",
+      { "uusCFInteraction", "gsm_map.ch.uusCFInteraction_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_supportedCamelPhases,
@@ -25166,7 +25166,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_suppress_T_CSI,
-      { "suppress-T-CSI", "gsm_map.ch.suppress_T_CSI",
+      { "suppress-T-CSI", "gsm_map.ch.suppress_T_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_offeredCamel4CSIs,
@@ -25178,15 +25178,15 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ch_RoutingInfo_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_camelRoutingInfo,
-      { "camelRoutingInfo", "gsm_map.ch.camelRoutingInfo",
+      { "camelRoutingInfo", "gsm_map.ch.camelRoutingInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_gmscCamelSubscriptionInfo,
-      { "gmscCamelSubscriptionInfo", "gsm_map.ch.gmscCamelSubscriptionInfo",
+      { "gmscCamelSubscriptionInfo", "gsm_map.ch.gmscCamelSubscriptionInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_t_CSI,
-      { "t-CSI", "gsm_map.ch.t_CSI",
+      { "t-CSI", "gsm_map.ch.t_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_o_BcsmCamelTDP_CriteriaList,
@@ -25206,11 +25206,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ch_CCBS_SubscriberStatus_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_eventReportData,
-      { "eventReportData", "gsm_map.ch.eventReportData",
+      { "eventReportData", "gsm_map.ch.eventReportData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_callReportdata,
-      { "callReportdata", "gsm_map.ch.callReportdata",
+      { "callReportdata", "gsm_map.ch.callReportdata_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_monitoringMode,
@@ -25222,11 +25222,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ch_CallOutcome_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_callInfo,
-      { "callInfo", "gsm_map.ch.callInfo",
+      { "callInfo", "gsm_map.ch.callInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ExternalSignalInfo", HFILL }},
     { &hf_gsm_map_ch_ccbs_Feature,
-      { "ccbs-Feature", "gsm_map.ch.ccbs_Feature",
+      { "ccbs-Feature", "gsm_map.ch.ccbs_Feature_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_translatedB_Number,
@@ -25234,7 +25234,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ch_replaceB_Number,
-      { "replaceB-Number", "gsm_map.ch.replaceB_Number",
+      { "replaceB-Number", "gsm_map.ch.replaceB_Number_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_ruf_Outcome,
@@ -25242,7 +25242,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ch_RUF_Outcome_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_istInformationWithdraw,
-      { "istInformationWithdraw", "gsm_map.ch.istInformationWithdraw",
+      { "istInformationWithdraw", "gsm_map.ch.istInformationWithdraw_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ch_callTerminationIndicator,
@@ -25273,7 +25273,7 @@ void proto_register_gsm_map(void) {
 /* --- Module MAP-LCS-DataTypes --- --- ---                                   */
 
     { &hf_gsm_map_lcs_gsm_map_lcs_LCS_ClientID_PDU,
-      { "LCS-ClientID", "gsm_map.lcs.LCS_ClientID",
+      { "LCS-ClientID", "gsm_map.lcs.LCS_ClientID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_mlcNumber,
@@ -25285,11 +25285,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_SubscriberIdentity_vals), 0,
         "SubscriberIdentity", HFILL }},
     { &hf_gsm_map_lcs_extensionContainer,
-      { "extensionContainer", "gsm_map.lcs.extensionContainer",
+      { "extensionContainer", "gsm_map.lcs.extensionContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_lcsLocationInfo,
-      { "lcsLocationInfo", "gsm_map.lcs.lcsLocationInfo",
+      { "lcsLocationInfo", "gsm_map.lcs.lcsLocationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_v_gmlc_Address,
@@ -25317,7 +25317,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_gprsNodeIndicator,
-      { "gprsNodeIndicator", "gsm_map.lcs.gprsNodeIndicator",
+      { "gprsNodeIndicator", "gsm_map.lcs.gprsNodeIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_additional_Number,
@@ -25341,7 +25341,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "DiameterIdentity", HFILL }},
     { &hf_gsm_map_lcs_locationType,
-      { "locationType", "gsm_map.lcs.locationType",
+      { "locationType", "gsm_map.lcs.locationType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_mlc_Number,
@@ -25349,11 +25349,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "ISDN_AddressString", HFILL }},
     { &hf_gsm_map_lcs_lcs_ClientID,
-      { "lcs-ClientID", "gsm_map.lcs.lcs_ClientID",
+      { "lcs-ClientID", "gsm_map.lcs.lcs_ClientID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_privacyOverride,
-      { "privacyOverride", "gsm_map.lcs.privacyOverride",
+      { "privacyOverride", "gsm_map.lcs.privacyOverride_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_imsi,
@@ -25373,7 +25373,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_lcs_QoS,
-      { "lcs-QoS", "gsm_map.lcs.lcs_QoS",
+      { "lcs-QoS", "gsm_map.lcs.lcs_QoS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_supportedGADShapes,
@@ -25389,27 +25389,27 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_LCSServiceTypeID_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_lcsCodeword,
-      { "lcsCodeword", "gsm_map.lcs.lcsCodeword",
+      { "lcsCodeword", "gsm_map.lcs.lcsCodeword_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_lcs_PrivacyCheck,
-      { "lcs-PrivacyCheck", "gsm_map.lcs.lcs_PrivacyCheck",
+      { "lcs-PrivacyCheck", "gsm_map.lcs.lcs_PrivacyCheck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_areaEventInfo,
-      { "areaEventInfo", "gsm_map.lcs.areaEventInfo",
+      { "areaEventInfo", "gsm_map.lcs.areaEventInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_mo_lrShortCircuitIndicator,
-      { "mo-lrShortCircuitIndicator", "gsm_map.lcs.mo_lrShortCircuitIndicator",
+      { "mo-lrShortCircuitIndicator", "gsm_map.lcs.mo_lrShortCircuitIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_periodicLDRInfo,
-      { "periodicLDRInfo", "gsm_map.lcs.periodicLDRInfo",
+      { "periodicLDRInfo", "gsm_map.lcs.periodicLDRInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_reportingPLMNList,
-      { "reportingPLMNList", "gsm_map.lcs.reportingPLMNList",
+      { "reportingPLMNList", "gsm_map.lcs.reportingPLMNList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_locationEstimateType,
@@ -25425,7 +25425,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_lcs_LCSClientType_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_lcsClientExternalID,
-      { "lcsClientExternalID", "gsm_map.lcs.lcsClientExternalID",
+      { "lcsClientExternalID", "gsm_map.lcs.lcsClientExternalID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_lcsClientDialedByMS,
@@ -25437,7 +25437,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_LCSClientInternalID_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_lcsClientName,
-      { "lcsClientName", "gsm_map.lcs.lcsClientName",
+      { "lcsClientName", "gsm_map.lcs.lcsClientName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_lcsAPN,
@@ -25445,7 +25445,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "APN", HFILL }},
     { &hf_gsm_map_lcs_lcsRequestorID,
-      { "lcsRequestorID", "gsm_map.lcs.lcsRequestorID",
+      { "lcsRequestorID", "gsm_map.lcs.lcsRequestorID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_dataCodingScheme,
@@ -25469,7 +25469,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_verticalCoordinateRequest,
-      { "verticalCoordinateRequest", "gsm_map.lcs.verticalCoordinateRequest",
+      { "verticalCoordinateRequest", "gsm_map.lcs.verticalCoordinateRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_vertical_accuracy,
@@ -25477,11 +25477,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_responseTime,
-      { "responseTime", "gsm_map.lcs.responseTime",
+      { "responseTime", "gsm_map.lcs.responseTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_velocityRequest,
-      { "velocityRequest", "gsm_map.lcs.velocityRequest",
+      { "velocityRequest", "gsm_map.lcs.velocityRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_responseTimeCategory,
@@ -25501,7 +25501,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_lcs_PrivacyCheckRelatedAction_vals), 0,
         "PrivacyCheckRelatedAction", HFILL }},
     { &hf_gsm_map_lcs_areaDefinition,
-      { "areaDefinition", "gsm_map.lcs.areaDefinition",
+      { "areaDefinition", "gsm_map.lcs.areaDefinition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_occurrenceInfo,
@@ -25517,7 +25517,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_AreaList_item,
-      { "Area", "gsm_map.lcs.Area",
+      { "Area", "gsm_map.lcs.Area_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_areaType,
@@ -25537,7 +25537,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_plmn_ListPrioritized,
-      { "plmn-ListPrioritized", "gsm_map.lcs.plmn_ListPrioritized",
+      { "plmn-ListPrioritized", "gsm_map.lcs.plmn_ListPrioritized_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_plmn_List,
@@ -25545,7 +25545,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PLMNList", HFILL }},
     { &hf_gsm_map_lcs_PLMNList_item,
-      { "ReportingPLMN", "gsm_map.lcs.ReportingPLMN",
+      { "ReportingPLMN", "gsm_map.lcs.ReportingPLMN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_plmn_Id,
@@ -25557,7 +25557,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_lcs_RAN_Technology_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_ran_PeriodicLocationSupport,
-      { "ran-PeriodicLocationSupport", "gsm_map.lcs.ran_PeriodicLocationSupport",
+      { "ran-PeriodicLocationSupport", "gsm_map.lcs.ran_PeriodicLocationSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_locationEstimate,
@@ -25573,7 +25573,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Add_GeographicalInformation", HFILL }},
     { &hf_gsm_map_lcs_deferredmt_lrResponseIndicator,
-      { "deferredmt-lrResponseIndicator", "gsm_map.lcs.deferredmt_lrResponseIndicator",
+      { "deferredmt-lrResponseIndicator", "gsm_map.lcs.deferredmt_lrResponseIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_geranPositioningData,
@@ -25589,7 +25589,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_CellGlobalIdOrServiceAreaIdOrLAI_vals), 0,
         "CellGlobalIdOrServiceAreaIdOrLAI", HFILL }},
     { &hf_gsm_map_lcs_sai_Present,
-      { "sai-Present", "gsm_map.lcs.sai_Present",
+      { "sai-Present", "gsm_map.lcs.sai_Present_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_accuracyFulfilmentIndicator,
@@ -25625,15 +25625,15 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "ISDN_AddressString", HFILL }},
     { &hf_gsm_map_lcs_slr_ArgExtensionContainer,
-      { "slr-ArgExtensionContainer", "gsm_map.lcs.slr_ArgExtensionContainer",
+      { "slr-ArgExtensionContainer", "gsm_map.lcs.slr_ArgExtensionContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_deferredmt_lrData,
-      { "deferredmt-lrData", "gsm_map.lcs.deferredmt_lrData",
+      { "deferredmt-lrData", "gsm_map.lcs.deferredmt_lrData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_pseudonymIndicator,
-      { "pseudonymIndicator", "gsm_map.lcs.pseudonymIndicator",
+      { "pseudonymIndicator", "gsm_map.lcs.pseudonymIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_lcs_sequenceNumber,
@@ -25736,11 +25736,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_EMLPP_Priority_vals), 0,
         "EMLPP_Priority", HFILL }},
     { &hf_gsm_map_gr_uplinkFree,
-      { "uplinkFree", "gsm_map.gr.uplinkFree",
+      { "uplinkFree", "gsm_map.gr.uplinkFree_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_gr_extensionContainer,
-      { "extensionContainer", "gsm_map.gr.extensionContainer",
+      { "extensionContainer", "gsm_map.gr.extensionContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_gr_vstk,
@@ -25752,11 +25752,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_gr_talkerChannelParameter,
-      { "talkerChannelParameter", "gsm_map.gr.talkerChannelParameter",
+      { "talkerChannelParameter", "gsm_map.gr.talkerChannelParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_gr_uplinkReplyIndicator,
-      { "uplinkReplyIndicator", "gsm_map.gr.uplinkReplyIndicator",
+      { "uplinkReplyIndicator", "gsm_map.gr.uplinkReplyIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_gr_groupCallNumber,
@@ -25776,31 +25776,31 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_gr_uplinkRequestAck,
-      { "uplinkRequestAck", "gsm_map.gr.uplinkRequestAck",
+      { "uplinkRequestAck", "gsm_map.gr.uplinkRequestAck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_gr_uplinkReleaseIndication,
-      { "uplinkReleaseIndication", "gsm_map.gr.uplinkReleaseIndication",
+      { "uplinkReleaseIndication", "gsm_map.gr.uplinkReleaseIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_gr_uplinkRejectCommand,
-      { "uplinkRejectCommand", "gsm_map.gr.uplinkRejectCommand",
+      { "uplinkRejectCommand", "gsm_map.gr.uplinkRejectCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_gr_uplinkSeizedCommand,
-      { "uplinkSeizedCommand", "gsm_map.gr.uplinkSeizedCommand",
+      { "uplinkSeizedCommand", "gsm_map.gr.uplinkSeizedCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_gr_uplinkReleaseCommand,
-      { "uplinkReleaseCommand", "gsm_map.gr.uplinkReleaseCommand",
+      { "uplinkReleaseCommand", "gsm_map.gr.uplinkReleaseCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_gr_stateAttributes,
-      { "stateAttributes", "gsm_map.gr.stateAttributes",
+      { "stateAttributes", "gsm_map.gr.stateAttributes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_gr_emergencyModeResetCommandFlag,
-      { "emergencyModeResetCommandFlag", "gsm_map.gr.emergencyModeResetCommandFlag",
+      { "emergencyModeResetCommandFlag", "gsm_map.gr.emergencyModeResetCommandFlag_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_gr_sm_RP_UI,
@@ -25808,31 +25808,31 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "SignalInfo", HFILL }},
     { &hf_gsm_map_gr_an_APDU,
-      { "an-APDU", "gsm_map.gr.an_APDU",
+      { "an-APDU", "gsm_map.gr.an_APDU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AccessNetworkSignalInfo", HFILL }},
     { &hf_gsm_map_gr_uplinkRequest,
-      { "uplinkRequest", "gsm_map.gr.uplinkRequest",
+      { "uplinkRequest", "gsm_map.gr.uplinkRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_gr_releaseGroupCall,
-      { "releaseGroupCall", "gsm_map.gr.releaseGroupCall",
+      { "releaseGroupCall", "gsm_map.gr.releaseGroupCall_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_gr_downlinkAttached,
-      { "downlinkAttached", "gsm_map.gr.downlinkAttached",
+      { "downlinkAttached", "gsm_map.gr.downlinkAttached_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_gr_uplinkAttached,
-      { "uplinkAttached", "gsm_map.gr.uplinkAttached",
+      { "uplinkAttached", "gsm_map.gr.uplinkAttached_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_gr_dualCommunication,
-      { "dualCommunication", "gsm_map.gr.dualCommunication",
+      { "dualCommunication", "gsm_map.gr.dualCommunication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_gr_callOriginator,
-      { "callOriginator", "gsm_map.gr.callOriginator",
+      { "callOriginator", "gsm_map.gr.callOriginator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_gr_requestedInfo,
@@ -25875,27 +25875,27 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_dialogue_MAP_DialoguePDU_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_dialogue_map_open,
-      { "map-open", "gsm_map.dialogue.map_open",
+      { "map-open", "gsm_map.dialogue.map_open_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MAP_OpenInfo", HFILL }},
     { &hf_gsm_map_dialogue_map_accept,
-      { "map-accept", "gsm_map.dialogue.map_accept",
+      { "map-accept", "gsm_map.dialogue.map_accept_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MAP_AcceptInfo", HFILL }},
     { &hf_gsm_map_dialogue_map_close,
-      { "map-close", "gsm_map.dialogue.map_close",
+      { "map-close", "gsm_map.dialogue.map_close_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MAP_CloseInfo", HFILL }},
     { &hf_gsm_map_dialogue_map_refuse,
-      { "map-refuse", "gsm_map.dialogue.map_refuse",
+      { "map-refuse", "gsm_map.dialogue.map_refuse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MAP_RefuseInfo", HFILL }},
     { &hf_gsm_map_dialogue_map_userAbort,
-      { "map-userAbort", "gsm_map.dialogue.map_userAbort",
+      { "map-userAbort", "gsm_map.dialogue.map_userAbort_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MAP_UserAbortInfo", HFILL }},
     { &hf_gsm_map_dialogue_map_providerAbort,
-      { "map-providerAbort", "gsm_map.dialogue.map_providerAbort",
+      { "map-providerAbort", "gsm_map.dialogue.map_providerAbort_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MAP_ProviderAbortInfo", HFILL }},
     { &hf_gsm_map_dialogue_destinationReference,
@@ -25907,7 +25907,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "AddressString", HFILL }},
     { &hf_gsm_map_dialogue_extensionContainer,
-      { "extensionContainer", "gsm_map.dialogue.extensionContainer",
+      { "extensionContainer", "gsm_map.dialogue.extensionContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_dialogue_reason,
@@ -25923,11 +25923,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_dialogue_MAP_UserAbortChoice_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_map_dialogue_userSpecificReason,
-      { "userSpecificReason", "gsm_map.dialogue.userSpecificReason",
+      { "userSpecificReason", "gsm_map.dialogue.userSpecificReason_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_dialogue_userResourceLimitation,
-      { "userResourceLimitation", "gsm_map.dialogue.userResourceLimitation",
+      { "userResourceLimitation", "gsm_map.dialogue.userResourceLimitation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_dialogue_resourceUnavailable,
@@ -25946,23 +25946,23 @@ void proto_register_gsm_map(void) {
 /* --- Module DummyMAP --- --- ---                                            */
 
     { &hf_gsm_old_invoke,
-      { "invoke", "gsm_old.invoke",
+      { "invoke", "gsm_old.invoke_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_old_returnResultLast,
-      { "returnResultLast", "gsm_old.returnResultLast",
+      { "returnResultLast", "gsm_old.returnResultLast_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReturnResult", HFILL }},
     { &hf_gsm_old_returnError,
-      { "returnError", "gsm_old.returnError",
+      { "returnError", "gsm_old.returnError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_old_reject,
-      { "reject", "gsm_old.reject",
+      { "reject", "gsm_old.reject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_old_returnResultNotLast,
-      { "returnResultNotLast", "gsm_old.returnResultNotLast",
+      { "returnResultNotLast", "gsm_old.returnResultNotLast_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReturnResult", HFILL }},
     { &hf_gsm_old_invokeID,
@@ -25978,15 +25978,15 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_old_MAP_OPERATION_vals), 0,
         "MAP_OPERATION", HFILL }},
     { &hf_gsm_old_invokeparameter,
-      { "invokeparameter", "gsm_old.invokeparameter",
+      { "invokeparameter", "gsm_old.invokeparameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_old_resultretres,
-      { "resultretres", "gsm_old.resultretres",
+      { "resultretres", "gsm_old.resultretres_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_old_returnparameter,
-      { "returnparameter", "gsm_old.returnparameter",
+      { "returnparameter", "gsm_old.returnparameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReturnResultParameter", HFILL }},
     { &hf_gsm_old_errorCode,
@@ -25994,7 +25994,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_old_MAP_ERROR_vals), 0,
         "MAP_ERROR", HFILL }},
     { &hf_gsm_old_parameter,
-      { "parameter", "gsm_old.parameter",
+      { "parameter", "gsm_old.parameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReturnErrorParameter", HFILL }},
     { &hf_gsm_old_invokeIDRej,
@@ -26006,7 +26006,7 @@ void proto_register_gsm_map(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "InvokeIdType", HFILL }},
     { &hf_gsm_old_not_derivable,
-      { "not-derivable", "gsm_old.not_derivable",
+      { "not-derivable", "gsm_old.not_derivable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_old_problem,
@@ -26050,15 +26050,15 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_old_extensionContainer,
-      { "extensionContainer", "gsm_old.extensionContainer",
+      { "extensionContainer", "gsm_old.extensionContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_old_gsm_BearerCapability,
-      { "gsm-BearerCapability", "gsm_old.gsm_BearerCapability",
+      { "gsm-BearerCapability", "gsm_old.gsm_BearerCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ExternalSignalInfo", HFILL }},
     { &hf_gsm_old_isdn_BearerCapability,
-      { "isdn-BearerCapability", "gsm_old.isdn_BearerCapability",
+      { "isdn-BearerCapability", "gsm_old.isdn_BearerCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ExternalSignalInfo", HFILL }},
     { &hf_gsm_old_call_Direction,
@@ -26070,15 +26070,15 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "ISDN_AddressString", HFILL }},
     { &hf_gsm_old_chosenChannel,
-      { "chosenChannel", "gsm_old.chosenChannel",
+      { "chosenChannel", "gsm_old.chosenChannel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ExternalSignalInfo", HFILL }},
     { &hf_gsm_old_lowerLayerCompatibility,
-      { "lowerLayerCompatibility", "gsm_old.lowerLayerCompatibility",
+      { "lowerLayerCompatibility", "gsm_old.lowerLayerCompatibility_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ExternalSignalInfo", HFILL }},
     { &hf_gsm_old_highLayerCompatibility,
-      { "highLayerCompatibility", "gsm_old.highLayerCompatibility",
+      { "highLayerCompatibility", "gsm_old.highLayerCompatibility_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ExternalSignalInfo", HFILL }},
     { &hf_gsm_old_sIWFSNumber,
@@ -26098,11 +26098,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "GlobalCellId", HFILL }},
     { &hf_gsm_old_ho_NumberNotRequired,
-      { "ho-NumberNotRequired", "gsm_old.ho_NumberNotRequired",
+      { "ho-NumberNotRequired", "gsm_old.ho_NumberNotRequired_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_old_bss_APDU,
-      { "bss-APDU", "gsm_old.bss_APDU",
+      { "bss-APDU", "gsm_old.bss_APDU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_old_handoverNumber,
@@ -26110,7 +26110,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "ISDN_AddressString", HFILL }},
     { &hf_gsm_old_SendAuthenticationInfoResOld_item,
-      { "SendAuthenticationInfoResOld item", "gsm_old.SendAuthenticationInfoResOld_item",
+      { "SendAuthenticationInfoResOld item", "gsm_old.SendAuthenticationInfoResOld_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_old_rand,
@@ -26130,15 +26130,15 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TripletListold", HFILL }},
     { &hf_gsm_old_TripletListold_item,
-      { "AuthenticationTriplet-v2", "gsm_old.AuthenticationTriplet_v2",
+      { "AuthenticationTriplet-v2", "gsm_old.AuthenticationTriplet_v2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_old_channelType,
-      { "channelType", "gsm_old.channelType",
+      { "channelType", "gsm_old.channelType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ExternalSignalInfo", HFILL }},
     { &hf_gsm_old_securityHeader,
-      { "securityHeader", "gsm_old.securityHeader",
+      { "securityHeader", "gsm_old.securityHeader_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_old_protectedPayload,
@@ -26166,7 +26166,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_old_ErrorCode_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_old_userInfo,
-      { "userInfo", "gsm_old.userInfo",
+      { "userInfo", "gsm_old.userInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_old_localValue_02,
@@ -26206,7 +26206,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "SignalInfo", HFILL }},
     { &hf_gsm_old_moreMessagesToSend,
-      { "moreMessagesToSend", "gsm_old.moreMessagesToSend",
+      { "moreMessagesToSend", "gsm_old.moreMessagesToSend_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_old_imsi_01,
@@ -26222,7 +26222,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_old_noSM_RP_DA,
-      { "noSM-RP-DA", "gsm_old.noSM_RP_DA",
+      { "noSM-RP-DA", "gsm_old.noSM_RP_DA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_old_msisdn_01,
@@ -26234,11 +26234,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_old_noSM_RP_OA,
-      { "noSM-RP-OA", "gsm_old.noSM_RP_OA",
+      { "noSM-RP-OA", "gsm_old.noSM_RP_OA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_old_cug_CheckInfo,
-      { "cug-CheckInfo", "gsm_old.cug_CheckInfo",
+      { "cug-CheckInfo", "gsm_old.cug_CheckInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_old_numberOfForwarding,
@@ -26246,7 +26246,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_old_networkSignalInfo,
-      { "networkSignalInfo", "gsm_old.networkSignalInfo",
+      { "networkSignalInfo", "gsm_old.networkSignalInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ExternalSignalInfo", HFILL }},
     { &hf_gsm_old_routingInfo,
@@ -26277,7 +26277,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_callIsWaiting_Indicator,
-      { "callIsWaiting-Indicator", "gsm_ss.callIsWaiting_Indicator",
+      { "callIsWaiting-Indicator", "gsm_ss.callIsWaiting_Indicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_callOnHold_Indicator,
@@ -26285,7 +26285,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_ss_CallOnHold_Indicator_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_ss_mpty_Indicator,
-      { "mpty-Indicator", "gsm_ss.mpty_Indicator",
+      { "mpty-Indicator", "gsm_ss.mpty_Indicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_cug_Index,
@@ -26293,19 +26293,19 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_clirSuppressionRejected,
-      { "clirSuppressionRejected", "gsm_ss.clirSuppressionRejected",
+      { "clirSuppressionRejected", "gsm_ss.clirSuppressionRejected_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_ect_Indicator,
-      { "ect-Indicator", "gsm_ss.ect_Indicator",
+      { "ect-Indicator", "gsm_ss.ect_Indicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_nameIndicator,
-      { "nameIndicator", "gsm_ss.nameIndicator",
+      { "nameIndicator", "gsm_ss.nameIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_ccbs_Feature,
-      { "ccbs-Feature", "gsm_ss.ccbs_Feature",
+      { "ccbs-Feature", "gsm_ss.ccbs_Feature_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_alertingPattern,
@@ -26317,7 +26317,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_ss_Multicall_Indicator_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_ss_chargingInformation,
-      { "chargingInformation", "gsm_ss.chargingInformation",
+      { "chargingInformation", "gsm_ss.chargingInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_e1,
@@ -26349,11 +26349,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_suppressPrefCUG,
-      { "suppressPrefCUG", "gsm_ss.suppressPrefCUG",
+      { "suppressPrefCUG", "gsm_ss.suppressPrefCUG_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_suppressOA,
-      { "suppressOA", "gsm_ss.suppressOA",
+      { "suppressOA", "gsm_ss.suppressOA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_ect_CallState,
@@ -26369,19 +26369,19 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_ss_Name_vals), 0,
         "Name", HFILL }},
     { &hf_gsm_ss_namePresentationAllowed,
-      { "namePresentationAllowed", "gsm_ss.namePresentationAllowed",
+      { "namePresentationAllowed", "gsm_ss.namePresentationAllowed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NameSet", HFILL }},
     { &hf_gsm_ss_presentationRestricted,
-      { "presentationRestricted", "gsm_ss.presentationRestricted",
+      { "presentationRestricted", "gsm_ss.presentationRestricted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_nameUnavailable,
-      { "nameUnavailable", "gsm_ss.nameUnavailable",
+      { "nameUnavailable", "gsm_ss.nameUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_namePresentationRestricted,
-      { "namePresentationRestricted", "gsm_ss.namePresentationRestricted",
+      { "namePresentationRestricted", "gsm_ss.namePresentationRestricted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NameSet", HFILL }},
     { &hf_gsm_ss_dataCodingScheme,
@@ -26397,15 +26397,15 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "USSD_String", HFILL }},
     { &hf_gsm_ss_presentationAllowedAddress,
-      { "presentationAllowedAddress", "gsm_ss.presentationAllowedAddress",
+      { "presentationAllowedAddress", "gsm_ss.presentationAllowedAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RemotePartyNumber", HFILL }},
     { &hf_gsm_ss_numberNotAvailableDueToInterworking,
-      { "numberNotAvailableDueToInterworking", "gsm_ss.numberNotAvailableDueToInterworking",
+      { "numberNotAvailableDueToInterworking", "gsm_ss.numberNotAvailableDueToInterworking_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_presentationRestrictedAddress,
-      { "presentationRestrictedAddress", "gsm_ss.presentationRestrictedAddress",
+      { "presentationRestrictedAddress", "gsm_ss.presentationRestrictedAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RemotePartyNumber", HFILL }},
     { &hf_gsm_ss_partyNumber,
@@ -26437,23 +26437,23 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_NotificationToMSUser_vals), 0,
         "NotificationToMSUser", HFILL }},
     { &hf_gsm_ss_locationType,
-      { "locationType", "gsm_ss.locationType",
+      { "locationType", "gsm_ss.locationType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_lcsClientExternalID,
-      { "lcsClientExternalID", "gsm_ss.lcsClientExternalID",
+      { "lcsClientExternalID", "gsm_ss.lcsClientExternalID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_lcsClientName,
-      { "lcsClientName", "gsm_ss.lcsClientName",
+      { "lcsClientName", "gsm_ss.lcsClientName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_lcsRequestorID,
-      { "lcsRequestorID", "gsm_ss.lcsRequestorID",
+      { "lcsRequestorID", "gsm_ss.lcsRequestorID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_lcsCodeword,
-      { "lcsCodeword", "gsm_ss.lcsCodeword",
+      { "lcsCodeword", "gsm_ss.lcsCodeword_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_lcsServiceTypeID,
@@ -26473,7 +26473,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_ss_LocationMethod_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_ss_lcs_QoS,
-      { "lcs-QoS", "gsm_ss.lcs_QoS",
+      { "lcs-QoS", "gsm_ss.lcs_QoS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_mlc_Number,
@@ -26493,7 +26493,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "AgeOfLocationInformation", HFILL }},
     { &hf_gsm_ss_pseudonymIndicator,
-      { "pseudonymIndicator", "gsm_ss.pseudonymIndicator",
+      { "pseudonymIndicator", "gsm_ss.pseudonymIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_h_gmlc_address,
@@ -26513,11 +26513,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "LCS_ReferenceNumber", HFILL }},
     { &hf_gsm_ss_periodicLDRInfo,
-      { "periodicLDRInfo", "gsm_ss.periodicLDRInfo",
+      { "periodicLDRInfo", "gsm_ss.periodicLDRInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_locationUpdateRequest,
-      { "locationUpdateRequest", "gsm_ss.locationUpdateRequest",
+      { "locationUpdateRequest", "gsm_ss.locationUpdateRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_sequenceNumber,
@@ -26529,7 +26529,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_ss_TerminationCause_vals), 0,
         NULL, HFILL }},
     { &hf_gsm_ss_mo_lrShortCircuit,
-      { "mo-lrShortCircuit", "gsm_ss.mo_lrShortCircuit",
+      { "mo-lrShortCircuit", "gsm_ss.mo_lrShortCircuit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_ganssAssistanceData,
@@ -26553,7 +26553,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Add_GeographicalInformation", HFILL }},
     { &hf_gsm_ss_reportingPLMNList,
-      { "reportingPLMNList", "gsm_ss.reportingPLMNList",
+      { "reportingPLMNList", "gsm_ss.reportingPLMNList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_deferredLocationEventType,
@@ -26561,11 +26561,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_areaEventInfo,
-      { "areaEventInfo", "gsm_ss.areaEventInfo",
+      { "areaEventInfo", "gsm_ss.areaEventInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_ss_qoS,
-      { "qoS", "gsm_ss.qoS",
+      { "qoS", "gsm_ss.qoS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LCS_QoS", HFILL }},
 
@@ -26588,7 +26588,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ericsson_extensionContainer,
-      { "extensionContainer", "gsm_map.ericsson.extensionContainer",
+      { "extensionContainer", "gsm_map.ericsson.extensionContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c
index 076fe4eff5..896c4503b3 100644
--- a/epan/dissectors/packet-h225.c
+++ b/epan/dissectors/packet-h225.c
@@ -7635,11 +7635,11 @@ void proto_register_h225(void) {
 /*--- Included file: packet-h225-hfarr.c ---*/
 #line 1 "../../asn1/h225/packet-h225-hfarr.c"
     { &hf_h225_H323_UserInformation_PDU,
-      { "H323-UserInformation", "h225.H323_UserInformation",
+      { "H323-UserInformation", "h225.H323_UserInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_h225_ExtendedAliasAddress_PDU,
-      { "ExtendedAliasAddress", "h225.ExtendedAliasAddress",
+      { "ExtendedAliasAddress", "h225.ExtendedAliasAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_RasMessage_PDU,
@@ -7647,11 +7647,11 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(h225_RasMessage_vals), 0,
         NULL, HFILL }},
     { &hf_h225_h323_uu_pdu,
-      { "h323-uu-pdu", "h225.h323_uu_pdu",
+      { "h323-uu-pdu", "h225.h323_uu_pdu_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_user_data,
-      { "user-data", "h225.user_data",
+      { "user-data", "h225.user_data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_protocol_discriminator,
@@ -7667,59 +7667,59 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(T_h323_message_body_vals), 0,
         NULL, HFILL }},
     { &hf_h225_setup,
-      { "setup", "h225.setup",
+      { "setup", "h225.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Setup_UUIE", HFILL }},
     { &hf_h225_callProceeding,
-      { "callProceeding", "h225.callProceeding",
+      { "callProceeding", "h225.callProceeding_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CallProceeding_UUIE", HFILL }},
     { &hf_h225_connect,
-      { "connect", "h225.connect",
+      { "connect", "h225.connect_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Connect_UUIE", HFILL }},
     { &hf_h225_alerting,
-      { "alerting", "h225.alerting",
+      { "alerting", "h225.alerting_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Alerting_UUIE", HFILL }},
     { &hf_h225_information,
-      { "information", "h225.information",
+      { "information", "h225.information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Information_UUIE", HFILL }},
     { &hf_h225_releaseComplete,
-      { "releaseComplete", "h225.releaseComplete",
+      { "releaseComplete", "h225.releaseComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReleaseComplete_UUIE", HFILL }},
     { &hf_h225_facility,
-      { "facility", "h225.facility",
+      { "facility", "h225.facility_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Facility_UUIE", HFILL }},
     { &hf_h225_progress,
-      { "progress", "h225.progress",
+      { "progress", "h225.progress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Progress_UUIE", HFILL }},
     { &hf_h225_empty_flg,
-      { "empty", "h225.empty",
+      { "empty", "h225.empty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_empty_flg", HFILL }},
     { &hf_h225_status,
-      { "status", "h225.status",
+      { "status", "h225.status_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Status_UUIE", HFILL }},
     { &hf_h225_statusInquiry,
-      { "statusInquiry", "h225.statusInquiry",
+      { "statusInquiry", "h225.statusInquiry_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "StatusInquiry_UUIE", HFILL }},
     { &hf_h225_setupAcknowledge,
-      { "setupAcknowledge", "h225.setupAcknowledge",
+      { "setupAcknowledge", "h225.setupAcknowledge_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SetupAcknowledge_UUIE", HFILL }},
     { &hf_h225_notify,
-      { "notify", "h225.notify",
+      { "notify", "h225.notify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Notify_UUIE", HFILL }},
     { &hf_h225_nonStandardData,
-      { "nonStandardData", "h225.nonStandardData",
+      { "nonStandardData", "h225.nonStandardData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_h225_h4501SupplementaryService,
@@ -7747,19 +7747,19 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_NonStandardParameter", HFILL }},
     { &hf_h225_nonStandardControl_item,
-      { "NonStandardParameter", "h225.NonStandardParameter",
+      { "NonStandardParameter", "h225.NonStandardParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_callLinkage,
-      { "callLinkage", "h225.callLinkage",
+      { "callLinkage", "h225.callLinkage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_tunnelledSignallingMessage,
-      { "tunnelledSignallingMessage", "h225.tunnelledSignallingMessage",
+      { "tunnelledSignallingMessage", "h225.tunnelledSignallingMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_tunnelledProtocolID,
-      { "tunnelledProtocolID", "h225.tunnelledProtocolID",
+      { "tunnelledProtocolID", "h225.tunnelledProtocolID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TunnelledProtocol", HFILL }},
     { &hf_h225_messageContent,
@@ -7771,15 +7771,15 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_messageContent_item", HFILL }},
     { &hf_h225_tunnellingRequired,
-      { "tunnellingRequired", "h225.tunnellingRequired",
+      { "tunnellingRequired", "h225.tunnellingRequired_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_provisionalRespToH245Tunnelling,
-      { "provisionalRespToH245Tunnelling", "h225.provisionalRespToH245Tunnelling",
+      { "provisionalRespToH245Tunnelling", "h225.provisionalRespToH245Tunnelling_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_stimulusControl,
-      { "stimulusControl", "h225.stimulusControl",
+      { "stimulusControl", "h225.stimulusControl_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_genericData,
@@ -7787,15 +7787,15 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_GenericData", HFILL }},
     { &hf_h225_genericData_item,
-      { "GenericData", "h225.GenericData",
+      { "GenericData", "h225.GenericData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_nonStandard,
-      { "nonStandard", "h225.nonStandard",
+      { "nonStandard", "h225.nonStandard_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_h225_isText,
-      { "isText", "h225.isText",
+      { "isText", "h225.isText_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_h248Message,
@@ -7807,7 +7807,7 @@ void proto_register_h225(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_uUIE_destinationInfo,
-      { "destinationInfo", "h225.destinationInfo",
+      { "destinationInfo", "h225.destinationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointType", HFILL }},
     { &hf_h225_h245Address,
@@ -7815,7 +7815,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(h225_H245TransportAddress_vals), 0,
         "H245TransportAddress", HFILL }},
     { &hf_h225_callIdentifier,
-      { "callIdentifier", "h225.callIdentifier",
+      { "callIdentifier", "h225.callIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_h245SecurityMode,
@@ -7827,7 +7827,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ClearToken", HFILL }},
     { &hf_h225_tokens_item,
-      { "ClearToken", "h225.ClearToken",
+      { "ClearToken", "h225.ClearToken_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_cryptoTokens,
@@ -7867,7 +7867,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(h225_ScreeningIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_h225_fastConnectRefused,
-      { "fastConnectRefused", "h225.fastConnectRefused",
+      { "fastConnectRefused", "h225.fastConnectRefused_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_serviceControl,
@@ -7875,15 +7875,15 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ServiceControlSession", HFILL }},
     { &hf_h225_serviceControl_item,
-      { "ServiceControlSession", "h225.ServiceControlSession",
+      { "ServiceControlSession", "h225.ServiceControlSession_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_capacity,
-      { "capacity", "h225.capacity",
+      { "capacity", "h225.capacity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CallCapacity", HFILL }},
     { &hf_h225_featureSet,
-      { "featureSet", "h225.featureSet",
+      { "featureSet", "h225.featureSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_displayName,
@@ -7891,7 +7891,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_DisplayName", HFILL }},
     { &hf_h225_displayName_item,
-      { "DisplayName", "h225.DisplayName",
+      { "DisplayName", "h225.DisplayName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_conferenceID,
@@ -7911,7 +7911,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0,
         NULL, HFILL }},
     { &hf_h225_circuitInfo,
-      { "circuitInfo", "h225.circuitInfo",
+      { "circuitInfo", "h225.circuitInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_releaseCompleteReason,
@@ -7927,79 +7927,79 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0,
         NULL, HFILL }},
     { &hf_h225_destinationInfo,
-      { "destinationInfo", "h225.destinationInfo",
+      { "destinationInfo", "h225.destinationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointType", HFILL }},
     { &hf_h225_noBandwidth,
-      { "noBandwidth", "h225.noBandwidth",
+      { "noBandwidth", "h225.noBandwidth_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_gatekeeperResources,
-      { "gatekeeperResources", "h225.gatekeeperResources",
+      { "gatekeeperResources", "h225.gatekeeperResources_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_unreachableDestination,
-      { "unreachableDestination", "h225.unreachableDestination",
+      { "unreachableDestination", "h225.unreachableDestination_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_destinationRejection,
-      { "destinationRejection", "h225.destinationRejection",
+      { "destinationRejection", "h225.destinationRejection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_invalidRevision,
-      { "invalidRevision", "h225.invalidRevision",
+      { "invalidRevision", "h225.invalidRevision_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_noPermission,
-      { "noPermission", "h225.noPermission",
+      { "noPermission", "h225.noPermission_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_unreachableGatekeeper,
-      { "unreachableGatekeeper", "h225.unreachableGatekeeper",
+      { "unreachableGatekeeper", "h225.unreachableGatekeeper_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_gatewayResources,
-      { "gatewayResources", "h225.gatewayResources",
+      { "gatewayResources", "h225.gatewayResources_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_badFormatAddress,
-      { "badFormatAddress", "h225.badFormatAddress",
+      { "badFormatAddress", "h225.badFormatAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_adaptiveBusy,
-      { "adaptiveBusy", "h225.adaptiveBusy",
+      { "adaptiveBusy", "h225.adaptiveBusy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_inConf,
-      { "inConf", "h225.inConf",
+      { "inConf", "h225.inConf_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_undefinedReason,
-      { "undefinedReason", "h225.undefinedReason",
+      { "undefinedReason", "h225.undefinedReason_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_facilityCallDeflection,
-      { "facilityCallDeflection", "h225.facilityCallDeflection",
+      { "facilityCallDeflection", "h225.facilityCallDeflection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_securityDenied,
-      { "securityDenied", "h225.securityDenied",
+      { "securityDenied", "h225.securityDenied_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_calledPartyNotRegistered,
-      { "calledPartyNotRegistered", "h225.calledPartyNotRegistered",
+      { "calledPartyNotRegistered", "h225.calledPartyNotRegistered_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_callerNotRegistered,
-      { "callerNotRegistered", "h225.callerNotRegistered",
+      { "callerNotRegistered", "h225.callerNotRegistered_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_newConnectionNeeded,
-      { "newConnectionNeeded", "h225.newConnectionNeeded",
+      { "newConnectionNeeded", "h225.newConnectionNeeded_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_nonStandardReason,
-      { "nonStandardReason", "h225.nonStandardReason",
+      { "nonStandardReason", "h225.nonStandardReason_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_h225_replaceWithConferenceInvite,
@@ -8007,19 +8007,19 @@ void proto_register_h225(void) {
         FT_GUID, BASE_NONE, NULL, 0,
         "ConferenceIdentifier", HFILL }},
     { &hf_h225_genericDataReason,
-      { "genericDataReason", "h225.genericDataReason",
+      { "genericDataReason", "h225.genericDataReason_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_neededFeatureNotSupported,
-      { "neededFeatureNotSupported", "h225.neededFeatureNotSupported",
+      { "neededFeatureNotSupported", "h225.neededFeatureNotSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_tunnelledSignallingRejected,
-      { "tunnelledSignallingRejected", "h225.tunnelledSignallingRejected",
+      { "tunnelledSignallingRejected", "h225.tunnelledSignallingRejected_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_invalidCID,
-      { "invalidCID", "h225.invalidCID",
+      { "invalidCID", "h225.invalidCID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_rLC_securityError,
@@ -8027,7 +8027,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(h225_SecurityErrors_vals), 0,
         "SecurityErrors", HFILL }},
     { &hf_h225_hopCountExceeded,
-      { "hopCountExceeded", "h225.hopCountExceeded",
+      { "hopCountExceeded", "h225.hopCountExceeded_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_sourceAddress,
@@ -8039,7 +8039,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0,
         NULL, HFILL }},
     { &hf_h225_setup_UUIE_sourceInfo,
-      { "sourceInfo", "h225.sourceInfo",
+      { "sourceInfo", "h225.sourceInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointType", HFILL }},
     { &hf_h225_destinationAddress,
@@ -8079,27 +8079,27 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(h225_T_conferenceGoal_vals), 0,
         NULL, HFILL }},
     { &hf_h225_create,
-      { "create", "h225.create",
+      { "create", "h225.create_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_join,
-      { "join", "h225.join",
+      { "join", "h225.join_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_invite,
-      { "invite", "h225.invite",
+      { "invite", "h225.invite_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_capability_negotiation,
-      { "capability-negotiation", "h225.capability_negotiation",
+      { "capability-negotiation", "h225.capability_negotiation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_callIndependentSupplementaryService,
-      { "callIndependentSupplementaryService", "h225.callIndependentSupplementaryService",
+      { "callIndependentSupplementaryService", "h225.callIndependentSupplementaryService_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_callServices,
-      { "callServices", "h225.callServices",
+      { "callServices", "h225.callServices_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "QseriesOptions", HFILL }},
     { &hf_h225_callType,
@@ -8139,7 +8139,7 @@ void proto_register_h225(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_connectionParameters,
-      { "connectionParameters", "h225.connectionParameters",
+      { "connectionParameters", "h225.connectionParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_connectionType,
@@ -8159,7 +8159,7 @@ void proto_register_h225(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "IA5String_SIZE_1_32", HFILL }},
     { &hf_h225_symmetricOperationRequired,
-      { "symmetricOperationRequired", "h225.symmetricOperationRequired",
+      { "symmetricOperationRequired", "h225.symmetricOperationRequired_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_desiredProtocols,
@@ -8175,7 +8175,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_FeatureDescriptor", HFILL }},
     { &hf_h225_neededFeatures_item,
-      { "FeatureDescriptor", "h225.FeatureDescriptor",
+      { "FeatureDescriptor", "h225.FeatureDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_desiredFeatures,
@@ -8183,7 +8183,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_FeatureDescriptor", HFILL }},
     { &hf_h225_desiredFeatures_item,
-      { "FeatureDescriptor", "h225.FeatureDescriptor",
+      { "FeatureDescriptor", "h225.FeatureDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_supportedFeatures,
@@ -8191,7 +8191,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_FeatureDescriptor", HFILL }},
     { &hf_h225_supportedFeatures_item,
-      { "FeatureDescriptor", "h225.FeatureDescriptor",
+      { "FeatureDescriptor", "h225.FeatureDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_ParallelH245Control_item,
@@ -8207,7 +8207,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ExtendedAliasAddress", HFILL }},
     { &hf_h225_additionalSourceAddresses_item,
-      { "ExtendedAliasAddress", "h225.ExtendedAliasAddress",
+      { "ExtendedAliasAddress", "h225.ExtendedAliasAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_hopCount_1_31,
@@ -8215,67 +8215,67 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_31", HFILL }},
     { &hf_h225_unknown,
-      { "unknown", "h225.unknown",
+      { "unknown", "h225.unknown_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_bChannel,
-      { "bChannel", "h225.bChannel",
+      { "bChannel", "h225.bChannel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_hybrid2x64,
-      { "hybrid2x64", "h225.hybrid2x64",
+      { "hybrid2x64", "h225.hybrid2x64_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_hybrid384,
-      { "hybrid384", "h225.hybrid384",
+      { "hybrid384", "h225.hybrid384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_hybrid1536,
-      { "hybrid1536", "h225.hybrid1536",
+      { "hybrid1536", "h225.hybrid1536_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_hybrid1920,
-      { "hybrid1920", "h225.hybrid1920",
+      { "hybrid1920", "h225.hybrid1920_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_multirate,
-      { "multirate", "h225.multirate",
+      { "multirate", "h225.multirate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_auto,
-      { "auto", "h225.auto",
+      { "auto", "h225.auto_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_none,
-      { "none", "h225.none",
+      { "none", "h225.none_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_h221,
-      { "h221", "h225.h221",
+      { "h221", "h225.h221_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_bonded_mode1,
-      { "bonded-mode1", "h225.bonded_mode1",
+      { "bonded-mode1", "h225.bonded_mode1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_bonded_mode2,
-      { "bonded-mode2", "h225.bonded_mode2",
+      { "bonded-mode2", "h225.bonded_mode2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_bonded_mode3,
-      { "bonded-mode3", "h225.bonded_mode3",
+      { "bonded-mode3", "h225.bonded_mode3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_presentationAllowed,
-      { "presentationAllowed", "h225.presentationAllowed",
+      { "presentationAllowed", "h225.presentationAllowed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_presentationRestricted,
-      { "presentationRestricted", "h225.presentationRestricted",
+      { "presentationRestricted", "h225.presentationRestricted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_addressNotAvailable,
-      { "addressNotAvailable", "h225.addressNotAvailable",
+      { "addressNotAvailable", "h225.addressNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_alternativeAddress,
@@ -8299,7 +8299,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ConferenceList", HFILL }},
     { &hf_h225_conferences_item,
-      { "ConferenceList", "h225.ConferenceList",
+      { "ConferenceList", "h225.ConferenceList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_conferenceAlias,
@@ -8307,47 +8307,47 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0,
         "AliasAddress", HFILL }},
     { &hf_h225_routeCallToGatekeeper,
-      { "routeCallToGatekeeper", "h225.routeCallToGatekeeper",
+      { "routeCallToGatekeeper", "h225.routeCallToGatekeeper_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_callForwarded,
-      { "callForwarded", "h225.callForwarded",
+      { "callForwarded", "h225.callForwarded_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_routeCallToMC,
-      { "routeCallToMC", "h225.routeCallToMC",
+      { "routeCallToMC", "h225.routeCallToMC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_conferenceListChoice,
-      { "conferenceListChoice", "h225.conferenceListChoice",
+      { "conferenceListChoice", "h225.conferenceListChoice_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_startH245,
-      { "startH245", "h225.startH245",
+      { "startH245", "h225.startH245_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_noH245,
-      { "noH245", "h225.noH245",
+      { "noH245", "h225.noH245_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_newTokens,
-      { "newTokens", "h225.newTokens",
+      { "newTokens", "h225.newTokens_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_featureSetUpdate,
-      { "featureSetUpdate", "h225.featureSetUpdate",
+      { "featureSetUpdate", "h225.featureSetUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_forwardedElements,
-      { "forwardedElements", "h225.forwardedElements",
+      { "forwardedElements", "h225.forwardedElements_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_transportedInformation,
-      { "transportedInformation", "h225.transportedInformation",
+      { "transportedInformation", "h225.transportedInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_h245IpAddress,
-      { "ipAddress", "h225.ipAddress",
+      { "ipAddress", "h225.ipAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_h245IpAddress", HFILL }},
     { &hf_h225_h245Ip,
@@ -8359,7 +8359,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_h245IpPort", HFILL }},
     { &hf_h225_h245IpSourceRoute,
-      { "ipSourceRoute", "h225.ipSourceRoute",
+      { "ipSourceRoute", "h225.ipSourceRoute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_h245IpSourceRoute", HFILL }},
     { &hf_h225_ip,
@@ -8383,15 +8383,15 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(h225_T_h245Routing_vals), 0,
         "T_h245Routing", HFILL }},
     { &hf_h225_strict,
-      { "strict", "h225.strict",
+      { "strict", "h225.strict_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_loose,
-      { "loose", "h225.loose",
+      { "loose", "h225.loose_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_h245IpxAddress,
-      { "ipxAddress", "h225.ipxAddress",
+      { "ipxAddress", "h225.ipxAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_h245IpxAddress", HFILL }},
     { &hf_h225_node,
@@ -8407,7 +8407,7 @@ void proto_register_h225(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_2", HFILL }},
     { &hf_h225_h245Ip6Address,
-      { "ip6Address", "h225.ip6Address",
+      { "ip6Address", "h225.ip6Address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_h245Ip6Address", HFILL }},
     { &hf_h225_h245Ip6,
@@ -8423,11 +8423,11 @@ void proto_register_h225(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_1_20", HFILL }},
     { &hf_h225_nonStandardAddress,
-      { "nonStandardAddress", "h225.nonStandardAddress",
+      { "nonStandardAddress", "h225.nonStandardAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_h225_ipAddress,
-      { "ipAddress", "h225.ipAddress",
+      { "ipAddress", "h225.ipAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_ipV4,
@@ -8439,7 +8439,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_65535", HFILL }},
     { &hf_h225_ipSourceRoute,
-      { "ipSourceRoute", "h225.ipSourceRoute",
+      { "ipSourceRoute", "h225.ipSourceRoute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_src_route_ipV4,
@@ -8463,7 +8463,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(h225_T_routing_vals), 0,
         NULL, HFILL }},
     { &hf_h225_ipxAddress,
-      { "ipxAddress", "h225.ipxAddress",
+      { "ipxAddress", "h225.ipxAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_ipx_port,
@@ -8471,7 +8471,7 @@ void proto_register_h225(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_2", HFILL }},
     { &hf_h225_ip6Address,
-      { "ip6Address", "h225.ip6Address",
+      { "ip6Address", "h225.ip6Address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_ipV6,
@@ -8483,23 +8483,23 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_65535", HFILL }},
     { &hf_h225_vendor,
-      { "vendor", "h225.vendor",
+      { "vendor", "h225.vendor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "VendorIdentifier", HFILL }},
     { &hf_h225_gatekeeper,
-      { "gatekeeper", "h225.gatekeeper",
+      { "gatekeeper", "h225.gatekeeper_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GatekeeperInfo", HFILL }},
     { &hf_h225_gateway,
-      { "gateway", "h225.gateway",
+      { "gateway", "h225.gateway_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GatewayInfo", HFILL }},
     { &hf_h225_mcu,
-      { "mcu", "h225.mcu",
+      { "mcu", "h225.mcu_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "McuInfo", HFILL }},
     { &hf_h225_terminal,
-      { "terminal", "h225.terminal",
+      { "terminal", "h225.terminal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminalInfo", HFILL }},
     { &hf_h225_mc,
@@ -8519,7 +8519,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_TunnelledProtocol", HFILL }},
     { &hf_h225_supportedTunnelledProtocols_item,
-      { "TunnelledProtocol", "h225.TunnelledProtocol",
+      { "TunnelledProtocol", "h225.TunnelledProtocol_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_protocol,
@@ -8531,47 +8531,47 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(h225_SupportedProtocols_vals), 0,
         NULL, HFILL }},
     { &hf_h225_h310,
-      { "h310", "h225.h310",
+      { "h310", "h225.h310_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "H310Caps", HFILL }},
     { &hf_h225_h320,
-      { "h320", "h225.h320",
+      { "h320", "h225.h320_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "H320Caps", HFILL }},
     { &hf_h225_h321,
-      { "h321", "h225.h321",
+      { "h321", "h225.h321_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "H321Caps", HFILL }},
     { &hf_h225_h322,
-      { "h322", "h225.h322",
+      { "h322", "h225.h322_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "H322Caps", HFILL }},
     { &hf_h225_h323,
-      { "h323", "h225.h323",
+      { "h323", "h225.h323_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "H323Caps", HFILL }},
     { &hf_h225_h324,
-      { "h324", "h225.h324",
+      { "h324", "h225.h324_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "H324Caps", HFILL }},
     { &hf_h225_voice,
-      { "voice", "h225.voice",
+      { "voice", "h225.voice_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "VoiceCaps", HFILL }},
     { &hf_h225_t120_only,
-      { "t120-only", "h225.t120_only",
+      { "t120-only", "h225.t120_only_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T120OnlyCaps", HFILL }},
     { &hf_h225_nonStandardProtocol,
-      { "nonStandardProtocol", "h225.nonStandardProtocol",
+      { "nonStandardProtocol", "h225.nonStandardProtocol_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_t38FaxAnnexbOnly,
-      { "t38FaxAnnexbOnly", "h225.t38FaxAnnexbOnly",
+      { "t38FaxAnnexbOnly", "h225.t38FaxAnnexbOnly_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T38FaxAnnexbOnlyCaps", HFILL }},
     { &hf_h225_sip,
-      { "sip", "h225.sip",
+      { "sip", "h225.sip_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SIPCaps", HFILL }},
     { &hf_h225_dataRatesSupported,
@@ -8579,7 +8579,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_DataRate", HFILL }},
     { &hf_h225_dataRatesSupported_item,
-      { "DataRate", "h225.DataRate",
+      { "DataRate", "h225.DataRate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_supportedPrefixes,
@@ -8587,7 +8587,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_SupportedPrefix", HFILL }},
     { &hf_h225_supportedPrefixes_item,
-      { "SupportedPrefix", "h225.SupportedPrefix",
+      { "SupportedPrefix", "h225.SupportedPrefix_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_t38FaxProtocol,
@@ -8595,11 +8595,11 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(DataProtocolCapability_vals), 0,
         "DataProtocolCapability", HFILL }},
     { &hf_h225_t38FaxProfile,
-      { "t38FaxProfile", "h225.t38FaxProfile",
+      { "t38FaxProfile", "h225.t38FaxProfile_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_vendorIdentifier_vendor,
-      { "vendor", "h225.vendor",
+      { "vendor", "h225.vendor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "H221NonStandard", HFILL }},
     { &hf_h225_productId,
@@ -8635,7 +8635,7 @@ void proto_register_h225(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_tunnelledProtocolAlternateID,
-      { "tunnelledProtocolAlternateID", "h225.tunnelledProtocolAlternateID",
+      { "tunnelledProtocolAlternateID", "h225.tunnelledProtocolAlternateID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TunnelledProtocolAlternateIdentifier", HFILL }},
     { &hf_h225_subIdentifier,
@@ -8663,7 +8663,7 @@ void proto_register_h225(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "T_nsiOID", HFILL }},
     { &hf_h225_h221NonStandard,
-      { "h221NonStandard", "h225.h221NonStandard",
+      { "h221NonStandard", "h225.h221NonStandard_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_dialledDigits,
@@ -8703,7 +8703,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0,
         "AliasAddress", HFILL }},
     { &hf_h225_range,
-      { "range", "h225.range",
+      { "range", "h225.range_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_startOfRange,
@@ -8715,7 +8715,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(h225_PartyNumber_vals), 0,
         "PartyNumber", HFILL }},
     { &hf_h225_e164Number,
-      { "e164Number", "h225.e164Number",
+      { "e164Number", "h225.e164Number_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PublicPartyNumber", HFILL }},
     { &hf_h225_dataPartyNumber,
@@ -8727,7 +8727,7 @@ void proto_register_h225(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "NumberDigits", HFILL }},
     { &hf_h225_privateNumber,
-      { "privateNumber", "h225.privateNumber",
+      { "privateNumber", "h225.privateNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrivatePartyNumber", HFILL }},
     { &hf_h225_nationalStandardPartyNumber,
@@ -8759,47 +8759,47 @@ void proto_register_h225(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "BMPString_SIZE_1_80", HFILL }},
     { &hf_h225_internationalNumber,
-      { "internationalNumber", "h225.internationalNumber",
+      { "internationalNumber", "h225.internationalNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_nationalNumber,
-      { "nationalNumber", "h225.nationalNumber",
+      { "nationalNumber", "h225.nationalNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_networkSpecificNumber,
-      { "networkSpecificNumber", "h225.networkSpecificNumber",
+      { "networkSpecificNumber", "h225.networkSpecificNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_subscriberNumber,
-      { "subscriberNumber", "h225.subscriberNumber",
+      { "subscriberNumber", "h225.subscriberNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_abbreviatedNumber,
-      { "abbreviatedNumber", "h225.abbreviatedNumber",
+      { "abbreviatedNumber", "h225.abbreviatedNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_level2RegionalNumber,
-      { "level2RegionalNumber", "h225.level2RegionalNumber",
+      { "level2RegionalNumber", "h225.level2RegionalNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_level1RegionalNumber,
-      { "level1RegionalNumber", "h225.level1RegionalNumber",
+      { "level1RegionalNumber", "h225.level1RegionalNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_pISNSpecificNumber,
-      { "pISNSpecificNumber", "h225.pISNSpecificNumber",
+      { "pISNSpecificNumber", "h225.pISNSpecificNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_localNumber,
-      { "localNumber", "h225.localNumber",
+      { "localNumber", "h225.localNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_ansi_41_uim,
-      { "ansi-41-uim", "h225.ansi_41_uim",
+      { "ansi-41-uim", "h225.ansi_41_uim_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_gsm_uim,
-      { "gsm-uim", "h225.gsm_uim",
+      { "gsm-uim", "h225.gsm_uim_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_imsi,
@@ -8875,7 +8875,7 @@ void proto_register_h225(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "TBCD_STRING_SIZE_1_4", HFILL }},
     { &hf_h225_isupE164Number,
-      { "e164Number", "h225.e164Number",
+      { "e164Number", "h225.e164Number_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IsupPublicPartyNumber", HFILL }},
     { &hf_h225_isupDataPartyNumber,
@@ -8887,7 +8887,7 @@ void proto_register_h225(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "IsupDigits", HFILL }},
     { &hf_h225_isupPrivateNumber,
-      { "privateNumber", "h225.privateNumber",
+      { "privateNumber", "h225.privateNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IsupPrivatePartyNumber", HFILL }},
     { &hf_h225_isupNationalStandardPartyNumber,
@@ -8903,15 +8903,15 @@ void proto_register_h225(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "IsupDigits", HFILL }},
     { &hf_h225_routingNumberNationalFormat,
-      { "routingNumberNationalFormat", "h225.routingNumberNationalFormat",
+      { "routingNumberNationalFormat", "h225.routingNumberNationalFormat_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_routingNumberNetworkSpecificFormat,
-      { "routingNumberNetworkSpecificFormat", "h225.routingNumberNetworkSpecificFormat",
+      { "routingNumberNetworkSpecificFormat", "h225.routingNumberNetworkSpecificFormat_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_routingNumberWithCalledDirectoryNumber,
-      { "routingNumberWithCalledDirectoryNumber", "h225.routingNumberWithCalledDirectoryNumber",
+      { "routingNumberWithCalledDirectoryNumber", "h225.routingNumberWithCalledDirectoryNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_extAliasAddress,
@@ -8943,7 +8943,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(h225_TransportAddress_vals), 0,
         NULL, HFILL }},
     { &hf_h225_endpointType,
-      { "endpointType", "h225.endpointType",
+      { "endpointType", "h225.endpointType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_priority,
@@ -8959,7 +8959,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0,
         NULL, HFILL }},
     { &hf_h225_alternateTransportAddresses,
-      { "alternateTransportAddresses", "h225.alternateTransportAddresses",
+      { "alternateTransportAddresses", "h225.alternateTransportAddresses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_annexE,
@@ -8979,15 +8979,15 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(h225_TransportAddress_vals), 0,
         NULL, HFILL }},
     { &hf_h225_tcp,
-      { "tcp", "h225.tcp",
+      { "tcp", "h225.tcp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_annexE_flg,
-      { "annexE", "h225.annexE",
+      { "annexE", "h225.annexE_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_sctp_flg,
-      { "sctp", "h225.sctp",
+      { "sctp", "h225.sctp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_alternateGK_rasAddress,
@@ -9007,7 +9007,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_AlternateGK", HFILL }},
     { &hf_h225_alternateGatekeeper_item,
-      { "AlternateGK", "h225.AlternateGK",
+      { "AlternateGK", "h225.AlternateGK_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_altGKisPermanent,
@@ -9015,7 +9015,7 @@ void proto_register_h225(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h225_default,
-      { "default", "h225.default",
+      { "default", "h225.default_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_encryption,
@@ -9031,79 +9031,79 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(h225_SecurityServiceMode_vals), 0,
         "SecurityServiceMode", HFILL }},
     { &hf_h225_securityWrongSyncTime,
-      { "securityWrongSyncTime", "h225.securityWrongSyncTime",
+      { "securityWrongSyncTime", "h225.securityWrongSyncTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_securityReplay,
-      { "securityReplay", "h225.securityReplay",
+      { "securityReplay", "h225.securityReplay_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_securityWrongGeneralID,
-      { "securityWrongGeneralID", "h225.securityWrongGeneralID",
+      { "securityWrongGeneralID", "h225.securityWrongGeneralID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_securityWrongSendersID,
-      { "securityWrongSendersID", "h225.securityWrongSendersID",
+      { "securityWrongSendersID", "h225.securityWrongSendersID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_securityIntegrityFailed,
-      { "securityIntegrityFailed", "h225.securityIntegrityFailed",
+      { "securityIntegrityFailed", "h225.securityIntegrityFailed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_securityWrongOID,
-      { "securityWrongOID", "h225.securityWrongOID",
+      { "securityWrongOID", "h225.securityWrongOID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_securityDHmismatch,
-      { "securityDHmismatch", "h225.securityDHmismatch",
+      { "securityDHmismatch", "h225.securityDHmismatch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_securityCertificateExpired,
-      { "securityCertificateExpired", "h225.securityCertificateExpired",
+      { "securityCertificateExpired", "h225.securityCertificateExpired_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_securityCertificateDateInvalid,
-      { "securityCertificateDateInvalid", "h225.securityCertificateDateInvalid",
+      { "securityCertificateDateInvalid", "h225.securityCertificateDateInvalid_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_securityCertificateRevoked,
-      { "securityCertificateRevoked", "h225.securityCertificateRevoked",
+      { "securityCertificateRevoked", "h225.securityCertificateRevoked_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_securityCertificateNotReadable,
-      { "securityCertificateNotReadable", "h225.securityCertificateNotReadable",
+      { "securityCertificateNotReadable", "h225.securityCertificateNotReadable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_securityCertificateSignatureInvalid,
-      { "securityCertificateSignatureInvalid", "h225.securityCertificateSignatureInvalid",
+      { "securityCertificateSignatureInvalid", "h225.securityCertificateSignatureInvalid_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_securityCertificateMissing,
-      { "securityCertificateMissing", "h225.securityCertificateMissing",
+      { "securityCertificateMissing", "h225.securityCertificateMissing_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_securityCertificateIncomplete,
-      { "securityCertificateIncomplete", "h225.securityCertificateIncomplete",
+      { "securityCertificateIncomplete", "h225.securityCertificateIncomplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_securityUnsupportedCertificateAlgOID,
-      { "securityUnsupportedCertificateAlgOID", "h225.securityUnsupportedCertificateAlgOID",
+      { "securityUnsupportedCertificateAlgOID", "h225.securityUnsupportedCertificateAlgOID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_securityUnknownCA,
-      { "securityUnknownCA", "h225.securityUnknownCA",
+      { "securityUnknownCA", "h225.securityUnknownCA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_noSecurity,
-      { "noSecurity", "h225.noSecurity",
+      { "noSecurity", "h225.noSecurity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_tls,
-      { "tls", "h225.tls",
+      { "tls", "h225.tls_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecurityCapabilities", HFILL }},
     { &hf_h225_ipsec,
-      { "ipsec", "h225.ipsec",
+      { "ipsec", "h225.ipsec_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecurityCapabilities", HFILL }},
     { &hf_h225_q932Full,
@@ -9135,7 +9135,7 @@ void proto_register_h225(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h225_q954Info,
-      { "q954Info", "h225.q954Info",
+      { "q954Info", "h225.q954Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Q954Details", HFILL }},
     { &hf_h225_conferenceCalling,
@@ -9155,7 +9155,7 @@ void proto_register_h225(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_h225_hMAC_MD5,
-      { "hMAC-MD5", "h225.hMAC_MD5",
+      { "hMAC-MD5", "h225.hMAC_MD5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_hMAC_iso10118_2_s,
@@ -9171,7 +9171,7 @@ void proto_register_h225(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_h225_digSig,
-      { "digSig", "h225.digSig",
+      { "digSig", "h225.digSig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_iso9797,
@@ -9191,7 +9191,7 @@ void proto_register_h225(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_h225_cryptoEPPwdHash,
-      { "cryptoEPPwdHash", "h225.cryptoEPPwdHash",
+      { "cryptoEPPwdHash", "h225.cryptoEPPwdHash_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_alias,
@@ -9203,11 +9203,11 @@ void proto_register_h225(void) {
         FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_token,
-      { "token", "h225.token",
+      { "token", "h225.token_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HASHED", HFILL }},
     { &hf_h225_cryptoGKPwdHash,
-      { "cryptoGKPwdHash", "h225.cryptoGKPwdHash",
+      { "cryptoGKPwdHash", "h225.cryptoGKPwdHash_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_gatekeeperId,
@@ -9215,23 +9215,23 @@ void proto_register_h225(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "GatekeeperIdentifier", HFILL }},
     { &hf_h225_cryptoEPPwdEncr,
-      { "cryptoEPPwdEncr", "h225.cryptoEPPwdEncr",
+      { "cryptoEPPwdEncr", "h225.cryptoEPPwdEncr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ENCRYPTED", HFILL }},
     { &hf_h225_cryptoGKPwdEncr,
-      { "cryptoGKPwdEncr", "h225.cryptoGKPwdEncr",
+      { "cryptoGKPwdEncr", "h225.cryptoGKPwdEncr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ENCRYPTED", HFILL }},
     { &hf_h225_cryptoEPCert,
-      { "cryptoEPCert", "h225.cryptoEPCert",
+      { "cryptoEPCert", "h225.cryptoEPCert_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SIGNED", HFILL }},
     { &hf_h225_cryptoGKCert,
-      { "cryptoGKCert", "h225.cryptoGKCert",
+      { "cryptoGKCert", "h225.cryptoGKCert_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SIGNED", HFILL }},
     { &hf_h225_cryptoFastStart,
-      { "cryptoFastStart", "h225.cryptoFastStart",
+      { "cryptoFastStart", "h225.cryptoFastStart_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SIGNED", HFILL }},
     { &hf_h225_nestedcryptoToken,
@@ -9263,23 +9263,23 @@ void proto_register_h225(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h225_capacityReportingSpecification_when,
-      { "when", "h225.when",
+      { "when", "h225.when_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CapacityReportingSpecification_when", HFILL }},
     { &hf_h225_callStart,
-      { "callStart", "h225.callStart",
+      { "callStart", "h225.callStart_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_callEnd,
-      { "callEnd", "h225.callEnd",
+      { "callEnd", "h225.callEnd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_maximumCallCapacity,
-      { "maximumCallCapacity", "h225.maximumCallCapacity",
+      { "maximumCallCapacity", "h225.maximumCallCapacity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CallCapacityInfo", HFILL }},
     { &hf_h225_currentCallCapacity,
-      { "currentCallCapacity", "h225.currentCallCapacity",
+      { "currentCallCapacity", "h225.currentCallCapacity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CallCapacityInfo", HFILL }},
     { &hf_h225_voiceGwCallsAvailable,
@@ -9287,7 +9287,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_CallsAvailable", HFILL }},
     { &hf_h225_voiceGwCallsAvailable_item,
-      { "CallsAvailable", "h225.CallsAvailable",
+      { "CallsAvailable", "h225.CallsAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_h310GwCallsAvailable,
@@ -9295,7 +9295,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_CallsAvailable", HFILL }},
     { &hf_h225_h310GwCallsAvailable_item,
-      { "CallsAvailable", "h225.CallsAvailable",
+      { "CallsAvailable", "h225.CallsAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_h320GwCallsAvailable,
@@ -9303,7 +9303,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_CallsAvailable", HFILL }},
     { &hf_h225_h320GwCallsAvailable_item,
-      { "CallsAvailable", "h225.CallsAvailable",
+      { "CallsAvailable", "h225.CallsAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_h321GwCallsAvailable,
@@ -9311,7 +9311,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_CallsAvailable", HFILL }},
     { &hf_h225_h321GwCallsAvailable_item,
-      { "CallsAvailable", "h225.CallsAvailable",
+      { "CallsAvailable", "h225.CallsAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_h322GwCallsAvailable,
@@ -9319,7 +9319,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_CallsAvailable", HFILL }},
     { &hf_h225_h322GwCallsAvailable_item,
-      { "CallsAvailable", "h225.CallsAvailable",
+      { "CallsAvailable", "h225.CallsAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_h323GwCallsAvailable,
@@ -9327,7 +9327,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_CallsAvailable", HFILL }},
     { &hf_h225_h323GwCallsAvailable_item,
-      { "CallsAvailable", "h225.CallsAvailable",
+      { "CallsAvailable", "h225.CallsAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_h324GwCallsAvailable,
@@ -9335,7 +9335,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_CallsAvailable", HFILL }},
     { &hf_h225_h324GwCallsAvailable_item,
-      { "CallsAvailable", "h225.CallsAvailable",
+      { "CallsAvailable", "h225.CallsAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_t120OnlyGwCallsAvailable,
@@ -9343,7 +9343,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_CallsAvailable", HFILL }},
     { &hf_h225_t120OnlyGwCallsAvailable_item,
-      { "CallsAvailable", "h225.CallsAvailable",
+      { "CallsAvailable", "h225.CallsAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_t38FaxAnnexbOnlyGwCallsAvailable,
@@ -9351,7 +9351,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_CallsAvailable", HFILL }},
     { &hf_h225_t38FaxAnnexbOnlyGwCallsAvailable_item,
-      { "CallsAvailable", "h225.CallsAvailable",
+      { "CallsAvailable", "h225.CallsAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_terminalCallsAvailable,
@@ -9359,7 +9359,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_CallsAvailable", HFILL }},
     { &hf_h225_terminalCallsAvailable_item,
-      { "CallsAvailable", "h225.CallsAvailable",
+      { "CallsAvailable", "h225.CallsAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_mcuCallsAvailable,
@@ -9367,7 +9367,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_CallsAvailable", HFILL }},
     { &hf_h225_mcuCallsAvailable_item,
-      { "CallsAvailable", "h225.CallsAvailable",
+      { "CallsAvailable", "h225.CallsAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_sipGwCallsAvailable,
@@ -9375,7 +9375,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_CallsAvailable", HFILL }},
     { &hf_h225_sipGwCallsAvailable_item,
-      { "CallsAvailable", "h225.CallsAvailable",
+      { "CallsAvailable", "h225.CallsAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_calls,
@@ -9387,23 +9387,23 @@ void proto_register_h225(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "IA5String_SIZE_1_128", HFILL }},
     { &hf_h225_carrier,
-      { "carrier", "h225.carrier",
+      { "carrier", "h225.carrier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CarrierInfo", HFILL }},
     { &hf_h225_sourceCircuitID,
-      { "sourceCircuitID", "h225.sourceCircuitID",
+      { "sourceCircuitID", "h225.sourceCircuitID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CircuitIdentifier", HFILL }},
     { &hf_h225_destinationCircuitID,
-      { "destinationCircuitID", "h225.destinationCircuitID",
+      { "destinationCircuitID", "h225.destinationCircuitID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CircuitIdentifier", HFILL }},
     { &hf_h225_cic,
-      { "cic", "h225.cic",
+      { "cic", "h225.cic_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CicInfo", HFILL }},
     { &hf_h225_group,
-      { "group", "h225.group",
+      { "group", "h225.group_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GroupID", HFILL }},
     { &hf_h225_cic_2_4,
@@ -9443,7 +9443,7 @@ void proto_register_h225(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "H248SignalsDescriptor", HFILL }},
     { &hf_h225_callCreditServiceControl,
-      { "callCreditServiceControl", "h225.callCreditServiceControl",
+      { "callCreditServiceControl", "h225.callCreditServiceControl_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_sessionId_0_255,
@@ -9459,15 +9459,15 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(h225_ServiceControlSession_reason_vals), 0,
         "ServiceControlSession_reason", HFILL }},
     { &hf_h225_open,
-      { "open", "h225.open",
+      { "open", "h225.open_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_refresh,
-      { "refresh", "h225.refresh",
+      { "refresh", "h225.refresh_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_close,
-      { "close", "h225.close",
+      { "close", "h225.close_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_nonStandardUsageTypes,
@@ -9475,51 +9475,51 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_NonStandardParameter", HFILL }},
     { &hf_h225_nonStandardUsageTypes_item,
-      { "NonStandardParameter", "h225.NonStandardParameter",
+      { "NonStandardParameter", "h225.NonStandardParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_startTime,
-      { "startTime", "h225.startTime",
+      { "startTime", "h225.startTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_endTime_flg,
-      { "endTime", "h225.endTime",
+      { "endTime", "h225.endTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_terminationCause_flg,
-      { "terminationCause", "h225.terminationCause",
+      { "terminationCause", "h225.terminationCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_when,
-      { "when", "h225.when",
+      { "when", "h225.when_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RasUsageSpecification_when", HFILL }},
     { &hf_h225_start,
-      { "start", "h225.start",
+      { "start", "h225.start_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_end,
-      { "end", "h225.end",
+      { "end", "h225.end_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_inIrr,
-      { "inIrr", "h225.inIrr",
+      { "inIrr", "h225.inIrr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_ras_callStartingPoint,
-      { "callStartingPoint", "h225.callStartingPoint",
+      { "callStartingPoint", "h225.callStartingPoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RasUsageSpecificationcallStartingPoint", HFILL }},
     { &hf_h225_alerting_flg,
-      { "alerting", "h225.alerting",
+      { "alerting", "h225.alerting_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_connect_flg,
-      { "connect", "h225.connect",
+      { "connect", "h225.connect_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_required,
-      { "required", "h225.required",
+      { "required", "h225.required_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RasUsageInfoTypes", HFILL }},
     { &hf_h225_nonStandardUsageFields,
@@ -9527,7 +9527,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_NonStandardParameter", HFILL }},
     { &hf_h225_nonStandardUsageFields_item,
-      { "NonStandardParameter", "h225.NonStandardParameter",
+      { "NonStandardParameter", "h225.NonStandardParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_alertingTime,
@@ -9559,7 +9559,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_rtcpAddresses,
-      { "rtcpAddresses", "h225.rtcpAddresses",
+      { "rtcpAddresses", "h225.rtcpAddresses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelInfo", HFILL }},
     { &hf_h225_canDisplayAmountString,
@@ -9579,11 +9579,11 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(h225_T_billingMode_vals), 0,
         NULL, HFILL }},
     { &hf_h225_credit,
-      { "credit", "h225.credit",
+      { "credit", "h225.credit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_debit,
-      { "debit", "h225.debit",
+      { "debit", "h225.debit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_callDurationLimit,
@@ -9607,7 +9607,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_parameters_item,
-      { "parameters item", "h225.parameters_item",
+      { "parameters item", "h225.parameters_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_standard,
@@ -9663,7 +9663,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_512_OF_EnumeratedParameter", HFILL }},
     { &hf_h225_compound_item,
-      { "EnumeratedParameter", "h225.EnumeratedParameter",
+      { "EnumeratedParameter", "h225.EnumeratedParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_nested,
@@ -9671,7 +9671,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_16_OF_GenericData", HFILL }},
     { &hf_h225_nested_item,
-      { "GenericData", "h225.GenericData",
+      { "GenericData", "h225.GenericData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_replacementFeatureSet,
@@ -9687,11 +9687,11 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(h225_TransportAddress_vals), 0,
         "TransportAddress", HFILL }},
     { &hf_h225_rtpAddress,
-      { "rtpAddress", "h225.rtpAddress",
+      { "rtpAddress", "h225.rtpAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelInfo", HFILL }},
     { &hf_h225_rtcpAddress,
-      { "rtcpAddress", "h225.rtcpAddress",
+      { "rtcpAddress", "h225.rtcpAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelInfo", HFILL }},
     { &hf_h225_cname,
@@ -9715,143 +9715,143 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_255", HFILL }},
     { &hf_h225_multicast_flg,
-      { "multicast", "h225.multicast",
+      { "multicast", "h225.multicast_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_gatekeeperBased,
-      { "gatekeeperBased", "h225.gatekeeperBased",
+      { "gatekeeperBased", "h225.gatekeeperBased_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_endpointBased,
-      { "endpointBased", "h225.endpointBased",
+      { "endpointBased", "h225.endpointBased_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_gatekeeperRequest,
-      { "gatekeeperRequest", "h225.gatekeeperRequest",
+      { "gatekeeperRequest", "h225.gatekeeperRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_gatekeeperConfirm,
-      { "gatekeeperConfirm", "h225.gatekeeperConfirm",
+      { "gatekeeperConfirm", "h225.gatekeeperConfirm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_gatekeeperReject,
-      { "gatekeeperReject", "h225.gatekeeperReject",
+      { "gatekeeperReject", "h225.gatekeeperReject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_registrationRequest,
-      { "registrationRequest", "h225.registrationRequest",
+      { "registrationRequest", "h225.registrationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_registrationConfirm,
-      { "registrationConfirm", "h225.registrationConfirm",
+      { "registrationConfirm", "h225.registrationConfirm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_registrationReject,
-      { "registrationReject", "h225.registrationReject",
+      { "registrationReject", "h225.registrationReject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_unregistrationRequest,
-      { "unregistrationRequest", "h225.unregistrationRequest",
+      { "unregistrationRequest", "h225.unregistrationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_unregistrationConfirm,
-      { "unregistrationConfirm", "h225.unregistrationConfirm",
+      { "unregistrationConfirm", "h225.unregistrationConfirm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_unregistrationReject,
-      { "unregistrationReject", "h225.unregistrationReject",
+      { "unregistrationReject", "h225.unregistrationReject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_admissionRequest,
-      { "admissionRequest", "h225.admissionRequest",
+      { "admissionRequest", "h225.admissionRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_admissionConfirm,
-      { "admissionConfirm", "h225.admissionConfirm",
+      { "admissionConfirm", "h225.admissionConfirm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_admissionReject,
-      { "admissionReject", "h225.admissionReject",
+      { "admissionReject", "h225.admissionReject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_bandwidthRequest,
-      { "bandwidthRequest", "h225.bandwidthRequest",
+      { "bandwidthRequest", "h225.bandwidthRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_bandwidthConfirm,
-      { "bandwidthConfirm", "h225.bandwidthConfirm",
+      { "bandwidthConfirm", "h225.bandwidthConfirm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_bandwidthReject,
-      { "bandwidthReject", "h225.bandwidthReject",
+      { "bandwidthReject", "h225.bandwidthReject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_disengageRequest,
-      { "disengageRequest", "h225.disengageRequest",
+      { "disengageRequest", "h225.disengageRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_disengageConfirm,
-      { "disengageConfirm", "h225.disengageConfirm",
+      { "disengageConfirm", "h225.disengageConfirm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_disengageReject,
-      { "disengageReject", "h225.disengageReject",
+      { "disengageReject", "h225.disengageReject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_locationRequest,
-      { "locationRequest", "h225.locationRequest",
+      { "locationRequest", "h225.locationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_locationConfirm,
-      { "locationConfirm", "h225.locationConfirm",
+      { "locationConfirm", "h225.locationConfirm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_locationReject,
-      { "locationReject", "h225.locationReject",
+      { "locationReject", "h225.locationReject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_infoRequest,
-      { "infoRequest", "h225.infoRequest",
+      { "infoRequest", "h225.infoRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_infoRequestResponse,
-      { "infoRequestResponse", "h225.infoRequestResponse",
+      { "infoRequestResponse", "h225.infoRequestResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_nonStandardMessage,
-      { "nonStandardMessage", "h225.nonStandardMessage",
+      { "nonStandardMessage", "h225.nonStandardMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_unknownMessageResponse,
-      { "unknownMessageResponse", "h225.unknownMessageResponse",
+      { "unknownMessageResponse", "h225.unknownMessageResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_requestInProgress,
-      { "requestInProgress", "h225.requestInProgress",
+      { "requestInProgress", "h225.requestInProgress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_resourcesAvailableIndicate,
-      { "resourcesAvailableIndicate", "h225.resourcesAvailableIndicate",
+      { "resourcesAvailableIndicate", "h225.resourcesAvailableIndicate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_resourcesAvailableConfirm,
-      { "resourcesAvailableConfirm", "h225.resourcesAvailableConfirm",
+      { "resourcesAvailableConfirm", "h225.resourcesAvailableConfirm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_infoRequestAck,
-      { "infoRequestAck", "h225.infoRequestAck",
+      { "infoRequestAck", "h225.infoRequestAck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_infoRequestNak,
-      { "infoRequestNak", "h225.infoRequestNak",
+      { "infoRequestNak", "h225.infoRequestNak_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_serviceControlIndication,
-      { "serviceControlIndication", "h225.serviceControlIndication",
+      { "serviceControlIndication", "h225.serviceControlIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_serviceControlResponse,
-      { "serviceControlResponse", "h225.serviceControlResponse",
+      { "serviceControlResponse", "h225.serviceControlResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_admissionConfirmSequence,
@@ -9859,7 +9859,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_AdmissionConfirm", HFILL }},
     { &hf_h225_admissionConfirmSequence_item,
-      { "AdmissionConfirm", "h225.AdmissionConfirm",
+      { "AdmissionConfirm", "h225.AdmissionConfirm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_requestSeqNum,
@@ -9883,7 +9883,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Endpoint", HFILL }},
     { &hf_h225_alternateEndpoints_item,
-      { "Endpoint", "h225.Endpoint",
+      { "Endpoint", "h225.Endpoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_authenticationCapability,
@@ -9911,11 +9911,11 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(h225_IntegrityMechanism_vals), 0,
         NULL, HFILL }},
     { &hf_h225_integrityCheckValue,
-      { "integrityCheckValue", "h225.integrityCheckValue",
+      { "integrityCheckValue", "h225.integrityCheckValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ICV", HFILL }},
     { &hf_h225_supportsAltGK,
-      { "supportsAltGK", "h225.supportsAltGK",
+      { "supportsAltGK", "h225.supportsAltGK_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_supportsAssignedGK,
@@ -9923,7 +9923,7 @@ void proto_register_h225(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h225_assignedGatekeeper,
-      { "assignedGatekeeper", "h225.assignedGatekeeper",
+      { "assignedGatekeeper", "h225.assignedGatekeeper_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlternateGK", HFILL }},
     { &hf_h225_gatekeeperConfirm_rasAddress,
@@ -9943,19 +9943,19 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(GatekeeperRejectReason_vals), 0,
         "GatekeeperRejectReason", HFILL }},
     { &hf_h225_altGKInfo,
-      { "altGKInfo", "h225.altGKInfo",
+      { "altGKInfo", "h225.altGKInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_resourceUnavailable,
-      { "resourceUnavailable", "h225.resourceUnavailable",
+      { "resourceUnavailable", "h225.resourceUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_terminalExcluded,
-      { "terminalExcluded", "h225.terminalExcluded",
+      { "terminalExcluded", "h225.terminalExcluded_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_securityDenial,
-      { "securityDenial", "h225.securityDenial",
+      { "securityDenial", "h225.securityDenial_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_gkRej_securityError,
@@ -9967,7 +9967,7 @@ void proto_register_h225(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h225_terminalType,
-      { "terminalType", "h225.terminalType",
+      { "terminalType", "h225.terminalType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointType", HFILL }},
     { &hf_h225_terminalAlias,
@@ -9979,7 +9979,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0,
         NULL, HFILL }},
     { &hf_h225_endpointVendor,
-      { "endpointVendor", "h225.endpointVendor",
+      { "endpointVendor", "h225.endpointVendor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "VendorIdentifier", HFILL }},
     { &hf_h225_timeToLive,
@@ -9995,7 +9995,7 @@ void proto_register_h225(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h225_additiveRegistration,
-      { "additiveRegistration", "h225.additiveRegistration",
+      { "additiveRegistration", "h225.additiveRegistration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_terminalAliasPattern,
@@ -10007,7 +10007,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(h225_AddressPattern_vals), 0,
         NULL, HFILL }},
     { &hf_h225_usageReportingCapability,
-      { "usageReportingCapability", "h225.usageReportingCapability",
+      { "usageReportingCapability", "h225.usageReportingCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RasUsageInfoTypes", HFILL }},
     { &hf_h225_supportedH248Packages,
@@ -10019,19 +10019,19 @@ void proto_register_h225(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_callCreditCapability,
-      { "callCreditCapability", "h225.callCreditCapability",
+      { "callCreditCapability", "h225.callCreditCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_capacityReportingCapability,
-      { "capacityReportingCapability", "h225.capacityReportingCapability",
+      { "capacityReportingCapability", "h225.capacityReportingCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_restart,
-      { "restart", "h225.restart",
+      { "restart", "h225.restart_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_supportsACFSequences,
-      { "supportsACFSequences", "h225.supportsACFSequences",
+      { "supportsACFSequences", "h225.supportsACFSequences_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_transportQOS,
@@ -10043,7 +10043,7 @@ void proto_register_h225(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h225_preGrantedARQ,
-      { "preGrantedARQ", "h225.preGrantedARQ",
+      { "preGrantedARQ", "h225.preGrantedARQ_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_makeCall,
@@ -10075,7 +10075,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(h225_UseSpecifiedTransport_vals), 0,
         NULL, HFILL }},
     { &hf_h225_supportsAdditiveRegistration,
-      { "supportsAdditiveRegistration", "h225.supportsAdditiveRegistration",
+      { "supportsAdditiveRegistration", "h225.supportsAdditiveRegistration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_usageSpec,
@@ -10083,7 +10083,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_RasUsageSpecification", HFILL }},
     { &hf_h225_usageSpec_item,
-      { "RasUsageSpecification", "h225.RasUsageSpecification",
+      { "RasUsageSpecification", "h225.RasUsageSpecification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_featureServerAlias,
@@ -10091,7 +10091,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0,
         "AliasAddress", HFILL }},
     { &hf_h225_capacityReportingSpec,
-      { "capacityReportingSpec", "h225.capacityReportingSpec",
+      { "capacityReportingSpec", "h225.capacityReportingSpec_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CapacityReportingSpecification", HFILL }},
     { &hf_h225_registrationRejectReason,
@@ -10099,15 +10099,15 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(RegistrationRejectReason_vals), 0,
         "RegistrationRejectReason", HFILL }},
     { &hf_h225_discoveryRequired,
-      { "discoveryRequired", "h225.discoveryRequired",
+      { "discoveryRequired", "h225.discoveryRequired_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_invalidCallSignalAddress,
-      { "invalidCallSignalAddress", "h225.invalidCallSignalAddress",
+      { "invalidCallSignalAddress", "h225.invalidCallSignalAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_invalidRASAddress,
-      { "invalidRASAddress", "h225.invalidRASAddress",
+      { "invalidRASAddress", "h225.invalidRASAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_duplicateAlias,
@@ -10119,31 +10119,31 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0,
         NULL, HFILL }},
     { &hf_h225_invalidTerminalType,
-      { "invalidTerminalType", "h225.invalidTerminalType",
+      { "invalidTerminalType", "h225.invalidTerminalType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_transportNotSupported,
-      { "transportNotSupported", "h225.transportNotSupported",
+      { "transportNotSupported", "h225.transportNotSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_transportQOSNotSupported,
-      { "transportQOSNotSupported", "h225.transportQOSNotSupported",
+      { "transportQOSNotSupported", "h225.transportQOSNotSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_invalidAlias,
-      { "invalidAlias", "h225.invalidAlias",
+      { "invalidAlias", "h225.invalidAlias_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_fullRegistrationRequired,
-      { "fullRegistrationRequired", "h225.fullRegistrationRequired",
+      { "fullRegistrationRequired", "h225.fullRegistrationRequired_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_additiveRegistrationNotSupported,
-      { "additiveRegistrationNotSupported", "h225.additiveRegistrationNotSupported",
+      { "additiveRegistrationNotSupported", "h225.additiveRegistrationNotSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_invalidTerminalAliases,
-      { "invalidTerminalAliases", "h225.invalidTerminalAliases",
+      { "invalidTerminalAliases", "h225.invalidTerminalAliases_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_reg_securityError,
@@ -10151,7 +10151,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(h225_SecurityErrors_vals), 0,
         "SecurityErrors", HFILL }},
     { &hf_h225_registerWithAssignedGK,
-      { "registerWithAssignedGK", "h225.registerWithAssignedGK",
+      { "registerWithAssignedGK", "h225.registerWithAssignedGK_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_unregRequestReason,
@@ -10167,15 +10167,15 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(h225_AddressPattern_vals), 0,
         NULL, HFILL }},
     { &hf_h225_reregistrationRequired,
-      { "reregistrationRequired", "h225.reregistrationRequired",
+      { "reregistrationRequired", "h225.reregistrationRequired_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_ttlExpired,
-      { "ttlExpired", "h225.ttlExpired",
+      { "ttlExpired", "h225.ttlExpired_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_maintenance,
-      { "maintenance", "h225.maintenance",
+      { "maintenance", "h225.maintenance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_securityError,
@@ -10187,15 +10187,15 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(UnregRejectReason_vals), 0,
         "UnregRejectReason", HFILL }},
     { &hf_h225_notCurrentlyRegistered,
-      { "notCurrentlyRegistered", "h225.notCurrentlyRegistered",
+      { "notCurrentlyRegistered", "h225.notCurrentlyRegistered_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_callInProgress,
-      { "callInProgress", "h225.callInProgress",
+      { "callInProgress", "h225.callInProgress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_permissionDenied,
-      { "permissionDenied", "h225.permissionDenied",
+      { "permissionDenied", "h225.permissionDenied_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_callModel,
@@ -10239,7 +10239,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Endpoint", HFILL }},
     { &hf_h225_srcAlternatives_item,
-      { "Endpoint", "h225.Endpoint",
+      { "Endpoint", "h225.Endpoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_destAlternatives,
@@ -10247,15 +10247,15 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Endpoint", HFILL }},
     { &hf_h225_destAlternatives_item,
-      { "Endpoint", "h225.Endpoint",
+      { "Endpoint", "h225.Endpoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_gatewayDataRate,
-      { "gatewayDataRate", "h225.gatewayDataRate",
+      { "gatewayDataRate", "h225.gatewayDataRate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DataRate", HFILL }},
     { &hf_h225_desiredTunnelledProtocol,
-      { "desiredTunnelledProtocol", "h225.desiredTunnelledProtocol",
+      { "desiredTunnelledProtocol", "h225.desiredTunnelledProtocol_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TunnelledProtocol", HFILL }},
     { &hf_h225_canMapSrcAlias,
@@ -10263,39 +10263,39 @@ void proto_register_h225(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h225_pointToPoint,
-      { "pointToPoint", "h225.pointToPoint",
+      { "pointToPoint", "h225.pointToPoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_oneToN,
-      { "oneToN", "h225.oneToN",
+      { "oneToN", "h225.oneToN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_nToOne,
-      { "nToOne", "h225.nToOne",
+      { "nToOne", "h225.nToOne_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_nToN,
-      { "nToN", "h225.nToN",
+      { "nToN", "h225.nToN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_direct,
-      { "direct", "h225.direct",
+      { "direct", "h225.direct_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_gatekeeperRouted,
-      { "gatekeeperRouted", "h225.gatekeeperRouted",
+      { "gatekeeperRouted", "h225.gatekeeperRouted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_endpointControlled,
-      { "endpointControlled", "h225.endpointControlled",
+      { "endpointControlled", "h225.endpointControlled_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_gatekeeperControlled,
-      { "gatekeeperControlled", "h225.gatekeeperControlled",
+      { "gatekeeperControlled", "h225.gatekeeperControlled_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_noControl,
-      { "noControl", "h225.noControl",
+      { "noControl", "h225.noControl_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_qOSCapabilities,
@@ -10303,7 +10303,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_256_OF_QOSCapability", HFILL }},
     { &hf_h225_qOSCapabilities_item,
-      { "QOSCapability", "h225.QOSCapability",
+      { "QOSCapability", "h225.QOSCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_irrFrequency,
@@ -10311,11 +10311,11 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_65535", HFILL }},
     { &hf_h225_destinationType,
-      { "destinationType", "h225.destinationType",
+      { "destinationType", "h225.destinationType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointType", HFILL }},
     { &hf_h225_uuiesRequested,
-      { "uuiesRequested", "h225.uuiesRequested",
+      { "uuiesRequested", "h225.uuiesRequested_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_supportedProtocols,
@@ -10391,27 +10391,27 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(AdmissionRejectReason_vals), 0,
         "AdmissionRejectReason", HFILL }},
     { &hf_h225_invalidPermission,
-      { "invalidPermission", "h225.invalidPermission",
+      { "invalidPermission", "h225.invalidPermission_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_requestDenied,
-      { "requestDenied", "h225.requestDenied",
+      { "requestDenied", "h225.requestDenied_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_invalidEndpointIdentifier,
-      { "invalidEndpointIdentifier", "h225.invalidEndpointIdentifier",
+      { "invalidEndpointIdentifier", "h225.invalidEndpointIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_qosControlNotSupported,
-      { "qosControlNotSupported", "h225.qosControlNotSupported",
+      { "qosControlNotSupported", "h225.qosControlNotSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_incompleteAddress,
-      { "incompleteAddress", "h225.incompleteAddress",
+      { "incompleteAddress", "h225.incompleteAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_aliasesInconsistent,
-      { "aliasesInconsistent", "h225.aliasesInconsistent",
+      { "aliasesInconsistent", "h225.aliasesInconsistent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_routeCallToSCN,
@@ -10423,23 +10423,23 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(h225_PartyNumber_vals), 0,
         NULL, HFILL }},
     { &hf_h225_exceedsCallCapacity,
-      { "exceedsCallCapacity", "h225.exceedsCallCapacity",
+      { "exceedsCallCapacity", "h225.exceedsCallCapacity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_collectDestination,
-      { "collectDestination", "h225.collectDestination",
+      { "collectDestination", "h225.collectDestination_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_collectPIN,
-      { "collectPIN", "h225.collectPIN",
+      { "collectPIN", "h225.collectPIN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_noRouteToDestination,
-      { "noRouteToDestination", "h225.noRouteToDestination",
+      { "noRouteToDestination", "h225.noRouteToDestination_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_unallocatedNumber,
-      { "unallocatedNumber", "h225.unallocatedNumber",
+      { "unallocatedNumber", "h225.unallocatedNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_answeredCall,
@@ -10447,7 +10447,7 @@ void proto_register_h225(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h225_usageInformation,
-      { "usageInformation", "h225.usageInformation",
+      { "usageInformation", "h225.usageInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RasUsageInformation", HFILL }},
     { &hf_h225_bandwidthDetails,
@@ -10455,7 +10455,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_BandwidthDetails", HFILL }},
     { &hf_h225_bandwidthDetails_item,
-      { "BandwidthDetails", "h225.BandwidthDetails",
+      { "BandwidthDetails", "h225.BandwidthDetails_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_bandRejectReason,
@@ -10467,15 +10467,15 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "BandWidth", HFILL }},
     { &hf_h225_notBound,
-      { "notBound", "h225.notBound",
+      { "notBound", "h225.notBound_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_invalidConferenceID,
-      { "invalidConferenceID", "h225.invalidConferenceID",
+      { "invalidConferenceID", "h225.invalidConferenceID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_insufficientResources,
-      { "insufficientResources", "h225.insufficientResources",
+      { "insufficientResources", "h225.insufficientResources_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_replyAddress,
@@ -10515,7 +10515,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(LocationRejectReason_vals), 0,
         "LocationRejectReason", HFILL }},
     { &hf_h225_notRegistered,
-      { "notRegistered", "h225.notRegistered",
+      { "notRegistered", "h225.notRegistered_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_routeCalltoSCN,
@@ -10535,11 +10535,11 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(h225_CallTerminationCause_vals), 0,
         "CallTerminationCause", HFILL }},
     { &hf_h225_forcedDrop,
-      { "forcedDrop", "h225.forcedDrop",
+      { "forcedDrop", "h225.forcedDrop_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_normalDrop,
-      { "normalDrop", "h225.normalDrop",
+      { "normalDrop", "h225.normalDrop_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_disengageRejectReason,
@@ -10547,15 +10547,15 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(DisengageRejectReason_vals), 0,
         "DisengageRejectReason", HFILL }},
     { &hf_h225_requestToDropOther,
-      { "requestToDropOther", "h225.requestToDropOther",
+      { "requestToDropOther", "h225.requestToDropOther_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_usageInfoRequested,
-      { "usageInfoRequested", "h225.usageInfoRequested",
+      { "usageInfoRequested", "h225.usageInfoRequested_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RasUsageInfoTypes", HFILL }},
     { &hf_h225_segmentedResponseSupported,
-      { "segmentedResponseSupported", "h225.segmentedResponseSupported",
+      { "segmentedResponseSupported", "h225.segmentedResponseSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_nextSegmentRequested,
@@ -10563,7 +10563,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_65535", HFILL }},
     { &hf_h225_capacityInfoRequested,
-      { "capacityInfoRequested", "h225.capacityInfoRequested",
+      { "capacityInfoRequested", "h225.capacityInfoRequested_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_infoRequestResponse_rasAddress,
@@ -10575,7 +10575,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_perCallInfo_item,
-      { "perCallInfo item", "h225.perCallInfo_item",
+      { "perCallInfo item", "h225.perCallInfo_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_originator,
@@ -10587,7 +10587,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_RTPSession", HFILL }},
     { &hf_h225_audio_item,
-      { "RTPSession", "h225.RTPSession",
+      { "RTPSession", "h225.RTPSession_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_video,
@@ -10595,7 +10595,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_RTPSession", HFILL }},
     { &hf_h225_video_item,
-      { "RTPSession", "h225.RTPSession",
+      { "RTPSession", "h225.RTPSession_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_data,
@@ -10603,15 +10603,15 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_TransportChannelInfo", HFILL }},
     { &hf_h225_data_item,
-      { "TransportChannelInfo", "h225.TransportChannelInfo",
+      { "TransportChannelInfo", "h225.TransportChannelInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_h245,
-      { "h245", "h225.h245",
+      { "h245", "h225.h245_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelInfo", HFILL }},
     { &hf_h225_callSignalling,
-      { "callSignalling", "h225.callSignalling",
+      { "callSignalling", "h225.callSignalling_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelInfo", HFILL }},
     { &hf_h225_substituteConfIDs,
@@ -10627,11 +10627,11 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_pdu_item,
-      { "pdu item", "h225.pdu_item",
+      { "pdu item", "h225.pdu_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_h323pdu,
-      { "h323pdu", "h225.h323pdu",
+      { "h323pdu", "h225.h323pdu_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "H323_UU_PDU", HFILL }},
     { &hf_h225_sent,
@@ -10651,11 +10651,11 @@ void proto_register_h225(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h225_complete,
-      { "complete", "h225.complete",
+      { "complete", "h225.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_incomplete,
-      { "incomplete", "h225.incomplete",
+      { "incomplete", "h225.incomplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_segment,
@@ -10663,7 +10663,7 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_65535", HFILL }},
     { &hf_h225_invalidCall,
-      { "invalidCall", "h225.invalidCall",
+      { "invalidCall", "h225.invalidCall_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_nakReason,
@@ -10691,7 +10691,7 @@ void proto_register_h225(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h225_callSpecific,
-      { "callSpecific", "h225.callSpecific",
+      { "callSpecific", "h225.callSpecific_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_result,
@@ -10699,19 +10699,19 @@ void proto_register_h225(void) {
         FT_UINT32, BASE_DEC, VALS(h225_T_result_vals), 0,
         NULL, HFILL }},
     { &hf_h225_started,
-      { "started", "h225.started",
+      { "started", "h225.started_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_failed,
-      { "failed", "h225.failed",
+      { "failed", "h225.failed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_stopped,
-      { "stopped", "h225.stopped",
+      { "stopped", "h225.stopped_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h225_notAvailable,
-      { "notAvailable", "h225.notAvailable",
+      { "notAvailable", "h225.notAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c
index 4579eb7675..c9f07a5219 100644
--- a/epan/dissectors/packet-h235.c
+++ b/epan/dissectors/packet-h235.c
@@ -1092,11 +1092,11 @@ void proto_register_h235(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_0_511", HFILL }},
     { &hf_h235_eckasdhp,
-      { "eckasdhp", "h235.eckasdhp",
+      { "eckasdhp", "h235.eckasdhp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h235_public_key,
-      { "public-key", "h235.public_key",
+      { "public-key", "h235.public_key_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ECpoint", HFILL }},
     { &hf_h235_modulus,
@@ -1104,7 +1104,7 @@ void proto_register_h235(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_0_511", HFILL }},
     { &hf_h235_base,
-      { "base", "h235.base",
+      { "base", "h235.base_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ECpoint", HFILL }},
     { &hf_h235_weierstrassA,
@@ -1116,7 +1116,7 @@ void proto_register_h235(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_0_511", HFILL }},
     { &hf_h235_eckasdh2,
-      { "eckasdh2", "h235.eckasdh2",
+      { "eckasdh2", "h235.eckasdh2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h235_fieldSize,
@@ -1132,39 +1132,39 @@ void proto_register_h235(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_h235_default,
-      { "default", "h235.default",
+      { "default", "h235.default_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h235_radius,
-      { "radius", "h235.radius",
+      { "radius", "h235.radius_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h235_dhExch,
-      { "dhExch", "h235.dhExch",
+      { "dhExch", "h235.dhExch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h235_pwdSymEnc,
-      { "pwdSymEnc", "h235.pwdSymEnc",
+      { "pwdSymEnc", "h235.pwdSymEnc_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h235_pwdHash,
-      { "pwdHash", "h235.pwdHash",
+      { "pwdHash", "h235.pwdHash_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h235_certSign,
-      { "certSign", "h235.certSign",
+      { "certSign", "h235.certSign_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h235_ipsec,
-      { "ipsec", "h235.ipsec",
+      { "ipsec", "h235.ipsec_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h235_tls,
-      { "tls", "h235.tls",
+      { "tls", "h235.tls_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h235_nonStandard,
-      { "nonStandard", "h235.nonStandard",
+      { "nonStandard", "h235.nonStandard_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_h235_authenticationBES,
@@ -1188,7 +1188,7 @@ void proto_register_h235(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h235_dhkey,
-      { "dhkey", "h235.dhkey",
+      { "dhkey", "h235.dhkey_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DHset", HFILL }},
     { &hf_h235_challenge,
@@ -1200,7 +1200,7 @@ void proto_register_h235(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "RandomVal", HFILL }},
     { &hf_h235_certificate,
-      { "certificate", "h235.certificate",
+      { "certificate", "h235.certificate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TypedCertificate", HFILL }},
     { &hf_h235_generalID,
@@ -1224,7 +1224,7 @@ void proto_register_h235(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ProfileElement", HFILL }},
     { &hf_h235_profileInfo_item,
-      { "ProfileElement", "h235.ProfileElement",
+      { "ProfileElement", "h235.ProfileElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h235_elementID,
@@ -1232,7 +1232,7 @@ void proto_register_h235(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_255", HFILL }},
     { &hf_h235_paramS,
-      { "paramS", "h235.paramS",
+      { "paramS", "h235.paramS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h235_element,
@@ -1260,7 +1260,7 @@ void proto_register_h235(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h235_toBeSigned,
-      { "toBeSigned", "h235.toBeSigned",
+      { "toBeSigned", "h235.toBeSigned_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h235_algorithmOID,
@@ -1300,35 +1300,35 @@ void proto_register_h235(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_h235_cryptoEncryptedToken,
-      { "cryptoEncryptedToken", "h235.cryptoEncryptedToken",
+      { "cryptoEncryptedToken", "h235.cryptoEncryptedToken_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h235_encryptedToken,
-      { "token", "h235.token",
+      { "token", "h235.token_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ENCRYPTED", HFILL }},
     { &hf_h235_cryptoSignedToken,
-      { "cryptoSignedToken", "h235.cryptoSignedToken",
+      { "cryptoSignedToken", "h235.cryptoSignedToken_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h235_signedToken,
-      { "token", "h235.token",
+      { "token", "h235.token_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SIGNED", HFILL }},
     { &hf_h235_cryptoHashedToken,
-      { "cryptoHashedToken", "h235.cryptoHashedToken",
+      { "cryptoHashedToken", "h235.cryptoHashedToken_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h235_hashedVals,
-      { "hashedVals", "h235.hashedVals",
+      { "hashedVals", "h235.hashedVals_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ClearToken", HFILL }},
     { &hf_h235_hashedToken,
-      { "token", "h235.token",
+      { "token", "h235.token_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HASHED", HFILL }},
     { &hf_h235_cryptoPwdEncr,
-      { "cryptoPwdEncr", "h235.cryptoPwdEncr",
+      { "cryptoPwdEncr", "h235.cryptoPwdEncr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ENCRYPTED", HFILL }},
     { &hf_h235_secureChannel,
@@ -1336,15 +1336,15 @@ void proto_register_h235(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "KeyMaterial", HFILL }},
     { &hf_h235_sharedSecret,
-      { "sharedSecret", "h235.sharedSecret",
+      { "sharedSecret", "h235.sharedSecret_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ENCRYPTED", HFILL }},
     { &hf_h235_certProtectedKey,
-      { "certProtectedKey", "h235.certProtectedKey",
+      { "certProtectedKey", "h235.certProtectedKey_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SIGNED", HFILL }},
     { &hf_h235_secureSharedSecret,
-      { "secureSharedSecret", "h235.secureSharedSecret",
+      { "secureSharedSecret", "h235.secureSharedSecret_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "V3KeySyncMaterial", HFILL }},
     { &hf_h235_encryptedSessionKey,
@@ -1360,7 +1360,7 @@ void proto_register_h235(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_h235_paramSsalt,
-      { "paramSsalt", "h235.paramSsalt",
+      { "paramSsalt", "h235.paramSsalt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Params", HFILL }},
     { &hf_h235_keyDerivationOID,
@@ -1372,7 +1372,7 @@ void proto_register_h235(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_h235_SrtpCryptoCapability_item,
-      { "SrtpCryptoInfo", "h235.SrtpCryptoInfo",
+      { "SrtpCryptoInfo", "h235.SrtpCryptoInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h235_cryptoSuite,
@@ -1380,7 +1380,7 @@ void proto_register_h235(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_h235_sessionParams,
-      { "sessionParams", "h235.sessionParams",
+      { "sessionParams", "h235.sessionParams_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SrtpSessionParameters", HFILL }},
     { &hf_h235_allowMKI,
@@ -1388,7 +1388,7 @@ void proto_register_h235(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h235_SrtpKeys_item,
-      { "SrtpKeyParameters", "h235.SrtpKeyParameters",
+      { "SrtpKeyParameters", "h235.SrtpKeyParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h235_masterKey,
@@ -1412,7 +1412,7 @@ void proto_register_h235(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_h235_mki,
-      { "mki", "h235.mki",
+      { "mki", "h235.mki_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h235_length,
@@ -1440,7 +1440,7 @@ void proto_register_h235(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h235_fecOrder,
-      { "fecOrder", "h235.fecOrder",
+      { "fecOrder", "h235.fecOrder_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h235_windowSizeHint,
@@ -1452,15 +1452,15 @@ void proto_register_h235(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_GenericData", HFILL }},
     { &hf_h235_newParameter_item,
-      { "GenericData", "h235.GenericData",
+      { "GenericData", "h235.GenericData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h235_fecBeforeSrtp,
-      { "fecBeforeSrtp", "h235.fecBeforeSrtp",
+      { "fecBeforeSrtp", "h235.fecBeforeSrtp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h235_fecAfterSrtp,
-      { "fecAfterSrtp", "h235.fecAfterSrtp",
+      { "fecAfterSrtp", "h235.fecAfterSrtp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c
index 3b3c5ac60e..aa480bc182 100644
--- a/epan/dissectors/packet-h245.c
+++ b/epan/dissectors/packet-h245.c
@@ -14577,7 +14577,7 @@ void proto_register_h245(void) {
 /*--- Included file: packet-h245-hfarr.c ---*/
 #line 1 "../../asn1/h245/packet-h245-hfarr.c"
     { &hf_h245_OpenLogicalChannel_PDU,
-      { "OpenLogicalChannel", "h245.OpenLogicalChannel",
+      { "OpenLogicalChannel", "h245.OpenLogicalChannel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_request,
@@ -14597,51 +14597,51 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_IndicationMessage_vals), 0,
         "IndicationMessage", HFILL }},
     { &hf_h245_nonStandardMsg,
-      { "nonStandard", "h245.nonStandard",
+      { "nonStandard", "h245.nonStandard_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardMessage", HFILL }},
     { &hf_h245_masterSlaveDetermination,
-      { "masterSlaveDetermination", "h245.masterSlaveDetermination",
+      { "masterSlaveDetermination", "h245.masterSlaveDetermination_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_terminalCapabilitySet,
-      { "terminalCapabilitySet", "h245.terminalCapabilitySet",
+      { "terminalCapabilitySet", "h245.terminalCapabilitySet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_openLogicalChannel,
-      { "openLogicalChannel", "h245.openLogicalChannel",
+      { "openLogicalChannel", "h245.openLogicalChannel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_closeLogicalChannel,
-      { "closeLogicalChannel", "h245.closeLogicalChannel",
+      { "closeLogicalChannel", "h245.closeLogicalChannel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_requestChannelClose,
-      { "requestChannelClose", "h245.requestChannelClose",
+      { "requestChannelClose", "h245.requestChannelClose_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_multiplexEntrySend,
-      { "multiplexEntrySend", "h245.multiplexEntrySend",
+      { "multiplexEntrySend", "h245.multiplexEntrySend_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_requestMultiplexEntry,
-      { "requestMultiplexEntry", "h245.requestMultiplexEntry",
+      { "requestMultiplexEntry", "h245.requestMultiplexEntry_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_requestMode,
-      { "requestMode", "h245.requestMode",
+      { "requestMode", "h245.requestMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_roundTripDelayRequest,
-      { "roundTripDelayRequest", "h245.roundTripDelayRequest",
+      { "roundTripDelayRequest", "h245.roundTripDelayRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_maintenanceLoopRequest,
-      { "maintenanceLoopRequest", "h245.maintenanceLoopRequest",
+      { "maintenanceLoopRequest", "h245.maintenanceLoopRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_communicationModeRequest,
-      { "communicationModeRequest", "h245.communicationModeRequest",
+      { "communicationModeRequest", "h245.communicationModeRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_conferenceRequest,
@@ -14653,83 +14653,83 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_MultilinkRequest_vals), 0,
         NULL, HFILL }},
     { &hf_h245_logicalChannelRateRequest,
-      { "logicalChannelRateRequest", "h245.logicalChannelRateRequest",
+      { "logicalChannelRateRequest", "h245.logicalChannelRateRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_genericRequest,
-      { "genericRequest", "h245.genericRequest",
+      { "genericRequest", "h245.genericRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GenericMessage", HFILL }},
     { &hf_h245_masterSlaveDeterminationAck,
-      { "masterSlaveDeterminationAck", "h245.masterSlaveDeterminationAck",
+      { "masterSlaveDeterminationAck", "h245.masterSlaveDeterminationAck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_masterSlaveDeterminationReject,
-      { "masterSlaveDeterminationReject", "h245.masterSlaveDeterminationReject",
+      { "masterSlaveDeterminationReject", "h245.masterSlaveDeterminationReject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_terminalCapabilitySetAck,
-      { "terminalCapabilitySetAck", "h245.terminalCapabilitySetAck",
+      { "terminalCapabilitySetAck", "h245.terminalCapabilitySetAck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_terminalCapabilitySetReject,
-      { "terminalCapabilitySetReject", "h245.terminalCapabilitySetReject",
+      { "terminalCapabilitySetReject", "h245.terminalCapabilitySetReject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_openLogicalChannelAck,
-      { "openLogicalChannelAck", "h245.openLogicalChannelAck",
+      { "openLogicalChannelAck", "h245.openLogicalChannelAck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_openLogicalChannelReject,
-      { "openLogicalChannelReject", "h245.openLogicalChannelReject",
+      { "openLogicalChannelReject", "h245.openLogicalChannelReject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_closeLogicalChannelAck,
-      { "closeLogicalChannelAck", "h245.closeLogicalChannelAck",
+      { "closeLogicalChannelAck", "h245.closeLogicalChannelAck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_requestChannelCloseAck,
-      { "requestChannelCloseAck", "h245.requestChannelCloseAck",
+      { "requestChannelCloseAck", "h245.requestChannelCloseAck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_requestChannelCloseReject,
-      { "requestChannelCloseReject", "h245.requestChannelCloseReject",
+      { "requestChannelCloseReject", "h245.requestChannelCloseReject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_multiplexEntrySendAck,
-      { "multiplexEntrySendAck", "h245.multiplexEntrySendAck",
+      { "multiplexEntrySendAck", "h245.multiplexEntrySendAck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_multiplexEntrySendReject,
-      { "multiplexEntrySendReject", "h245.multiplexEntrySendReject",
+      { "multiplexEntrySendReject", "h245.multiplexEntrySendReject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_requestMultiplexEntryAck,
-      { "requestMultiplexEntryAck", "h245.requestMultiplexEntryAck",
+      { "requestMultiplexEntryAck", "h245.requestMultiplexEntryAck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_requestMultiplexEntryReject,
-      { "requestMultiplexEntryReject", "h245.requestMultiplexEntryReject",
+      { "requestMultiplexEntryReject", "h245.requestMultiplexEntryReject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_requestModeAck,
-      { "requestModeAck", "h245.requestModeAck",
+      { "requestModeAck", "h245.requestModeAck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_requestModeReject,
-      { "requestModeReject", "h245.requestModeReject",
+      { "requestModeReject", "h245.requestModeReject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_roundTripDelayResponse,
-      { "roundTripDelayResponse", "h245.roundTripDelayResponse",
+      { "roundTripDelayResponse", "h245.roundTripDelayResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_maintenanceLoopAck,
-      { "maintenanceLoopAck", "h245.maintenanceLoopAck",
+      { "maintenanceLoopAck", "h245.maintenanceLoopAck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_maintenanceLoopReject,
-      { "maintenanceLoopReject", "h245.maintenanceLoopReject",
+      { "maintenanceLoopReject", "h245.maintenanceLoopReject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_communicationModeResponse,
@@ -14745,19 +14745,19 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_MultilinkResponse_vals), 0,
         NULL, HFILL }},
     { &hf_h245_logicalChannelRateAcknowledge,
-      { "logicalChannelRateAcknowledge", "h245.logicalChannelRateAcknowledge",
+      { "logicalChannelRateAcknowledge", "h245.logicalChannelRateAcknowledge_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_logicalChannelRateReject,
-      { "logicalChannelRateReject", "h245.logicalChannelRateReject",
+      { "logicalChannelRateReject", "h245.logicalChannelRateReject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_genericResponse,
-      { "genericResponse", "h245.genericResponse",
+      { "genericResponse", "h245.genericResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GenericMessage", HFILL }},
     { &hf_h245_maintenanceLoopOffCommand,
-      { "maintenanceLoopOffCommand", "h245.maintenanceLoopOffCommand",
+      { "maintenanceLoopOffCommand", "h245.maintenanceLoopOffCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_sendTerminalCapabilitySet,
@@ -14769,7 +14769,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_EncryptionCommand_vals), 0,
         NULL, HFILL }},
     { &hf_h245_flowControlCommand,
-      { "flowControlCommand", "h245.flowControlCommand",
+      { "flowControlCommand", "h245.flowControlCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_endSessionCommand,
@@ -14777,11 +14777,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_EndSessionCommand_vals), 0,
         NULL, HFILL }},
     { &hf_h245_miscellaneousCommand,
-      { "miscellaneousCommand", "h245.miscellaneousCommand",
+      { "miscellaneousCommand", "h245.miscellaneousCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_communicationModeCommand,
-      { "communicationModeCommand", "h245.communicationModeCommand",
+      { "communicationModeCommand", "h245.communicationModeCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_conferenceCommand,
@@ -14793,15 +14793,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_H223MultiplexReconfiguration_vals), 0,
         NULL, HFILL }},
     { &hf_h245_newATMVCCommand,
-      { "newATMVCCommand", "h245.newATMVCCommand",
+      { "newATMVCCommand", "h245.newATMVCCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_mobileMultilinkReconfigurationCommand,
-      { "mobileMultilinkReconfigurationCommand", "h245.mobileMultilinkReconfigurationCommand",
+      { "mobileMultilinkReconfigurationCommand", "h245.mobileMultilinkReconfigurationCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_genericCommand,
-      { "genericCommand", "h245.genericCommand",
+      { "genericCommand", "h245.genericCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GenericMessage", HFILL }},
     { &hf_h245_functionNotUnderstood,
@@ -14809,47 +14809,47 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_FunctionNotUnderstood_vals), 0,
         NULL, HFILL }},
     { &hf_h245_masterSlaveDeterminationRelease,
-      { "masterSlaveDeterminationRelease", "h245.masterSlaveDeterminationRelease",
+      { "masterSlaveDeterminationRelease", "h245.masterSlaveDeterminationRelease_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_terminalCapabilitySetRelease,
-      { "terminalCapabilitySetRelease", "h245.terminalCapabilitySetRelease",
+      { "terminalCapabilitySetRelease", "h245.terminalCapabilitySetRelease_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_openLogicalChannelConfirm,
-      { "openLogicalChannelConfirm", "h245.openLogicalChannelConfirm",
+      { "openLogicalChannelConfirm", "h245.openLogicalChannelConfirm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_requestChannelCloseRelease,
-      { "requestChannelCloseRelease", "h245.requestChannelCloseRelease",
+      { "requestChannelCloseRelease", "h245.requestChannelCloseRelease_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_multiplexEntrySendRelease,
-      { "multiplexEntrySendRelease", "h245.multiplexEntrySendRelease",
+      { "multiplexEntrySendRelease", "h245.multiplexEntrySendRelease_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_requestMultiplexEntryRelease,
-      { "requestMultiplexEntryRelease", "h245.requestMultiplexEntryRelease",
+      { "requestMultiplexEntryRelease", "h245.requestMultiplexEntryRelease_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_requestModeRelease,
-      { "requestModeRelease", "h245.requestModeRelease",
+      { "requestModeRelease", "h245.requestModeRelease_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_miscellaneousIndication,
-      { "miscellaneousIndication", "h245.miscellaneousIndication",
+      { "miscellaneousIndication", "h245.miscellaneousIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_jitterIndication,
-      { "jitterIndication", "h245.jitterIndication",
+      { "jitterIndication", "h245.jitterIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_h223SkewIndication,
-      { "h223SkewIndication", "h245.h223SkewIndication",
+      { "h223SkewIndication", "h245.h223SkewIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_newATMVCIndication,
-      { "newATMVCIndication", "h245.newATMVCIndication",
+      { "newATMVCIndication", "h245.newATMVCIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_userInput,
@@ -14857,11 +14857,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_UserInputIndication_vals), 0,
         "UserInputIndication", HFILL }},
     { &hf_h245_h2250MaximumSkewIndication,
-      { "h2250MaximumSkewIndication", "h245.h2250MaximumSkewIndication",
+      { "h2250MaximumSkewIndication", "h245.h2250MaximumSkewIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_mcLocationIndication,
-      { "mcLocationIndication", "h245.mcLocationIndication",
+      { "mcLocationIndication", "h245.mcLocationIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_conferenceIndication,
@@ -14869,11 +14869,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_ConferenceIndication_vals), 0,
         NULL, HFILL }},
     { &hf_h245_vendorIdentification,
-      { "vendorIdentification", "h245.vendorIdentification",
+      { "vendorIdentification", "h245.vendorIdentification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_functionNotSupported,
-      { "functionNotSupported", "h245.functionNotSupported",
+      { "functionNotSupported", "h245.functionNotSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_multilinkIndication,
@@ -14881,19 +14881,19 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_MultilinkIndication_vals), 0,
         NULL, HFILL }},
     { &hf_h245_logicalChannelRateRelease,
-      { "logicalChannelRateRelease", "h245.logicalChannelRateRelease",
+      { "logicalChannelRateRelease", "h245.logicalChannelRateRelease_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_flowControlIndication,
-      { "flowControlIndication", "h245.flowControlIndication",
+      { "flowControlIndication", "h245.flowControlIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_mobileMultilinkReconfigurationIndication,
-      { "mobileMultilinkReconfigurationIndication", "h245.mobileMultilinkReconfigurationIndication",
+      { "mobileMultilinkReconfigurationIndication", "h245.mobileMultilinkReconfigurationIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_genericIndication,
-      { "genericIndication", "h245.genericIndication",
+      { "genericIndication", "h245.genericIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GenericMessage", HFILL }},
     { &hf_h245_messageIdentifier,
@@ -14909,11 +14909,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_messageContent_item,
-      { "messageContent item", "h245.messageContent_item",
+      { "messageContent item", "h245.messageContent_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_messageContent_item", HFILL }},
     { &hf_h245_nonStandardData,
-      { "nonStandardData", "h245.nonStandardData",
+      { "nonStandardData", "h245.nonStandardData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_h245_nonStandardIdentifier,
@@ -14929,7 +14929,7 @@ void proto_register_h245(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_h221NonStandardID,
-      { "h221NonStandard", "h245.h221NonStandard",
+      { "h221NonStandard", "h245.h221NonStandard_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "H221NonStandardID", HFILL }},
     { &hf_h245_t35CountryCode,
@@ -14957,11 +14957,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_decision_vals), 0,
         NULL, HFILL }},
     { &hf_h245_master,
-      { "master", "h245.master",
+      { "master", "h245.master_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_slave,
-      { "slave", "h245.slave",
+      { "slave", "h245.slave_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_msd_rej_cause,
@@ -14969,7 +14969,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_MasterSlaveDeterminationRejectCause_vals), 0,
         "MasterSlaveDeterminationRejectCause", HFILL }},
     { &hf_h245_identicalNumbers,
-      { "identicalNumbers", "h245.identicalNumbers",
+      { "identicalNumbers", "h245.identicalNumbers_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_sequenceNumber,
@@ -14989,7 +14989,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_256_OF_CapabilityTableEntry", HFILL }},
     { &hf_h245_capabilityTable_item,
-      { "CapabilityTableEntry", "h245.CapabilityTableEntry",
+      { "CapabilityTableEntry", "h245.CapabilityTableEntry_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_capabilityDescriptors,
@@ -14997,7 +14997,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_256_OF_CapabilityDescriptor", HFILL }},
     { &hf_h245_capabilityDescriptors_item,
-      { "CapabilityDescriptor", "h245.CapabilityDescriptor",
+      { "CapabilityDescriptor", "h245.CapabilityDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_genericInformation,
@@ -15005,7 +15005,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_GenericInformation", HFILL }},
     { &hf_h245_genericInformation_item,
-      { "GenericInformation", "h245.GenericInformation",
+      { "GenericInformation", "h245.GenericInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_capabilityTableEntryNumber,
@@ -15037,15 +15037,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_TerminalCapabilitySetRejectCause_vals), 0,
         "TerminalCapabilitySetRejectCause", HFILL }},
     { &hf_h245_unspecified,
-      { "unspecified", "h245.unspecified",
+      { "unspecified", "h245.unspecified_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_undefinedTableEntryUsed,
-      { "undefinedTableEntryUsed", "h245.undefinedTableEntryUsed",
+      { "undefinedTableEntryUsed", "h245.undefinedTableEntryUsed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_descriptorCapacityExceeded,
-      { "descriptorCapacityExceeded", "h245.descriptorCapacityExceeded",
+      { "descriptorCapacityExceeded", "h245.descriptorCapacityExceeded_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_tableEntryCapacityExceeded,
@@ -15057,11 +15057,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CapabilityTableEntryNumber", HFILL }},
     { &hf_h245_noneProcessed,
-      { "noneProcessed", "h245.noneProcessed",
+      { "noneProcessed", "h245.noneProcessed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_nonStandard,
-      { "nonStandard", "h245.nonStandard",
+      { "nonStandard", "h245.nonStandard_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_h245_receiveVideoCapability,
@@ -15089,15 +15089,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_AudioCapability_vals), 0,
         "AudioCapability", HFILL }},
     { &hf_h245_receiveDataApplicationCapability,
-      { "receiveDataApplicationCapability", "h245.receiveDataApplicationCapability",
+      { "receiveDataApplicationCapability", "h245.receiveDataApplicationCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DataApplicationCapability", HFILL }},
     { &hf_h245_transmitDataApplicationCapability,
-      { "transmitDataApplicationCapability", "h245.transmitDataApplicationCapability",
+      { "transmitDataApplicationCapability", "h245.transmitDataApplicationCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DataApplicationCapability", HFILL }},
     { &hf_h245_receiveAndTransmitDataApplicationCapability,
-      { "receiveAndTransmitDataApplicationCapability", "h245.receiveAndTransmitDataApplicationCapability",
+      { "receiveAndTransmitDataApplicationCapability", "h245.receiveAndTransmitDataApplicationCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DataApplicationCapability", HFILL }},
     { &hf_h245_h233EncryptionTransmitCapability,
@@ -15105,7 +15105,7 @@ void proto_register_h245(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h245_h233EncryptionReceiveCapability,
-      { "h233EncryptionReceiveCapability", "h245.h233EncryptionReceiveCapability",
+      { "h233EncryptionReceiveCapability", "h245.h233EncryptionReceiveCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_h233IVResponseTime,
@@ -15113,11 +15113,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_255", HFILL }},
     { &hf_h245_conferenceCapability,
-      { "conferenceCapability", "h245.conferenceCapability",
+      { "conferenceCapability", "h245.conferenceCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_h235SecurityCapability,
-      { "h235SecurityCapability", "h245.h235SecurityCapability",
+      { "h235SecurityCapability", "h245.h235SecurityCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_maxPendingReplacementFor,
@@ -15137,27 +15137,27 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_UserInputCapability_vals), 0,
         "UserInputCapability", HFILL }},
     { &hf_h245_genericControlCapability,
-      { "genericControlCapability", "h245.genericControlCapability",
+      { "genericControlCapability", "h245.genericControlCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GenericCapability", HFILL }},
     { &hf_h245_receiveMultiplexedStreamCapability,
-      { "receiveMultiplexedStreamCapability", "h245.receiveMultiplexedStreamCapability",
+      { "receiveMultiplexedStreamCapability", "h245.receiveMultiplexedStreamCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MultiplexedStreamCapability", HFILL }},
     { &hf_h245_transmitMultiplexedStreamCapability,
-      { "transmitMultiplexedStreamCapability", "h245.transmitMultiplexedStreamCapability",
+      { "transmitMultiplexedStreamCapability", "h245.transmitMultiplexedStreamCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MultiplexedStreamCapability", HFILL }},
     { &hf_h245_receiveAndTransmitMultiplexedStreamCapability,
-      { "receiveAndTransmitMultiplexedStreamCapability", "h245.receiveAndTransmitMultiplexedStreamCapability",
+      { "receiveAndTransmitMultiplexedStreamCapability", "h245.receiveAndTransmitMultiplexedStreamCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MultiplexedStreamCapability", HFILL }},
     { &hf_h245_receiveRTPAudioTelephonyEventCapability,
-      { "receiveRTPAudioTelephonyEventCapability", "h245.receiveRTPAudioTelephonyEventCapability",
+      { "receiveRTPAudioTelephonyEventCapability", "h245.receiveRTPAudioTelephonyEventCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AudioTelephonyEventCapability", HFILL }},
     { &hf_h245_receiveRTPAudioToneCapability,
-      { "receiveRTPAudioToneCapability", "h245.receiveRTPAudioToneCapability",
+      { "receiveRTPAudioToneCapability", "h245.receiveRTPAudioToneCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AudioToneCapability", HFILL }},
     { &hf_h245_depFecCapability,
@@ -15165,15 +15165,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_DepFECCapability_vals), 0,
         NULL, HFILL }},
     { &hf_h245_multiplePayloadStreamCapability,
-      { "multiplePayloadStreamCapability", "h245.multiplePayloadStreamCapability",
+      { "multiplePayloadStreamCapability", "h245.multiplePayloadStreamCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_fecCapability,
-      { "fecCapability", "h245.fecCapability",
+      { "fecCapability", "h245.fecCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_redundancyEncodingCap,
-      { "redundancyEncodingCap", "h245.redundancyEncodingCap",
+      { "redundancyEncodingCap", "h245.redundancyEncodingCap_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RedundancyEncodingCapability", HFILL }},
     { &hf_h245_oneOfCapabilities,
@@ -15181,7 +15181,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "AlternativeCapabilitySet", HFILL }},
     { &hf_h245_encryptionAuthenticationAndIntegrity,
-      { "encryptionAuthenticationAndIntegrity", "h245.encryptionAuthenticationAndIntegrity",
+      { "encryptionAuthenticationAndIntegrity", "h245.encryptionAuthenticationAndIntegrity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_mediaCapability,
@@ -15189,23 +15189,23 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CapabilityTableEntryNumber", HFILL }},
     { &hf_h245_h222Capability,
-      { "h222Capability", "h245.h222Capability",
+      { "h222Capability", "h245.h222Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_h223Capability,
-      { "h223Capability", "h245.h223Capability",
+      { "h223Capability", "h245.h223Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_v76Capability,
-      { "v76Capability", "h245.v76Capability",
+      { "v76Capability", "h245.v76Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_h2250Capability,
-      { "h2250Capability", "h245.h2250Capability",
+      { "h2250Capability", "h245.h2250Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_genericMultiplexCapability,
-      { "genericMultiplexCapability", "h245.genericMultiplexCapability",
+      { "genericMultiplexCapability", "h245.genericMultiplexCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GenericCapability", HFILL }},
     { &hf_h245_numberOfVCs,
@@ -15217,11 +15217,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_VCCapability", HFILL }},
     { &hf_h245_vcCapability_item,
-      { "VCCapability", "h245.VCCapability",
+      { "VCCapability", "h245.VCCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_aal1,
-      { "aal1", "h245.aal1",
+      { "aal1", "h245.aal1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_nullClockRecovery,
@@ -15261,7 +15261,7 @@ void proto_register_h245(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h245_aal5,
-      { "aal5", "h245.aal5",
+      { "aal5", "h245.aal5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_forwardMaximumSDUSize,
@@ -15281,7 +15281,7 @@ void proto_register_h245(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h245_availableBitRates,
-      { "availableBitRates", "h245.availableBitRates",
+      { "availableBitRates", "h245.availableBitRates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_avb_type,
@@ -15293,7 +15293,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_65535", HFILL }},
     { &hf_h245_rangeOfBitRates,
-      { "rangeOfBitRates", "h245.rangeOfBitRates",
+      { "rangeOfBitRates", "h245.rangeOfBitRates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_lowerBitRate,
@@ -15305,7 +15305,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_65535", HFILL }},
     { &hf_h245_aal1ViaGateway,
-      { "aal1ViaGateway", "h245.aal1ViaGateway",
+      { "aal1ViaGateway", "h245.aal1ViaGateway_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_gatewayAddress,
@@ -15313,7 +15313,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_256_OF_Q2931Address", HFILL }},
     { &hf_h245_gatewayAddress_item,
-      { "Q2931Address", "h245.Q2931Address",
+      { "Q2931Address", "h245.Q2931Address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_srtsClockRecoveryflag,
@@ -15377,11 +15377,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_h223MultiplexTableCapability_vals), 0,
         NULL, HFILL }},
     { &hf_h245_basic,
-      { "basic", "h245.basic",
+      { "basic", "h245.basic_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_enhanced,
-      { "enhanced", "h245.enhanced",
+      { "enhanced", "h245.enhanced_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_maximumNestingDepth,
@@ -15405,7 +15405,7 @@ void proto_register_h245(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h245_mobileOperationTransmitCapability,
-      { "mobileOperationTransmitCapability", "h245.mobileOperationTransmitCapability",
+      { "mobileOperationTransmitCapability", "h245.mobileOperationTransmitCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_modeChangeCapability,
@@ -15429,7 +15429,7 @@ void proto_register_h245(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h245_h223AnnexCCapability,
-      { "h223AnnexCCapability", "h245.h223AnnexCCapability",
+      { "h223AnnexCCapability", "h245.h223AnnexCCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_bitRate_1_19200,
@@ -15437,7 +15437,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_19200", HFILL }},
     { &hf_h245_mobileMultilinkFrameCapability,
-      { "mobileMultilinkFrameCapability", "h245.mobileMultilinkFrameCapability",
+      { "mobileMultilinkFrameCapability", "h245.mobileMultilinkFrameCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_maximumSampleSize,
@@ -15561,7 +15561,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_127", HFILL }},
     { &hf_h245_v75Capability,
-      { "v75Capability", "h245.v75Capability",
+      { "v75Capability", "h245.v75Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_audioHeader,
@@ -15573,19 +15573,19 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_1023", HFILL }},
     { &hf_h245_receiveMultipointCapability,
-      { "receiveMultipointCapability", "h245.receiveMultipointCapability",
+      { "receiveMultipointCapability", "h245.receiveMultipointCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MultipointCapability", HFILL }},
     { &hf_h245_transmitMultipointCapability,
-      { "transmitMultipointCapability", "h245.transmitMultipointCapability",
+      { "transmitMultipointCapability", "h245.transmitMultipointCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MultipointCapability", HFILL }},
     { &hf_h245_receiveAndTransmitMultipointCapability,
-      { "receiveAndTransmitMultipointCapability", "h245.receiveAndTransmitMultipointCapability",
+      { "receiveAndTransmitMultipointCapability", "h245.receiveAndTransmitMultipointCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MultipointCapability", HFILL }},
     { &hf_h245_mcCapability,
-      { "mcCapability", "h245.mcCapability",
+      { "mcCapability", "h245.mcCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_centralizedConferenceMC,
@@ -15601,11 +15601,11 @@ void proto_register_h245(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h245_mediaPacketizationCapability,
-      { "mediaPacketizationCapability", "h245.mediaPacketizationCapability",
+      { "mediaPacketizationCapability", "h245.mediaPacketizationCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_transportCapability,
-      { "transportCapability", "h245.transportCapability",
+      { "transportCapability", "h245.transportCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_redundancyEncodingCapability,
@@ -15613,7 +15613,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_256_OF_RedundancyEncodingCapability", HFILL }},
     { &hf_h245_redundancyEncodingCapability_item,
-      { "RedundancyEncodingCapability", "h245.RedundancyEncodingCapability",
+      { "RedundancyEncodingCapability", "h245.RedundancyEncodingCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_logicalChannelSwitchingCapability,
@@ -15633,7 +15633,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_256_OF_RTPPayloadType", HFILL }},
     { &hf_h245_rtpPayloadTypes_item,
-      { "RTPPayloadType", "h245.RTPPayloadType",
+      { "RTPPayloadType", "h245.RTPPayloadType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_qosMode,
@@ -15661,11 +15661,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_4294967295", HFILL }},
     { &hf_h245_guaranteedQOS,
-      { "guaranteedQOS", "h245.guaranteedQOS",
+      { "guaranteedQOS", "h245.guaranteedQOS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_controlledLoad,
-      { "controlledLoad", "h245.controlledLoad",
+      { "controlledLoad", "h245.controlledLoad_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_maxNTUSize,
@@ -15693,7 +15693,7 @@ void proto_register_h245(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h245_nonStandardParameter,
-      { "nonStandardParameter", "h245.nonStandardParameter",
+      { "nonStandardParameter", "h245.nonStandardParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_value,
@@ -15705,7 +15705,7 @@ void proto_register_h245(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h245_servicePriorityValue,
-      { "servicePriorityValue", "h245.servicePriorityValue",
+      { "servicePriorityValue", "h245.servicePriorityValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_serviceClass,
@@ -15717,35 +15717,35 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_255", HFILL }},
     { &hf_h245_desired,
-      { "desired", "h245.desired",
+      { "desired", "h245.desired_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_required,
-      { "required", "h245.required",
+      { "required", "h245.required_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_class0,
-      { "class0", "h245.class0",
+      { "class0", "h245.class0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_class1,
-      { "class1", "h245.class1",
+      { "class1", "h245.class1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_class2,
-      { "class2", "h245.class2",
+      { "class2", "h245.class2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_class3,
-      { "class3", "h245.class3",
+      { "class3", "h245.class3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_class4,
-      { "class4", "h245.class4",
+      { "class4", "h245.class4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_class5,
-      { "class5", "h245.class5",
+      { "class5", "h245.class5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_qosType,
@@ -15765,11 +15765,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_4294967295", HFILL }},
     { &hf_h245_rsvpParameters,
-      { "rsvpParameters", "h245.rsvpParameters",
+      { "rsvpParameters", "h245.rsvpParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_atmParameters,
-      { "atmParameters", "h245.atmParameters",
+      { "atmParameters", "h245.atmParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_localQoS,
@@ -15777,19 +15777,19 @@ void proto_register_h245(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h245_genericTransportParameters,
-      { "genericTransportParameters", "h245.genericTransportParameters",
+      { "genericTransportParameters", "h245.genericTransportParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_servicePriority,
-      { "servicePriority", "h245.servicePriority",
+      { "servicePriority", "h245.servicePriority_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_authorizationParameter,
-      { "authorizationParameter", "h245.authorizationParameter",
+      { "authorizationParameter", "h245.authorizationParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AuthorizationParameters", HFILL }},
     { &hf_h245_qosDescriptor,
-      { "qosDescriptor", "h245.qosDescriptor",
+      { "qosDescriptor", "h245.qosDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_dscpValue,
@@ -15797,23 +15797,23 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_63", HFILL }},
     { &hf_h245_ip_UDP,
-      { "ip-UDP", "h245.ip_UDP",
+      { "ip-UDP", "h245.ip_UDP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_ip_TCP,
-      { "ip-TCP", "h245.ip_TCP",
+      { "ip-TCP", "h245.ip_TCP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_atm_AAL5_UNIDIR,
-      { "atm-AAL5-UNIDIR", "h245.atm_AAL5_UNIDIR",
+      { "atm-AAL5-UNIDIR", "h245.atm_AAL5_UNIDIR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_atm_AAL5_BIDIR,
-      { "atm-AAL5-BIDIR", "h245.atm_AAL5_BIDIR",
+      { "atm-AAL5-BIDIR", "h245.atm_AAL5_BIDIR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_atm_AAL5_compressed,
-      { "atm-AAL5-compressed", "h245.atm_AAL5_compressed",
+      { "atm-AAL5-compressed", "h245.atm_AAL5_compressed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_variable_delta,
@@ -15829,7 +15829,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_256_OF_QOSCapability", HFILL }},
     { &hf_h245_qOSCapabilities_item,
-      { "QOSCapability", "h245.QOSCapability",
+      { "QOSCapability", "h245.QOSCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_mediaChannelCapabilities,
@@ -15837,7 +15837,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_256_OF_MediaChannelCapability", HFILL }},
     { &hf_h245_mediaChannelCapabilities_item,
-      { "MediaChannelCapability", "h245.MediaChannelCapability",
+      { "MediaChannelCapability", "h245.MediaChannelCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_redundancyEncodingMethod,
@@ -15857,11 +15857,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_rtpAudioRedundancyEncoding,
-      { "rtpAudioRedundancyEncoding", "h245.rtpAudioRedundancyEncoding",
+      { "rtpAudioRedundancyEncoding", "h245.rtpAudioRedundancyEncoding_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_rtpH263VideoRedundancyEncoding,
-      { "rtpH263VideoRedundancyEncoding", "h245.rtpH263VideoRedundancyEncoding",
+      { "rtpH263VideoRedundancyEncoding", "h245.rtpH263VideoRedundancyEncoding_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_numberOfThreads,
@@ -15877,7 +15877,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_frameToThreadMapping_vals), 0,
         NULL, HFILL }},
     { &hf_h245_roundrobin,
-      { "roundrobin", "h245.roundrobin",
+      { "roundrobin", "h245.roundrobin_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_custom,
@@ -15885,7 +15885,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_256_OF_RTPH263VideoRedundancyFrameMapping", HFILL }},
     { &hf_h245_custom_item,
-      { "RTPH263VideoRedundancyFrameMapping", "h245.RTPH263VideoRedundancyFrameMapping",
+      { "RTPH263VideoRedundancyFrameMapping", "h245.RTPH263VideoRedundancyFrameMapping_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_containedThreads,
@@ -15921,7 +15921,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_MediaDistributionCapability", HFILL }},
     { &hf_h245_mediaDistributionCapability_item,
-      { "MediaDistributionCapability", "h245.MediaDistributionCapability",
+      { "MediaDistributionCapability", "h245.MediaDistributionCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_centralizedControl,
@@ -15953,7 +15953,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_DataApplicationCapability", HFILL }},
     { &hf_h245_centralizedData_item,
-      { "DataApplicationCapability", "h245.DataApplicationCapability",
+      { "DataApplicationCapability", "h245.DataApplicationCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_distributedData,
@@ -15961,31 +15961,31 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_DataApplicationCapability", HFILL }},
     { &hf_h245_distributedData_item,
-      { "DataApplicationCapability", "h245.DataApplicationCapability",
+      { "DataApplicationCapability", "h245.DataApplicationCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_h261VideoCapability,
-      { "h261VideoCapability", "h245.h261VideoCapability",
+      { "h261VideoCapability", "h245.h261VideoCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_h262VideoCapability,
-      { "h262VideoCapability", "h245.h262VideoCapability",
+      { "h262VideoCapability", "h245.h262VideoCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_h263VideoCapability,
-      { "h263VideoCapability", "h245.h263VideoCapability",
+      { "h263VideoCapability", "h245.h263VideoCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_is11172VideoCapability,
-      { "is11172VideoCapability", "h245.is11172VideoCapability",
+      { "is11172VideoCapability", "h245.is11172VideoCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_genericVideoCapability,
-      { "genericVideoCapability", "h245.genericVideoCapability",
+      { "genericVideoCapability", "h245.genericVideoCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GenericCapability", HFILL }},
     { &hf_h245_extendedVideoCapability,
-      { "extendedVideoCapability", "h245.extendedVideoCapability",
+      { "extendedVideoCapability", "h245.extendedVideoCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_videoCapability,
@@ -16001,7 +16001,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_GenericCapability", HFILL }},
     { &hf_h245_videoCapabilityExtension_item,
-      { "GenericCapability", "h245.GenericCapability",
+      { "GenericCapability", "h245.GenericCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_qcifMPI_1_4,
@@ -16169,11 +16169,11 @@ void proto_register_h245(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h245_enhancementLayerInfo,
-      { "enhancementLayerInfo", "h245.enhancementLayerInfo",
+      { "enhancementLayerInfo", "h245.enhancementLayerInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_h263Options,
-      { "h263Options", "h245.h263Options",
+      { "h263Options", "h245.h263Options_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_baseBitRateConstrained,
@@ -16185,7 +16185,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_14_OF_EnhancementOptions", HFILL }},
     { &hf_h245_snrEnhancement_item,
-      { "EnhancementOptions", "h245.EnhancementOptions",
+      { "EnhancementOptions", "h245.EnhancementOptions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_spatialEnhancement,
@@ -16193,7 +16193,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_14_OF_EnhancementOptions", HFILL }},
     { &hf_h245_spatialEnhancement_item,
-      { "EnhancementOptions", "h245.EnhancementOptions",
+      { "EnhancementOptions", "h245.EnhancementOptions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_bPictureEnhancement,
@@ -16201,11 +16201,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_14_OF_BEnhancementParameters", HFILL }},
     { &hf_h245_bPictureEnhancement_item,
-      { "BEnhancementParameters", "h245.BEnhancementParameters",
+      { "BEnhancementParameters", "h245.BEnhancementParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_enhancementOptions,
-      { "enhancementOptions", "h245.enhancementOptions",
+      { "enhancementOptions", "h245.enhancementOptions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_numberOfBPictures,
@@ -16305,7 +16305,7 @@ void proto_register_h245(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h245_transparencyParameters,
-      { "transparencyParameters", "h245.transparencyParameters",
+      { "transparencyParameters", "h245.transparencyParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_separateVideoBackChannel,
@@ -16313,7 +16313,7 @@ void proto_register_h245(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h245_refPictureSelection,
-      { "refPictureSelection", "h245.refPictureSelection",
+      { "refPictureSelection", "h245.refPictureSelection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_customPictureClockFrequency,
@@ -16321,7 +16321,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_16_OF_CustomPictureClockFrequency", HFILL }},
     { &hf_h245_customPictureClockFrequency_item,
-      { "CustomPictureClockFrequency", "h245.CustomPictureClockFrequency",
+      { "CustomPictureClockFrequency", "h245.CustomPictureClockFrequency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_customPictureFormat,
@@ -16329,7 +16329,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_16_OF_CustomPictureFormat", HFILL }},
     { &hf_h245_customPictureFormat_item,
-      { "CustomPictureFormat", "h245.CustomPictureFormat",
+      { "CustomPictureFormat", "h245.CustomPictureFormat_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_modeCombos,
@@ -16337,11 +16337,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_16_OF_H263VideoModeCombos", HFILL }},
     { &hf_h245_modeCombos_item,
-      { "H263VideoModeCombos", "h245.H263VideoModeCombos",
+      { "H263VideoModeCombos", "h245.H263VideoModeCombos_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_h263Version3Options,
-      { "h263Version3Options", "h245.h263Version3Options",
+      { "h263Version3Options", "h245.h263Version3Options_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_presentationOrder,
@@ -16365,7 +16365,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_255", HFILL }},
     { &hf_h245_additionalPictureMemory,
-      { "additionalPictureMemory", "h245.additionalPictureMemory",
+      { "additionalPictureMemory", "h245.additionalPictureMemory_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_sqcifAdditionalPictureMemory,
@@ -16401,31 +16401,31 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_videoBackChannelSend_vals), 0,
         NULL, HFILL }},
     { &hf_h245_none,
-      { "none", "h245.none",
+      { "none", "h245.none_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_ackMessageOnly,
-      { "ackMessageOnly", "h245.ackMessageOnly",
+      { "ackMessageOnly", "h245.ackMessageOnly_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_nackMessageOnly,
-      { "nackMessageOnly", "h245.nackMessageOnly",
+      { "nackMessageOnly", "h245.nackMessageOnly_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_ackOrNackMessageOnly,
-      { "ackOrNackMessageOnly", "h245.ackOrNackMessageOnly",
+      { "ackOrNackMessageOnly", "h245.ackOrNackMessageOnly_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_ackAndNackMessage,
-      { "ackAndNackMessage", "h245.ackAndNackMessage",
+      { "ackAndNackMessage", "h245.ackAndNackMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_enhancedReferencePicSelect,
-      { "enhancedReferencePicSelect", "h245.enhancedReferencePicSelect",
+      { "enhancedReferencePicSelect", "h245.enhancedReferencePicSelect_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_subPictureRemovalParameters,
-      { "subPictureRemovalParameters", "h245.subPictureRemovalParameters",
+      { "subPictureRemovalParameters", "h245.subPictureRemovalParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_mpuHorizMBs,
@@ -16485,7 +16485,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_2048", HFILL }},
     { &hf_h245_mPI,
-      { "mPI", "h245.mPI",
+      { "mPI", "h245.mPI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_standardMPI,
@@ -16497,7 +16497,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_customPCF_item,
-      { "customPCF item", "h245.customPCF_item",
+      { "customPCF item", "h245.customPCF_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_customMPI,
@@ -16525,7 +16525,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_extendedPAR_item,
-      { "extendedPAR item", "h245.extendedPAR_item",
+      { "extendedPAR item", "h245.extendedPAR_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_width,
@@ -16537,7 +16537,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_255", HFILL }},
     { &hf_h245_h263VideoUncoupledModes,
-      { "h263VideoUncoupledModes", "h245.h263VideoUncoupledModes",
+      { "h263VideoUncoupledModes", "h245.h263VideoUncoupledModes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "H263ModeComboFlags", HFILL }},
     { &hf_h245_h263VideoCoupledModes,
@@ -16545,7 +16545,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_16_OF_H263ModeComboFlags", HFILL }},
     { &hf_h245_h263VideoCoupledModes_item,
-      { "H263ModeComboFlags", "h245.H263ModeComboFlags",
+      { "H263ModeComboFlags", "h245.H263ModeComboFlags_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_referencePicSelect,
@@ -16625,7 +16625,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_256", HFILL }},
     { &hf_h245_g7231,
-      { "g7231", "h245.g7231",
+      { "g7231", "h245.g7231_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_maxAl_sduAudioFrames,
@@ -16649,11 +16649,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_256", HFILL }},
     { &hf_h245_is11172AudioCapability,
-      { "is11172AudioCapability", "h245.is11172AudioCapability",
+      { "is11172AudioCapability", "h245.is11172AudioCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_is13818AudioCapability,
-      { "is13818AudioCapability", "h245.is13818AudioCapability",
+      { "is13818AudioCapability", "h245.is13818AudioCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_g729wAnnexB,
@@ -16665,39 +16665,39 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_256", HFILL }},
     { &hf_h245_g7231AnnexCCapability,
-      { "g7231AnnexCCapability", "h245.g7231AnnexCCapability",
+      { "g7231AnnexCCapability", "h245.g7231AnnexCCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_gsmFullRate,
-      { "gsmFullRate", "h245.gsmFullRate",
+      { "gsmFullRate", "h245.gsmFullRate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GSMAudioCapability", HFILL }},
     { &hf_h245_gsmHalfRate,
-      { "gsmHalfRate", "h245.gsmHalfRate",
+      { "gsmHalfRate", "h245.gsmHalfRate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GSMAudioCapability", HFILL }},
     { &hf_h245_gsmEnhancedFullRate,
-      { "gsmEnhancedFullRate", "h245.gsmEnhancedFullRate",
+      { "gsmEnhancedFullRate", "h245.gsmEnhancedFullRate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GSMAudioCapability", HFILL }},
     { &hf_h245_genericAudioCapability,
-      { "genericAudioCapability", "h245.genericAudioCapability",
+      { "genericAudioCapability", "h245.genericAudioCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GenericCapability", HFILL }},
     { &hf_h245_g729Extensions,
-      { "g729Extensions", "h245.g729Extensions",
+      { "g729Extensions", "h245.g729Extensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_vbd,
-      { "vbd", "h245.vbd",
+      { "vbd", "h245.vbd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "VBDCapability", HFILL }},
     { &hf_h245_audioTelephonyEvent,
-      { "audioTelephonyEvent", "h245.audioTelephonyEvent",
+      { "audioTelephonyEvent", "h245.audioTelephonyEvent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NoPTAudioTelephonyEventCapability", HFILL }},
     { &hf_h245_audioTone,
-      { "audioTone", "h245.audioTone",
+      { "audioTone", "h245.audioTone_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NoPTAudioToneCapability", HFILL }},
     { &hf_h245_audioUnit,
@@ -16757,7 +16757,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_6_17", HFILL }},
     { &hf_h245_g723AnnexCAudioMode,
-      { "g723AnnexCAudioMode", "h245.g723AnnexCAudioMode",
+      { "g723AnnexCAudioMode", "h245.g723AnnexCAudioMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_audioLayer1,
@@ -16877,7 +16877,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(DataProtocolCapability_vals), 0,
         "DataProtocolCapability", HFILL }},
     { &hf_h245_t84,
-      { "t84", "h245.t84",
+      { "t84", "h245.t84_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_t84Protocol,
@@ -16905,11 +16905,11 @@ void proto_register_h245(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_h245_nlpid,
-      { "nlpid", "h245.nlpid",
+      { "nlpid", "h245.nlpid_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_dsvdControl,
-      { "dsvdControl", "h245.dsvdControl",
+      { "dsvdControl", "h245.dsvdControl_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_h222DataPartitioning,
@@ -16925,7 +16925,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(DataProtocolCapability_vals), 0,
         "DataProtocolCapability", HFILL }},
     { &hf_h245_t38fax,
-      { "t38fax", "h245.t38fax",
+      { "t38fax", "h245.t38fax_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_t38FaxProtocol,
@@ -16933,11 +16933,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(DataProtocolCapability_vals), 0,
         "DataProtocolCapability", HFILL }},
     { &hf_h245_t38FaxProfile,
-      { "t38FaxProfile", "h245.t38FaxProfile",
+      { "t38FaxProfile", "h245.t38FaxProfile_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_genericDataCapability,
-      { "genericDataCapability", "h245.genericDataCapability",
+      { "genericDataCapability", "h245.genericDataCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GenericCapability", HFILL }},
     { &hf_h245_application,
@@ -16949,43 +16949,43 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_4294967295", HFILL }},
     { &hf_h245_v14buffered,
-      { "v14buffered", "h245.v14buffered",
+      { "v14buffered", "h245.v14buffered_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_v42lapm,
-      { "v42lapm", "h245.v42lapm",
+      { "v42lapm", "h245.v42lapm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_hdlcFrameTunnelling,
-      { "hdlcFrameTunnelling", "h245.hdlcFrameTunnelling",
+      { "hdlcFrameTunnelling", "h245.hdlcFrameTunnelling_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_h310SeparateVCStack,
-      { "h310SeparateVCStack", "h245.h310SeparateVCStack",
+      { "h310SeparateVCStack", "h245.h310SeparateVCStack_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_h310SingleVCStack,
-      { "h310SingleVCStack", "h245.h310SingleVCStack",
+      { "h310SingleVCStack", "h245.h310SingleVCStack_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_transparent,
-      { "transparent", "h245.transparent",
+      { "transparent", "h245.transparent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_segmentationAndReassembly,
-      { "segmentationAndReassembly", "h245.segmentationAndReassembly",
+      { "segmentationAndReassembly", "h245.segmentationAndReassembly_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_hdlcFrameTunnelingwSAR,
-      { "hdlcFrameTunnelingwSAR", "h245.hdlcFrameTunnelingwSAR",
+      { "hdlcFrameTunnelingwSAR", "h245.hdlcFrameTunnelingwSAR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_v120,
-      { "v120", "h245.v120",
+      { "v120", "h245.v120_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_separateLANStack,
-      { "separateLANStack", "h245.separateLANStack",
+      { "separateLANStack", "h245.separateLANStack_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_v76wCompression,
@@ -17005,15 +17005,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_CompressionType_vals), 0,
         "CompressionType", HFILL }},
     { &hf_h245_tcp,
-      { "tcp", "h245.tcp",
+      { "tcp", "h245.tcp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_udp,
-      { "udp", "h245.udp",
+      { "udp", "h245.udp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_v42bis,
-      { "v42bis", "h245.v42bis",
+      { "v42bis", "h245.v42bis_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_numberOfCodewords,
@@ -17025,11 +17025,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_256", HFILL }},
     { &hf_h245_t84Unrestricted,
-      { "t84Unrestricted", "h245.t84Unrestricted",
+      { "t84Unrestricted", "h245.t84Unrestricted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_t84Restricted,
-      { "t84Restricted", "h245.t84Restricted",
+      { "t84Restricted", "h245.t84Restricted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_qcif_bool,
@@ -17129,19 +17129,19 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T38FaxRateManagement_vals), 0,
         NULL, HFILL }},
     { &hf_h245_t38FaxUdpOptions,
-      { "t38FaxUdpOptions", "h245.t38FaxUdpOptions",
+      { "t38FaxUdpOptions", "h245.t38FaxUdpOptions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_t38FaxTcpOptions,
-      { "t38FaxTcpOptions", "h245.t38FaxTcpOptions",
+      { "t38FaxTcpOptions", "h245.t38FaxTcpOptions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_localTCF,
-      { "localTCF", "h245.localTCF",
+      { "localTCF", "h245.localTCF_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_transferredTCF,
-      { "transferredTCF", "h245.transferredTCF",
+      { "transferredTCF", "h245.transferredTCF_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_t38FaxMaxBuffer,
@@ -17157,11 +17157,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_t38FaxUdpEC_vals), 0,
         NULL, HFILL }},
     { &hf_h245_t38UDPFEC,
-      { "t38UDPFEC", "h245.t38UDPFEC",
+      { "t38UDPFEC", "h245.t38UDPFEC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_t38UDPRedundancy,
-      { "t38UDPRedundancy", "h245.t38UDPRedundancy",
+      { "t38UDPRedundancy", "h245.t38UDPRedundancy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_t38TCPBidirectionalMode,
@@ -17173,15 +17173,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_authenticationCapability,
-      { "authenticationCapability", "h245.authenticationCapability",
+      { "authenticationCapability", "h245.authenticationCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_integrityCapability,
-      { "integrityCapability", "h245.integrityCapability",
+      { "integrityCapability", "h245.integrityCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_genericH235SecurityCapability,
-      { "genericH235SecurityCapability", "h245.genericH235SecurityCapability",
+      { "genericH235SecurityCapability", "h245.genericH235SecurityCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GenericCapability", HFILL }},
     { &hf_h245_EncryptionCapability_item,
@@ -17201,51 +17201,51 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_16_OF_NonStandardParameter", HFILL }},
     { &hf_h245_ui_nonStandard_item,
-      { "NonStandardParameter", "h245.NonStandardParameter",
+      { "NonStandardParameter", "h245.NonStandardParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_basicString,
-      { "basicString", "h245.basicString",
+      { "basicString", "h245.basicString_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_iA5String,
-      { "iA5String", "h245.iA5String",
+      { "iA5String", "h245.iA5String_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_generalString,
-      { "generalString", "h245.generalString",
+      { "generalString", "h245.generalString_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_dtmf,
-      { "dtmf", "h245.dtmf",
+      { "dtmf", "h245.dtmf_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_hookflash,
-      { "hookflash", "h245.hookflash",
+      { "hookflash", "h245.hookflash_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_extendedAlphanumericFlag,
-      { "extendedAlphanumeric", "h245.extendedAlphanumeric",
+      { "extendedAlphanumeric", "h245.extendedAlphanumeric_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_encryptedBasicString,
-      { "encryptedBasicString", "h245.encryptedBasicString",
+      { "encryptedBasicString", "h245.encryptedBasicString_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_encryptedIA5String,
-      { "encryptedIA5String", "h245.encryptedIA5String",
+      { "encryptedIA5String", "h245.encryptedIA5String_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_encryptedGeneralString,
-      { "encryptedGeneralString", "h245.encryptedGeneralString",
+      { "encryptedGeneralString", "h245.encryptedGeneralString_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_secureDTMF,
-      { "secureDTMF", "h245.secureDTMF",
+      { "secureDTMF", "h245.secureDTMF_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_genericUserInputCapability,
-      { "genericUserInputCapability", "h245.genericUserInputCapability",
+      { "genericUserInputCapability", "h245.genericUserInputCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GenericCapability", HFILL }},
     { &hf_h245_nonStandardParams,
@@ -17253,7 +17253,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_NonStandardParameter", HFILL }},
     { &hf_h245_nonStandardParams_item,
-      { "NonStandardParameter", "h245.NonStandardParameter",
+      { "NonStandardParameter", "h245.NonStandardParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_chairControlCapability,
@@ -17277,7 +17277,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_collapsing_item,
-      { "collapsing item", "h245.collapsing_item",
+      { "collapsing item", "h245.collapsing_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_nonCollapsing,
@@ -17285,7 +17285,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_nonCollapsing_item,
-      { "nonCollapsing item", "h245.nonCollapsing_item",
+      { "nonCollapsing item", "h245.nonCollapsing_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_nonCollapsingRaw,
@@ -17301,7 +17301,7 @@ void proto_register_h245(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "T_standardOid", HFILL }},
     { &hf_h245_h221NonStandard,
-      { "h221NonStandard", "h245.h221NonStandard",
+      { "h221NonStandard", "h245.h221NonStandard_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_h245_uuid,
@@ -17333,7 +17333,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_logical,
-      { "logical", "h245.logical",
+      { "logical", "h245.logical_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_booleanArray,
@@ -17365,7 +17365,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_GenericParameter", HFILL }},
     { &hf_h245_genericParameters_item,
-      { "GenericParameter", "h245.GenericParameter",
+      { "GenericParameter", "h245.GenericParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_multiplexFormat,
@@ -17401,7 +17401,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_fecc_rfc2733,
-      { "rfc2733", "h245.rfc2733",
+      { "rfc2733", "h245.rfc2733_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FECC_rfc2733", HFILL }},
     { &hf_h245_redundancyEncodingBool,
@@ -17409,7 +17409,7 @@ void proto_register_h245(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h245_separateStreamBool,
-      { "separateStream", "h245.separateStream",
+      { "separateStream", "h245.separateStream_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_separateStreamBool", HFILL }},
     { &hf_h245_separatePort,
@@ -17449,7 +17449,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OLC_fw_lcn", HFILL }},
     { &hf_h245_forwardLogicalChannelParameters,
-      { "forwardLogicalChannelParameters", "h245.forwardLogicalChannelParameters",
+      { "forwardLogicalChannelParameters", "h245.forwardLogicalChannelParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_portNumber,
@@ -17465,19 +17465,19 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_OLC_forw_multiplexParameters_vals), 0,
         "OLC_forw_multiplexParameters", HFILL }},
     { &hf_h245_h222LogicalChannelParameters,
-      { "h222LogicalChannelParameters", "h245.h222LogicalChannelParameters",
+      { "h222LogicalChannelParameters", "h245.h222LogicalChannelParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_olc_fw_h223_params,
-      { "h223LogicalChannelParameters", "h245.h223LogicalChannelParameters",
+      { "h223LogicalChannelParameters", "h245.h223LogicalChannelParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OLC_fw_h223_params", HFILL }},
     { &hf_h245_v76LogicalChannelParameters,
-      { "v76LogicalChannelParameters", "h245.v76LogicalChannelParameters",
+      { "v76LogicalChannelParameters", "h245.v76LogicalChannelParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_h2250LogicalChannelParameters,
-      { "h2250LogicalChannelParameters", "h245.h2250LogicalChannelParameters",
+      { "h2250LogicalChannelParameters", "h245.h2250LogicalChannelParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_forwardLogicalChannelDependency,
@@ -17489,7 +17489,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "LogicalChannelNumber", HFILL }},
     { &hf_h245_reverseLogicalChannelParameters,
-      { "reverseLogicalChannelParameters", "h245.reverseLogicalChannelParameters",
+      { "reverseLogicalChannelParameters", "h245.reverseLogicalChannelParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OLC_reverseLogicalChannelParameters", HFILL }},
     { &hf_h245_olc_rev_multiplexParameter,
@@ -17497,7 +17497,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_OLC_rev_multiplexParameters_vals), 0,
         "OLC_rev_multiplexParameters", HFILL }},
     { &hf_h245_olc_rev_h223_params,
-      { "h223LogicalChannelParameters", "h245.h223LogicalChannelParameters",
+      { "h223LogicalChannelParameters", "h245.h223LogicalChannelParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OLC_rev_h223_params", HFILL }},
     { &hf_h245_reverseLogicalChannelDependency,
@@ -17505,11 +17505,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "LogicalChannelNumber", HFILL }},
     { &hf_h245_separateStack,
-      { "separateStack", "h245.separateStack",
+      { "separateStack", "h245.separateStack_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NetworkAccessParameters", HFILL }},
     { &hf_h245_encryptionSync,
-      { "encryptionSync", "h245.encryptionSync",
+      { "encryptionSync", "h245.encryptionSync_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_distribution,
@@ -17517,11 +17517,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_distribution_vals), 0,
         NULL, HFILL }},
     { &hf_h245_unicast,
-      { "unicast", "h245.unicast",
+      { "unicast", "h245.unicast_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_multicast,
-      { "multicast", "h245.multicast",
+      { "multicast", "h245.multicast_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_networkAddress,
@@ -17529,7 +17529,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_networkAddress_vals), 0,
         NULL, HFILL }},
     { &hf_h245_q2931Address,
-      { "q2931Address", "h245.q2931Address",
+      { "q2931Address", "h245.q2931Address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_e164Address,
@@ -17553,15 +17553,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_t120SetupProcedure_vals), 0,
         NULL, HFILL }},
     { &hf_h245_originateCall,
-      { "originateCall", "h245.originateCall",
+      { "originateCall", "h245.originateCall_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_waitForCall,
-      { "waitForCall", "h245.waitForCall",
+      { "waitForCall", "h245.waitForCall_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_issueQuery,
-      { "issueQuery", "h245.issueQuery",
+      { "issueQuery", "h245.issueQuery_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_address,
@@ -17585,7 +17585,7 @@ void proto_register_h245(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h245_nullData,
-      { "nullData", "h245.nullData",
+      { "nullData", "h245.nullData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_videoData,
@@ -17597,7 +17597,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_AudioCapability_vals), 0,
         "AudioCapability", HFILL }},
     { &hf_h245_data,
-      { "data", "h245.data",
+      { "data", "h245.data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DataApplicationCapability", HFILL }},
     { &hf_h245_encryptionData,
@@ -17605,23 +17605,23 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_EncryptionMode_vals), 0,
         "EncryptionMode", HFILL }},
     { &hf_h245_h235Control,
-      { "h235Control", "h245.h235Control",
+      { "h235Control", "h245.h235Control_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_h245_h235Media,
-      { "h235Media", "h245.h235Media",
+      { "h235Media", "h245.h235Media_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_multiplexedStream,
-      { "multiplexedStream", "h245.multiplexedStream",
+      { "multiplexedStream", "h245.multiplexedStream_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MultiplexedStreamParameter", HFILL }},
     { &hf_h245_redundancyEncoding,
-      { "redundancyEncoding", "h245.redundancyEncoding",
+      { "redundancyEncoding", "h245.redundancyEncoding_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_multiplePayloadStream,
-      { "multiplePayloadStream", "h245.multiplePayloadStream",
+      { "multiplePayloadStream", "h245.multiplePayloadStream_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_depFec,
@@ -17661,19 +17661,19 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_adaptationLayerType_vals), 0,
         NULL, HFILL }},
     { &hf_h245_h223_al_type_al1Framed,
-      { "al1Framed", "h245.al1Framed",
+      { "al1Framed", "h245.al1Framed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_h223_al_type_al1Framed", HFILL }},
     { &hf_h245_h223_al_type_al1NotFramed,
-      { "al1NotFramed", "h245.al1NotFramed",
+      { "al1NotFramed", "h245.al1NotFramed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_h223_al_type_al1NotFramed", HFILL }},
     { &hf_h245_h223_al_type_al2WithoutSequenceNumbers,
-      { "al2WithoutSequenceNumbers", "h245.al2WithoutSequenceNumbers",
+      { "al2WithoutSequenceNumbers", "h245.al2WithoutSequenceNumbers_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_h223_al_type_al2WithoutSequenceNumbers", HFILL }},
     { &hf_h245_h223_al_type_al2WithSequenceNumbers,
-      { "al2WithSequenceNumbers", "h245.al2WithSequenceNumbers",
+      { "al2WithSequenceNumbers", "h245.al2WithSequenceNumbers_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_h223_al_type_al2WithSequenceNumbers", HFILL }},
     { &hf_h245_controlFieldOctets,
@@ -17685,19 +17685,19 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_al3_sendBufferSize", HFILL }},
     { &hf_h245_h223_al_type_al3,
-      { "al3", "h245.al3",
+      { "al3", "h245.al3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_h223_al_type_al3", HFILL }},
     { &hf_h245_h223_al_type_al1M,
-      { "al1M", "h245.al1M",
+      { "al1M", "h245.al1M_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_h223_al_type_al1M", HFILL }},
     { &hf_h245_h223_al_type_al2M,
-      { "al2M", "h245.al2M",
+      { "al2M", "h245.al2M_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_h223_al_type_al2M", HFILL }},
     { &hf_h245_h223_al_type_al3M,
-      { "al3M", "h245.al3M",
+      { "al3M", "h245.al3M_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_h223_al_type_al3M", HFILL }},
     { &hf_h245_h223_lc_segmentableFlag,
@@ -17709,11 +17709,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_transferMode_vals), 0,
         NULL, HFILL }},
     { &hf_h245_framed,
-      { "framed", "h245.framed",
+      { "framed", "h245.framed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_unframed,
-      { "unframed", "h245.unframed",
+      { "unframed", "h245.unframed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_aL1HeaderFEC,
@@ -17721,11 +17721,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_AL1HeaderFEC_vals), 0,
         "AL1HeaderFEC", HFILL }},
     { &hf_h245_sebch16_7,
-      { "sebch16-7", "h245.sebch16_7",
+      { "sebch16-7", "h245.sebch16_7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_golay24_12,
-      { "golay24-12", "h245.golay24_12",
+      { "golay24-12", "h245.golay24_12_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_crcLength2,
@@ -17733,35 +17733,35 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_AL1CrcLength_vals), 0,
         "AL1CrcLength", HFILL }},
     { &hf_h245_crc4bit,
-      { "crc4bit", "h245.crc4bit",
+      { "crc4bit", "h245.crc4bit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_crc12bit,
-      { "crc12bit", "h245.crc12bit",
+      { "crc12bit", "h245.crc12bit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_crc20bit,
-      { "crc20bit", "h245.crc20bit",
+      { "crc20bit", "h245.crc20bit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_crc28bit,
-      { "crc28bit", "h245.crc28bit",
+      { "crc28bit", "h245.crc28bit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_crc8bit,
-      { "crc8bit", "h245.crc8bit",
+      { "crc8bit", "h245.crc8bit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_crc16bit,
-      { "crc16bit", "h245.crc16bit",
+      { "crc16bit", "h245.crc16bit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_crc32bit,
-      { "crc32bit", "h245.crc32bit",
+      { "crc32bit", "h245.crc32bit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_crcNotUsed,
-      { "crcNotUsed", "h245.crcNotUsed",
+      { "crcNotUsed", "h245.crcNotUsed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_rcpcCodeRate,
@@ -17769,15 +17769,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_8_32", HFILL }},
     { &hf_h245_noArq,
-      { "noArq", "h245.noArq",
+      { "noArq", "h245.noArq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_typeIArq,
-      { "typeIArq", "h245.typeIArq",
+      { "typeIArq", "h245.typeIArq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "H223AnnexCArqParameters", HFILL }},
     { &hf_h245_typeIIArq,
-      { "typeIIArq", "h245.typeIIArq",
+      { "typeIIArq", "h245.typeIIArq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "H223AnnexCArqParameters", HFILL }},
     { &hf_h245_arqType,
@@ -17797,7 +17797,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_AL2HeaderFEC_vals), 0,
         "AL2HeaderFEC", HFILL }},
     { &hf_h245_sebch16_5,
-      { "sebch16-5", "h245.sebch16_5",
+      { "sebch16-5", "h245.sebch16_5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_headerFormat,
@@ -17817,7 +17817,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_16", HFILL }},
     { &hf_h245_infinite,
-      { "infinite", "h245.infinite",
+      { "infinite", "h245.infinite_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_sendBufferSize,
@@ -17825,7 +17825,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_16777215", HFILL }},
     { &hf_h245_hdlcParameters,
-      { "hdlcParameters", "h245.hdlcParameters",
+      { "hdlcParameters", "h245.hdlcParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "V76HDLCParameters", HFILL }},
     { &hf_h245_suspendResume,
@@ -17833,15 +17833,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_suspendResume_vals), 0,
         NULL, HFILL }},
     { &hf_h245_noSuspendResume,
-      { "noSuspendResume", "h245.noSuspendResume",
+      { "noSuspendResume", "h245.noSuspendResume_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_suspendResumewAddress,
-      { "suspendResumewAddress", "h245.suspendResumewAddress",
+      { "suspendResumewAddress", "h245.suspendResumewAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_suspendResumewoAddress,
-      { "suspendResumewoAddress", "h245.suspendResumewoAddress",
+      { "suspendResumewoAddress", "h245.suspendResumewoAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_uIH,
@@ -17853,7 +17853,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_V76LCP_mode_vals), 0,
         "V76LCP_mode", HFILL }},
     { &hf_h245_eRM,
-      { "eRM", "h245.eRM",
+      { "eRM", "h245.eRM_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_windowSize,
@@ -17865,23 +17865,23 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_recovery_vals), 0,
         NULL, HFILL }},
     { &hf_h245_rej,
-      { "rej", "h245.rej",
+      { "rej", "h245.rej_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_sREJ,
-      { "sREJ", "h245.sREJ",
+      { "sREJ", "h245.sREJ_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_mSREJ,
-      { "mSREJ", "h245.mSREJ",
+      { "mSREJ", "h245.mSREJ_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_uNERM,
-      { "uNERM", "h245.uNERM",
+      { "uNERM", "h245.uNERM_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_v75Parameters,
-      { "v75Parameters", "h245.v75Parameters",
+      { "v75Parameters", "h245.v75Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_crcLength,
@@ -17921,7 +17921,7 @@ void proto_register_h245(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h245_destination,
-      { "destination", "h245.destination",
+      { "destination", "h245.destination_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminalLabel", HFILL }},
     { &hf_h245_mediaPacketization,
@@ -17929,15 +17929,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_mediaPacketization_vals), 0,
         NULL, HFILL }},
     { &hf_h245_h261aVideoPacketizationFlag,
-      { "h261aVideoPacketization", "h245.h261aVideoPacketization",
+      { "h261aVideoPacketization", "h245.h261aVideoPacketization_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_rtpPayloadType,
-      { "rtpPayloadType", "h245.rtpPayloadType",
+      { "rtpPayloadType", "h245.rtpPayloadType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_source,
-      { "source", "h245.source",
+      { "source", "h245.source_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminalLabel", HFILL }},
     { &hf_h245_payloadDescriptor,
@@ -17961,11 +17961,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_DataType_vals), 0,
         "DataType", HFILL }},
     { &hf_h245_rtpRedundancyEncoding,
-      { "rtpRedundancyEncoding", "h245.rtpRedundancyEncoding",
+      { "rtpRedundancyEncoding", "h245.rtpRedundancyEncoding_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_primary,
-      { "primary", "h245.primary",
+      { "primary", "h245.primary_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RedundancyEncodingElement", HFILL }},
     { &hf_h245_secondary,
@@ -17973,7 +17973,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_RedundancyEncodingElement", HFILL }},
     { &hf_h245_secondary_item,
-      { "RedundancyEncodingElement", "h245.RedundancyEncodingElement",
+      { "RedundancyEncodingElement", "h245.RedundancyEncodingElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_payloadType,
@@ -17985,11 +17985,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_MultiplePayloadStreamElement", HFILL }},
     { &hf_h245_elements_item,
-      { "MultiplePayloadStreamElement", "h245.MultiplePayloadStreamElement",
+      { "MultiplePayloadStreamElement", "h245.MultiplePayloadStreamElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_dep_rfc2733,
-      { "rfc2733", "h245.rfc2733",
+      { "rfc2733", "h245.rfc2733_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RFC2733Data", HFILL }},
     { &hf_h245_fec_data_mode,
@@ -17997,11 +17997,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_FECdata_mode_vals), 0,
         "FECdata_mode", HFILL }},
     { &hf_h245_redundancyEncodingFlag,
-      { "redundancyEncoding", "h245.redundancyEncoding",
+      { "redundancyEncoding", "h245.redundancyEncoding_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_differentPort,
-      { "differentPort", "h245.differentPort",
+      { "differentPort", "h245.differentPort_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_protectedSessionID,
@@ -18013,7 +18013,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_127", HFILL }},
     { &hf_h245_samePort,
-      { "samePort", "h245.samePort",
+      { "samePort", "h245.samePort_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_separateStream,
@@ -18021,7 +18021,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_DepSeparateStream_vals), 0,
         "DepSeparateStream", HFILL }},
     { &hf_h245_rfc2733,
-      { "rfc2733", "h245.rfc2733",
+      { "rfc2733", "h245.rfc2733_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_pktMode,
@@ -18029,15 +18029,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_pktMode_vals), 0,
         NULL, HFILL }},
     { &hf_h245_rfc2198coding,
-      { "rfc2198coding", "h245.rfc2198coding",
+      { "rfc2198coding", "h245.rfc2198coding_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_mode_rfc2733sameport,
-      { "rfc2733sameport", "h245.rfc2733sameport",
+      { "rfc2733sameport", "h245.rfc2733sameport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_mode_rfc2733sameport", HFILL }},
     { &hf_h245_mode_rfc2733diffport,
-      { "rfc2733diffport", "h245.rfc2733diffport",
+      { "rfc2733diffport", "h245.rfc2733diffport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_mode_rfc2733diffport", HFILL }},
     { &hf_h245_protectedChannel,
@@ -18053,7 +18053,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_MulticastAddress_vals), 0,
         NULL, HFILL }},
     { &hf_h245_iPAddress,
-      { "iPAddress", "h245.iPAddress",
+      { "iPAddress", "h245.iPAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_ip4_network,
@@ -18065,7 +18065,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_iPXAddress,
-      { "iPXAddress", "h245.iPXAddress",
+      { "iPXAddress", "h245.iPXAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_node,
@@ -18081,7 +18081,7 @@ void proto_register_h245(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_2", HFILL }},
     { &hf_h245_iP6Address,
-      { "iP6Address", "h245.iP6Address",
+      { "iP6Address", "h245.iP6Address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_ip6_network,
@@ -18097,7 +18097,7 @@ void proto_register_h245(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_16", HFILL }},
     { &hf_h245_iPSourceRouteAddress,
-      { "iPSourceRouteAddress", "h245.iPSourceRouteAddress",
+      { "iPSourceRouteAddress", "h245.iPSourceRouteAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_routing,
@@ -18105,11 +18105,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_routing_vals), 0,
         NULL, HFILL }},
     { &hf_h245_strict,
-      { "strict", "h245.strict",
+      { "strict", "h245.strict_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_loose,
-      { "loose", "h245.loose",
+      { "loose", "h245.loose_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_network,
@@ -18133,11 +18133,11 @@ void proto_register_h245(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_1_20", HFILL }},
     { &hf_h245_nonStandardAddress,
-      { "nonStandardAddress", "h245.nonStandardAddress",
+      { "nonStandardAddress", "h245.nonStandardAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_h245_mIPAddress,
-      { "iPAddress", "h245.iPAddress",
+      { "iPAddress", "h245.iPAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MIPAddress", HFILL }},
     { &hf_h245_mip4_network,
@@ -18149,7 +18149,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_65535", HFILL }},
     { &hf_h245_mIP6Address,
-      { "iP6Address", "h245.iP6Address",
+      { "iP6Address", "h245.iP6Address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MIP6Address", HFILL }},
     { &hf_h245_mip6_network,
@@ -18173,11 +18173,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_256_OF_EscrowData", HFILL }},
     { &hf_h245_escrowentry_item,
-      { "EscrowData", "h245.EscrowData",
+      { "EscrowData", "h245.EscrowData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_genericParameter,
-      { "genericParameter", "h245.genericParameter",
+      { "genericParameter", "h245.genericParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_escrowID,
@@ -18193,7 +18193,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OLC_ack_fw_lcn", HFILL }},
     { &hf_h245_olc_ack_reverseLogicalChannelParameters,
-      { "reverseLogicalChannelParameters", "h245.reverseLogicalChannelParameters",
+      { "reverseLogicalChannelParameters", "h245.reverseLogicalChannelParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OLC_ack_reverseLogicalChannelParameters", HFILL }},
     { &hf_h245_reverseLogicalChannelNumber,
@@ -18209,7 +18209,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_forwardMultiplexAckParameters_vals), 0,
         NULL, HFILL }},
     { &hf_h245_h2250LogicalChannelAckParameters,
-      { "h2250LogicalChannelAckParameters", "h245.h2250LogicalChannelAckParameters",
+      { "h2250LogicalChannelAckParameters", "h245.h2250LogicalChannelAckParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_forwardLogicalChannelNumber,
@@ -18221,63 +18221,63 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_OpenLogicalChannelRejectCause_vals), 0,
         "OpenLogicalChannelRejectCause", HFILL }},
     { &hf_h245_unsuitableReverseParameters,
-      { "unsuitableReverseParameters", "h245.unsuitableReverseParameters",
+      { "unsuitableReverseParameters", "h245.unsuitableReverseParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_dataTypeNotSupported,
-      { "dataTypeNotSupported", "h245.dataTypeNotSupported",
+      { "dataTypeNotSupported", "h245.dataTypeNotSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_dataTypeNotAvailable,
-      { "dataTypeNotAvailable", "h245.dataTypeNotAvailable",
+      { "dataTypeNotAvailable", "h245.dataTypeNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_unknownDataType,
-      { "unknownDataType", "h245.unknownDataType",
+      { "unknownDataType", "h245.unknownDataType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_dataTypeALCombinationNotSupported,
-      { "dataTypeALCombinationNotSupported", "h245.dataTypeALCombinationNotSupported",
+      { "dataTypeALCombinationNotSupported", "h245.dataTypeALCombinationNotSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_multicastChannelNotAllowed,
-      { "multicastChannelNotAllowed", "h245.multicastChannelNotAllowed",
+      { "multicastChannelNotAllowed", "h245.multicastChannelNotAllowed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_insufficientBandwidth,
-      { "insufficientBandwidth", "h245.insufficientBandwidth",
+      { "insufficientBandwidth", "h245.insufficientBandwidth_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_separateStackEstablishmentFailed,
-      { "separateStackEstablishmentFailed", "h245.separateStackEstablishmentFailed",
+      { "separateStackEstablishmentFailed", "h245.separateStackEstablishmentFailed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_invalidSessionID,
-      { "invalidSessionID", "h245.invalidSessionID",
+      { "invalidSessionID", "h245.invalidSessionID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_masterSlaveConflict,
-      { "masterSlaveConflict", "h245.masterSlaveConflict",
+      { "masterSlaveConflict", "h245.masterSlaveConflict_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_waitForCommunicationMode,
-      { "waitForCommunicationMode", "h245.waitForCommunicationMode",
+      { "waitForCommunicationMode", "h245.waitForCommunicationMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_invalidDependentChannel,
-      { "invalidDependentChannel", "h245.invalidDependentChannel",
+      { "invalidDependentChannel", "h245.invalidDependentChannel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_replacementForRejected,
-      { "replacementForRejected", "h245.replacementForRejected",
+      { "replacementForRejected", "h245.replacementForRejected_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_securityDenied,
-      { "securityDenied", "h245.securityDenied",
+      { "securityDenied", "h245.securityDenied_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_qoSControlNotSupported,
-      { "qoSControlNotSupported", "h245.qoSControlNotSupported",
+      { "qoSControlNotSupported", "h245.qoSControlNotSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_sessionID,
@@ -18301,11 +18301,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_cLC_source_vals), 0,
         "T_cLC_source", HFILL }},
     { &hf_h245_user,
-      { "user", "h245.user",
+      { "user", "h245.user_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_lcse,
-      { "lcse", "h245.lcse",
+      { "lcse", "h245.lcse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_clc_reason,
@@ -18313,15 +18313,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_Clc_reason_vals), 0,
         "Clc_reason", HFILL }},
     { &hf_h245_unknown,
-      { "unknown", "h245.unknown",
+      { "unknown", "h245.unknown_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_reopen,
-      { "reopen", "h245.reopen",
+      { "reopen", "h245.reopen_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_reservationFailure,
-      { "reservationFailure", "h245.reservationFailure",
+      { "reservationFailure", "h245.reservationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_networkErrorCode,
@@ -18329,7 +18329,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_255", HFILL }},
     { &hf_h245_qosCapability,
-      { "qosCapability", "h245.qosCapability",
+      { "qosCapability", "h245.qosCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_reason,
@@ -18337,7 +18337,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_reason_vals), 0,
         NULL, HFILL }},
     { &hf_h245_normal,
-      { "normal", "h245.normal",
+      { "normal", "h245.normal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_req_chan_clos_rej_cause,
@@ -18349,7 +18349,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_15_OF_MultiplexEntryDescriptor", HFILL }},
     { &hf_h245_multiplexEntryDescriptors_item,
-      { "MultiplexEntryDescriptor", "h245.MultiplexEntryDescriptor",
+      { "MultiplexEntryDescriptor", "h245.MultiplexEntryDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_multiplexTableEntryNumber,
@@ -18361,7 +18361,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_elementList_item,
-      { "MultiplexElement", "h245.MultiplexElement",
+      { "MultiplexElement", "h245.MultiplexElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_me_type,
@@ -18377,7 +18377,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_subElementList_item,
-      { "MultiplexElement", "h245.MultiplexElement",
+      { "MultiplexElement", "h245.MultiplexElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_me_repeatCount,
@@ -18389,7 +18389,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ME_finiteRepeatCount", HFILL }},
     { &hf_h245_untilClosingFlag,
-      { "untilClosingFlag", "h245.untilClosingFlag",
+      { "untilClosingFlag", "h245.untilClosingFlag_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_multiplexTableEntryNumbers,
@@ -18405,7 +18405,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_15_OF_MultiplexEntryRejectionDescriptions", HFILL }},
     { &hf_h245_sendRejectionDescriptions_item,
-      { "MultiplexEntryRejectionDescriptions", "h245.MultiplexEntryRejectionDescriptions",
+      { "MultiplexEntryRejectionDescriptions", "h245.MultiplexEntryRejectionDescriptions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_mux_rej_cause,
@@ -18413,11 +18413,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_MultiplexEntryRejectionDescriptionsCause_vals), 0,
         "MultiplexEntryRejectionDescriptionsCause", HFILL }},
     { &hf_h245_unspecifiedCause,
-      { "unspecifiedCause", "h245.unspecifiedCause",
+      { "unspecifiedCause", "h245.unspecifiedCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_descriptorTooComplex,
-      { "descriptorTooComplex", "h245.descriptorTooComplex",
+      { "descriptorTooComplex", "h245.descriptorTooComplex_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_entryNumbers,
@@ -18433,7 +18433,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_15_OF_RequestMultiplexEntryRejectionDescriptions", HFILL }},
     { &hf_h245_rejectionDescriptions_item,
-      { "RequestMultiplexEntryRejectionDescriptions", "h245.RequestMultiplexEntryRejectionDescriptions",
+      { "RequestMultiplexEntryRejectionDescriptions", "h245.RequestMultiplexEntryRejectionDescriptions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_req_mux_rej_cause,
@@ -18453,11 +18453,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_Req_mode_ack_response_vals), 0,
         "Req_mode_ack_response", HFILL }},
     { &hf_h245_willTransmitMostPreferredMode,
-      { "willTransmitMostPreferredMode", "h245.willTransmitMostPreferredMode",
+      { "willTransmitMostPreferredMode", "h245.willTransmitMostPreferredMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_willTransmitLessPreferredMode,
-      { "willTransmitLessPreferredMode", "h245.willTransmitLessPreferredMode",
+      { "willTransmitLessPreferredMode", "h245.willTransmitLessPreferredMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_req_rej_cause,
@@ -18465,19 +18465,19 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_RequestModeRejectCause_vals), 0,
         "RequestModeRejectCause", HFILL }},
     { &hf_h245_modeUnavailable,
-      { "modeUnavailable", "h245.modeUnavailable",
+      { "modeUnavailable", "h245.modeUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_multipointConstraint,
-      { "multipointConstraint", "h245.multipointConstraint",
+      { "multipointConstraint", "h245.multipointConstraint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_requestDenied,
-      { "requestDenied", "h245.requestDenied",
+      { "requestDenied", "h245.requestDenied_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_ModeDescription_item,
-      { "ModeElement", "h245.ModeElement",
+      { "ModeElement", "h245.ModeElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_videoMode,
@@ -18489,7 +18489,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_AudioMode_vals), 0,
         NULL, HFILL }},
     { &hf_h245_dataMode,
-      { "dataMode", "h245.dataMode",
+      { "dataMode", "h245.dataMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_encryptionMode,
@@ -18497,19 +18497,19 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_EncryptionMode_vals), 0,
         NULL, HFILL }},
     { &hf_h245_h235Mode,
-      { "h235Mode", "h245.h235Mode",
+      { "h235Mode", "h245.h235Mode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_multiplexedStreamMode,
-      { "multiplexedStreamMode", "h245.multiplexedStreamMode",
+      { "multiplexedStreamMode", "h245.multiplexedStreamMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MultiplexedStreamParameter", HFILL }},
     { &hf_h245_redundancyEncodingDTMode,
-      { "redundancyEncodingDTMode", "h245.redundancyEncodingDTMode",
+      { "redundancyEncodingDTMode", "h245.redundancyEncodingDTMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_multiplePayloadStreamMode,
-      { "multiplePayloadStreamMode", "h245.multiplePayloadStreamMode",
+      { "multiplePayloadStreamMode", "h245.multiplePayloadStreamMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_depFecMode,
@@ -18517,7 +18517,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_DepFECMode_vals), 0,
         NULL, HFILL }},
     { &hf_h245_fecMode,
-      { "fecMode", "h245.fecMode",
+      { "fecMode", "h245.fecMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_type,
@@ -18525,7 +18525,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_ModeElementType_vals), 0,
         "ModeElementType", HFILL }},
     { &hf_h245_h223ModeParameters,
-      { "h223ModeParameters", "h245.h223ModeParameters",
+      { "h223ModeParameters", "h245.h223ModeParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_v76ModeParameters,
@@ -18533,15 +18533,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_V76ModeParameters_vals), 0,
         NULL, HFILL }},
     { &hf_h245_h2250ModeParameters,
-      { "h2250ModeParameters", "h245.h2250ModeParameters",
+      { "h2250ModeParameters", "h245.h2250ModeParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_genericModeParameters,
-      { "genericModeParameters", "h245.genericModeParameters",
+      { "genericModeParameters", "h245.genericModeParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GenericCapability", HFILL }},
     { &hf_h245_multiplexedStreamModeParameters,
-      { "multiplexedStreamModeParameters", "h245.multiplexedStreamModeParameters",
+      { "multiplexedStreamModeParameters", "h245.multiplexedStreamModeParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_logicalChannelNumber,
@@ -18553,7 +18553,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_mediaMode_vals), 0,
         NULL, HFILL }},
     { &hf_h245_prmary_dtmode,
-      { "primary", "h245.primary",
+      { "primary", "h245.primary_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RedundancyEncodingDTModeElement", HFILL }},
     { &hf_h245_secondaryDTM,
@@ -18561,7 +18561,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_RedundancyEncodingDTModeElement", HFILL }},
     { &hf_h245_secondaryDTM_item,
-      { "RedundancyEncodingDTModeElement", "h245.RedundancyEncodingDTModeElement",
+      { "RedundancyEncodingDTModeElement", "h245.RedundancyEncodingDTModeElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_re_type,
@@ -18573,11 +18573,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_MultiplePayloadStreamElementMode", HFILL }},
     { &hf_h245_mpsmElements_item,
-      { "MultiplePayloadStreamElementMode", "h245.MultiplePayloadStreamElementMode",
+      { "MultiplePayloadStreamElementMode", "h245.MultiplePayloadStreamElementMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_rfc2733Mode,
-      { "rfc2733Mode", "h245.rfc2733Mode",
+      { "rfc2733Mode", "h245.rfc2733Mode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_fec_mode,
@@ -18593,35 +18593,35 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_AdaptationLayerType_vals), 0,
         NULL, HFILL }},
     { &hf_h245_al1Framed,
-      { "al1Framed", "h245.al1Framed",
+      { "al1Framed", "h245.al1Framed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_al1NotFramed,
-      { "al1NotFramed", "h245.al1NotFramed",
+      { "al1NotFramed", "h245.al1NotFramed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_al2WithoutSequenceNumbers,
-      { "al2WithoutSequenceNumbers", "h245.al2WithoutSequenceNumbers",
+      { "al2WithoutSequenceNumbers", "h245.al2WithoutSequenceNumbers_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_al2WithSequenceNumbers,
-      { "al2WithSequenceNumbers", "h245.al2WithSequenceNumbers",
+      { "al2WithSequenceNumbers", "h245.al2WithSequenceNumbers_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_al3,
-      { "al3", "h245.al3",
+      { "al3", "h245.al3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_al1M,
-      { "al1M", "h245.al1M",
+      { "al1M", "h245.al1M_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "H223AL1MParameters", HFILL }},
     { &hf_h245_al2M,
-      { "al2M", "h245.al2M",
+      { "al2M", "h245.al2M_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "H223AL2MParameters", HFILL }},
     { &hf_h245_al3M,
-      { "al3M", "h245.al3M",
+      { "al3M", "h245.al3M_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "H223AL3MParameters", HFILL }},
     { &hf_h245_segmentableFlag,
@@ -18629,7 +18629,7 @@ void proto_register_h245(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h245_redundancyEncodingMode,
-      { "redundancyEncodingMode", "h245.redundancyEncodingMode",
+      { "redundancyEncodingMode", "h245.redundancyEncodingMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_secondaryEncodingMode,
@@ -18637,23 +18637,23 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_secondaryEncodingMode_vals), 0,
         "T_secondaryEncodingMode", HFILL }},
     { &hf_h245_h261VideoMode,
-      { "h261VideoMode", "h245.h261VideoMode",
+      { "h261VideoMode", "h245.h261VideoMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_h262VideoMode,
-      { "h262VideoMode", "h245.h262VideoMode",
+      { "h262VideoMode", "h245.h262VideoMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_h263VideoMode,
-      { "h263VideoMode", "h245.h263VideoMode",
+      { "h263VideoMode", "h245.h263VideoMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_is11172VideoMode,
-      { "is11172VideoMode", "h245.is11172VideoMode",
+      { "is11172VideoMode", "h245.is11172VideoMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_genericVideoMode,
-      { "genericVideoMode", "h245.genericVideoMode",
+      { "genericVideoMode", "h245.genericVideoMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GenericCapability", HFILL }},
     { &hf_h245_h261_resolution,
@@ -18661,11 +18661,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_H261Resolution_vals), 0,
         "H261Resolution", HFILL }},
     { &hf_h245_qcif,
-      { "qcif", "h245.qcif",
+      { "qcif", "h245.qcif_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_cif,
-      { "cif", "h245.cif",
+      { "cif", "h245.cif_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_profileAndLevel,
@@ -18673,47 +18673,47 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_profileAndLevel_vals), 0,
         NULL, HFILL }},
     { &hf_h245_profileAndLevel_SPatMLMode,
-      { "profileAndLevel-SPatML", "h245.profileAndLevel_SPatML",
+      { "profileAndLevel-SPatML", "h245.profileAndLevel_SPatML_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_profileAndLevel_MPatLLMode,
-      { "profileAndLevel-MPatLL", "h245.profileAndLevel_MPatLL",
+      { "profileAndLevel-MPatLL", "h245.profileAndLevel_MPatLL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_profileAndLevel_MPatMLMode,
-      { "profileAndLevel-MPatML", "h245.profileAndLevel_MPatML",
+      { "profileAndLevel-MPatML", "h245.profileAndLevel_MPatML_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_profileAndLevel_MPatH_14Mode,
-      { "profileAndLevel-MPatH-14", "h245.profileAndLevel_MPatH_14",
+      { "profileAndLevel-MPatH-14", "h245.profileAndLevel_MPatH_14_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_profileAndLevel_MPatHLMode,
-      { "profileAndLevel-MPatHL", "h245.profileAndLevel_MPatHL",
+      { "profileAndLevel-MPatHL", "h245.profileAndLevel_MPatHL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_profileAndLevel_SNRatLLMode,
-      { "profileAndLevel-SNRatLL", "h245.profileAndLevel_SNRatLL",
+      { "profileAndLevel-SNRatLL", "h245.profileAndLevel_SNRatLL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_profileAndLevel_SNRatMLMode,
-      { "profileAndLevel-SNRatML", "h245.profileAndLevel_SNRatML",
+      { "profileAndLevel-SNRatML", "h245.profileAndLevel_SNRatML_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_profileAndLevel_SpatialatH_14Mode,
-      { "profileAndLevel-SpatialatH-14", "h245.profileAndLevel_SpatialatH_14",
+      { "profileAndLevel-SpatialatH-14", "h245.profileAndLevel_SpatialatH_14_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_profileAndLevel_HPatMLMode,
-      { "profileAndLevel-HPatML", "h245.profileAndLevel_HPatML",
+      { "profileAndLevel-HPatML", "h245.profileAndLevel_HPatML_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_profileAndLevel_HPatH_14Mode,
-      { "profileAndLevel-HPatH-14", "h245.profileAndLevel_HPatH_14",
+      { "profileAndLevel-HPatH-14", "h245.profileAndLevel_HPatH_14_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_profileAndLevel_HPatHLMode,
-      { "profileAndLevel-HPatHL", "h245.profileAndLevel_HPatHL",
+      { "profileAndLevel-HPatHL", "h245.profileAndLevel_HPatHL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_h263_resolution,
@@ -18721,59 +18721,59 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_H263Resolution_vals), 0,
         "H263Resolution", HFILL }},
     { &hf_h245_sqcif,
-      { "sqcif", "h245.sqcif",
+      { "sqcif", "h245.sqcif_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_cif4,
-      { "cif4", "h245.cif4",
+      { "cif4", "h245.cif4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_cif16,
-      { "cif16", "h245.cif16",
+      { "cif16", "h245.cif16_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_custom_res,
-      { "custom", "h245.custom",
+      { "custom", "h245.custom_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_g711Alaw64k_mode,
-      { "g711Alaw64k", "h245.g711Alaw64k",
+      { "g711Alaw64k", "h245.g711Alaw64k_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_g711Alaw56k_mode,
-      { "g711Alaw56k", "h245.g711Alaw56k",
+      { "g711Alaw56k", "h245.g711Alaw56k_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_g711Ulaw64k_mode,
-      { "g711Ulaw64k", "h245.g711Ulaw64k",
+      { "g711Ulaw64k", "h245.g711Ulaw64k_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_g711Ulaw56k_mode,
-      { "g711Ulaw56k", "h245.g711Ulaw56k",
+      { "g711Ulaw56k", "h245.g711Ulaw56k_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_g722_64k_mode,
-      { "g722-64k", "h245.g722_64k",
+      { "g722-64k", "h245.g722_64k_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_g722_56k_mode,
-      { "g722-56k", "h245.g722_56k",
+      { "g722-56k", "h245.g722_56k_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_g722_48k_mode,
-      { "g722-48k", "h245.g722_48k",
+      { "g722-48k", "h245.g722_48k_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_g728_mode,
-      { "g728", "h245.g728",
+      { "g728", "h245.g728_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_g729_mode,
-      { "g729", "h245.g729",
+      { "g729", "h245.g729_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_g729AnnexA_mode,
-      { "g729AnnexA", "h245.g729AnnexA",
+      { "g729AnnexA", "h245.g729AnnexA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_g7231_mode,
@@ -18781,39 +18781,39 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_Mode_g7231_vals), 0,
         "Mode_g7231", HFILL }},
     { &hf_h245_noSilenceSuppressionLowRate,
-      { "noSilenceSuppressionLowRate", "h245.noSilenceSuppressionLowRate",
+      { "noSilenceSuppressionLowRate", "h245.noSilenceSuppressionLowRate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_noSilenceSuppressionHighRate,
-      { "noSilenceSuppressionHighRate", "h245.noSilenceSuppressionHighRate",
+      { "noSilenceSuppressionHighRate", "h245.noSilenceSuppressionHighRate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_silenceSuppressionLowRate,
-      { "silenceSuppressionLowRate", "h245.silenceSuppressionLowRate",
+      { "silenceSuppressionLowRate", "h245.silenceSuppressionLowRate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_silenceSuppressionHighRate,
-      { "silenceSuppressionHighRate", "h245.silenceSuppressionHighRate",
+      { "silenceSuppressionHighRate", "h245.silenceSuppressionHighRate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_is11172AudioMode,
-      { "is11172AudioMode", "h245.is11172AudioMode",
+      { "is11172AudioMode", "h245.is11172AudioMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_is13818AudioMode,
-      { "is13818AudioMode", "h245.is13818AudioMode",
+      { "is13818AudioMode", "h245.is13818AudioMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_g7231AnnexCMode,
-      { "g7231AnnexCMode", "h245.g7231AnnexCMode",
+      { "g7231AnnexCMode", "h245.g7231AnnexCMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_genericAudioMode,
-      { "genericAudioMode", "h245.genericAudioMode",
+      { "genericAudioMode", "h245.genericAudioMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GenericCapability", HFILL }},
     { &hf_h245_vbd_mode,
-      { "vbd", "h245.vbd",
+      { "vbd", "h245.vbd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "VBDMode", HFILL }},
     { &hf_h245_audioLayer,
@@ -18821,15 +18821,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_audioLayer_vals), 0,
         NULL, HFILL }},
     { &hf_h245_audioLayer1Mode,
-      { "audioLayer1", "h245.audioLayer1",
+      { "audioLayer1", "h245.audioLayer1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_audioLayer2Mode,
-      { "audioLayer2", "h245.audioLayer2",
+      { "audioLayer2", "h245.audioLayer2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_audioLayer3Mode,
-      { "audioLayer3", "h245.audioLayer3",
+      { "audioLayer3", "h245.audioLayer3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_audioSampling,
@@ -18837,15 +18837,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_audioSampling_vals), 0,
         NULL, HFILL }},
     { &hf_h245_audioSampling32kMode,
-      { "audioSampling32k", "h245.audioSampling32k",
+      { "audioSampling32k", "h245.audioSampling32k_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_audioSampling44k1Mode,
-      { "audioSampling44k1", "h245.audioSampling44k1",
+      { "audioSampling44k1", "h245.audioSampling44k1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_audioSampling48kMode,
-      { "audioSampling48k", "h245.audioSampling48k",
+      { "audioSampling48k", "h245.audioSampling48k_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_is11172multichannelType,
@@ -18853,15 +18853,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_IS11172_multichannelType_vals), 0,
         "IS11172_multichannelType", HFILL }},
     { &hf_h245_singleChannelMode,
-      { "singleChannel", "h245.singleChannel",
+      { "singleChannel", "h245.singleChannel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_twoChannelStereo,
-      { "twoChannelStereo", "h245.twoChannelStereo",
+      { "twoChannelStereo", "h245.twoChannelStereo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_twoChannelDual,
-      { "twoChannelDual", "h245.twoChannelDual",
+      { "twoChannelDual", "h245.twoChannelDual_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_audioLayerMode,
@@ -18873,15 +18873,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_IS13818AudioSampling_vals), 0,
         "IS13818AudioSampling", HFILL }},
     { &hf_h245_audioSampling16kMode,
-      { "audioSampling16k", "h245.audioSampling16k",
+      { "audioSampling16k", "h245.audioSampling16k_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_audioSampling22k05Mode,
-      { "audioSampling22k05", "h245.audioSampling22k05",
+      { "audioSampling22k05", "h245.audioSampling22k05_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_audioSampling24kMode,
-      { "audioSampling24k", "h245.audioSampling24k",
+      { "audioSampling24k", "h245.audioSampling24k_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_is13818MultichannelType,
@@ -18889,31 +18889,31 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_IS13818MultichannelType_vals), 0,
         "IS13818MultichannelType", HFILL }},
     { &hf_h245_threeChannels2_1Mode,
-      { "threeChannels2-1", "h245.threeChannels2_1",
+      { "threeChannels2-1", "h245.threeChannels2_1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_threeChannels3_0Mode,
-      { "threeChannels3-0", "h245.threeChannels3_0",
+      { "threeChannels3-0", "h245.threeChannels3_0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_fourChannels2_0_2_0Mode,
-      { "fourChannels2-0-2-0", "h245.fourChannels2_0_2_0",
+      { "fourChannels2-0-2-0", "h245.fourChannels2_0_2_0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_fourChannels2_2Mode,
-      { "fourChannels2-2", "h245.fourChannels2_2",
+      { "fourChannels2-2", "h245.fourChannels2_2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_fourChannels3_1Mode,
-      { "fourChannels3-1", "h245.fourChannels3_1",
+      { "fourChannels3-1", "h245.fourChannels3_1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_fiveChannels3_0_2_0Mode,
-      { "fiveChannels3-0-2-0", "h245.fiveChannels3_0_2_0",
+      { "fiveChannels3-0-2-0", "h245.fiveChannels3_0_2_0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_fiveChannels3_2Mode,
-      { "fiveChannels3-2", "h245.fiveChannels3_2",
+      { "fiveChannels3-2", "h245.fiveChannels3_2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_vbd_type,
@@ -18929,11 +18929,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(DataProtocolCapability_vals), 0,
         "DataProtocolCapability", HFILL }},
     { &hf_h245_t38faxDataProtocolCapability,
-      { "t38fax", "h245.t38fax",
+      { "t38fax", "h245.t38fax_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T38faxApp", HFILL }},
     { &hf_h245_genericDataMode,
-      { "genericDataMode", "h245.genericDataMode",
+      { "genericDataMode", "h245.genericDataMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GenericCapability", HFILL }},
     { &hf_h245_bitRate_0_4294967295,
@@ -18941,7 +18941,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_4294967295", HFILL }},
     { &hf_h245_h233Encryption,
-      { "h233Encryption", "h245.h233Encryption",
+      { "h233Encryption", "h245.h233Encryption_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_mlr_type,
@@ -18949,7 +18949,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_Mlr_type_vals), 0,
         "Mlr_type", HFILL }},
     { &hf_h245_systemLoop,
-      { "systemLoop", "h245.systemLoop",
+      { "systemLoop", "h245.systemLoop_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_mediaLoop,
@@ -18973,7 +18973,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_MaintenanceLoopRejectCause_vals), 0,
         "MaintenanceLoopRejectCause", HFILL }},
     { &hf_h245_canNotPerformLoop,
-      { "canNotPerformLoop", "h245.canNotPerformLoop",
+      { "canNotPerformLoop", "h245.canNotPerformLoop_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_communicationModeTable,
@@ -18981,11 +18981,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_256_OF_CommunicationModeTableEntry", HFILL }},
     { &hf_h245_communicationModeTable_item,
-      { "CommunicationModeTableEntry", "h245.CommunicationModeTableEntry",
+      { "CommunicationModeTableEntry", "h245.CommunicationModeTableEntry_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_terminalLabel,
-      { "terminalLabel", "h245.terminalLabel",
+      { "terminalLabel", "h245.terminalLabel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_sessionDescription,
@@ -19009,47 +19009,47 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_255", HFILL }},
     { &hf_h245_terminalListRequest,
-      { "terminalListRequest", "h245.terminalListRequest",
+      { "terminalListRequest", "h245.terminalListRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_makeMeChair,
-      { "makeMeChair", "h245.makeMeChair",
+      { "makeMeChair", "h245.makeMeChair_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_cancelMakeMeChair,
-      { "cancelMakeMeChair", "h245.cancelMakeMeChair",
+      { "cancelMakeMeChair", "h245.cancelMakeMeChair_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_dropTerminal,
-      { "dropTerminal", "h245.dropTerminal",
+      { "dropTerminal", "h245.dropTerminal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminalLabel", HFILL }},
     { &hf_h245_requestTerminalID,
-      { "requestTerminalID", "h245.requestTerminalID",
+      { "requestTerminalID", "h245.requestTerminalID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminalLabel", HFILL }},
     { &hf_h245_enterH243Password,
-      { "enterH243Password", "h245.enterH243Password",
+      { "enterH243Password", "h245.enterH243Password_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_enterH243TerminalID,
-      { "enterH243TerminalID", "h245.enterH243TerminalID",
+      { "enterH243TerminalID", "h245.enterH243TerminalID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_enterH243ConferenceID,
-      { "enterH243ConferenceID", "h245.enterH243ConferenceID",
+      { "enterH243ConferenceID", "h245.enterH243ConferenceID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_enterExtensionAddress,
-      { "enterExtensionAddress", "h245.enterExtensionAddress",
+      { "enterExtensionAddress", "h245.enterExtensionAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_requestChairTokenOwner,
-      { "requestChairTokenOwner", "h245.requestChairTokenOwner",
+      { "requestChairTokenOwner", "h245.requestChairTokenOwner_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_requestTerminalCertificate,
-      { "requestTerminalCertificate", "h245.requestTerminalCertificate",
+      { "requestTerminalCertificate", "h245.requestTerminalCertificate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_certSelectionCriteria,
@@ -19065,15 +19065,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "LogicalChannelNumber", HFILL }},
     { &hf_h245_makeTerminalBroadcaster,
-      { "makeTerminalBroadcaster", "h245.makeTerminalBroadcaster",
+      { "makeTerminalBroadcaster", "h245.makeTerminalBroadcaster_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminalLabel", HFILL }},
     { &hf_h245_sendThisSource,
-      { "sendThisSource", "h245.sendThisSource",
+      { "sendThisSource", "h245.sendThisSource_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminalLabel", HFILL }},
     { &hf_h245_requestAllTerminalIDs,
-      { "requestAllTerminalIDs", "h245.requestAllTerminalIDs",
+      { "requestAllTerminalIDs", "h245.requestAllTerminalIDs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_remoteMCRequest,
@@ -19081,7 +19081,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_RemoteMCRequest_vals), 0,
         NULL, HFILL }},
     { &hf_h245_CertSelectionCriteria_item,
-      { "Criteria", "h245.Criteria",
+      { "Criteria", "h245.Criteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_field,
@@ -19101,7 +19101,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_mCTerminalIDResponse,
-      { "mCTerminalIDResponse", "h245.mCTerminalIDResponse",
+      { "mCTerminalIDResponse", "h245.mCTerminalIDResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_terminalID,
@@ -19109,11 +19109,11 @@ void proto_register_h245(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_terminalIDResponse,
-      { "terminalIDResponse", "h245.terminalIDResponse",
+      { "terminalIDResponse", "h245.terminalIDResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_conferenceIDResponse,
-      { "conferenceIDResponse", "h245.conferenceIDResponse",
+      { "conferenceIDResponse", "h245.conferenceIDResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_conferenceID,
@@ -19121,7 +19121,7 @@ void proto_register_h245(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_passwordResponse,
-      { "passwordResponse", "h245.passwordResponse",
+      { "passwordResponse", "h245.passwordResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_password,
@@ -19133,15 +19133,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_256_OF_TerminalLabel", HFILL }},
     { &hf_h245_terminalListResponse_item,
-      { "TerminalLabel", "h245.TerminalLabel",
+      { "TerminalLabel", "h245.TerminalLabel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_videoCommandReject,
-      { "videoCommandReject", "h245.videoCommandReject",
+      { "videoCommandReject", "h245.videoCommandReject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_terminalDropReject,
-      { "terminalDropReject", "h245.terminalDropReject",
+      { "terminalDropReject", "h245.terminalDropReject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_makeMeChairResponse,
@@ -19149,15 +19149,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_makeMeChairResponse_vals), 0,
         NULL, HFILL }},
     { &hf_h245_grantedChairToken,
-      { "grantedChairToken", "h245.grantedChairToken",
+      { "grantedChairToken", "h245.grantedChairToken_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_deniedChairToken,
-      { "deniedChairToken", "h245.deniedChairToken",
+      { "deniedChairToken", "h245.deniedChairToken_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_extensionAddressResponse,
-      { "extensionAddressResponse", "h245.extensionAddressResponse",
+      { "extensionAddressResponse", "h245.extensionAddressResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_extensionAddress,
@@ -19165,11 +19165,11 @@ void proto_register_h245(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "TerminalID", HFILL }},
     { &hf_h245_chairTokenOwnerResponse,
-      { "chairTokenOwnerResponse", "h245.chairTokenOwnerResponse",
+      { "chairTokenOwnerResponse", "h245.chairTokenOwnerResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_terminalCertificateResponse,
-      { "terminalCertificateResponse", "h245.terminalCertificateResponse",
+      { "terminalCertificateResponse", "h245.terminalCertificateResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_certificateResponse,
@@ -19181,11 +19181,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_broadcastMyLogicalChannelResponse_vals), 0,
         NULL, HFILL }},
     { &hf_h245_grantedBroadcastMyLogicalChannel,
-      { "grantedBroadcastMyLogicalChannel", "h245.grantedBroadcastMyLogicalChannel",
+      { "grantedBroadcastMyLogicalChannel", "h245.grantedBroadcastMyLogicalChannel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_deniedBroadcastMyLogicalChannel,
-      { "deniedBroadcastMyLogicalChannel", "h245.deniedBroadcastMyLogicalChannel",
+      { "deniedBroadcastMyLogicalChannel", "h245.deniedBroadcastMyLogicalChannel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_makeTerminalBroadcasterResponse,
@@ -19193,11 +19193,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_makeTerminalBroadcasterResponse_vals), 0,
         NULL, HFILL }},
     { &hf_h245_grantedMakeTerminalBroadcaster,
-      { "grantedMakeTerminalBroadcaster", "h245.grantedMakeTerminalBroadcaster",
+      { "grantedMakeTerminalBroadcaster", "h245.grantedMakeTerminalBroadcaster_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_deniedMakeTerminalBroadcaster,
-      { "deniedMakeTerminalBroadcaster", "h245.deniedMakeTerminalBroadcaster",
+      { "deniedMakeTerminalBroadcaster", "h245.deniedMakeTerminalBroadcaster_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_sendThisSourceResponse,
@@ -19205,15 +19205,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_sendThisSourceResponse_vals), 0,
         NULL, HFILL }},
     { &hf_h245_grantedSendThisSource,
-      { "grantedSendThisSource", "h245.grantedSendThisSource",
+      { "grantedSendThisSource", "h245.grantedSendThisSource_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_deniedSendThisSource,
-      { "deniedSendThisSource", "h245.deniedSendThisSource",
+      { "deniedSendThisSource", "h245.deniedSendThisSource_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_requestAllTerminalIDsResponse,
-      { "requestAllTerminalIDsResponse", "h245.requestAllTerminalIDsResponse",
+      { "requestAllTerminalIDsResponse", "h245.requestAllTerminalIDsResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_remoteMCResponse,
@@ -19225,23 +19225,23 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_TerminalInformation", HFILL }},
     { &hf_h245_terminalInformation_item,
-      { "TerminalInformation", "h245.TerminalInformation",
+      { "TerminalInformation", "h245.TerminalInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_masterActivate,
-      { "masterActivate", "h245.masterActivate",
+      { "masterActivate", "h245.masterActivate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_slaveActivate,
-      { "slaveActivate", "h245.slaveActivate",
+      { "slaveActivate", "h245.slaveActivate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_deActivate,
-      { "deActivate", "h245.deActivate",
+      { "deActivate", "h245.deActivate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_accept,
-      { "accept", "h245.accept",
+      { "accept", "h245.accept_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_reject,
@@ -19249,11 +19249,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_reject_vals), 0,
         NULL, HFILL }},
     { &hf_h245_functionNotSupportedFlag,
-      { "functionNotSupported", "h245.functionNotSupported",
+      { "functionNotSupported", "h245.functionNotSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_callInformationReq,
-      { "callInformation", "h245.callInformation",
+      { "callInformation", "h245.callInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CallInformationReq", HFILL }},
     { &hf_h245_maxNumberOfAdditionalConnections,
@@ -19261,7 +19261,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_65535", HFILL }},
     { &hf_h245_addConnectionReq,
-      { "addConnection", "h245.addConnection",
+      { "addConnection", "h245.addConnection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AddConnectionReq", HFILL }},
     { &hf_h245_dialingInformation,
@@ -19269,15 +19269,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_DialingInformation_vals), 0,
         NULL, HFILL }},
     { &hf_h245_removeConnectionReq,
-      { "removeConnection", "h245.removeConnection",
+      { "removeConnection", "h245.removeConnection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RemoveConnectionReq", HFILL }},
     { &hf_h245_connectionIdentifier,
-      { "connectionIdentifier", "h245.connectionIdentifier",
+      { "connectionIdentifier", "h245.connectionIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_maximumHeaderIntervalReq,
-      { "maximumHeaderInterval", "h245.maximumHeaderInterval",
+      { "maximumHeaderInterval", "h245.maximumHeaderInterval_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MaximumHeaderIntervalReq", HFILL }},
     { &hf_h245_requestType,
@@ -19285,7 +19285,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_requestType_vals), 0,
         NULL, HFILL }},
     { &hf_h245_currentIntervalInformation,
-      { "currentIntervalInformation", "h245.currentIntervalInformation",
+      { "currentIntervalInformation", "h245.currentIntervalInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_requestedInterval,
@@ -19293,7 +19293,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_65535", HFILL }},
     { &hf_h245_callInformationResp,
-      { "callInformation", "h245.callInformation",
+      { "callInformation", "h245.callInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CallInformationResp", HFILL }},
     { &hf_h245_callAssociationNumber,
@@ -19301,7 +19301,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_4294967295", HFILL }},
     { &hf_h245_addConnectionResp,
-      { "addConnection", "h245.addConnection",
+      { "addConnection", "h245.addConnection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AddConnectionResp", HFILL }},
     { &hf_h245_responseCode,
@@ -19309,7 +19309,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_responseCode_vals), 0,
         NULL, HFILL }},
     { &hf_h245_accepted,
-      { "accepted", "h245.accepted",
+      { "accepted", "h245.accepted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_rejected,
@@ -19317,19 +19317,19 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_rejected_vals), 0,
         NULL, HFILL }},
     { &hf_h245_connectionsNotAvailable,
-      { "connectionsNotAvailable", "h245.connectionsNotAvailable",
+      { "connectionsNotAvailable", "h245.connectionsNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_userRejected,
-      { "userRejected", "h245.userRejected",
+      { "userRejected", "h245.userRejected_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_removeConnectionResp,
-      { "removeConnection", "h245.removeConnection",
+      { "removeConnection", "h245.removeConnection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RemoveConnectionResp", HFILL }},
     { &hf_h245_maximumHeaderIntervalResp,
-      { "maximumHeaderInterval", "h245.maximumHeaderInterval",
+      { "maximumHeaderInterval", "h245.maximumHeaderInterval_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MaximumHeaderIntervalResp", HFILL }},
     { &hf_h245_currentInterval,
@@ -19337,11 +19337,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_65535", HFILL }},
     { &hf_h245_crcDesired,
-      { "crcDesired", "h245.crcDesired",
+      { "crcDesired", "h245.crcDesired_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_excessiveError,
-      { "excessiveError", "h245.excessiveError",
+      { "excessiveError", "h245.excessiveError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_differential,
@@ -19349,7 +19349,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_65535_OF_DialingInformationNumber", HFILL }},
     { &hf_h245_differential_item,
-      { "DialingInformationNumber", "h245.DialingInformationNumber",
+      { "DialingInformationNumber", "h245.DialingInformationNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_infoNotAvailable,
@@ -19373,15 +19373,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_DialingInformationNetworkType_vals), 0,
         NULL, HFILL }},
     { &hf_h245_n_isdn,
-      { "n-isdn", "h245.n_isdn",
+      { "n-isdn", "h245.n_isdn_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_gstn,
-      { "gstn", "h245.gstn",
+      { "gstn", "h245.gstn_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_mobile,
-      { "mobile", "h245.mobile",
+      { "mobile", "h245.mobile_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_channelTag,
@@ -19405,15 +19405,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MaximumBitRate", HFILL }},
     { &hf_h245_undefinedReason,
-      { "undefinedReason", "h245.undefinedReason",
+      { "undefinedReason", "h245.undefinedReason_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_insufficientResources,
-      { "insufficientResources", "h245.insufficientResources",
+      { "insufficientResources", "h245.insufficientResources_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_specificRequest,
-      { "specificRequest", "h245.specificRequest",
+      { "specificRequest", "h245.specificRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_multiplexCapabilityBool,
@@ -19437,7 +19437,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_genericRequestFlag,
-      { "genericRequest", "h245.genericRequest",
+      { "genericRequest", "h245.genericRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_encryptionSE,
@@ -19445,11 +19445,11 @@ void proto_register_h245(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_h245_encryptionIVRequest,
-      { "encryptionIVRequest", "h245.encryptionIVRequest",
+      { "encryptionIVRequest", "h245.encryptionIVRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_encryptionAlgorithmID,
-      { "encryptionAlgorithmID", "h245.encryptionAlgorithmID",
+      { "encryptionAlgorithmID", "h245.encryptionAlgorithmID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_h233AlgorithmIdentifier,
@@ -19457,11 +19457,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SequenceNumber", HFILL }},
     { &hf_h245_associatedAlgorithm,
-      { "associatedAlgorithm", "h245.associatedAlgorithm",
+      { "associatedAlgorithm", "h245.associatedAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_h245_wholeMultiplex,
-      { "wholeMultiplex", "h245.wholeMultiplex",
+      { "wholeMultiplex", "h245.wholeMultiplex_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_scope,
@@ -19473,7 +19473,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_16777215", HFILL }},
     { &hf_h245_noRestriction,
-      { "noRestriction", "h245.noRestriction",
+      { "noRestriction", "h245.noRestriction_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_restriction,
@@ -19481,7 +19481,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_Restriction_vals), 0,
         NULL, HFILL }},
     { &hf_h245_disconnect,
-      { "disconnect", "h245.disconnect",
+      { "disconnect", "h245.disconnect_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_gstnOptions,
@@ -19489,23 +19489,23 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_gstnOptions_vals), 0,
         NULL, HFILL }},
     { &hf_h245_telephonyMode,
-      { "telephonyMode", "h245.telephonyMode",
+      { "telephonyMode", "h245.telephonyMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_v8bis,
-      { "v8bis", "h245.v8bis",
+      { "v8bis", "h245.v8bis_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_v34DSVD,
-      { "v34DSVD", "h245.v34DSVD",
+      { "v34DSVD", "h245.v34DSVD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_v34DuplexFAX,
-      { "v34DuplexFAX", "h245.v34DuplexFAX",
+      { "v34DuplexFAX", "h245.v34DuplexFAX_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_v34H324,
-      { "v34H324", "h245.v34H324",
+      { "v34H324", "h245.v34H324_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_isdnOptions,
@@ -19513,11 +19513,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_isdnOptions_vals), 0,
         NULL, HFILL }},
     { &hf_h245_v140,
-      { "v140", "h245.v140",
+      { "v140", "h245.v140_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_terminalOnHold,
-      { "terminalOnHold", "h245.terminalOnHold",
+      { "terminalOnHold", "h245.terminalOnHold_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_cancelBroadcastMyLogicalChannel,
@@ -19525,19 +19525,19 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "LogicalChannelNumber", HFILL }},
     { &hf_h245_cancelMakeTerminalBroadcaster,
-      { "cancelMakeTerminalBroadcaster", "h245.cancelMakeTerminalBroadcaster",
+      { "cancelMakeTerminalBroadcaster", "h245.cancelMakeTerminalBroadcaster_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_cancelSendThisSource,
-      { "cancelSendThisSource", "h245.cancelSendThisSource",
+      { "cancelSendThisSource", "h245.cancelSendThisSource_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_dropConference,
-      { "dropConference", "h245.dropConference",
+      { "dropConference", "h245.dropConference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_substituteConferenceIDCommand,
-      { "substituteConferenceIDCommand", "h245.substituteConferenceIDCommand",
+      { "substituteConferenceIDCommand", "h245.substituteConferenceIDCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_conferenceIdentifier,
@@ -19545,11 +19545,11 @@ void proto_register_h245(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_16", HFILL }},
     { &hf_h245_masterToSlave,
-      { "masterToSlave", "h245.masterToSlave",
+      { "masterToSlave", "h245.masterToSlave_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_slaveToMaster,
-      { "slaveToMaster", "h245.slaveToMaster",
+      { "slaveToMaster", "h245.slaveToMaster_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_mc_type,
@@ -19557,31 +19557,31 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_Mc_type_vals), 0,
         "Mc_type", HFILL }},
     { &hf_h245_equaliseDelay,
-      { "equaliseDelay", "h245.equaliseDelay",
+      { "equaliseDelay", "h245.equaliseDelay_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_zeroDelay,
-      { "zeroDelay", "h245.zeroDelay",
+      { "zeroDelay", "h245.zeroDelay_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_multipointModeCommand,
-      { "multipointModeCommand", "h245.multipointModeCommand",
+      { "multipointModeCommand", "h245.multipointModeCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_cancelMultipointModeCommand,
-      { "cancelMultipointModeCommand", "h245.cancelMultipointModeCommand",
+      { "cancelMultipointModeCommand", "h245.cancelMultipointModeCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_videoFreezePicture,
-      { "videoFreezePicture", "h245.videoFreezePicture",
+      { "videoFreezePicture", "h245.videoFreezePicture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_videoFastUpdatePicture,
-      { "videoFastUpdatePicture", "h245.videoFastUpdatePicture",
+      { "videoFastUpdatePicture", "h245.videoFastUpdatePicture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_videoFastUpdateGOB,
-      { "videoFastUpdateGOB", "h245.videoFastUpdateGOB",
+      { "videoFastUpdateGOB", "h245.videoFastUpdateGOB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_firstGOB,
@@ -19597,15 +19597,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_31", HFILL }},
     { &hf_h245_videoSendSyncEveryGOB,
-      { "videoSendSyncEveryGOB", "h245.videoSendSyncEveryGOB",
+      { "videoSendSyncEveryGOB", "h245.videoSendSyncEveryGOB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_videoSendSyncEveryGOBCancel,
-      { "videoSendSyncEveryGOBCancel", "h245.videoSendSyncEveryGOBCancel",
+      { "videoSendSyncEveryGOBCancel", "h245.videoSendSyncEveryGOBCancel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_videoFastUpdateMB,
-      { "videoFastUpdateMB", "h245.videoFastUpdateMB",
+      { "videoFastUpdateMB", "h245.videoFastUpdateMB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_firstGOB_0_255,
@@ -19625,23 +19625,23 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_65535", HFILL }},
     { &hf_h245_encryptionUpdate,
-      { "encryptionUpdate", "h245.encryptionUpdate",
+      { "encryptionUpdate", "h245.encryptionUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EncryptionSync", HFILL }},
     { &hf_h245_encryptionUpdateRequest,
-      { "encryptionUpdateRequest", "h245.encryptionUpdateRequest",
+      { "encryptionUpdateRequest", "h245.encryptionUpdateRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_switchReceiveMediaOff,
-      { "switchReceiveMediaOff", "h245.switchReceiveMediaOff",
+      { "switchReceiveMediaOff", "h245.switchReceiveMediaOff_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_switchReceiveMediaOn,
-      { "switchReceiveMediaOn", "h245.switchReceiveMediaOn",
+      { "switchReceiveMediaOn", "h245.switchReceiveMediaOn_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_progressiveRefinementStart,
-      { "progressiveRefinementStart", "h245.progressiveRefinementStart",
+      { "progressiveRefinementStart", "h245.progressiveRefinementStart_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_repeatCount,
@@ -19649,31 +19649,31 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_repeatCount_vals), 0,
         NULL, HFILL }},
     { &hf_h245_doOneProgression,
-      { "doOneProgression", "h245.doOneProgression",
+      { "doOneProgression", "h245.doOneProgression_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_doContinuousProgressions,
-      { "doContinuousProgressions", "h245.doContinuousProgressions",
+      { "doContinuousProgressions", "h245.doContinuousProgressions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_doOneIndependentProgression,
-      { "doOneIndependentProgression", "h245.doOneIndependentProgression",
+      { "doOneIndependentProgression", "h245.doOneIndependentProgression_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_doContinuousIndependentProgressions,
-      { "doContinuousIndependentProgressions", "h245.doContinuousIndependentProgressions",
+      { "doContinuousIndependentProgressions", "h245.doContinuousIndependentProgressions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_progressiveRefinementAbortOne,
-      { "progressiveRefinementAbortOne", "h245.progressiveRefinementAbortOne",
+      { "progressiveRefinementAbortOne", "h245.progressiveRefinementAbortOne_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_progressiveRefinementAbortContinuous,
-      { "progressiveRefinementAbortContinuous", "h245.progressiveRefinementAbortContinuous",
+      { "progressiveRefinementAbortContinuous", "h245.progressiveRefinementAbortContinuous_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_videoBadMBs,
-      { "videoBadMBs", "h245.videoBadMBs",
+      { "videoBadMBs", "h245.videoBadMBs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_firstMB,
@@ -19697,7 +19697,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_PictureReference_vals), 0,
         NULL, HFILL }},
     { &hf_h245_lostPartialPicture,
-      { "lostPartialPicture", "h245.lostPartialPicture",
+      { "lostPartialPicture", "h245.lostPartialPicture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_pictureReference,
@@ -19713,11 +19713,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_PictureReference_vals), 0,
         NULL, HFILL }},
     { &hf_h245_encryptionUpdateCommand,
-      { "encryptionUpdateCommand", "h245.encryptionUpdateCommand",
+      { "encryptionUpdateCommand", "h245.encryptionUpdateCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_encryptionUpdateAck,
-      { "encryptionUpdateAck", "h245.encryptionUpdateAck",
+      { "encryptionUpdateAck", "h245.encryptionUpdateAck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_direction,
@@ -19737,7 +19737,7 @@ void proto_register_h245(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h245_keyProtectionMethod,
-      { "keyProtectionMethod", "h245.keyProtectionMethod",
+      { "keyProtectionMethod", "h245.keyProtectionMethod_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_pictureNumber,
@@ -19753,19 +19753,19 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_h223ModeChange_vals), 0,
         NULL, HFILL }},
     { &hf_h245_toLevel0,
-      { "toLevel0", "h245.toLevel0",
+      { "toLevel0", "h245.toLevel0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_toLevel1,
-      { "toLevel1", "h245.toLevel1",
+      { "toLevel1", "h245.toLevel1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_toLevel2,
-      { "toLevel2", "h245.toLevel2",
+      { "toLevel2", "h245.toLevel2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_toLevel2withOptionalHeader,
-      { "toLevel2withOptionalHeader", "h245.toLevel2withOptionalHeader",
+      { "toLevel2withOptionalHeader", "h245.toLevel2withOptionalHeader_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_h223AnnexADoubleFlag,
@@ -19773,11 +19773,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_h223AnnexADoubleFlag_vals), 0,
         NULL, HFILL }},
     { &hf_h245_start,
-      { "start", "h245.start",
+      { "start", "h245.start_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_stop,
-      { "stop", "h245.stop",
+      { "stop", "h245.stop_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_bitRate,
@@ -19797,7 +19797,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_Cmd_aal_vals), 0,
         "Cmd_aal", HFILL }},
     { &hf_h245_cmd_aal1,
-      { "aal1", "h245.aal1",
+      { "aal1", "h245.aal1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Cmd_aal1", HFILL }},
     { &hf_h245_cmd_clockRecovery,
@@ -19805,15 +19805,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_Cmd_clockRecovery_vals), 0,
         "Cmd_clockRecovery", HFILL }},
     { &hf_h245_nullClockRecoveryflag,
-      { "nullClockRecovery", "h245.nullClockRecovery",
+      { "nullClockRecovery", "h245.nullClockRecovery_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_srtsClockRecovery,
-      { "srtsClockRecovery", "h245.srtsClockRecovery",
+      { "srtsClockRecovery", "h245.srtsClockRecovery_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_adaptiveClockRecoveryFlag,
-      { "adaptiveClockRecovery", "h245.adaptiveClockRecovery",
+      { "adaptiveClockRecovery", "h245.adaptiveClockRecovery_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_cmd_errorCorrection,
@@ -19821,23 +19821,23 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_Cmd_errorCorrection_vals), 0,
         "Cmd_errorCorrection", HFILL }},
     { &hf_h245_nullErrorCorrectionFlag,
-      { "nullErrorCorrection", "h245.nullErrorCorrection",
+      { "nullErrorCorrection", "h245.nullErrorCorrection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_longInterleaverFlag,
-      { "longInterleaver", "h245.longInterleaver",
+      { "longInterleaver", "h245.longInterleaver_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_shortInterleaverFlag,
-      { "shortInterleaver", "h245.shortInterleaver",
+      { "shortInterleaver", "h245.shortInterleaver_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_errorCorrectionOnlyFlag,
-      { "errorCorrectionOnly", "h245.errorCorrectionOnly",
+      { "errorCorrectionOnly", "h245.errorCorrectionOnly_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_cmd_aal5,
-      { "aal5", "h245.aal5",
+      { "aal5", "h245.aal5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Cmd_aal5", HFILL }},
     { &hf_h245_cmd_multiplex,
@@ -19845,19 +19845,19 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_Cmd_multiplex_vals), 0,
         "Cmd_multiplex", HFILL }},
     { &hf_h245_noMultiplex,
-      { "noMultiplex", "h245.noMultiplex",
+      { "noMultiplex", "h245.noMultiplex_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_transportStream,
-      { "transportStream", "h245.transportStream",
+      { "transportStream", "h245.transportStream_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_programStreamFlag,
-      { "programStream", "h245.programStream",
+      { "programStream", "h245.programStream_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_cmd_reverseParameters,
-      { "reverseParameters", "h245.reverseParameters",
+      { "reverseParameters", "h245.reverseParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Cmd_reverseParameters", HFILL }},
     { &hf_h245_cmdr_multiplex,
@@ -19877,11 +19877,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_status_vals), 0,
         NULL, HFILL }},
     { &hf_h245_synchronized,
-      { "synchronized", "h245.synchronized",
+      { "synchronized", "h245.synchronized_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_reconfiguration,
-      { "reconfiguration", "h245.reconfiguration",
+      { "reconfiguration", "h245.reconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_fns_cause,
@@ -19889,15 +19889,15 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_FunctionNotSupportedCause_vals), 0,
         "FunctionNotSupportedCause", HFILL }},
     { &hf_h245_syntaxError,
-      { "syntaxError", "h245.syntaxError",
+      { "syntaxError", "h245.syntaxError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_semanticError,
-      { "semanticError", "h245.semanticError",
+      { "semanticError", "h245.semanticError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_unknownFunction,
-      { "unknownFunction", "h245.unknownFunction",
+      { "unknownFunction", "h245.unknownFunction_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_returnedFunction,
@@ -19909,63 +19909,63 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_9", HFILL }},
     { &hf_h245_terminalNumberAssign,
-      { "terminalNumberAssign", "h245.terminalNumberAssign",
+      { "terminalNumberAssign", "h245.terminalNumberAssign_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminalLabel", HFILL }},
     { &hf_h245_terminalJoinedConference,
-      { "terminalJoinedConference", "h245.terminalJoinedConference",
+      { "terminalJoinedConference", "h245.terminalJoinedConference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminalLabel", HFILL }},
     { &hf_h245_terminalLeftConference,
-      { "terminalLeftConference", "h245.terminalLeftConference",
+      { "terminalLeftConference", "h245.terminalLeftConference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminalLabel", HFILL }},
     { &hf_h245_seenByAtLeastOneOther,
-      { "seenByAtLeastOneOther", "h245.seenByAtLeastOneOther",
+      { "seenByAtLeastOneOther", "h245.seenByAtLeastOneOther_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_cancelSeenByAtLeastOneOther,
-      { "cancelSeenByAtLeastOneOther", "h245.cancelSeenByAtLeastOneOther",
+      { "cancelSeenByAtLeastOneOther", "h245.cancelSeenByAtLeastOneOther_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_seenByAll,
-      { "seenByAll", "h245.seenByAll",
+      { "seenByAll", "h245.seenByAll_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_cancelSeenByAll,
-      { "cancelSeenByAll", "h245.cancelSeenByAll",
+      { "cancelSeenByAll", "h245.cancelSeenByAll_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_terminalYouAreSeeing,
-      { "terminalYouAreSeeing", "h245.terminalYouAreSeeing",
+      { "terminalYouAreSeeing", "h245.terminalYouAreSeeing_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminalLabel", HFILL }},
     { &hf_h245_requestForFloor,
-      { "requestForFloor", "h245.requestForFloor",
+      { "requestForFloor", "h245.requestForFloor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_withdrawChairToken,
-      { "withdrawChairToken", "h245.withdrawChairToken",
+      { "withdrawChairToken", "h245.withdrawChairToken_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_floorRequested,
-      { "floorRequested", "h245.floorRequested",
+      { "floorRequested", "h245.floorRequested_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminalLabel", HFILL }},
     { &hf_h245_terminalYouAreSeeingInSubPictureNumber,
-      { "terminalYouAreSeeingInSubPictureNumber", "h245.terminalYouAreSeeingInSubPictureNumber",
+      { "terminalYouAreSeeingInSubPictureNumber", "h245.terminalYouAreSeeingInSubPictureNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_videoIndicateCompose,
-      { "videoIndicateCompose", "h245.videoIndicateCompose",
+      { "videoIndicateCompose", "h245.videoIndicateCompose_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_masterMCU,
-      { "masterMCU", "h245.masterMCU",
+      { "masterMCU", "h245.masterMCU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_cancelMasterMCU,
-      { "cancelMasterMCU", "h245.cancelMasterMCU",
+      { "cancelMasterMCU", "h245.cancelMasterMCU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_subPictureNumber,
@@ -19981,43 +19981,43 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_Mi_type_vals), 0,
         "Mi_type", HFILL }},
     { &hf_h245_logicalChannelActive,
-      { "logicalChannelActive", "h245.logicalChannelActive",
+      { "logicalChannelActive", "h245.logicalChannelActive_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_logicalChannelInactive,
-      { "logicalChannelInactive", "h245.logicalChannelInactive",
+      { "logicalChannelInactive", "h245.logicalChannelInactive_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_multipointConference,
-      { "multipointConference", "h245.multipointConference",
+      { "multipointConference", "h245.multipointConference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_cancelMultipointConference,
-      { "cancelMultipointConference", "h245.cancelMultipointConference",
+      { "cancelMultipointConference", "h245.cancelMultipointConference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_multipointZeroComm,
-      { "multipointZeroComm", "h245.multipointZeroComm",
+      { "multipointZeroComm", "h245.multipointZeroComm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_cancelMultipointZeroComm,
-      { "cancelMultipointZeroComm", "h245.cancelMultipointZeroComm",
+      { "cancelMultipointZeroComm", "h245.cancelMultipointZeroComm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_multipointSecondaryStatus,
-      { "multipointSecondaryStatus", "h245.multipointSecondaryStatus",
+      { "multipointSecondaryStatus", "h245.multipointSecondaryStatus_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_cancelMultipointSecondaryStatus,
-      { "cancelMultipointSecondaryStatus", "h245.cancelMultipointSecondaryStatus",
+      { "cancelMultipointSecondaryStatus", "h245.cancelMultipointSecondaryStatus_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_videoIndicateReadyToActivate,
-      { "videoIndicateReadyToActivate", "h245.videoIndicateReadyToActivate",
+      { "videoIndicateReadyToActivate", "h245.videoIndicateReadyToActivate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_videoNotDecodedMBs,
-      { "videoNotDecodedMBs", "h245.videoNotDecodedMBs",
+      { "videoNotDecodedMBs", "h245.videoNotDecodedMBs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_temporalReference_0_255,
@@ -20077,7 +20077,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_Ind_aal_vals), 0,
         "Ind_aal", HFILL }},
     { &hf_h245_ind_aal1,
-      { "aal1", "h245.aal1",
+      { "aal1", "h245.aal1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ind_aal1", HFILL }},
     { &hf_h245_ind_clockRecovery,
@@ -20089,7 +20089,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_Ind_errorCorrection_vals), 0,
         "Ind_errorCorrection", HFILL }},
     { &hf_h245_ind_aal5,
-      { "aal5", "h245.aal5",
+      { "aal5", "h245.aal5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ind_aal5", HFILL }},
     { &hf_h245_ind_multiplex,
@@ -20097,7 +20097,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_Ind_multiplex_vals), 0,
         "Ind_multiplex", HFILL }},
     { &hf_h245_ind_reverseParameters,
-      { "reverseParameters", "h245.reverseParameters",
+      { "reverseParameters", "h245.reverseParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ind_reverseParameters", HFILL }},
     { &hf_h245_indr_multiplex,
@@ -20125,7 +20125,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, VALS(h245_T_userInputSupportIndication_vals), 0,
         NULL, HFILL }},
     { &hf_h245_signal,
-      { "signal", "h245.signal",
+      { "signal", "h245.signal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_signalType,
@@ -20137,7 +20137,7 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_65535", HFILL }},
     { &hf_h245_rtp,
-      { "rtp", "h245.rtp",
+      { "rtp", "h245.rtp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_timestamp,
@@ -20149,11 +20149,11 @@ void proto_register_h245(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_4294967295", HFILL }},
     { &hf_h245_rtpPayloadIndication,
-      { "rtpPayloadIndication", "h245.rtpPayloadIndication",
+      { "rtpPayloadIndication", "h245.rtpPayloadIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_paramS,
-      { "paramS", "h245.paramS",
+      { "paramS", "h245.paramS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_encryptedSignalType,
@@ -20165,15 +20165,15 @@ void proto_register_h245(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_h245_signalUpdate,
-      { "signalUpdate", "h245.signalUpdate",
+      { "signalUpdate", "h245.signalUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_si_rtp,
-      { "rtp", "h245.rtp",
+      { "rtp", "h245.rtp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Si_rtp", HFILL }},
     { &hf_h245_extendedAlphanumeric,
-      { "extendedAlphanumeric", "h245.extendedAlphanumeric",
+      { "extendedAlphanumeric", "h245.extendedAlphanumeric_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h245_encrypted,
@@ -20181,7 +20181,7 @@ void proto_register_h245(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_h245_encryptedAlphanumeric,
-      { "encryptedAlphanumeric", "h245.encryptedAlphanumeric",
+      { "encryptedAlphanumeric", "h245.encryptedAlphanumeric_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c
index 4cfa04a727..69508d1c89 100644
--- a/epan/dissectors/packet-h248.c
+++ b/epan/dissectors/packet-h248.c
@@ -5531,11 +5531,11 @@ void proto_register_h248(void) {
 /*--- Included file: packet-h248-hfarr.c ---*/
 #line 1 "../../asn1/h248/packet-h248-hfarr.c"
     { &hf_h248_authHeader,
-      { "authHeader", "h248.authHeader",
+      { "authHeader", "h248.authHeader_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AuthenticationHeader", HFILL }},
     { &hf_h248_mess,
-      { "mess", "h248.mess",
+      { "mess", "h248.mess_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Message", HFILL }},
     { &hf_h248_secParmIndex,
@@ -5563,7 +5563,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, VALS(h248_T_messageBody_vals), 0,
         NULL, HFILL }},
     { &hf_h248_messageError,
-      { "messageError", "h248.messageError",
+      { "messageError", "h248.messageError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ErrorDescriptor", HFILL }},
     { &hf_h248_transactions,
@@ -5575,15 +5575,15 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, VALS(h248_Transaction_vals), 0,
         NULL, HFILL }},
     { &hf_h248_ip4Address,
-      { "ip4Address", "h248.ip4Address",
+      { "ip4Address", "h248.ip4Address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_ip6Address,
-      { "ip6Address", "h248.ip6Address",
+      { "ip6Address", "h248.ip6Address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_domainName,
-      { "domainName", "h248.domainName",
+      { "domainName", "h248.domainName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_deviceName,
@@ -5611,15 +5611,15 @@ void proto_register_h248(void) {
         FT_IPv6, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_16", HFILL }},
     { &hf_h248_transactionRequest,
-      { "transactionRequest", "h248.transactionRequest",
+      { "transactionRequest", "h248.transactionRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_transactionPending,
-      { "transactionPending", "h248.transactionPending",
+      { "transactionPending", "h248.transactionPending_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_transactionReply,
-      { "transactionReply", "h248.transactionReply",
+      { "transactionReply", "h248.transactionReply_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_transactionResponseAck,
@@ -5627,7 +5627,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_segmentReply,
-      { "segmentReply", "h248.segmentReply",
+      { "segmentReply", "h248.segmentReply_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_transactionId,
@@ -5639,7 +5639,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ActionRequest", HFILL }},
     { &hf_h248_actions_item,
-      { "ActionRequest", "h248.ActionRequest",
+      { "ActionRequest", "h248.ActionRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_tpend_transactionId,
@@ -5651,7 +5651,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_trep_transactionId", HFILL }},
     { &hf_h248_immAckRequired,
-      { "immAckRequired", "h248.immAckRequired",
+      { "immAckRequired", "h248.immAckRequired_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_transactionResult,
@@ -5659,7 +5659,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, VALS(h248_T_transactionResult_vals), 0,
         NULL, HFILL }},
     { &hf_h248_transactionError,
-      { "transactionError", "h248.transactionError",
+      { "transactionError", "h248.transactionError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ErrorDescriptor", HFILL }},
     { &hf_h248_actionReplies,
@@ -5667,7 +5667,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ActionReply", HFILL }},
     { &hf_h248_actionReplies_item,
-      { "ActionReply", "h248.ActionReply",
+      { "ActionReply", "h248.ActionReply_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_segmentNumber,
@@ -5675,7 +5675,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_segmentationComplete,
-      { "segmentationComplete", "h248.segmentationComplete",
+      { "segmentationComplete", "h248.segmentationComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_seg_rep_transactionId,
@@ -5683,7 +5683,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_seg_rep_transactionId", HFILL }},
     { &hf_h248_TransactionResponseAck_item,
-      { "TransactionAck", "h248.TransactionAck",
+      { "TransactionAck", "h248.TransactionAck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_firstAck,
@@ -5707,11 +5707,11 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_HEX, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_contextRequest,
-      { "contextRequest", "h248.contextRequest",
+      { "contextRequest", "h248.contextRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_contextAttrAuditReq,
-      { "contextAttrAuditReq", "h248.contextAttrAuditReq",
+      { "contextAttrAuditReq", "h248.contextAttrAuditReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_commandRequests,
@@ -5719,15 +5719,15 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_CommandRequest", HFILL }},
     { &hf_h248_commandRequests_item,
-      { "CommandRequest", "h248.CommandRequest",
+      { "CommandRequest", "h248.CommandRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_errorDescriptor,
-      { "errorDescriptor", "h248.errorDescriptor",
+      { "errorDescriptor", "h248.errorDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_contextReply,
-      { "contextReply", "h248.contextReply",
+      { "contextReply", "h248.contextReply_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ContextRequest", HFILL }},
     { &hf_h248_commandReply,
@@ -5751,7 +5751,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_topologyReq_item,
-      { "TopologyRequest", "h248.TopologyRequest",
+      { "TopologyRequest", "h248.TopologyRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_iepscallind_BOOL,
@@ -5763,7 +5763,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_PropertyParm", HFILL }},
     { &hf_h248_contextProp_item,
-      { "PropertyParm", "h248.PropertyParm",
+      { "PropertyParm", "h248.PropertyParm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_contextList,
@@ -5775,19 +5775,19 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_topology,
-      { "topology", "h248.topology",
+      { "topology", "h248.topology_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_cAAREmergency,
-      { "emergency", "h248.emergency",
+      { "emergency", "h248.emergency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_cAARPriority,
-      { "priority", "h248.priority",
+      { "priority", "h248.priority_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_iepscallind,
-      { "iepscallind", "h248.iepscallind",
+      { "iepscallind", "h248.iepscallind_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_contextPropAud,
@@ -5795,7 +5795,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_IndAudPropertyParm", HFILL }},
     { &hf_h248_contextPropAud_item,
-      { "IndAudPropertyParm", "h248.IndAudPropertyParm",
+      { "IndAudPropertyParm", "h248.IndAudPropertyParm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_selectpriority,
@@ -5815,11 +5815,11 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, VALS(h248_SelectLogic_vals), 0,
         NULL, HFILL }},
     { &hf_h248_andAUDITSelect,
-      { "andAUDITSelect", "h248.andAUDITSelect",
+      { "andAUDITSelect", "h248.andAUDITSelect_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_orAUDITSelect,
-      { "orAUDITSelect", "h248.orAUDITSelect",
+      { "orAUDITSelect", "h248.orAUDITSelect_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_command,
@@ -5827,59 +5827,59 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, VALS(h248_Command_vals), 0,
         NULL, HFILL }},
     { &hf_h248_optional,
-      { "optional", "h248.optional",
+      { "optional", "h248.optional_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_wildcardReturn,
-      { "wildcardReturn", "h248.wildcardReturn",
+      { "wildcardReturn", "h248.wildcardReturn_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_addReq,
-      { "addReq", "h248.addReq",
+      { "addReq", "h248.addReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_moveReq,
-      { "moveReq", "h248.moveReq",
+      { "moveReq", "h248.moveReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_modReq,
-      { "modReq", "h248.modReq",
+      { "modReq", "h248.modReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_subtractReq,
-      { "subtractReq", "h248.subtractReq",
+      { "subtractReq", "h248.subtractReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_auditCapRequest,
-      { "auditCapRequest", "h248.auditCapRequest",
+      { "auditCapRequest", "h248.auditCapRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_auditValueRequest,
-      { "auditValueRequest", "h248.auditValueRequest",
+      { "auditValueRequest", "h248.auditValueRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_notifyReq,
-      { "notifyReq", "h248.notifyReq",
+      { "notifyReq", "h248.notifyReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_serviceChangeReq,
-      { "serviceChangeReq", "h248.serviceChangeReq",
+      { "serviceChangeReq", "h248.serviceChangeReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ServiceChangeRequest", HFILL }},
     { &hf_h248_addReply,
-      { "addReply", "h248.addReply",
+      { "addReply", "h248.addReply_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_moveReply,
-      { "moveReply", "h248.moveReply",
+      { "moveReply", "h248.moveReply_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_modReply,
-      { "modReply", "h248.modReply",
+      { "modReply", "h248.modReply_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_subtractReply,
-      { "subtractReply", "h248.subtractReply",
+      { "subtractReply", "h248.subtractReply_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_auditCapReply,
@@ -5891,19 +5891,19 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, VALS(h248_AuditReply_vals), 0,
         NULL, HFILL }},
     { &hf_h248_notifyReply,
-      { "notifyReply", "h248.notifyReply",
+      { "notifyReply", "h248.notifyReply_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_serviceChangeReply,
-      { "serviceChangeReply", "h248.serviceChangeReply",
+      { "serviceChangeReply", "h248.serviceChangeReply_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_terminationFrom,
-      { "terminationFrom", "h248.terminationFrom",
+      { "terminationFrom", "h248.terminationFrom_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminationID", HFILL }},
     { &hf_h248_terminationTo,
-      { "terminationTo", "h248.terminationTo",
+      { "terminationTo", "h248.terminationTo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminationID", HFILL }},
     { &hf_h248_topologyDirection,
@@ -5931,19 +5931,19 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, VALS(h248_AmmDescriptor_vals), 0,
         NULL, HFILL }},
     { &hf_h248_mediaDescriptor,
-      { "mediaDescriptor", "h248.mediaDescriptor",
+      { "mediaDescriptor", "h248.mediaDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_modemDescriptor,
-      { "modemDescriptor", "h248.modemDescriptor",
+      { "modemDescriptor", "h248.modemDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_muxDescriptor,
-      { "muxDescriptor", "h248.muxDescriptor",
+      { "muxDescriptor", "h248.muxDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_eventsDescriptor,
-      { "eventsDescriptor", "h248.eventsDescriptor",
+      { "eventsDescriptor", "h248.eventsDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_eventBufferDescriptor,
@@ -5955,11 +5955,11 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_digitMapDescriptor,
-      { "digitMapDescriptor", "h248.digitMapDescriptor",
+      { "digitMapDescriptor", "h248.digitMapDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_auditDescriptor,
-      { "auditDescriptor", "h248.auditDescriptor",
+      { "auditDescriptor", "h248.auditDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_aDstatisticsDescriptor,
@@ -5971,7 +5971,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_terminationID,
-      { "terminationID", "h248.terminationID",
+      { "terminationID", "h248.terminationID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_contextAuditResult,
@@ -5979,15 +5979,15 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TerminationIDList", HFILL }},
     { &hf_h248_error,
-      { "error", "h248.error",
+      { "error", "h248.error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ErrorDescriptor", HFILL }},
     { &hf_h248_auditResult,
-      { "auditResult", "h248.auditResult",
+      { "auditResult", "h248.auditResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_auditResultTermList,
-      { "auditResultTermList", "h248.auditResultTermList",
+      { "auditResultTermList", "h248.auditResultTermList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TermListAuditResult", HFILL }},
     { &hf_h248_terminationAuditResult,
@@ -5999,7 +5999,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, VALS(h248_AuditReturnParameter_vals), 0,
         NULL, HFILL }},
     { &hf_h248_observedEventsDescriptor,
-      { "observedEventsDescriptor", "h248.observedEventsDescriptor",
+      { "observedEventsDescriptor", "h248.observedEventsDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_aRPstatisticsDescriptor,
@@ -6011,7 +6011,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_emptyDescriptors,
-      { "emptyDescriptors", "h248.emptyDescriptors",
+      { "emptyDescriptors", "h248.emptyDescriptors_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AuditDescriptor", HFILL }},
     { &hf_h248_auditToken,
@@ -6027,15 +6027,15 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, VALS(h248_IndAuditParameter_vals), 0,
         NULL, HFILL }},
     { &hf_h248_indaudmediaDescriptor,
-      { "indaudmediaDescriptor", "h248.indaudmediaDescriptor",
+      { "indaudmediaDescriptor", "h248.indaudmediaDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_indaudeventsDescriptor,
-      { "indaudeventsDescriptor", "h248.indaudeventsDescriptor",
+      { "indaudeventsDescriptor", "h248.indaudeventsDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_indaudeventBufferDescriptor,
-      { "indaudeventBufferDescriptor", "h248.indaudeventBufferDescriptor",
+      { "indaudeventBufferDescriptor", "h248.indaudeventBufferDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_indaudsignalsDescriptor,
@@ -6043,19 +6043,19 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, VALS(h248_IndAudSignalsDescriptor_vals), 0,
         NULL, HFILL }},
     { &hf_h248_indauddigitMapDescriptor,
-      { "indauddigitMapDescriptor", "h248.indauddigitMapDescriptor",
+      { "indauddigitMapDescriptor", "h248.indauddigitMapDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_indaudstatisticsDescriptor,
-      { "indaudstatisticsDescriptor", "h248.indaudstatisticsDescriptor",
+      { "indaudstatisticsDescriptor", "h248.indaudstatisticsDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_indaudpackagesDescriptor,
-      { "indaudpackagesDescriptor", "h248.indaudpackagesDescriptor",
+      { "indaudpackagesDescriptor", "h248.indaudpackagesDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_indAudTerminationStateDescriptor,
-      { "termStateDescr", "h248.termStateDescr",
+      { "termStateDescr", "h248.termStateDescr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IndAudTerminationStateDescriptor", HFILL }},
     { &hf_h248_indAudMediaDescriptorStreams,
@@ -6063,7 +6063,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, VALS(h248_IndAudMediaDescriptorStreams_vals), 0,
         "IndAudMediaDescriptorStreams", HFILL }},
     { &hf_h248_oneStream,
-      { "oneStream", "h248.oneStream",
+      { "oneStream", "h248.oneStream_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IndAudStreamParms", HFILL }},
     { &hf_h248_multiStream,
@@ -6071,39 +6071,39 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_IndAudStreamDescriptor", HFILL }},
     { &hf_h248_multiStream_item,
-      { "IndAudStreamDescriptor", "h248.IndAudStreamDescriptor",
+      { "IndAudStreamDescriptor", "h248.IndAudStreamDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_indAudStreamParms,
-      { "streamParms", "h248.streamParms",
+      { "streamParms", "h248.streamParms_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IndAudStreamParms", HFILL }},
     { &hf_h248_iASPLocalControlDescriptor,
-      { "localControlDescriptor", "h248.localControlDescriptor",
+      { "localControlDescriptor", "h248.localControlDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IndAudLocalControlDescriptor", HFILL }},
     { &hf_h248_iASPLocalDescriptor,
-      { "localDescriptor", "h248.localDescriptor",
+      { "localDescriptor", "h248.localDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IndAudLocalRemoteDescriptor", HFILL }},
     { &hf_h248_iASPRemoteDescriptor,
-      { "remoteDescriptor", "h248.remoteDescriptor",
+      { "remoteDescriptor", "h248.remoteDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IndAudLocalRemoteDescriptor", HFILL }},
     { &hf_h248_statisticsDescriptor,
-      { "statisticsDescriptor", "h248.statisticsDescriptor",
+      { "statisticsDescriptor", "h248.statisticsDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IndAudStatisticsDescriptor", HFILL }},
     { &hf_h248_iALCDStreamMode,
-      { "streamMode", "h248.streamMode",
+      { "streamMode", "h248.streamMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_iALCDReserveValue,
-      { "reserveValue", "h248.reserveValue",
+      { "reserveValue", "h248.reserveValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_iALCDReserveGroup,
-      { "reserveGroup", "h248.reserveGroup",
+      { "reserveGroup", "h248.reserveGroup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_indAudPropertyParms,
@@ -6111,7 +6111,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_IndAudPropertyParm", HFILL }},
     { &hf_h248_indAudPropertyParms_item,
-      { "IndAudPropertyParm", "h248.IndAudPropertyParm",
+      { "IndAudPropertyParm", "h248.IndAudPropertyParm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_streamModeSel,
@@ -6123,7 +6123,7 @@ void proto_register_h248(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "PkgdName", HFILL }},
     { &hf_h248_propertyParms,
-      { "propertyParms", "h248.propertyParms",
+      { "propertyParms", "h248.propertyParms_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PropertyParm", HFILL }},
     { &hf_h248_propGroupID,
@@ -6135,15 +6135,15 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "IndAudPropertyGroup", HFILL }},
     { &hf_h248_IndAudPropertyGroup_item,
-      { "IndAudPropertyParm", "h248.IndAudPropertyParm",
+      { "IndAudPropertyParm", "h248.IndAudPropertyParm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_eventBufferControl,
-      { "eventBufferControl", "h248.eventBufferControl",
+      { "eventBufferControl", "h248.eventBufferControl_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_iATSDServiceState,
-      { "serviceState", "h248.serviceState",
+      { "serviceState", "h248.serviceState_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_serviceStateSel,
@@ -6163,11 +6163,11 @@ void proto_register_h248(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "PkgdName", HFILL }},
     { &hf_h248_indAudSignal,
-      { "signal", "h248.signal",
+      { "signal", "h248.signal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IndAudSignal", HFILL }},
     { &hf_h248_indAudSeqSigList,
-      { "seqSigList", "h248.seqSigList",
+      { "seqSigList", "h248.seqSigList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IndAudSeqSigList", HFILL }},
     { &hf_h248_id,
@@ -6175,7 +6175,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_65535", HFILL }},
     { &hf_h248_iASignalList,
-      { "signalList", "h248.signalList",
+      { "signalList", "h248.signalList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IndAudSignal", HFILL }},
     { &hf_h248_iASignalName,
@@ -6211,7 +6211,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ObservedEvent", HFILL }},
     { &hf_h248_observedEventLst_item,
-      { "ObservedEvent", "h248.ObservedEvent",
+      { "ObservedEvent", "h248.ObservedEvent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_eventName,
@@ -6223,11 +6223,11 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_EventParameter", HFILL }},
     { &hf_h248_eventParList_item,
-      { "EventParameter", "h248.EventParameter",
+      { "EventParameter", "h248.EventParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_timeNotation,
-      { "timeNotation", "h248.timeNotation",
+      { "timeNotation", "h248.timeNotation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_eventParameterName,
@@ -6259,7 +6259,7 @@ void proto_register_h248(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_serviceChangeParms,
-      { "serviceChangeParms", "h248.serviceChangeParms",
+      { "serviceChangeParms", "h248.serviceChangeParms_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ServiceChangeParm", HFILL }},
     { &hf_h248_serviceChangeResult,
@@ -6267,7 +6267,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, VALS(h248_ServiceChangeResult_vals), 0,
         NULL, HFILL }},
     { &hf_h248_serviceChangeResParms,
-      { "serviceChangeResParms", "h248.serviceChangeResParms",
+      { "serviceChangeResParms", "h248.serviceChangeResParms_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ServiceChangeResParm", HFILL }},
     { &hf_h248_wildcard,
@@ -6283,11 +6283,11 @@ void proto_register_h248(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "T_terminationId", HFILL }},
     { &hf_h248_TerminationIDList_item,
-      { "TerminationID", "h248.TerminationID",
+      { "TerminationID", "h248.TerminationID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_termStateDescr,
-      { "termStateDescr", "h248.termStateDescr",
+      { "termStateDescr", "h248.termStateDescr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminationStateDescriptor", HFILL }},
     { &hf_h248_streams,
@@ -6295,7 +6295,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, VALS(h248_T_streams_vals), 0,
         NULL, HFILL }},
     { &hf_h248_mediaDescriptorOneStream,
-      { "oneStream", "h248.oneStream",
+      { "oneStream", "h248.oneStream_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "StreamParms", HFILL }},
     { &hf_h248_mediaDescriptorMultiStream,
@@ -6303,23 +6303,23 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_StreamDescriptor", HFILL }},
     { &hf_h248_mediaDescriptorMultiStream_item,
-      { "StreamDescriptor", "h248.StreamDescriptor",
+      { "StreamDescriptor", "h248.StreamDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_streamParms,
-      { "streamParms", "h248.streamParms",
+      { "streamParms", "h248.streamParms_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_localControlDescriptor,
-      { "localControlDescriptor", "h248.localControlDescriptor",
+      { "localControlDescriptor", "h248.localControlDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_localDescriptor,
-      { "localDescriptor", "h248.localDescriptor",
+      { "localDescriptor", "h248.localDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LocalRemoteDescriptor", HFILL }},
     { &hf_h248_remoteDescriptor,
-      { "remoteDescriptor", "h248.remoteDescriptor",
+      { "remoteDescriptor", "h248.remoteDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LocalRemoteDescriptor", HFILL }},
     { &hf_h248_sPstatisticsDescriptor,
@@ -6343,7 +6343,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_PropertyParm", HFILL }},
     { &hf_h248_lCDpropertyParms_item,
-      { "PropertyParm", "h248.PropertyParm",
+      { "PropertyParm", "h248.PropertyParm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_propertyName,
@@ -6371,7 +6371,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_PropertyGroup_item,
-      { "PropertyParm", "h248.PropertyParm",
+      { "PropertyParm", "h248.PropertyParm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_tSDpropertyParms,
@@ -6379,7 +6379,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_PropertyParm", HFILL }},
     { &hf_h248_tSDpropertyParms_item,
-      { "PropertyParm", "h248.PropertyParm",
+      { "PropertyParm", "h248.PropertyParm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_tSEventBufferControl,
@@ -6399,11 +6399,11 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_TerminationID", HFILL }},
     { &hf_h248_termList_item,
-      { "TerminationID", "h248.TerminationID",
+      { "TerminationID", "h248.TerminationID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_nonStandardData,
-      { "nonStandardData", "h248.nonStandardData",
+      { "nonStandardData", "h248.nonStandardData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_eventList,
@@ -6411,11 +6411,11 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_RequestedEvent", HFILL }},
     { &hf_h248_eventList_item,
-      { "RequestedEvent", "h248.RequestedEvent",
+      { "RequestedEvent", "h248.RequestedEvent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_eventAction,
-      { "eventAction", "h248.eventAction",
+      { "eventAction", "h248.eventAction_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RequestedActions", HFILL }},
     { &hf_h248_evParList,
@@ -6423,23 +6423,23 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_EventParameter", HFILL }},
     { &hf_h248_evParList_item,
-      { "EventParameter", "h248.EventParameter",
+      { "EventParameter", "h248.EventParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_secondEvent,
-      { "secondEvent", "h248.secondEvent",
+      { "secondEvent", "h248.secondEvent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecondEventsDescriptor", HFILL }},
     { &hf_h248_notifyImmediate,
-      { "notifyImmediate", "h248.notifyImmediate",
+      { "notifyImmediate", "h248.notifyImmediate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_notifyRegulated,
-      { "notifyRegulated", "h248.notifyRegulated",
+      { "notifyRegulated", "h248.notifyRegulated_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RegulatedEmbeddedDescriptor", HFILL }},
     { &hf_h248_neverNotify,
-      { "neverNotify", "h248.neverNotify",
+      { "neverNotify", "h248.neverNotify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_keepActive,
@@ -6455,11 +6455,11 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, VALS(h248_NotifyBehaviour_vals), 0,
         NULL, HFILL }},
     { &hf_h248_resetEventsDescriptor,
-      { "resetEventsDescriptor", "h248.resetEventsDescriptor",
+      { "resetEventsDescriptor", "h248.resetEventsDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_digitMapValue,
-      { "digitMapValue", "h248.digitMapValue",
+      { "digitMapValue", "h248.digitMapValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_secondaryEventList,
@@ -6467,7 +6467,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_SecondRequestedEvent", HFILL }},
     { &hf_h248_secondaryEventList_item,
-      { "SecondRequestedEvent", "h248.SecondRequestedEvent",
+      { "SecondRequestedEvent", "h248.SecondRequestedEvent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_pkgdName,
@@ -6475,11 +6475,11 @@ void proto_register_h248(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_secondaryEventAction,
-      { "eventAction", "h248.eventAction",
+      { "eventAction", "h248.eventAction_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecondRequestedActions", HFILL }},
     { &hf_h248_EventBufferDescriptor_item,
-      { "EventSpec", "h248.EventSpec",
+      { "EventSpec", "h248.EventSpec_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_SignalsDescriptor_item,
@@ -6487,11 +6487,11 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, VALS(h248_SignalRequest_vals), 0,
         NULL, HFILL }},
     { &hf_h248_signal,
-      { "signal", "h248.signal",
+      { "signal", "h248.signal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_seqSigList,
-      { "seqSigList", "h248.seqSigList",
+      { "seqSigList", "h248.seqSigList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_signalList,
@@ -6499,7 +6499,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Signal", HFILL }},
     { &hf_h248_signalList_item,
-      { "Signal", "h248.Signal",
+      { "Signal", "h248.Signal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_signalName,
@@ -6523,7 +6523,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_SigParameter", HFILL }},
     { &hf_h248_sigParList_item,
-      { "SigParameter", "h248.SigParameter",
+      { "SigParameter", "h248.SigParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_direction,
@@ -6563,7 +6563,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_PropertyParm", HFILL }},
     { &hf_h248_mpl_item,
-      { "PropertyParm", "h248.PropertyParm",
+      { "PropertyParm", "h248.PropertyParm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_startTimer,
@@ -6599,7 +6599,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_99", HFILL }},
     { &hf_h248_serviceChangeProfile,
-      { "serviceChangeProfile", "h248.serviceChangeProfile",
+      { "serviceChangeProfile", "h248.serviceChangeProfile_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_serviceChangeReason,
@@ -6615,15 +6615,15 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, VALS(h248_MId_vals), 0,
         "MId", HFILL }},
     { &hf_h248_timeStamp,
-      { "timeStamp", "h248.timeStamp",
+      { "timeStamp", "h248.timeStamp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TimeNotation", HFILL }},
     { &hf_h248_serviceChangeInfo,
-      { "serviceChangeInfo", "h248.serviceChangeInfo",
+      { "serviceChangeInfo", "h248.serviceChangeInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AuditDescriptor", HFILL }},
     { &hf_h248_serviceChangeIncompleteFlag,
-      { "serviceChangeIncompleteFlag", "h248.serviceChangeIncompleteFlag",
+      { "serviceChangeIncompleteFlag", "h248.serviceChangeIncompleteFlag_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_SCreasonValue_item,
@@ -6631,7 +6631,7 @@ void proto_register_h248(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_timestamp,
-      { "timestamp", "h248.timestamp",
+      { "timestamp", "h248.timestamp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TimeNotation", HFILL }},
     { &hf_h248_profileName,
@@ -6639,11 +6639,11 @@ void proto_register_h248(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "IA5String_SIZE_1_67", HFILL }},
     { &hf_h248_PackagesDescriptor_item,
-      { "PackagesItem", "h248.PackagesItem",
+      { "PackagesItem", "h248.PackagesItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_StatisticsDescriptor_item,
-      { "StatisticsParameter", "h248.StatisticsParameter",
+      { "StatisticsParameter", "h248.StatisticsParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_statName,
@@ -6667,7 +6667,7 @@ void proto_register_h248(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_h248_h221NonStandard,
-      { "h221NonStandard", "h248.h221NonStandard",
+      { "h221NonStandard", "h248.h221NonStandard_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h248_experimental,
@@ -6707,7 +6707,7 @@ void proto_register_h248(void) {
         FT_UINT32, BASE_DEC, VALS(h248_AuditResultV1_vals), 0,
         "AuditResultV1", HFILL }},
     { &hf_h248_contectAuditResult,
-      { "contectAuditResult", "h248.contectAuditResult",
+      { "contectAuditResult", "h248.contectAuditResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminationID", HFILL }},
     { &hf_h248_eventParamterName,
diff --git a/epan/dissectors/packet-h282.c b/epan/dissectors/packet-h282.c
index 727fe2693a..f4e4341993 100644
--- a/epan/dissectors/packet-h282.c
+++ b/epan/dissectors/packet-h282.c
@@ -4448,27 +4448,27 @@ void proto_register_h282(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "H221NonStandardIdentifier", HFILL }},
     { &hf_h282_camera,
-      { "camera", "h282.camera",
+      { "camera", "h282.camera_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_microphone,
-      { "microphone", "h282.microphone",
+      { "microphone", "h282.microphone_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_streamPlayerRecorder,
-      { "streamPlayerRecorder", "h282.streamPlayerRecorder",
+      { "streamPlayerRecorder", "h282.streamPlayerRecorder_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_slideProjector,
-      { "slideProjector", "h282.slideProjector",
+      { "slideProjector", "h282.slideProjector_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_lightSource,
-      { "lightSource", "h282.lightSource",
+      { "lightSource", "h282.lightSource_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_sourceCombiner,
-      { "sourceCombiner", "h282.sourceCombiner",
+      { "sourceCombiner", "h282.sourceCombiner_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_nonStandardDevice,
@@ -4532,7 +4532,7 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, VALS(h282_Key_vals), 0,
         "Key", HFILL }},
     { &hf_h282_NonCollapsingCapabilities_item,
-      { "NonCollapsingCapabilities item", "h282.NonCollapsingCapabilities_item",
+      { "NonCollapsingCapabilities item", "h282.NonCollapsingCapabilities_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_capabilityID,
@@ -4548,7 +4548,7 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_0_127_OF_DeviceProfile", HFILL }},
     { &hf_h282_deviceList_item,
-      { "DeviceProfile", "h282.DeviceProfile",
+      { "DeviceProfile", "h282.DeviceProfile_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_streamList,
@@ -4556,47 +4556,47 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_0_127_OF_StreamProfile", HFILL }},
     { &hf_h282_streamList_item,
-      { "StreamProfile", "h282.StreamProfile",
+      { "StreamProfile", "h282.StreamProfile_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_playing,
-      { "playing", "h282.playing",
+      { "playing", "h282.playing_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_recording,
-      { "recording", "h282.recording",
+      { "recording", "h282.recording_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_pausedOnRecord,
-      { "pausedOnRecord", "h282.pausedOnRecord",
+      { "pausedOnRecord", "h282.pausedOnRecord_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_pausedOnPlay,
-      { "pausedOnPlay", "h282.pausedOnPlay",
+      { "pausedOnPlay", "h282.pausedOnPlay_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_rewinding,
-      { "rewinding", "h282.rewinding",
+      { "rewinding", "h282.rewinding_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_fastForwarding,
-      { "fastForwarding", "h282.fastForwarding",
+      { "fastForwarding", "h282.fastForwarding_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_searchingForwards,
-      { "searchingForwards", "h282.searchingForwards",
+      { "searchingForwards", "h282.searchingForwards_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_searchingBackwards,
-      { "searchingBackwards", "h282.searchingBackwards",
+      { "searchingBackwards", "h282.searchingBackwards_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_stopped,
-      { "stopped", "h282.stopped",
+      { "stopped", "h282.stopped_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_programUnavailable,
-      { "programUnavailable", "h282.programUnavailable",
+      { "programUnavailable", "h282.programUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_maxNumber,
@@ -4608,7 +4608,7 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_presetCapability_item,
-      { "presetCapability item", "h282.presetCapability_item",
+      { "presetCapability item", "h282.presetCapability_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_presetNumber,
@@ -4632,7 +4632,7 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_filterTextLabel_item,
-      { "filterTextLabel item", "h282.filterTextLabel_item",
+      { "filterTextLabel item", "h282.filterTextLabel_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_filterNumber,
@@ -4652,7 +4652,7 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_accessoryTextLabel_item,
-      { "accessoryTextLabel item", "h282.accessoryTextLabel_item",
+      { "accessoryTextLabel item", "h282.accessoryTextLabel_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_lensNumber,
@@ -4672,7 +4672,7 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_lightTextLabel_item,
-      { "lightTextLabel item", "h282.lightTextLabel_item",
+      { "lightTextLabel item", "h282.lightTextLabel_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_lightNumber,
@@ -4756,7 +4756,7 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_availableDevices_item,
-      { "availableDevices item", "h282.availableDevices_item",
+      { "availableDevices item", "h282.availableDevices_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_deviceClass,
@@ -4772,67 +4772,67 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_availableDevices_01", HFILL }},
     { &hf_h282_availableDevices_item_01,
-      { "availableDevices item", "h282.availableDevices_item",
+      { "availableDevices item", "h282.availableDevices_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_availableDevices_item_01", HFILL }},
     { &hf_h282_deviceStateSupported,
-      { "deviceStateSupported", "h282.deviceStateSupported",
+      { "deviceStateSupported", "h282.deviceStateSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_deviceDateSupported,
-      { "deviceDateSupported", "h282.deviceDateSupported",
+      { "deviceDateSupported", "h282.deviceDateSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_deviceTimeSupported,
-      { "deviceTimeSupported", "h282.deviceTimeSupported",
+      { "deviceTimeSupported", "h282.deviceTimeSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_devicePresetSupported,
-      { "devicePresetSupported", "h282.devicePresetSupported",
+      { "devicePresetSupported", "h282.devicePresetSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DevicePresetCapability", HFILL }},
     { &hf_h282_irisModeSupported,
-      { "irisModeSupported", "h282.irisModeSupported",
+      { "irisModeSupported", "h282.irisModeSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_focusModeSupported,
-      { "focusModeSupported", "h282.focusModeSupported",
+      { "focusModeSupported", "h282.focusModeSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_pointingModeSupported,
-      { "pointingModeSupported", "h282.pointingModeSupported",
+      { "pointingModeSupported", "h282.pointingModeSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_cameraLensSupported,
-      { "cameraLensSupported", "h282.cameraLensSupported",
+      { "cameraLensSupported", "h282.cameraLensSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CameraLensCapability", HFILL }},
     { &hf_h282_cameraFilterSupported,
-      { "cameraFilterSupported", "h282.cameraFilterSupported",
+      { "cameraFilterSupported", "h282.cameraFilterSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CameraFilterCapability", HFILL }},
     { &hf_h282_homePositionSupported,
-      { "homePositionSupported", "h282.homePositionSupported",
+      { "homePositionSupported", "h282.homePositionSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_externalCameraLightSupported,
-      { "externalCameraLightSupported", "h282.externalCameraLightSupported",
+      { "externalCameraLightSupported", "h282.externalCameraLightSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ExternalCameraLightCapability", HFILL }},
     { &hf_h282_clearCameraLensSupported,
-      { "clearCameraLensSupported", "h282.clearCameraLensSupported",
+      { "clearCameraLensSupported", "h282.clearCameraLensSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_cameraPanSpeedSupported,
-      { "cameraPanSpeedSupported", "h282.cameraPanSpeedSupported",
+      { "cameraPanSpeedSupported", "h282.cameraPanSpeedSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CameraPanSpeedCapability", HFILL }},
     { &hf_h282_cameraTiltSpeedSupported,
-      { "cameraTiltSpeedSupported", "h282.cameraTiltSpeedSupported",
+      { "cameraTiltSpeedSupported", "h282.cameraTiltSpeedSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CameraTiltSpeedCapability", HFILL }},
     { &hf_h282_backLightModeSupported,
-      { "backLightModeSupported", "h282.backLightModeSupported",
+      { "backLightModeSupported", "h282.backLightModeSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_backLightSettingSupported,
@@ -4844,39 +4844,39 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MaxWhiteBalance", HFILL }},
     { &hf_h282_whiteBalanceModeSupported,
-      { "whiteBalanceModeSupported", "h282.whiteBalanceModeSupported",
+      { "whiteBalanceModeSupported", "h282.whiteBalanceModeSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_calibrateWhiteBalanceSupported,
-      { "calibrateWhiteBalanceSupported", "h282.calibrateWhiteBalanceSupported",
+      { "calibrateWhiteBalanceSupported", "h282.calibrateWhiteBalanceSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_focusImageSupported,
-      { "focusImageSupported", "h282.focusImageSupported",
+      { "focusImageSupported", "h282.focusImageSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_captureImageSupported,
-      { "captureImageSupported", "h282.captureImageSupported",
+      { "captureImageSupported", "h282.captureImageSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_panContinuousSupported,
-      { "panContinuousSupported", "h282.panContinuousSupported",
+      { "panContinuousSupported", "h282.panContinuousSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_tiltContinuousSupported,
-      { "tiltContinuousSupported", "h282.tiltContinuousSupported",
+      { "tiltContinuousSupported", "h282.tiltContinuousSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_zoomContinuousSupported,
-      { "zoomContinuousSupported", "h282.zoomContinuousSupported",
+      { "zoomContinuousSupported", "h282.zoomContinuousSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_focusContinuousSupported,
-      { "focusContinuousSupported", "h282.focusContinuousSupported",
+      { "focusContinuousSupported", "h282.focusContinuousSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_irisContinuousSupported,
-      { "irisContinuousSupported", "h282.irisContinuousSupported",
+      { "irisContinuousSupported", "h282.irisContinuousSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_zoomPositionSupported,
@@ -4892,11 +4892,11 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MinIrisPositionStepSize", HFILL }},
     { &hf_h282_panPositionSupported,
-      { "panPositionSupported", "h282.panPositionSupported",
+      { "panPositionSupported", "h282.panPositionSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PanPositionCapability", HFILL }},
     { &hf_h282_tiltPositionSupported,
-      { "tiltPositionSupported", "h282.tiltPositionSupported",
+      { "tiltPositionSupported", "h282.tiltPositionSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TiltPositionCapability", HFILL }},
     { &hf_h282_zoomMagnificationSupported,
@@ -4904,11 +4904,11 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MinZoomMagnificationStepSize", HFILL }},
     { &hf_h282_panViewSupported,
-      { "panViewSupported", "h282.panViewSupported",
+      { "panViewSupported", "h282.panViewSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_tiltViewSupported,
-      { "tiltViewSupported", "h282.tiltViewSupported",
+      { "tiltViewSupported", "h282.tiltViewSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_selectSlideSupported,
@@ -4916,15 +4916,15 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MaxNumberOfSlides", HFILL }},
     { &hf_h282_selectNextSlideSupported,
-      { "selectNextSlideSupported", "h282.selectNextSlideSupported",
+      { "selectNextSlideSupported", "h282.selectNextSlideSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_slideShowModeSupported,
-      { "slideShowModeSupported", "h282.slideShowModeSupported",
+      { "slideShowModeSupported", "h282.slideShowModeSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_playSlideShowSupported,
-      { "playSlideShowSupported", "h282.playSlideShowSupported",
+      { "playSlideShowSupported", "h282.playSlideShowSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_setSlideDisplayTimeSupported,
@@ -4932,23 +4932,23 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MaxSlideDisplayTime", HFILL }},
     { &hf_h282_continuousRewindSupported,
-      { "continuousRewindSupported", "h282.continuousRewindSupported",
+      { "continuousRewindSupported", "h282.continuousRewindSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_continuousFastForwardSupported,
-      { "continuousFastForwardSupported", "h282.continuousFastForwardSupported",
+      { "continuousFastForwardSupported", "h282.continuousFastForwardSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_searchBackwardsSupported,
-      { "searchBackwardsSupported", "h282.searchBackwardsSupported",
+      { "searchBackwardsSupported", "h282.searchBackwardsSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_searchForwardsSupported,
-      { "searchForwardsSupported", "h282.searchForwardsSupported",
+      { "searchForwardsSupported", "h282.searchForwardsSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_pauseSupported,
-      { "pauseSupported", "h282.pauseSupported",
+      { "pauseSupported", "h282.pauseSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_selectProgramSupported,
@@ -4956,111 +4956,111 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MaxNumberOfPrograms", HFILL }},
     { &hf_h282_nextProgramSupported,
-      { "nextProgramSupported", "h282.nextProgramSupported",
+      { "nextProgramSupported", "h282.nextProgramSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_gotoNormalPlayTimePointSupported,
-      { "gotoNormalPlayTimePointSupported", "h282.gotoNormalPlayTimePointSupported",
+      { "gotoNormalPlayTimePointSupported", "h282.gotoNormalPlayTimePointSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_readStreamPlayerStateSupported,
-      { "readStreamPlayerStateSupported", "h282.readStreamPlayerStateSupported",
+      { "readStreamPlayerStateSupported", "h282.readStreamPlayerStateSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_readProgramDurationSupported,
-      { "readProgramDurationSupported", "h282.readProgramDurationSupported",
+      { "readProgramDurationSupported", "h282.readProgramDurationSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_continuousPlayBackModeSupported,
-      { "continuousPlayBackModeSupported", "h282.continuousPlayBackModeSupported",
+      { "continuousPlayBackModeSupported", "h282.continuousPlayBackModeSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_playbackSpeedSupported,
-      { "playbackSpeedSupported", "h282.playbackSpeedSupported",
+      { "playbackSpeedSupported", "h282.playbackSpeedSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PlayBackSpeedCapability", HFILL }},
     { &hf_h282_playSupported,
-      { "playSupported", "h282.playSupported",
+      { "playSupported", "h282.playSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_setAudioOutputStateSupported,
-      { "setAudioOutputStateSupported", "h282.setAudioOutputStateSupported",
+      { "setAudioOutputStateSupported", "h282.setAudioOutputStateSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_playToNormalPlayTimePointSupported,
-      { "playToNormalPlayTimePointSupported", "h282.playToNormalPlayTimePointSupported",
+      { "playToNormalPlayTimePointSupported", "h282.playToNormalPlayTimePointSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_recordSupported,
-      { "recordSupported", "h282.recordSupported",
+      { "recordSupported", "h282.recordSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_recordForDurationSupported,
-      { "recordForDurationSupported", "h282.recordForDurationSupported",
+      { "recordForDurationSupported", "h282.recordForDurationSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_configurableVideoInputsSupported,
-      { "configurableVideoInputsSupported", "h282.configurableVideoInputsSupported",
+      { "configurableVideoInputsSupported", "h282.configurableVideoInputsSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "VideoInputsCapability", HFILL }},
     { &hf_h282_videoInputsSupported,
-      { "videoInputsSupported", "h282.videoInputsSupported",
+      { "videoInputsSupported", "h282.videoInputsSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "VideoInputsCapability", HFILL }},
     { &hf_h282_configurableAudioInputsSupported,
-      { "configurableAudioInputsSupported", "h282.configurableAudioInputsSupported",
+      { "configurableAudioInputsSupported", "h282.configurableAudioInputsSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AudioInputsCapability", HFILL }},
     { &hf_h282_audioInputsSupported,
-      { "audioInputsSupported", "h282.audioInputsSupported",
+      { "audioInputsSupported", "h282.audioInputsSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AudioInputsCapability", HFILL }},
     { &hf_h282_deviceLockStateChangedSupported,
-      { "deviceLockStateChangedSupported", "h282.deviceLockStateChangedSupported",
+      { "deviceLockStateChangedSupported", "h282.deviceLockStateChangedSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_deviceAvailabilityChangedSupported,
-      { "deviceAvailabilityChangedSupported", "h282.deviceAvailabilityChangedSupported",
+      { "deviceAvailabilityChangedSupported", "h282.deviceAvailabilityChangedSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_cameraPannedToLimitSupported,
-      { "cameraPannedToLimitSupported", "h282.cameraPannedToLimitSupported",
+      { "cameraPannedToLimitSupported", "h282.cameraPannedToLimitSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_cameraTiltedToLimitSupported,
-      { "cameraTiltedToLimitSupported", "h282.cameraTiltedToLimitSupported",
+      { "cameraTiltedToLimitSupported", "h282.cameraTiltedToLimitSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_cameraZoomedToLimitSupported,
-      { "cameraZoomedToLimitSupported", "h282.cameraZoomedToLimitSupported",
+      { "cameraZoomedToLimitSupported", "h282.cameraZoomedToLimitSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_cameraFocusedToLimitSupported,
-      { "cameraFocusedToLimitSupported", "h282.cameraFocusedToLimitSupported",
+      { "cameraFocusedToLimitSupported", "h282.cameraFocusedToLimitSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_autoSlideShowFinishedSupported,
-      { "autoSlideShowFinishedSupported", "h282.autoSlideShowFinishedSupported",
+      { "autoSlideShowFinishedSupported", "h282.autoSlideShowFinishedSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_streamPlayerStateChangeSupported,
-      { "streamPlayerStateChangeSupported", "h282.streamPlayerStateChangeSupported",
+      { "streamPlayerStateChangeSupported", "h282.streamPlayerStateChangeSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_streamPlayerProgramChangeSupported,
-      { "streamPlayerProgramChangeSupported", "h282.streamPlayerProgramChangeSupported",
+      { "streamPlayerProgramChangeSupported", "h282.streamPlayerProgramChangeSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_nonStandardAttributeSupported,
-      { "nonStandardAttributeSupported", "h282.nonStandardAttributeSupported",
+      { "nonStandardAttributeSupported", "h282.nonStandardAttributeSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_h282_active,
-      { "active", "h282.active",
+      { "active", "h282.active_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_inactive,
-      { "inactive", "h282.inactive",
+      { "inactive", "h282.inactive_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_day,
@@ -5088,27 +5088,27 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, VALS(h282_T_mode_vals), 0,
         NULL, HFILL }},
     { &hf_h282_store,
-      { "store", "h282.store",
+      { "store", "h282.store_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_activate,
-      { "activate", "h282.activate",
+      { "activate", "h282.activate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_manual,
-      { "manual", "h282.manual",
+      { "manual", "h282.manual_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_auto,
-      { "auto", "h282.auto",
+      { "auto", "h282.auto_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_toggle,
-      { "toggle", "h282.toggle",
+      { "toggle", "h282.toggle_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_none,
-      { "none", "h282.none",
+      { "none", "h282.none_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_panDirection,
@@ -5116,19 +5116,19 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, VALS(h282_T_panDirection_vals), 0,
         NULL, HFILL }},
     { &hf_h282_left,
-      { "left", "h282.left",
+      { "left", "h282.left_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_right,
-      { "right", "h282.right",
+      { "right", "h282.right_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_stop,
-      { "stop", "h282.stop",
+      { "stop", "h282.stop_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_continue,
-      { "continue", "h282.continue",
+      { "continue", "h282.continue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_timeOut,
@@ -5140,11 +5140,11 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, VALS(h282_T_tiltDirection_vals), 0,
         NULL, HFILL }},
     { &hf_h282_up,
-      { "up", "h282.up",
+      { "up", "h282.up_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_down,
-      { "down", "h282.down",
+      { "down", "h282.down_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_zoomDirection,
@@ -5152,11 +5152,11 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, VALS(h282_T_zoomDirection_vals), 0,
         NULL, HFILL }},
     { &hf_h282_telescopic,
-      { "telescopic", "h282.telescopic",
+      { "telescopic", "h282.telescopic_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_wide,
-      { "wide", "h282.wide",
+      { "wide", "h282.wide_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_focusDirection,
@@ -5164,19 +5164,19 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, VALS(h282_T_focusDirection_vals), 0,
         NULL, HFILL }},
     { &hf_h282_near,
-      { "near", "h282.near",
+      { "near", "h282.near_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_far,
-      { "far", "h282.far",
+      { "far", "h282.far_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_relative,
-      { "relative", "h282.relative",
+      { "relative", "h282.relative_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_absolute,
-      { "absolute", "h282.absolute",
+      { "absolute", "h282.absolute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_zoomPosition,
@@ -5204,19 +5204,19 @@ void proto_register_h282(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_next,
-      { "next", "h282.next",
+      { "next", "h282.next_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_previous,
-      { "previous", "h282.previous",
+      { "previous", "h282.previous_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_start,
-      { "start", "h282.start",
+      { "start", "h282.start_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_pause,
-      { "pause", "h282.pause",
+      { "pause", "h282.pause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_hours,
@@ -5248,7 +5248,7 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_inputDevices_item,
-      { "inputDevices item", "h282.inputDevices_item",
+      { "inputDevices item", "h282.inputDevices_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_setDeviceState,
@@ -5256,15 +5256,15 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, VALS(h282_DeviceState_vals), 0,
         "DeviceState", HFILL }},
     { &hf_h282_setDeviceDate,
-      { "setDeviceDate", "h282.setDeviceDate",
+      { "setDeviceDate", "h282.setDeviceDate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeviceDate", HFILL }},
     { &hf_h282_setDeviceTime,
-      { "setDeviceTime", "h282.setDeviceTime",
+      { "setDeviceTime", "h282.setDeviceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeviceTime", HFILL }},
     { &hf_h282_setDevicePreset,
-      { "setDevicePreset", "h282.setDevicePreset",
+      { "setDevicePreset", "h282.setDevicePreset_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DevicePreset", HFILL }},
     { &hf_h282_setIrisMode,
@@ -5292,7 +5292,7 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CameraFilterNumber", HFILL }},
     { &hf_h282_gotoHomePosition,
-      { "gotoHomePosition", "h282.gotoHomePosition",
+      { "gotoHomePosition", "h282.gotoHomePosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_selectExternalLight,
@@ -5300,7 +5300,7 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, VALS(h282_SelectExternalLight_vals), 0,
         NULL, HFILL }},
     { &hf_h282_clearCameraLens,
-      { "clearCameraLens", "h282.clearCameraLens",
+      { "clearCameraLens", "h282.clearCameraLens_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_setCameraPanSpeed,
@@ -5324,51 +5324,51 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, VALS(h282_Mode_vals), 0,
         "Mode", HFILL }},
     { &hf_h282_calibrateWhiteBalance,
-      { "calibrateWhiteBalance", "h282.calibrateWhiteBalance",
+      { "calibrateWhiteBalance", "h282.calibrateWhiteBalance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_focusImage,
-      { "focusImage", "h282.focusImage",
+      { "focusImage", "h282.focusImage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_captureImage,
-      { "captureImage", "h282.captureImage",
+      { "captureImage", "h282.captureImage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_panContinuous,
-      { "panContinuous", "h282.panContinuous",
+      { "panContinuous", "h282.panContinuous_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_tiltContinuous,
-      { "tiltContinuous", "h282.tiltContinuous",
+      { "tiltContinuous", "h282.tiltContinuous_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_zoomContinuous,
-      { "zoomContinuous", "h282.zoomContinuous",
+      { "zoomContinuous", "h282.zoomContinuous_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_focusContinuous,
-      { "focusContinuous", "h282.focusContinuous",
+      { "focusContinuous", "h282.focusContinuous_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_setZoomPosition,
-      { "setZoomPosition", "h282.setZoomPosition",
+      { "setZoomPosition", "h282.setZoomPosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_setFocusPosition,
-      { "setFocusPosition", "h282.setFocusPosition",
+      { "setFocusPosition", "h282.setFocusPosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_setIrisPosition,
-      { "setIrisPosition", "h282.setIrisPosition",
+      { "setIrisPosition", "h282.setIrisPosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_setPanPosition,
-      { "setPanPosition", "h282.setPanPosition",
+      { "setPanPosition", "h282.setPanPosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_setTiltPosition,
-      { "setTiltPosition", "h282.setTiltPosition",
+      { "setTiltPosition", "h282.setTiltPosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_setZoomMagnification,
@@ -5428,7 +5428,7 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, VALS(h282_SelectDirection_vals), 0,
         "SelectDirection", HFILL }},
     { &hf_h282_gotoNormalPlayTimePoint,
-      { "gotoNormalPlayTimePoint", "h282.gotoNormalPlayTimePoint",
+      { "gotoNormalPlayTimePoint", "h282.gotoNormalPlayTimePoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProgramDuration", HFILL }},
     { &hf_h282_continuousPlayBackMode,
@@ -5436,7 +5436,7 @@ void proto_register_h282(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h282_setPlaybackSpeed,
-      { "setPlaybackSpeed", "h282.setPlaybackSpeed",
+      { "setPlaybackSpeed", "h282.setPlaybackSpeed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PlaybackSpeed", HFILL }},
     { &hf_h282_play,
@@ -5448,7 +5448,7 @@ void proto_register_h282(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h282_playToNormalPlayTimePoint,
-      { "playToNormalPlayTimePoint", "h282.playToNormalPlayTimePoint",
+      { "playToNormalPlayTimePoint", "h282.playToNormalPlayTimePoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProgramDuration", HFILL }},
     { &hf_h282_record,
@@ -5456,151 +5456,151 @@ void proto_register_h282(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h282_recordForDuration,
-      { "recordForDuration", "h282.recordForDuration",
+      { "recordForDuration", "h282.recordForDuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_configureVideoInputs,
-      { "configureVideoInputs", "h282.configureVideoInputs",
+      { "configureVideoInputs", "h282.configureVideoInputs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeviceInputs", HFILL }},
     { &hf_h282_configureAudioInputs,
-      { "configureAudioInputs", "h282.configureAudioInputs",
+      { "configureAudioInputs", "h282.configureAudioInputs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeviceInputs", HFILL }},
     { &hf_h282_nonStandardControl,
-      { "nonStandardControl", "h282.nonStandardControl",
+      { "nonStandardControl", "h282.nonStandardControl_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_h282_getDeviceState,
-      { "getDeviceState", "h282.getDeviceState",
+      { "getDeviceState", "h282.getDeviceState_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getDeviceDate,
-      { "getDeviceDate", "h282.getDeviceDate",
+      { "getDeviceDate", "h282.getDeviceDate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getDeviceTime,
-      { "getDeviceTime", "h282.getDeviceTime",
+      { "getDeviceTime", "h282.getDeviceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getdevicePreset,
-      { "getdevicePreset", "h282.getdevicePreset",
+      { "getdevicePreset", "h282.getdevicePreset_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getIrisMode,
-      { "getIrisMode", "h282.getIrisMode",
+      { "getIrisMode", "h282.getIrisMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getFocusMode,
-      { "getFocusMode", "h282.getFocusMode",
+      { "getFocusMode", "h282.getFocusMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getBacklightMode,
-      { "getBacklightMode", "h282.getBacklightMode",
+      { "getBacklightMode", "h282.getBacklightMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getPointingMode,
-      { "getPointingMode", "h282.getPointingMode",
+      { "getPointingMode", "h282.getPointingMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getCameraLens,
-      { "getCameraLens", "h282.getCameraLens",
+      { "getCameraLens", "h282.getCameraLens_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getCameraFilter,
-      { "getCameraFilter", "h282.getCameraFilter",
+      { "getCameraFilter", "h282.getCameraFilter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getExternalLight,
-      { "getExternalLight", "h282.getExternalLight",
+      { "getExternalLight", "h282.getExternalLight_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getCameraPanSpeed,
-      { "getCameraPanSpeed", "h282.getCameraPanSpeed",
+      { "getCameraPanSpeed", "h282.getCameraPanSpeed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getCameraTiltSpeed,
-      { "getCameraTiltSpeed", "h282.getCameraTiltSpeed",
+      { "getCameraTiltSpeed", "h282.getCameraTiltSpeed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getBackLightMode,
-      { "getBackLightMode", "h282.getBackLightMode",
+      { "getBackLightMode", "h282.getBackLightMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getBackLight,
-      { "getBackLight", "h282.getBackLight",
+      { "getBackLight", "h282.getBackLight_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getWhiteBalance,
-      { "getWhiteBalance", "h282.getWhiteBalance",
+      { "getWhiteBalance", "h282.getWhiteBalance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getWhiteBalanceMode,
-      { "getWhiteBalanceMode", "h282.getWhiteBalanceMode",
+      { "getWhiteBalanceMode", "h282.getWhiteBalanceMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getZoomPosition,
-      { "getZoomPosition", "h282.getZoomPosition",
+      { "getZoomPosition", "h282.getZoomPosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getFocusPosition,
-      { "getFocusPosition", "h282.getFocusPosition",
+      { "getFocusPosition", "h282.getFocusPosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getIrisPosition,
-      { "getIrisPosition", "h282.getIrisPosition",
+      { "getIrisPosition", "h282.getIrisPosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getPanPosition,
-      { "getPanPosition", "h282.getPanPosition",
+      { "getPanPosition", "h282.getPanPosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getTiltPosition,
-      { "getTiltPosition", "h282.getTiltPosition",
+      { "getTiltPosition", "h282.getTiltPosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getSelectedSlide,
-      { "getSelectedSlide", "h282.getSelectedSlide",
+      { "getSelectedSlide", "h282.getSelectedSlide_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getAutoSlideDisplayTime,
-      { "getAutoSlideDisplayTime", "h282.getAutoSlideDisplayTime",
+      { "getAutoSlideDisplayTime", "h282.getAutoSlideDisplayTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getSelectedProgram,
-      { "getSelectedProgram", "h282.getSelectedProgram",
+      { "getSelectedProgram", "h282.getSelectedProgram_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getStreamPlayerState,
-      { "getStreamPlayerState", "h282.getStreamPlayerState",
+      { "getStreamPlayerState", "h282.getStreamPlayerState_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getCurrentProgramDuration,
-      { "getCurrentProgramDuration", "h282.getCurrentProgramDuration",
+      { "getCurrentProgramDuration", "h282.getCurrentProgramDuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getPlaybackSpeed,
-      { "getPlaybackSpeed", "h282.getPlaybackSpeed",
+      { "getPlaybackSpeed", "h282.getPlaybackSpeed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getAudioOutputState,
-      { "getAudioOutputState", "h282.getAudioOutputState",
+      { "getAudioOutputState", "h282.getAudioOutputState_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getConfigurableVideoInputs,
-      { "getConfigurableVideoInputs", "h282.getConfigurableVideoInputs",
+      { "getConfigurableVideoInputs", "h282.getConfigurableVideoInputs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getVideoInputs,
-      { "getVideoInputs", "h282.getVideoInputs",
+      { "getVideoInputs", "h282.getVideoInputs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getConfigurableAudioInputs,
-      { "getConfigurableAudioInputs", "h282.getConfigurableAudioInputs",
+      { "getConfigurableAudioInputs", "h282.getConfigurableAudioInputs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getAudioInputs,
-      { "getAudioInputs", "h282.getAudioInputs",
+      { "getAudioInputs", "h282.getAudioInputs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_getNonStandardStatus,
@@ -5612,7 +5612,7 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, VALS(h282_DeviceState_vals), 0,
         NULL, HFILL }},
     { &hf_h282_unknown,
-      { "unknown", "h282.unknown",
+      { "unknown", "h282.unknown_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_currentDay,
@@ -5644,7 +5644,7 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, VALS(h282_Mode_vals), 0,
         NULL, HFILL }},
     { &hf_h282_automatic,
-      { "automatic", "h282.automatic",
+      { "automatic", "h282.automatic_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_lensNumber_01,
@@ -5688,7 +5688,7 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, VALS(h282_StreamPlayerState_vals), 0,
         "StreamPlayerState", HFILL }},
     { &hf_h282_speed_02,
-      { "speed", "h282.speed",
+      { "speed", "h282.speed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PlaybackSpeed", HFILL }},
     { &hf_h282_mute,
@@ -5700,11 +5700,11 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, VALS(h282_CurrentDeviceState_vals), 0,
         NULL, HFILL }},
     { &hf_h282_currentDeviceDate,
-      { "currentDeviceDate", "h282.currentDeviceDate",
+      { "currentDeviceDate", "h282.currentDeviceDate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_currentDeviceTime,
-      { "currentDeviceTime", "h282.currentDeviceTime",
+      { "currentDeviceTime", "h282.currentDeviceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_currentDevicePreset,
@@ -5796,7 +5796,7 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, VALS(h282_CurrentStreamPlayerState_vals), 0,
         NULL, HFILL }},
     { &hf_h282_currentProgramDuration,
-      { "currentProgramDuration", "h282.currentProgramDuration",
+      { "currentProgramDuration", "h282.currentProgramDuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProgramDuration", HFILL }},
     { &hf_h282_currentPlaybackSpeed,
@@ -5808,59 +5808,59 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, VALS(h282_CurrentAudioOutputMute_vals), 0,
         NULL, HFILL }},
     { &hf_h282_configurableVideoInputs,
-      { "configurableVideoInputs", "h282.configurableVideoInputs",
+      { "configurableVideoInputs", "h282.configurableVideoInputs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeviceInputs", HFILL }},
     { &hf_h282_videoInputs,
-      { "videoInputs", "h282.videoInputs",
+      { "videoInputs", "h282.videoInputs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeviceInputs", HFILL }},
     { &hf_h282_configurableAudioInputs,
-      { "configurableAudioInputs", "h282.configurableAudioInputs",
+      { "configurableAudioInputs", "h282.configurableAudioInputs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeviceInputs", HFILL }},
     { &hf_h282_audioInputs,
-      { "audioInputs", "h282.audioInputs",
+      { "audioInputs", "h282.audioInputs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeviceInputs", HFILL }},
     { &hf_h282_nonStandardStatus,
-      { "nonStandardStatus", "h282.nonStandardStatus",
+      { "nonStandardStatus", "h282.nonStandardStatus_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_h282_requestDeviceLockChanged,
-      { "requestDeviceLockChanged", "h282.requestDeviceLockChanged",
+      { "requestDeviceLockChanged", "h282.requestDeviceLockChanged_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_requestDeviceAvailabilityChanged,
-      { "requestDeviceAvailabilityChanged", "h282.requestDeviceAvailabilityChanged",
+      { "requestDeviceAvailabilityChanged", "h282.requestDeviceAvailabilityChanged_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_requestCameraPannedToLimit,
-      { "requestCameraPannedToLimit", "h282.requestCameraPannedToLimit",
+      { "requestCameraPannedToLimit", "h282.requestCameraPannedToLimit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_requestCameraTiltedToLimit,
-      { "requestCameraTiltedToLimit", "h282.requestCameraTiltedToLimit",
+      { "requestCameraTiltedToLimit", "h282.requestCameraTiltedToLimit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_requestCameraZoomedToLimit,
-      { "requestCameraZoomedToLimit", "h282.requestCameraZoomedToLimit",
+      { "requestCameraZoomedToLimit", "h282.requestCameraZoomedToLimit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_requestCameraFocusedToLimit,
-      { "requestCameraFocusedToLimit", "h282.requestCameraFocusedToLimit",
+      { "requestCameraFocusedToLimit", "h282.requestCameraFocusedToLimit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_requestAutoSlideShowFinished,
-      { "requestAutoSlideShowFinished", "h282.requestAutoSlideShowFinished",
+      { "requestAutoSlideShowFinished", "h282.requestAutoSlideShowFinished_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_requestStreamPlayerStateChange,
-      { "requestStreamPlayerStateChange", "h282.requestStreamPlayerStateChange",
+      { "requestStreamPlayerStateChange", "h282.requestStreamPlayerStateChange_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_requestStreamPlayerProgramChange,
-      { "requestStreamPlayerProgramChange", "h282.requestStreamPlayerProgramChange",
+      { "requestStreamPlayerProgramChange", "h282.requestStreamPlayerProgramChange_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_requestNonStandardEvent,
@@ -5892,7 +5892,7 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, VALS(h282_CameraFocusedToLimit_vals), 0,
         NULL, HFILL }},
     { &hf_h282_autoSlideShowFinished,
-      { "autoSlideShowFinished", "h282.autoSlideShowFinished",
+      { "autoSlideShowFinished", "h282.autoSlideShowFinished_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_streamPlayerStateChange,
@@ -5904,7 +5904,7 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ProgramNumber", HFILL }},
     { &hf_h282_nonStandardEvent,
-      { "nonStandardEvent", "h282.nonStandardEvent",
+      { "nonStandardEvent", "h282.nonStandardEvent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_h282_requestHandle,
@@ -5920,27 +5920,27 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, VALS(h282_T_result_vals), 0,
         NULL, HFILL }},
     { &hf_h282_successful,
-      { "successful", "h282.successful",
+      { "successful", "h282.successful_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_requestDenied,
-      { "requestDenied", "h282.requestDenied",
+      { "requestDenied", "h282.requestDenied_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_deviceUnavailable,
-      { "deviceUnavailable", "h282.deviceUnavailable",
+      { "deviceUnavailable", "h282.deviceUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_invalidStreamID,
-      { "invalidStreamID", "h282.invalidStreamID",
+      { "invalidStreamID", "h282.invalidStreamID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_currentDeviceIsLocked,
-      { "currentDeviceIsLocked", "h282.currentDeviceIsLocked",
+      { "currentDeviceIsLocked", "h282.currentDeviceIsLocked_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_deviceIncompatible,
-      { "deviceIncompatible", "h282.deviceIncompatible",
+      { "deviceIncompatible", "h282.deviceIncompatible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_sourceEventNotify,
@@ -5952,7 +5952,7 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, VALS(h282_T_result_01_vals), 0,
         "T_result_01", HFILL }},
     { &hf_h282_eventsNotSupported,
-      { "eventsNotSupported", "h282.eventsNotSupported",
+      { "eventsNotSupported", "h282.eventsNotSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_deviceAttributeList,
@@ -5968,7 +5968,7 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, VALS(h282_T_result_02_vals), 0,
         "T_result_02", HFILL }},
     { &hf_h282_unknownDevice,
-      { "unknownDevice", "h282.unknownDevice",
+      { "unknownDevice", "h282.unknownDevice_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_lockFlag,
@@ -5980,11 +5980,11 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, VALS(h282_T_result_03_vals), 0,
         "T_result_03", HFILL }},
     { &hf_h282_lockingNotSupported,
-      { "lockingNotSupported", "h282.lockingNotSupported",
+      { "lockingNotSupported", "h282.lockingNotSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_deviceAlreadyLocked,
-      { "deviceAlreadyLocked", "h282.deviceAlreadyLocked",
+      { "deviceAlreadyLocked", "h282.deviceAlreadyLocked_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_result_04,
@@ -5992,11 +5992,11 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, VALS(h282_T_result_04_vals), 0,
         "T_result_04", HFILL }},
     { &hf_h282_lockRequired,
-      { "lockRequired", "h282.lockRequired",
+      { "lockRequired", "h282.lockRequired_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_lockNotRequired,
-      { "lockNotRequired", "h282.lockNotRequired",
+      { "lockNotRequired", "h282.lockNotRequired_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_controlAttributeList,
@@ -6028,7 +6028,7 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, VALS(h282_T_result_05_vals), 0,
         "T_result_05", HFILL }},
     { &hf_h282_deviceAttributeError,
-      { "deviceAttributeError", "h282.deviceAttributeError",
+      { "deviceAttributeError", "h282.deviceAttributeError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_deviceEventIdentifierList,
@@ -6052,7 +6052,7 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, VALS(h282_DeviceEvent_vals), 0,
         NULL, HFILL }},
     { &hf_h282_nonStandardData,
-      { "nonStandardData", "h282.nonStandardData",
+      { "nonStandardData", "h282.nonStandardData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_h282_request,
@@ -6068,87 +6068,87 @@ void proto_register_h282(void) {
         FT_UINT32, BASE_DEC, VALS(h282_IndicationPDU_vals), 0,
         "IndicationPDU", HFILL }},
     { &hf_h282_sourceSelectRequest,
-      { "sourceSelectRequest", "h282.sourceSelectRequest",
+      { "sourceSelectRequest", "h282.sourceSelectRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_sourceEventsRequest,
-      { "sourceEventsRequest", "h282.sourceEventsRequest",
+      { "sourceEventsRequest", "h282.sourceEventsRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_deviceAttributeRequest,
-      { "deviceAttributeRequest", "h282.deviceAttributeRequest",
+      { "deviceAttributeRequest", "h282.deviceAttributeRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_deviceLockRequest,
-      { "deviceLockRequest", "h282.deviceLockRequest",
+      { "deviceLockRequest", "h282.deviceLockRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_deviceLockEnquireRequest,
-      { "deviceLockEnquireRequest", "h282.deviceLockEnquireRequest",
+      { "deviceLockEnquireRequest", "h282.deviceLockEnquireRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_deviceControlRequest,
-      { "deviceControlRequest", "h282.deviceControlRequest",
+      { "deviceControlRequest", "h282.deviceControlRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_deviceStatusEnquireRequest,
-      { "deviceStatusEnquireRequest", "h282.deviceStatusEnquireRequest",
+      { "deviceStatusEnquireRequest", "h282.deviceStatusEnquireRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_configureDeviceEventsRequest,
-      { "configureDeviceEventsRequest", "h282.configureDeviceEventsRequest",
+      { "configureDeviceEventsRequest", "h282.configureDeviceEventsRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_nonStandardRequest,
-      { "nonStandardRequest", "h282.nonStandardRequest",
+      { "nonStandardRequest", "h282.nonStandardRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardPDU", HFILL }},
     { &hf_h282_sourceSelectResponse,
-      { "sourceSelectResponse", "h282.sourceSelectResponse",
+      { "sourceSelectResponse", "h282.sourceSelectResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_sourceEventsResponse,
-      { "sourceEventsResponse", "h282.sourceEventsResponse",
+      { "sourceEventsResponse", "h282.sourceEventsResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_deviceAttributeResponse,
-      { "deviceAttributeResponse", "h282.deviceAttributeResponse",
+      { "deviceAttributeResponse", "h282.deviceAttributeResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_deviceLockResponse,
-      { "deviceLockResponse", "h282.deviceLockResponse",
+      { "deviceLockResponse", "h282.deviceLockResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_deviceLockEnquireResponse,
-      { "deviceLockEnquireResponse", "h282.deviceLockEnquireResponse",
+      { "deviceLockEnquireResponse", "h282.deviceLockEnquireResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_deviceStatusEnquireResponse,
-      { "deviceStatusEnquireResponse", "h282.deviceStatusEnquireResponse",
+      { "deviceStatusEnquireResponse", "h282.deviceStatusEnquireResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_configureDeviceEventsResponse,
-      { "configureDeviceEventsResponse", "h282.configureDeviceEventsResponse",
+      { "configureDeviceEventsResponse", "h282.configureDeviceEventsResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_nonStandardResponse,
-      { "nonStandardResponse", "h282.nonStandardResponse",
+      { "nonStandardResponse", "h282.nonStandardResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardPDU", HFILL }},
     { &hf_h282_sourceChangeEventIndication,
-      { "sourceChangeEventIndication", "h282.sourceChangeEventIndication",
+      { "sourceChangeEventIndication", "h282.sourceChangeEventIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_deviceLockTerminatedIndication,
-      { "deviceLockTerminatedIndication", "h282.deviceLockTerminatedIndication",
+      { "deviceLockTerminatedIndication", "h282.deviceLockTerminatedIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_deviceEventNotifyIndication,
-      { "deviceEventNotifyIndication", "h282.deviceEventNotifyIndication",
+      { "deviceEventNotifyIndication", "h282.deviceEventNotifyIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h282_nonStandardIndication,
-      { "nonStandardIndication", "h282.nonStandardIndication",
+      { "nonStandardIndication", "h282.nonStandardIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardPDU", HFILL }},
 
diff --git a/epan/dissectors/packet-h283.c b/epan/dissectors/packet-h283.c
index b37a2c0384..69bc124f50 100644
--- a/epan/dissectors/packet-h283.c
+++ b/epan/dissectors/packet-h283.c
@@ -591,7 +591,7 @@ void proto_register_h283(void) {
 /*--- Included file: packet-h283-hfarr.c ---*/
 #line 1 "../../asn1/h283/packet-h283-hfarr.c"
     { &hf_h283_LCTPDU_PDU,
-      { "LCTPDU", "h283.LCTPDU",
+      { "LCTPDU", "h283.LCTPDU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h283_t35CountryCode,
@@ -611,7 +611,7 @@ void proto_register_h283(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_h283_h221NonStandard,
-      { "h221NonStandard", "h283.h221NonStandard",
+      { "h221NonStandard", "h283.h221NonStandard_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h283_nonStandardIdentifier,
@@ -623,11 +623,11 @@ void proto_register_h283(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_h283_srcAddr,
-      { "srcAddr", "h283.srcAddr",
+      { "srcAddr", "h283.srcAddr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MTAddress", HFILL }},
     { &hf_h283_dstAddr,
-      { "dstAddr", "h283.dstAddr",
+      { "dstAddr", "h283.dstAddr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MTAddress", HFILL }},
     { &hf_h283_timestamp,
@@ -643,11 +643,11 @@ void proto_register_h283(void) {
         FT_UINT32, BASE_DEC, VALS(h283_T_pduType_vals), 0,
         NULL, HFILL }},
     { &hf_h283_ack,
-      { "ack", "h283.ack",
+      { "ack", "h283.ack_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h283_rdcData,
-      { "rdcData", "h283.rdcData",
+      { "rdcData", "h283.rdcData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h283_nonStandardParameters,
@@ -655,7 +655,7 @@ void proto_register_h283(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_NonStandardParameter", HFILL }},
     { &hf_h283_nonStandardParameters_item,
-      { "NonStandardParameter", "h283.NonStandardParameter",
+      { "NonStandardParameter", "h283.NonStandardParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h283_mAddress,
@@ -695,19 +695,19 @@ void proto_register_h283(void) {
         FT_UINT32, BASE_DEC, VALS(h283_LCTIndication_vals), 0,
         NULL, HFILL }},
     { &hf_h283_nonStandardMessage,
-      { "nonStandardMessage", "h283.nonStandardMessage",
+      { "nonStandardMessage", "h283.nonStandardMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h283_announceReq,
-      { "announceReq", "h283.announceReq",
+      { "announceReq", "h283.announceReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h283_deviceListReq,
-      { "deviceListReq", "h283.deviceListReq",
+      { "deviceListReq", "h283.deviceListReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h283_announceResp,
-      { "announceResp", "h283.announceResp",
+      { "announceResp", "h283.announceResp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h283_deviceListResp,
@@ -715,7 +715,7 @@ void proto_register_h283(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h283_deviceChange,
-      { "deviceChange", "h283.deviceChange",
+      { "deviceChange", "h283.deviceChange_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-h323.c b/epan/dissectors/packet-h323.c
index 423002f9e3..6ae3c3767b 100644
--- a/epan/dissectors/packet-h323.c
+++ b/epan/dissectors/packet-h323.c
@@ -451,15 +451,15 @@ void proto_register_h323(void) {
 /*--- Included file: packet-h323-hfarr.c ---*/
 #line 1 "../../asn1/h323/packet-h323-hfarr.c"
     { &hf_h323_RasTunnelledSignallingMessage_PDU,
-      { "RasTunnelledSignallingMessage", "h323.RasTunnelledSignallingMessage",
+      { "RasTunnelledSignallingMessage", "h323.RasTunnelledSignallingMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h323_RobustnessData_PDU,
-      { "RobustnessData", "h323.RobustnessData",
+      { "RobustnessData", "h323.RobustnessData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h323_tunnelledProtocolID,
-      { "tunnelledProtocolID", "h323.tunnelledProtocolID",
+      { "tunnelledProtocolID", "h323.tunnelledProtocolID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TunnelledProtocol", HFILL }},
     { &hf_h323_messageContent,
@@ -471,11 +471,11 @@ void proto_register_h323(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_h323_tunnellingRequired,
-      { "tunnellingRequired", "h323.tunnellingRequired",
+      { "tunnellingRequired", "h323.tunnellingRequired_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h323_nonStandardData,
-      { "nonStandardData", "h323.nonStandardData",
+      { "nonStandardData", "h323.nonStandardData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_h323_versionID,
@@ -487,27 +487,27 @@ void proto_register_h323(void) {
         FT_UINT32, BASE_DEC, VALS(h323_T_robustnessData_vals), 0,
         NULL, HFILL }},
     { &hf_h323_rrqData,
-      { "rrqData", "h323.rrqData",
+      { "rrqData", "h323.rrqData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Rrq_RD", HFILL }},
     { &hf_h323_rcfData,
-      { "rcfData", "h323.rcfData",
+      { "rcfData", "h323.rcfData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Rcf_RD", HFILL }},
     { &hf_h323_setupData,
-      { "setupData", "h323.setupData",
+      { "setupData", "h323.setupData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Setup_RD", HFILL }},
     { &hf_h323_connectData,
-      { "connectData", "h323.connectData",
+      { "connectData", "h323.connectData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Connect_RD", HFILL }},
     { &hf_h323_statusData,
-      { "statusData", "h323.statusData",
+      { "statusData", "h323.statusData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Status_RD", HFILL }},
     { &hf_h323_statusInquiryData,
-      { "statusInquiryData", "h323.statusInquiryData",
+      { "statusInquiryData", "h323.statusInquiryData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "StatusInquiry_RD", HFILL }},
     { &hf_h323_BackupCallSignalAddresses_item,
@@ -519,7 +519,7 @@ void proto_register_h323(void) {
         FT_UINT32, BASE_DEC, VALS(h225_TransportAddress_vals), 0,
         "TransportAddress", HFILL }},
     { &hf_h323_alternateTransport,
-      { "alternateTransport", "h323.alternateTransport",
+      { "alternateTransport", "h323.alternateTransport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlternateTransportAddresses", HFILL }},
     { &hf_h323_backupCallSignalAddresses,
@@ -527,7 +527,7 @@ void proto_register_h323(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h323_hasSharedRepository,
-      { "hasSharedRepository", "h323.hasSharedRepository",
+      { "hasSharedRepository", "h323.hasSharedRepository_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h323_irrFrequency,
@@ -551,7 +551,7 @@ void proto_register_h323(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_h323_resetH245,
-      { "resetH245", "h323.resetH245",
+      { "resetH245", "h323.resetH245_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h323_timeToLive,
@@ -559,7 +559,7 @@ void proto_register_h323(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h323_includeFastStart,
-      { "includeFastStart", "h323.includeFastStart",
+      { "includeFastStart", "h323.includeFastStart_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-h450-ros.c b/epan/dissectors/packet-h450-ros.c
index f686ec0598..e974c72f2a 100644
--- a/epan/dissectors/packet-h450-ros.c
+++ b/epan/dissectors/packet-h450-ros.c
@@ -597,19 +597,19 @@ void proto_register_h450_ros(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_ros_invoke,
-      { "invoke", "h450.ros.invoke",
+      { "invoke", "h450.ros.invoke_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_ros_returnResult,
-      { "returnResult", "h450.ros.returnResult",
+      { "returnResult", "h450.ros.returnResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_ros_returnError,
-      { "returnError", "h450.ros.returnError",
+      { "returnError", "h450.ros.returnError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_ros_reject,
-      { "reject", "h450.ros.reject",
+      { "reject", "h450.ros.reject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_ros_invokeIdConstrained,
@@ -633,7 +633,7 @@ void proto_register_h450_ros(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_ros_result,
-      { "result", "h450.ros.result",
+      { "result", "h450.ros.result_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_ros_resultArgument,
diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c
index 7ea596c34a..5eb3a5083e 100644
--- a/epan/dissectors/packet-h450.c
+++ b/epan/dissectors/packet-h450.c
@@ -4847,11 +4847,11 @@ void proto_register_h450(void) {
 /* --- Modules H4501-Supplementary-ServiceAPDU-Structure Addressing-Data-Elements H225-generic-parameters-definition Manufacturer-specific-service-extension-definition H4501-General-Error-List --- --- --- */
 
     { &hf_h450_h450_H4501SupplementaryService_PDU,
-      { "H4501SupplementaryService", "h450.H4501SupplementaryService",
+      { "H4501SupplementaryService", "h450.H4501SupplementaryService_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_networkFacilityExtension,
-      { "networkFacilityExtension", "h450.networkFacilityExtension",
+      { "networkFacilityExtension", "h450.networkFacilityExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_interpretationApdu,
@@ -4879,23 +4879,23 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0,
         "AddressInformation", HFILL }},
     { &hf_h450_endpoint,
-      { "endpoint", "h450.endpoint",
+      { "endpoint", "h450.endpoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_anyEntity,
-      { "anyEntity", "h450.anyEntity",
+      { "anyEntity", "h450.anyEntity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_discardAnyUnrecognizedInvokePdu,
-      { "discardAnyUnrecognizedInvokePdu", "h450.discardAnyUnrecognizedInvokePdu",
+      { "discardAnyUnrecognizedInvokePdu", "h450.discardAnyUnrecognizedInvokePdu_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_clearCallIfAnyInvokePduNotRecognized,
-      { "clearCallIfAnyInvokePduNotRecognized", "h450.clearCallIfAnyInvokePduNotRecognized",
+      { "clearCallIfAnyInvokePduNotRecognized", "h450.clearCallIfAnyInvokePduNotRecognized_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_rejectAnyUnrecognizedInvokePdu,
-      { "rejectAnyUnrecognizedInvokePdu", "h450.rejectAnyUnrecognizedInvokePdu",
+      { "rejectAnyUnrecognizedInvokePdu", "h450.rejectAnyUnrecognizedInvokePdu_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_rosApdus,
@@ -4935,7 +4935,7 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h225_ScreeningIndicator_vals), 0,
         "ScreeningIndicator", HFILL }},
     { &hf_h450_userSpecifiedSubaddress,
-      { "userSpecifiedSubaddress", "h450.userSpecifiedSubaddress",
+      { "userSpecifiedSubaddress", "h450.userSpecifiedSubaddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_nsapSubaddress,
@@ -4955,7 +4955,7 @@ void proto_register_h450(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_h450_extensionArgument,
-      { "extensionArgument", "h450.extensionArgument",
+      { "extensionArgument", "h450.extensionArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
@@ -4966,11 +4966,11 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_2_DummyArg_vals), 0,
         NULL, HFILL }},
     { &hf_h450_2_h450_2_CTIdentifyRes_PDU,
-      { "CTIdentifyRes", "h450.2.CTIdentifyRes",
+      { "CTIdentifyRes", "h450.2.CTIdentifyRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_2_h450_2_CTInitiateArg_PDU,
-      { "CTInitiateArg", "h450.2.CTInitiateArg",
+      { "CTInitiateArg", "h450.2.CTInitiateArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_2_h450_2_DummyRes_PDU,
@@ -4978,23 +4978,23 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_2_DummyRes_vals), 0,
         NULL, HFILL }},
     { &hf_h450_2_h450_2_CTSetupArg_PDU,
-      { "CTSetupArg", "h450.2.CTSetupArg",
+      { "CTSetupArg", "h450.2.CTSetupArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_2_h450_2_CTUpdateArg_PDU,
-      { "CTUpdateArg", "h450.2.CTUpdateArg",
+      { "CTUpdateArg", "h450.2.CTUpdateArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_2_h450_2_SubaddressTransferArg_PDU,
-      { "SubaddressTransferArg", "h450.2.SubaddressTransferArg",
+      { "SubaddressTransferArg", "h450.2.SubaddressTransferArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_2_h450_2_CTCompleteArg_PDU,
-      { "CTCompleteArg", "h450.2.CTCompleteArg",
+      { "CTCompleteArg", "h450.2.CTCompleteArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_2_h450_2_CTActiveArg_PDU,
-      { "CTActiveArg", "h450.2.CTActiveArg",
+      { "CTActiveArg", "h450.2.CTActiveArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_2_h450_2_PAR_unspecified_PDU,
@@ -5006,7 +5006,7 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_2_nonStandardData,
-      { "nonStandardData", "h450.2.nonStandardData",
+      { "nonStandardData", "h450.2.nonStandardData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_h450_2_callIdentity,
@@ -5014,7 +5014,7 @@ void proto_register_h450(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_2_reroutingNumber,
-      { "reroutingNumber", "h450.2.reroutingNumber",
+      { "reroutingNumber", "h450.2.reroutingNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_2_cTInitiateArg_argumentExtension,
@@ -5022,7 +5022,7 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_2_T_cTInitiateArg_argumentExtension_vals), 0,
         "T_cTInitiateArg_argumentExtension", HFILL }},
     { &hf_h450_2_transferringNumber,
-      { "transferringNumber", "h450.2.transferringNumber",
+      { "transferringNumber", "h450.2.transferringNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_2_cTSetupArg_argumentExtension,
@@ -5034,7 +5034,7 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_2_T_resultExtension_vals), 0,
         NULL, HFILL }},
     { &hf_h450_2_redirectionNumber,
-      { "redirectionNumber", "h450.2.redirectionNumber",
+      { "redirectionNumber", "h450.2.redirectionNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_2_redirectionInfo,
@@ -5070,7 +5070,7 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_2_T_cTCompleteArg_argumentExtension_vals), 0,
         "T_cTCompleteArg_argumentExtension", HFILL }},
     { &hf_h450_2_connectedAddress,
-      { "connectedAddress", "h450.2.connectedAddress",
+      { "connectedAddress", "h450.2.connectedAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_2_connectedInfo,
@@ -5082,22 +5082,22 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_2_T_cTActiveArg_argumentExtension_vals), 0,
         "T_cTActiveArg_argumentExtension", HFILL }},
     { &hf_h450_2_ExtensionSeq_item,
-      { "Extension", "h450.2.Extension",
+      { "Extension", "h450.2.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_2_unspecified_extension,
-      { "extension", "h450.2.extension",
+      { "extension", "h450.2.extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_2_nonStandard,
-      { "nonStandard", "h450.2.nonStandard",
+      { "nonStandard", "h450.2.nonStandard_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
 
 /* --- Module Call-Diversion-Operations --- --- ---                           */
 
     { &hf_h450_3_h450_3_ARG_activateDiversionQ_PDU,
-      { "ARG-activateDiversionQ", "h450.3.ARG_activateDiversionQ",
+      { "ARG-activateDiversionQ", "h450.3.ARG_activateDiversionQ_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_3_h450_3_RES_activateDiversionQ_PDU,
@@ -5105,7 +5105,7 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_3_RES_activateDiversionQ_vals), 0,
         NULL, HFILL }},
     { &hf_h450_3_h450_3_ARG_deactivateDiversionQ_PDU,
-      { "ARG-deactivateDiversionQ", "h450.3.ARG_deactivateDiversionQ",
+      { "ARG-deactivateDiversionQ", "h450.3.ARG_deactivateDiversionQ_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_3_h450_3_RES_deactivateDiversionQ_PDU,
@@ -5113,7 +5113,7 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_3_RES_deactivateDiversionQ_vals), 0,
         NULL, HFILL }},
     { &hf_h450_3_h450_3_ARG_interrogateDiversionQ_PDU,
-      { "ARG-interrogateDiversionQ", "h450.3.ARG_interrogateDiversionQ",
+      { "ARG-interrogateDiversionQ", "h450.3.ARG_interrogateDiversionQ_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_3_h450_3_IntResultList_PDU,
@@ -5121,7 +5121,7 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_3_h450_3_ARG_checkRestriction_PDU,
-      { "ARG-checkRestriction", "h450.3.ARG_checkRestriction",
+      { "ARG-checkRestriction", "h450.3.ARG_checkRestriction_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_3_h450_3_RES_checkRestriction_PDU,
@@ -5129,7 +5129,7 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_3_RES_checkRestriction_vals), 0,
         NULL, HFILL }},
     { &hf_h450_3_h450_3_ARG_callRerouting_PDU,
-      { "ARG-callRerouting", "h450.3.ARG_callRerouting",
+      { "ARG-callRerouting", "h450.3.ARG_callRerouting_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_3_h450_3_RES_callRerouting_PDU,
@@ -5137,19 +5137,19 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_3_RES_callRerouting_vals), 0,
         NULL, HFILL }},
     { &hf_h450_3_h450_3_ARG_divertingLegInformation1_PDU,
-      { "ARG-divertingLegInformation1", "h450.3.ARG_divertingLegInformation1",
+      { "ARG-divertingLegInformation1", "h450.3.ARG_divertingLegInformation1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_3_h450_3_ARG_divertingLegInformation2_PDU,
-      { "ARG-divertingLegInformation2", "h450.3.ARG_divertingLegInformation2",
+      { "ARG-divertingLegInformation2", "h450.3.ARG_divertingLegInformation2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_3_h450_3_ARG_divertingLegInformation3_PDU,
-      { "ARG-divertingLegInformation3", "h450.3.ARG_divertingLegInformation3",
+      { "ARG-divertingLegInformation3", "h450.3.ARG_divertingLegInformation3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_3_h450_3_ARG_divertingLegInformation4_PDU,
-      { "ARG-divertingLegInformation4", "h450.3.ARG_divertingLegInformation4",
+      { "ARG-divertingLegInformation4", "h450.3.ARG_divertingLegInformation4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_3_h450_3_ARG_cfnrDivertedLegFailed_PDU,
@@ -5169,15 +5169,15 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_3_BasicService_vals), 0,
         NULL, HFILL }},
     { &hf_h450_3_divertedToAddress,
-      { "divertedToAddress", "h450.3.divertedToAddress",
+      { "divertedToAddress", "h450.3.divertedToAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_3_servedUserNr,
-      { "servedUserNr", "h450.3.servedUserNr",
+      { "servedUserNr", "h450.3.servedUserNr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_3_activatingUserNr,
-      { "activatingUserNr", "h450.3.activatingUserNr",
+      { "activatingUserNr", "h450.3.activatingUserNr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_3_activateDiversionQArg_extension,
@@ -5189,11 +5189,11 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_3_nonStandardData,
-      { "nonStandardData", "h450.3.nonStandardData",
+      { "nonStandardData", "h450.3.nonStandardData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_h450_3_deactivatingUserNr,
-      { "deactivatingUserNr", "h450.3.deactivatingUserNr",
+      { "deactivatingUserNr", "h450.3.deactivatingUserNr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_3_deactivateDiversionQArg_extension,
@@ -5201,7 +5201,7 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_3_DeactivateDiversionQArg_extension_vals), 0,
         "DeactivateDiversionQArg_extension", HFILL }},
     { &hf_h450_3_interrogatingUserNr,
-      { "interrogatingUserNr", "h450.3.interrogatingUserNr",
+      { "interrogatingUserNr", "h450.3.interrogatingUserNr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_3_interrogateDiversionQ_extension,
@@ -5209,7 +5209,7 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_3_InterrogateDiversionQ_extension_vals), 0,
         "InterrogateDiversionQ_extension", HFILL }},
     { &hf_h450_3_divertedToNr,
-      { "divertedToNr", "h450.3.divertedToNr",
+      { "divertedToNr", "h450.3.divertedToNr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_3_checkRestrictionArg_extension,
@@ -5225,7 +5225,7 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_3_DiversionReason_vals), 0,
         "DiversionReason", HFILL }},
     { &hf_h450_3_calledAddress,
-      { "calledAddress", "h450.3.calledAddress",
+      { "calledAddress", "h450.3.calledAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_3_diversionCounter,
@@ -5237,7 +5237,7 @@ void proto_register_h450(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "H225InformationElement", HFILL }},
     { &hf_h450_3_lastReroutingNr,
-      { "lastReroutingNr", "h450.3.lastReroutingNr",
+      { "lastReroutingNr", "h450.3.lastReroutingNr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_3_subscriptionOption,
@@ -5249,7 +5249,7 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_PartySubaddress_vals), 0,
         "PartySubaddress", HFILL }},
     { &hf_h450_3_callingNumber,
-      { "callingNumber", "h450.3.callingNumber",
+      { "callingNumber", "h450.3.callingNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_3_callingInfo,
@@ -5257,7 +5257,7 @@ void proto_register_h450(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "BMPString_SIZE_1_128", HFILL }},
     { &hf_h450_3_originalCalledNr,
-      { "originalCalledNr", "h450.3.originalCalledNr",
+      { "originalCalledNr", "h450.3.originalCalledNr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_3_redirectingInfo,
@@ -5277,7 +5277,7 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_3_DiversionReason_vals), 0,
         NULL, HFILL }},
     { &hf_h450_3_nominatedNr,
-      { "nominatedNr", "h450.3.nominatedNr",
+      { "nominatedNr", "h450.3.nominatedNr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_3_nominatedInfo,
@@ -5285,7 +5285,7 @@ void proto_register_h450(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "BMPString_SIZE_1_128", HFILL }},
     { &hf_h450_3_redirectingNr,
-      { "redirectingNr", "h450.3.redirectingNr",
+      { "redirectingNr", "h450.3.redirectingNr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_3_divertingLegInformation1Arg_extension,
@@ -5297,7 +5297,7 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_3_DiversionReason_vals), 0,
         "DiversionReason", HFILL }},
     { &hf_h450_3_divertingNr,
-      { "divertingNr", "h450.3.divertingNr",
+      { "divertingNr", "h450.3.divertingNr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_3_divertingLegInformation2Arg_extension,
@@ -5309,7 +5309,7 @@ void proto_register_h450(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_3_redirectionNr,
-      { "redirectionNr", "h450.3.redirectionNr",
+      { "redirectionNr", "h450.3.redirectionNr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_3_redirectionInfo,
@@ -5321,7 +5321,7 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_3_DivertingLegInformation3Arg_extension_vals), 0,
         "DivertingLegInformation3Arg_extension", HFILL }},
     { &hf_h450_3_callingNr,
-      { "callingNr", "h450.3.callingNr",
+      { "callingNr", "h450.3.callingNr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_3_divertingLegInformation4Arg_extension,
@@ -5329,7 +5329,7 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_3_DivertingLegInformation4Arg_extension_vals), 0,
         "DivertingLegInformation4Arg_extension", HFILL }},
     { &hf_h450_3_IntResultList_item,
-      { "IntResult", "h450.3.IntResult",
+      { "IntResult", "h450.3.IntResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_3_remoteEnabled,
@@ -5341,42 +5341,42 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_3_IntResult_extension_vals), 0,
         "IntResult_extension", HFILL }},
     { &hf_h450_3_unspecified_extension,
-      { "extension", "h450.3.extension",
+      { "extension", "h450.3.extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_3_nonStandard,
-      { "nonStandard", "h450.3.nonStandard",
+      { "nonStandard", "h450.3.nonStandard_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_h450_3_ExtensionSeq_item,
-      { "Extension", "h450.3.Extension",
+      { "Extension", "h450.3.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
 /* --- Module Call-Hold-Operations --- --- ---                                */
 
     { &hf_h450_4_h450_4_HoldNotificArg_PDU,
-      { "HoldNotificArg", "h450.4.HoldNotificArg",
+      { "HoldNotificArg", "h450.4.HoldNotificArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_4_h450_4_RetrieveNotificArg_PDU,
-      { "RetrieveNotificArg", "h450.4.RetrieveNotificArg",
+      { "RetrieveNotificArg", "h450.4.RetrieveNotificArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_4_h450_4_RemoteHoldArg_PDU,
-      { "RemoteHoldArg", "h450.4.RemoteHoldArg",
+      { "RemoteHoldArg", "h450.4.RemoteHoldArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_4_h450_4_RemoteHoldRes_PDU,
-      { "RemoteHoldRes", "h450.4.RemoteHoldRes",
+      { "RemoteHoldRes", "h450.4.RemoteHoldRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_4_h450_4_RemoteRetrieveArg_PDU,
-      { "RemoteRetrieveArg", "h450.4.RemoteRetrieveArg",
+      { "RemoteRetrieveArg", "h450.4.RemoteRetrieveArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_4_h450_4_RemoteRetrieveRes_PDU,
-      { "RemoteRetrieveRes", "h450.4.RemoteRetrieveRes",
+      { "RemoteRetrieveRes", "h450.4.RemoteRetrieveRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_4_h450_4_PAR_undefined_PDU,
@@ -5424,11 +5424,11 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0,
         NULL, HFILL }},
     { &hf_h450_4_mixedExtension_extension,
-      { "extension", "h450.4.extension",
+      { "extension", "h450.4.extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_4_nonStandardData,
-      { "nonStandardData", "h450.4.nonStandardData",
+      { "nonStandardData", "h450.4.nonStandardData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_h450_4_PAR_undefined_item,
@@ -5439,67 +5439,67 @@ void proto_register_h450(void) {
 /* --- Module Call-Park-Pickup-Operations --- --- ---                         */
 
     { &hf_h450_5_h450_5_CpRequestArg_PDU,
-      { "CpRequestArg", "h450.5.CpRequestArg",
+      { "CpRequestArg", "h450.5.CpRequestArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_5_h450_5_CpRequestRes_PDU,
-      { "CpRequestRes", "h450.5.CpRequestRes",
+      { "CpRequestRes", "h450.5.CpRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_5_h450_5_CpSetupArg_PDU,
-      { "CpSetupArg", "h450.5.CpSetupArg",
+      { "CpSetupArg", "h450.5.CpSetupArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_5_h450_5_CpSetupRes_PDU,
-      { "CpSetupRes", "h450.5.CpSetupRes",
+      { "CpSetupRes", "h450.5.CpSetupRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_5_h450_5_GroupIndicationOnArg_PDU,
-      { "GroupIndicationOnArg", "h450.5.GroupIndicationOnArg",
+      { "GroupIndicationOnArg", "h450.5.GroupIndicationOnArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_5_h450_5_GroupIndicationOnRes_PDU,
-      { "GroupIndicationOnRes", "h450.5.GroupIndicationOnRes",
+      { "GroupIndicationOnRes", "h450.5.GroupIndicationOnRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_5_h450_5_GroupIndicationOffArg_PDU,
-      { "GroupIndicationOffArg", "h450.5.GroupIndicationOffArg",
+      { "GroupIndicationOffArg", "h450.5.GroupIndicationOffArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_5_h450_5_GroupIndicationOffRes_PDU,
-      { "GroupIndicationOffRes", "h450.5.GroupIndicationOffRes",
+      { "GroupIndicationOffRes", "h450.5.GroupIndicationOffRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_5_h450_5_PickrequArg_PDU,
-      { "PickrequArg", "h450.5.PickrequArg",
+      { "PickrequArg", "h450.5.PickrequArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_5_h450_5_PickrequRes_PDU,
-      { "PickrequRes", "h450.5.PickrequRes",
+      { "PickrequRes", "h450.5.PickrequRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_5_h450_5_PickupArg_PDU,
-      { "PickupArg", "h450.5.PickupArg",
+      { "PickupArg", "h450.5.PickupArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_5_h450_5_PickupRes_PDU,
-      { "PickupRes", "h450.5.PickupRes",
+      { "PickupRes", "h450.5.PickupRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_5_h450_5_PickExeArg_PDU,
-      { "PickExeArg", "h450.5.PickExeArg",
+      { "PickExeArg", "h450.5.PickExeArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_5_h450_5_PickExeRes_PDU,
-      { "PickExeRes", "h450.5.PickExeRes",
+      { "PickExeRes", "h450.5.PickExeRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_5_h450_5_CpNotifyArg_PDU,
-      { "CpNotifyArg", "h450.5.CpNotifyArg",
+      { "CpNotifyArg", "h450.5.CpNotifyArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_5_h450_5_CpickupNotifyArg_PDU,
-      { "CpickupNotifyArg", "h450.5.CpickupNotifyArg",
+      { "CpickupNotifyArg", "h450.5.CpickupNotifyArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_5_h450_5_PAR_undefined_PDU,
@@ -5507,15 +5507,15 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_5_parkingNumber,
-      { "parkingNumber", "h450.5.parkingNumber",
+      { "parkingNumber", "h450.5.parkingNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_5_parkedNumber,
-      { "parkedNumber", "h450.5.parkedNumber",
+      { "parkedNumber", "h450.5.parkedNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_5_parkedToNumber,
-      { "parkedToNumber", "h450.5.parkedToNumber",
+      { "parkedToNumber", "h450.5.parkedToNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_5_parkedToPosition,
@@ -5551,11 +5551,11 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0,
         NULL, HFILL }},
     { &hf_h450_5_callPickupId,
-      { "callPickupId", "h450.5.callPickupId",
+      { "callPickupId", "h450.5.callPickupId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CallIdentifier", HFILL }},
     { &hf_h450_5_groupMemberUserNr,
-      { "groupMemberUserNr", "h450.5.groupMemberUserNr",
+      { "groupMemberUserNr", "h450.5.groupMemberUserNr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_5_retrieveCallType,
@@ -5563,11 +5563,11 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_5_CallType_vals), 0,
         "CallType", HFILL }},
     { &hf_h450_5_partyToRetrieve,
-      { "partyToRetrieve", "h450.5.partyToRetrieve",
+      { "partyToRetrieve", "h450.5.partyToRetrieve_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_5_retrieveAddress,
-      { "retrieveAddress", "h450.5.retrieveAddress",
+      { "retrieveAddress", "h450.5.retrieveAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_5_parkPosition,
@@ -5591,7 +5591,7 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0,
         NULL, HFILL }},
     { &hf_h450_5_picking_upNumber,
-      { "picking-upNumber", "h450.5.picking_upNumber",
+      { "picking-upNumber", "h450.5.picking_upNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_5_pickrequArg_extensionArg,
@@ -5642,7 +5642,7 @@ void proto_register_h450(void) {
 /* --- Module Call-Waiting-Operations --- --- ---                             */
 
     { &hf_h450_6_h450_6_CallWaitingArg_PDU,
-      { "CallWaitingArg", "h450.6.CallWaitingArg",
+      { "CallWaitingArg", "h450.6.CallWaitingArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_6_nbOfAddWaitingCalls,
@@ -5661,7 +5661,7 @@ void proto_register_h450(void) {
 /* --- Module Message-Waiting-Indication-Operations --- --- ---               */
 
     { &hf_h450_7_h450_7_MWIActivateArg_PDU,
-      { "MWIActivateArg", "h450.7.MWIActivateArg",
+      { "MWIActivateArg", "h450.7.MWIActivateArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_7_h450_7_DummyRes_PDU,
@@ -5669,11 +5669,11 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_7_h450_7_MWIDeactivateArg_PDU,
-      { "MWIDeactivateArg", "h450.7.MWIDeactivateArg",
+      { "MWIDeactivateArg", "h450.7.MWIDeactivateArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_7_h450_7_MWIInterrogateArg_PDU,
-      { "MWIInterrogateArg", "h450.7.MWIInterrogateArg",
+      { "MWIInterrogateArg", "h450.7.MWIInterrogateArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_7_h450_7_MWIInterrogateRes_PDU,
@@ -5685,7 +5685,7 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_7_servedUserNr,
-      { "servedUserNr", "h450.7.servedUserNr",
+      { "servedUserNr", "h450.7.servedUserNr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_7_basicService,
@@ -5701,7 +5701,7 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_7_originatingNr,
-      { "originatingNr", "h450.7.originatingNr",
+      { "originatingNr", "h450.7.originatingNr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_7_timestamp,
@@ -5745,7 +5745,7 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0,
         NULL, HFILL }},
     { &hf_h450_7_MWIInterrogateRes_item,
-      { "MWIInterrogateResElt", "h450.7.MWIInterrogateResElt",
+      { "MWIInterrogateResElt", "h450.7.MWIInterrogateResElt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_7_mWIInterrogateResElt_extensionArg,
@@ -5761,7 +5761,7 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_65535", HFILL }},
     { &hf_h450_7_partyNumber,
-      { "partyNumber", "h450.7.partyNumber",
+      { "partyNumber", "h450.7.partyNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_7_numericString,
@@ -5776,19 +5776,19 @@ void proto_register_h450(void) {
 /* --- Module Name-Operations --- --- ---                                     */
 
     { &hf_h450_8_h450_8_ARG_callingName_PDU,
-      { "ARG-callingName", "h450.8.ARG_callingName",
+      { "ARG-callingName", "h450.8.ARG_callingName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_8_h450_8_ARG_alertingName_PDU,
-      { "ARG-alertingName", "h450.8.ARG_alertingName",
+      { "ARG-alertingName", "h450.8.ARG_alertingName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_8_h450_8_ARG_connectedName_PDU,
-      { "ARG-connectedName", "h450.8.ARG_connectedName",
+      { "ARG-connectedName", "h450.8.ARG_connectedName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_8_h450_8_ARG_busyName_PDU,
-      { "ARG-busyName", "h450.8.ARG_busyName",
+      { "ARG-busyName", "h450.8.ARG_busyName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_8_name,
@@ -5812,7 +5812,7 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_8_NamePresentationRestricted_vals), 0,
         NULL, HFILL }},
     { &hf_h450_8_nameNotAvailable,
-      { "nameNotAvailable", "h450.8.nameNotAvailable",
+      { "nameNotAvailable", "h450.8.nameNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_8_simpleName,
@@ -5824,18 +5824,18 @@ void proto_register_h450(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_8_restrictedNull,
-      { "restrictedNull", "h450.8.restrictedNull",
+      { "restrictedNull", "h450.8.restrictedNull_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
 /* --- Module Call-Completion-Operations --- --- ---                          */
 
     { &hf_h450_9_h450_9_CcRequestArg_PDU,
-      { "CcRequestArg", "h450.9.CcRequestArg",
+      { "CcRequestArg", "h450.9.CcRequestArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_9_h450_9_CcRequestRes_PDU,
-      { "CcRequestRes", "h450.9.CcRequestRes",
+      { "CcRequestRes", "h450.9.CcRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_9_h450_9_CcArg_PDU,
@@ -5843,19 +5843,19 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_9_CcArg_vals), 0,
         NULL, HFILL }},
     { &hf_h450_9_h450_9_CcShortArg_PDU,
-      { "CcShortArg", "h450.9.CcShortArg",
+      { "CcShortArg", "h450.9.CcShortArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_9_numberA,
-      { "numberA", "h450.9.numberA",
+      { "numberA", "h450.9.numberA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_9_numberB,
-      { "numberB", "h450.9.numberB",
+      { "numberB", "h450.9.numberB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointAddress", HFILL }},
     { &hf_h450_9_ccIdentifier,
-      { "ccIdentifier", "h450.9.ccIdentifier",
+      { "ccIdentifier", "h450.9.ccIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CallIdentifier", HFILL }},
     { &hf_h450_9_service,
@@ -5891,11 +5891,11 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0,
         NULL, HFILL }},
     { &hf_h450_9_shortArg,
-      { "shortArg", "h450.9.shortArg",
+      { "shortArg", "h450.9.shortArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CcShortArg", HFILL }},
     { &hf_h450_9_longArg,
-      { "longArg", "h450.9.longArg",
+      { "longArg", "h450.9.longArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CcLongArg", HFILL }},
     { &hf_h450_9_ccShortArg_extension,
@@ -5918,15 +5918,15 @@ void proto_register_h450(void) {
 /* --- Module Call-Offer-Operations --- --- ---                               */
 
     { &hf_h450_10_h450_10_CoReqOptArg_PDU,
-      { "CoReqOptArg", "h450.10.CoReqOptArg",
+      { "CoReqOptArg", "h450.10.CoReqOptArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_10_h450_10_RUAlertOptArg_PDU,
-      { "RUAlertOptArg", "h450.10.RUAlertOptArg",
+      { "RUAlertOptArg", "h450.10.RUAlertOptArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_10_h450_10_CfbOvrOptArg_PDU,
-      { "CfbOvrOptArg", "h450.10.CfbOvrOptArg",
+      { "CfbOvrOptArg", "h450.10.CfbOvrOptArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_10_coReqOptArg_extension,
@@ -5957,55 +5957,55 @@ void proto_register_h450(void) {
 /* --- Module Call-Intrusion-Operations --- --- ---                           */
 
     { &hf_h450_11_h450_11_CIRequestArg_PDU,
-      { "CIRequestArg", "h450.11.CIRequestArg",
+      { "CIRequestArg", "h450.11.CIRequestArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_11_h450_11_CIRequestRes_PDU,
-      { "CIRequestRes", "h450.11.CIRequestRes",
+      { "CIRequestRes", "h450.11.CIRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_11_h450_11_CIGetCIPLOptArg_PDU,
-      { "CIGetCIPLOptArg", "h450.11.CIGetCIPLOptArg",
+      { "CIGetCIPLOptArg", "h450.11.CIGetCIPLOptArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_11_h450_11_CIGetCIPLRes_PDU,
-      { "CIGetCIPLRes", "h450.11.CIGetCIPLRes",
+      { "CIGetCIPLRes", "h450.11.CIGetCIPLRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_11_h450_11_CIIsOptArg_PDU,
-      { "CIIsOptArg", "h450.11.CIIsOptArg",
+      { "CIIsOptArg", "h450.11.CIIsOptArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_11_h450_11_CIIsOptRes_PDU,
-      { "CIIsOptRes", "h450.11.CIIsOptRes",
+      { "CIIsOptRes", "h450.11.CIIsOptRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_11_h450_11_CIFrcRelArg_PDU,
-      { "CIFrcRelArg", "h450.11.CIFrcRelArg",
+      { "CIFrcRelArg", "h450.11.CIFrcRelArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_11_h450_11_CIFrcRelOptRes_PDU,
-      { "CIFrcRelOptRes", "h450.11.CIFrcRelOptRes",
+      { "CIFrcRelOptRes", "h450.11.CIFrcRelOptRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_11_h450_11_CIWobOptArg_PDU,
-      { "CIWobOptArg", "h450.11.CIWobOptArg",
+      { "CIWobOptArg", "h450.11.CIWobOptArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_11_h450_11_CIWobOptRes_PDU,
-      { "CIWobOptRes", "h450.11.CIWobOptRes",
+      { "CIWobOptRes", "h450.11.CIWobOptRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_11_h450_11_CISilentArg_PDU,
-      { "CISilentArg", "h450.11.CISilentArg",
+      { "CISilentArg", "h450.11.CISilentArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_11_h450_11_CISilentOptRes_PDU,
-      { "CISilentOptRes", "h450.11.CISilentOptRes",
+      { "CISilentOptRes", "h450.11.CISilentOptRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_11_h450_11_CINotificationArg_PDU,
-      { "CINotificationArg", "h450.11.CINotificationArg",
+      { "CINotificationArg", "h450.11.CINotificationArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_11_ciCapabilityLevel,
@@ -6045,7 +6045,7 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_11_CIProtectionLevel_vals), 0,
         NULL, HFILL }},
     { &hf_h450_11_silentMonitoringPermitted,
-      { "silentMonitoringPermitted", "h450.11.silentMonitoringPermitted",
+      { "silentMonitoringPermitted", "h450.11.silentMonitoringPermitted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_11_cIGetCIPLRes_resultExtension,
@@ -6105,7 +6105,7 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0,
         NULL, HFILL }},
     { &hf_h450_11_specificCall,
-      { "specificCall", "h450.11.specificCall",
+      { "specificCall", "h450.11.specificCall_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CallIdentifier", HFILL }},
     { &hf_h450_11_cISilentArg_argumentExtension,
@@ -6133,50 +6133,50 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0,
         NULL, HFILL }},
     { &hf_h450_11_callIntrusionImpending,
-      { "callIntrusionImpending", "h450.11.callIntrusionImpending",
+      { "callIntrusionImpending", "h450.11.callIntrusionImpending_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_11_callIntruded,
-      { "callIntruded", "h450.11.callIntruded",
+      { "callIntruded", "h450.11.callIntruded_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_11_callIsolated,
-      { "callIsolated", "h450.11.callIsolated",
+      { "callIsolated", "h450.11.callIsolated_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_11_callForceReleased,
-      { "callForceReleased", "h450.11.callForceReleased",
+      { "callForceReleased", "h450.11.callForceReleased_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_11_callIntrusionComplete,
-      { "callIntrusionComplete", "h450.11.callIntrusionComplete",
+      { "callIntrusionComplete", "h450.11.callIntrusionComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_11_callIntrusionEnd,
-      { "callIntrusionEnd", "h450.11.callIntrusionEnd",
+      { "callIntrusionEnd", "h450.11.callIntrusionEnd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
 /* --- Module Common-Information-Operations --- --- ---                       */
 
     { &hf_h450_12_h450_12_DummyArg_PDU,
-      { "DummyArg", "h450.12.DummyArg",
+      { "DummyArg", "h450.12.DummyArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_12_h450_12_CmnArg_PDU,
-      { "CmnArg", "h450.12.CmnArg",
+      { "CmnArg", "h450.12.CmnArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_12_featureList,
-      { "featureList", "h450.12.featureList",
+      { "featureList", "h450.12.featureList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_12_featureValues,
-      { "featureValues", "h450.12.featureValues",
+      { "featureValues", "h450.12.featureValues_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_12_featureControl,
-      { "featureControl", "h450.12.featureControl",
+      { "featureControl", "h450.12.featureControl_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_12_cmnArg_extension,
@@ -6196,55 +6196,55 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0,
         NULL, HFILL }},
     { &hf_h450_12_ssCFreRoutingSupported,
-      { "ssCFreRoutingSupported", "h450.12.ssCFreRoutingSupported",
+      { "ssCFreRoutingSupported", "h450.12.ssCFreRoutingSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_12_ssCTreRoutingSupported,
-      { "ssCTreRoutingSupported", "h450.12.ssCTreRoutingSupported",
+      { "ssCTreRoutingSupported", "h450.12.ssCTreRoutingSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_12_ssCCBSPossible,
-      { "ssCCBSPossible", "h450.12.ssCCBSPossible",
+      { "ssCCBSPossible", "h450.12.ssCCBSPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_12_ssCCNRPossible,
-      { "ssCCNRPossible", "h450.12.ssCCNRPossible",
+      { "ssCCNRPossible", "h450.12.ssCCNRPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_12_ssCOSupported,
-      { "ssCOSupported", "h450.12.ssCOSupported",
+      { "ssCOSupported", "h450.12.ssCOSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_12_ssCIForcedReleaseSupported,
-      { "ssCIForcedReleaseSupported", "h450.12.ssCIForcedReleaseSupported",
+      { "ssCIForcedReleaseSupported", "h450.12.ssCIForcedReleaseSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_12_ssCIIsolationSupported,
-      { "ssCIIsolationSupported", "h450.12.ssCIIsolationSupported",
+      { "ssCIIsolationSupported", "h450.12.ssCIIsolationSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_12_ssCIWaitOnBusySupported,
-      { "ssCIWaitOnBusySupported", "h450.12.ssCIWaitOnBusySupported",
+      { "ssCIWaitOnBusySupported", "h450.12.ssCIWaitOnBusySupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_12_ssCISilentMonitoringSupported,
-      { "ssCISilentMonitoringSupported", "h450.12.ssCISilentMonitoringSupported",
+      { "ssCISilentMonitoringSupported", "h450.12.ssCISilentMonitoringSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_12_ssCIConferenceSupported,
-      { "ssCIConferenceSupported", "h450.12.ssCIConferenceSupported",
+      { "ssCIConferenceSupported", "h450.12.ssCIConferenceSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_12_ssCHFarHoldSupported,
-      { "ssCHFarHoldSupported", "h450.12.ssCHFarHoldSupported",
+      { "ssCHFarHoldSupported", "h450.12.ssCHFarHoldSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_12_ssMWICallbackSupported,
-      { "ssMWICallbackSupported", "h450.12.ssMWICallbackSupported",
+      { "ssMWICallbackSupported", "h450.12.ssMWICallbackSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_12_ssCPCallParkSupported,
-      { "ssCPCallParkSupported", "h450.12.ssCPCallParkSupported",
+      { "ssCPCallParkSupported", "h450.12.ssCPCallParkSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_12_partyCategory,
@@ -6256,19 +6256,19 @@ void proto_register_h450(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_12_ssCHDoNotHold,
-      { "ssCHDoNotHold", "h450.12.ssCHDoNotHold",
+      { "ssCHDoNotHold", "h450.12.ssCHDoNotHold_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_12_ssCTDoNotTransfer,
-      { "ssCTDoNotTransfer", "h450.12.ssCTDoNotTransfer",
+      { "ssCTDoNotTransfer", "h450.12.ssCTDoNotTransfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_12_ssMWICallbackCall,
-      { "ssMWICallbackCall", "h450.12.ssMWICallbackCall",
+      { "ssMWICallbackCall", "h450.12.ssMWICallbackCall_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h450_12_ssCISilentMonitorPermitted,
-      { "ssCISilentMonitorPermitted", "h450.12.ssCISilentMonitorPermitted",
+      { "ssCISilentMonitorPermitted", "h450.12.ssCISilentMonitorPermitted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-h460.c b/epan/dissectors/packet-h460.c
index 70084b3990..1782dc9061 100644
--- a/epan/dissectors/packet-h460.c
+++ b/epan/dissectors/packet-h460.c
@@ -2171,31 +2171,31 @@ void proto_register_h460(void) {
         FT_UINT32, BASE_DEC, VALS(h460_2_NumberPortabilityRejectReason_vals), 0,
         NULL, HFILL }},
     { &hf_h460_2_nUMBERPORTABILITYDATA,
-      { "nUMBERPORTABILITYDATA", "h460.2.nUMBERPORTABILITYDATA",
+      { "nUMBERPORTABILITYDATA", "h460.2.nUMBERPORTABILITYDATA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_2_addressTranslated,
-      { "addressTranslated", "h460.2.addressTranslated",
+      { "addressTranslated", "h460.2.addressTranslated_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_2_portedAddress,
-      { "portedAddress", "h460.2.portedAddress",
+      { "portedAddress", "h460.2.portedAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PortabilityAddress", HFILL }},
     { &hf_h460_2_routingAddress,
-      { "routingAddress", "h460.2.routingAddress",
+      { "routingAddress", "h460.2.routingAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PortabilityAddress", HFILL }},
     { &hf_h460_2_regionalParams,
-      { "regionalParams", "h460.2.regionalParams",
+      { "regionalParams", "h460.2.regionalParams_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RegionalParameters", HFILL }},
     { &hf_h460_2_unspecified,
-      { "unspecified", "h460.2.unspecified",
+      { "unspecified", "h460.2.unspecified_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_2_qorPortedNumber,
-      { "qorPortedNumber", "h460.2.qorPortedNumber",
+      { "qorPortedNumber", "h460.2.qorPortedNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_2_aliasAddress,
@@ -2219,15 +2219,15 @@ void proto_register_h460(void) {
         FT_UINT32, BASE_DEC, VALS(h460_2_PortabilityTypeOfNumber_vals), 0,
         NULL, HFILL }},
     { &hf_h460_2_portedNumber,
-      { "portedNumber", "h460.2.portedNumber",
+      { "portedNumber", "h460.2.portedNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_2_routingNumber,
-      { "routingNumber", "h460.2.routingNumber",
+      { "routingNumber", "h460.2.routingNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_2_concatenatedNumber,
-      { "concatenatedNumber", "h460.2.concatenatedNumber",
+      { "concatenatedNumber", "h460.2.concatenatedNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_2_t35CountryCode,
@@ -2250,7 +2250,7 @@ void proto_register_h460(void) {
 /* --- Module CIRCUIT-STATUS-MAP --- --- ---                                  */
 
     { &hf_h460_3_h460_3_CircuitStatus_PDU,
-      { "CircuitStatus", "h460.3.CircuitStatus",
+      { "CircuitStatus", "h460.3.CircuitStatus_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_3_circuitStatusMap,
@@ -2258,7 +2258,7 @@ void proto_register_h460(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_CircuitStatusMap", HFILL }},
     { &hf_h460_3_circuitStatusMap_item,
-      { "CircuitStatusMap", "h460.3.CircuitStatusMap",
+      { "CircuitStatusMap", "h460.3.CircuitStatusMap_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_3_statusType,
@@ -2266,7 +2266,7 @@ void proto_register_h460(void) {
         FT_UINT32, BASE_DEC, VALS(h460_3_CircuitStatusType_vals), 0,
         "CircuitStatusType", HFILL }},
     { &hf_h460_3_baseCircuitID,
-      { "baseCircuitID", "h460.3.baseCircuitID",
+      { "baseCircuitID", "h460.3.baseCircuitID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CircuitIdentifier", HFILL }},
     { &hf_h460_3_range,
@@ -2278,22 +2278,22 @@ void proto_register_h460(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_h460_3_serviceStatus,
-      { "serviceStatus", "h460.3.serviceStatus",
+      { "serviceStatus", "h460.3.serviceStatus_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_3_busyStatus,
-      { "busyStatus", "h460.3.busyStatus",
+      { "busyStatus", "h460.3.busyStatus_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
 /* --- Module CALL-PRIORITY --- --- ---                                       */
 
     { &hf_h460_4_h460_4_CallPriorityInfo_PDU,
-      { "CallPriorityInfo", "h460.4.CallPriorityInfo",
+      { "CallPriorityInfo", "h460.4.CallPriorityInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_4_h460_4_CountryInternationalNetworkCallOriginationIdentification_PDU,
-      { "CountryInternationalNetworkCallOriginationIdentification", "h460.4.CountryInternationalNetworkCallOriginationIdentification",
+      { "CountryInternationalNetworkCallOriginationIdentification", "h460.4.CountryInternationalNetworkCallOriginationIdentification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_4_priorityValue,
@@ -2301,19 +2301,19 @@ void proto_register_h460(void) {
         FT_UINT32, BASE_DEC, VALS(h460_4_T_priorityValue_vals), 0,
         NULL, HFILL }},
     { &hf_h460_4_emergencyAuthorized,
-      { "emergencyAuthorized", "h460.4.emergencyAuthorized",
+      { "emergencyAuthorized", "h460.4.emergencyAuthorized_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_4_emergencyPublic,
-      { "emergencyPublic", "h460.4.emergencyPublic",
+      { "emergencyPublic", "h460.4.emergencyPublic_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_4_high,
-      { "high", "h460.4.high",
+      { "high", "h460.4.high_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_4_normal,
-      { "normal", "h460.4.normal",
+      { "normal", "h460.4.normal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_4_priorityExtension,
@@ -2325,7 +2325,7 @@ void proto_register_h460(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ClearToken", HFILL }},
     { &hf_h460_4_tokens_item,
-      { "ClearToken", "h460.4.ClearToken",
+      { "ClearToken", "h460.4.ClearToken_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_4_cryptoTokens,
@@ -2341,15 +2341,15 @@ void proto_register_h460(void) {
         FT_UINT32, BASE_DEC, VALS(h460_4_T_rejectReason_vals), 0,
         NULL, HFILL }},
     { &hf_h460_4_priorityUnavailable,
-      { "priorityUnavailable", "h460.4.priorityUnavailable",
+      { "priorityUnavailable", "h460.4.priorityUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_4_priorityUnauthorized,
-      { "priorityUnauthorized", "h460.4.priorityUnauthorized",
+      { "priorityUnauthorized", "h460.4.priorityUnauthorized_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_4_priorityValueUnknown,
-      { "priorityValueUnknown", "h460.4.priorityValueUnknown",
+      { "priorityValueUnknown", "h460.4.priorityValueUnknown_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_4_numberingPlan,
@@ -2357,7 +2357,7 @@ void proto_register_h460(void) {
         FT_UINT32, BASE_DEC, VALS(h460_4_T_numberingPlan_vals), 0,
         NULL, HFILL }},
     { &hf_h460_4_x121,
-      { "x121", "h460.4.x121",
+      { "x121", "h460.4.x121_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_4_x121CountryCode,
@@ -2365,7 +2365,7 @@ void proto_register_h460(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "X121CountryCode", HFILL }},
     { &hf_h460_4_e164,
-      { "e164", "h460.4.e164",
+      { "e164", "h460.4.e164_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_4_e164CountryCode,
@@ -2384,7 +2384,7 @@ void proto_register_h460(void) {
         FT_UINT32, BASE_DEC, VALS(h460_9_QosMonitoringReportData_vals), 0,
         NULL, HFILL }},
     { &hf_h460_9_h460_9_ExtendedRTPMetrics_PDU,
-      { "ExtendedRTPMetrics", "h460.9.ExtendedRTPMetrics",
+      { "ExtendedRTPMetrics", "h460.9.ExtendedRTPMetrics_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_9_extensionId,
@@ -2396,11 +2396,11 @@ void proto_register_h460(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_h460_9_rtpAddress,
-      { "rtpAddress", "h460.9.rtpAddress",
+      { "rtpAddress", "h460.9.rtpAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelInfo", HFILL }},
     { &hf_h460_9_rtcpAddress,
-      { "rtcpAddress", "h460.9.rtcpAddress",
+      { "rtcpAddress", "h460.9.rtcpAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelInfo", HFILL }},
     { &hf_h460_9_sessionId,
@@ -2408,11 +2408,11 @@ void proto_register_h460(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_255", HFILL }},
     { &hf_h460_9_nonStandardData,
-      { "nonStandardData", "h460.9.nonStandardData",
+      { "nonStandardData", "h460.9.nonStandardData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_h460_9_mediaSenderMeasures,
-      { "mediaSenderMeasures", "h460.9.mediaSenderMeasures",
+      { "mediaSenderMeasures", "h460.9.mediaSenderMeasures_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_9_worstEstimatedEnd2EndDelay,
@@ -2424,7 +2424,7 @@ void proto_register_h460(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "EstimatedEnd2EndDelay", HFILL }},
     { &hf_h460_9_mediaReceiverMeasures,
-      { "mediaReceiverMeasures", "h460.9.mediaReceiverMeasures",
+      { "mediaReceiverMeasures", "h460.9.mediaReceiverMeasures_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_9_cumulativeNumberOfPacketsLost,
@@ -2456,7 +2456,7 @@ void proto_register_h460(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_h460_9_extensions_item,
-      { "Extension", "h460.9.Extension",
+      { "Extension", "h460.9.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_9_callReferenceValue,
@@ -2468,7 +2468,7 @@ void proto_register_h460(void) {
         FT_GUID, BASE_NONE, NULL, 0,
         "ConferenceIdentifier", HFILL }},
     { &hf_h460_9_callIdentifier,
-      { "callIdentifier", "h460.9.callIdentifier",
+      { "callIdentifier", "h460.9.callIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_9_mediaChannelsQoS,
@@ -2476,19 +2476,19 @@ void proto_register_h460(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_RTCPMeasures", HFILL }},
     { &hf_h460_9_mediaChannelsQoS_item,
-      { "RTCPMeasures", "h460.9.RTCPMeasures",
+      { "RTCPMeasures", "h460.9.RTCPMeasures_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_9_periodic,
-      { "periodic", "h460.9.periodic",
+      { "periodic", "h460.9.periodic_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PeriodicQoSMonReport", HFILL }},
     { &hf_h460_9_final,
-      { "final", "h460.9.final",
+      { "final", "h460.9.final_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FinalQosMonReport", HFILL }},
     { &hf_h460_9_interGK,
-      { "interGK", "h460.9.interGK",
+      { "interGK", "h460.9.interGK_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterGKQosMonReport", HFILL }},
     { &hf_h460_9_perCallInfo,
@@ -2496,7 +2496,7 @@ void proto_register_h460(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_PerCallQoSReport", HFILL }},
     { &hf_h460_9_perCallInfo_item,
-      { "PerCallQoSReport", "h460.9.PerCallQoSReport",
+      { "PerCallQoSReport", "h460.9.PerCallQoSReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_9_mediaInfo,
@@ -2504,7 +2504,7 @@ void proto_register_h460(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_RTCPMeasures", HFILL }},
     { &hf_h460_9_mediaInfo_item,
-      { "RTCPMeasures", "h460.9.RTCPMeasures",
+      { "RTCPMeasures", "h460.9.RTCPMeasures_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_9_networkPacketLossRate,
@@ -2516,7 +2516,7 @@ void proto_register_h460(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_255", HFILL }},
     { &hf_h460_9_burstMetrics,
-      { "burstMetrics", "h460.9.burstMetrics",
+      { "burstMetrics", "h460.9.burstMetrics_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_9_rtcpRoundTripDelay,
@@ -2560,7 +2560,7 @@ void proto_register_h460(void) {
         FT_UINT32, BASE_DEC, VALS(h460_9_PLCtypes_vals), 0,
         "PLCtypes", HFILL }},
     { &hf_h460_9_jitterBufferParms,
-      { "jitterBufferParms", "h460.9.jitterBufferParms",
+      { "jitterBufferParms", "h460.9.jitterBufferParms_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_9_gmin,
@@ -2584,19 +2584,19 @@ void proto_register_h460(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_65535", HFILL }},
     { &hf_h460_9_unspecified,
-      { "unspecified", "h460.9.unspecified",
+      { "unspecified", "h460.9.unspecified_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_9_disabled,
-      { "disabled", "h460.9.disabled",
+      { "disabled", "h460.9.disabled_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_9_enhanced,
-      { "enhanced", "h460.9.enhanced",
+      { "enhanced", "h460.9.enhanced_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_9_standard,
-      { "standard", "h460.9.standard",
+      { "standard", "h460.9.standard_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_9_jitterBufferType,
@@ -2620,26 +2620,26 @@ void proto_register_h460(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_65535", HFILL }},
     { &hf_h460_9_unknown,
-      { "unknown", "h460.9.unknown",
+      { "unknown", "h460.9.unknown_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_9_reserved,
-      { "reserved", "h460.9.reserved",
+      { "reserved", "h460.9.reserved_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_9_nonadaptive,
-      { "nonadaptive", "h460.9.nonadaptive",
+      { "nonadaptive", "h460.9.nonadaptive_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_9_adaptive,
-      { "adaptive", "h460.9.adaptive",
+      { "adaptive", "h460.9.adaptive_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
 /* --- Module CALL-PARTY-CATEGORY --- --- ---                                 */
 
     { &hf_h460_10_h460_10_CallPartyCategoryInfo_PDU,
-      { "CallPartyCategoryInfo", "h460.10.CallPartyCategoryInfo",
+      { "CallPartyCategoryInfo", "h460.10.CallPartyCategoryInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_10_callPartyCategory,
@@ -2654,7 +2654,7 @@ void proto_register_h460(void) {
 /* --- Module MLPP --- --- ---                                                */
 
     { &hf_h460_14_h460_14_MLPPInfo_PDU,
-      { "MLPPInfo", "h460.14.MLPPInfo",
+      { "MLPPInfo", "h460.14.MLPPInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_14_precedence,
@@ -2670,27 +2670,27 @@ void proto_register_h460(void) {
         FT_UINT32, BASE_DEC, VALS(h460_14_MlppNotification_vals), 0,
         NULL, HFILL }},
     { &hf_h460_14_alternateParty,
-      { "alternateParty", "h460.14.alternateParty",
+      { "alternateParty", "h460.14.alternateParty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_14_releaseCall,
-      { "releaseCall", "h460.14.releaseCall",
+      { "releaseCall", "h460.14.releaseCall_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_14_preemptionPending,
-      { "preemptionPending", "h460.14.preemptionPending",
+      { "preemptionPending", "h460.14.preemptionPending_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_14_preemptionInProgress,
-      { "preemptionInProgress", "h460.14.preemptionInProgress",
+      { "preemptionInProgress", "h460.14.preemptionInProgress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_14_preemptionEnd,
-      { "preemptionEnd", "h460.14.preemptionEnd",
+      { "preemptionEnd", "h460.14.preemptionEnd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_14_preemptionComplete,
-      { "preemptionComplete", "h460.14.preemptionComplete",
+      { "preemptionComplete", "h460.14.preemptionComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_14_altID,
@@ -2702,7 +2702,7 @@ void proto_register_h460(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_255", HFILL }},
     { &hf_h460_14_preemptCallID,
-      { "preemptCallID", "h460.14.preemptCallID",
+      { "preemptCallID", "h460.14.preemptCallID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CallIdentifier", HFILL }},
     { &hf_h460_14_releaseReason,
@@ -2717,7 +2717,7 @@ void proto_register_h460(void) {
 /* --- Module SIGNALLING-CHANNEL-SUSPEND-REDIRECT --- --- ---                 */
 
     { &hf_h460_15_h460_15_SignallingChannelData_PDU,
-      { "SignallingChannelData", "h460.15.SignallingChannelData",
+      { "SignallingChannelData", "h460.15.SignallingChannelData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_15_signallingChannelData,
@@ -2725,27 +2725,27 @@ void proto_register_h460(void) {
         FT_UINT32, BASE_DEC, VALS(h460_15_T_signallingChannelData_vals), 0,
         NULL, HFILL }},
     { &hf_h460_15_channelSuspendRequest,
-      { "channelSuspendRequest", "h460.15.channelSuspendRequest",
+      { "channelSuspendRequest", "h460.15.channelSuspendRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_15_channelSuspendResponse,
-      { "channelSuspendResponse", "h460.15.channelSuspendResponse",
+      { "channelSuspendResponse", "h460.15.channelSuspendResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_15_channelSuspendConfirm,
-      { "channelSuspendConfirm", "h460.15.channelSuspendConfirm",
+      { "channelSuspendConfirm", "h460.15.channelSuspendConfirm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_15_channelSuspendCancel,
-      { "channelSuspendCancel", "h460.15.channelSuspendCancel",
+      { "channelSuspendCancel", "h460.15.channelSuspendCancel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_15_channelResumeRequest,
-      { "channelResumeRequest", "h460.15.channelResumeRequest",
+      { "channelResumeRequest", "h460.15.channelResumeRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_15_channelResumeResponse,
-      { "channelResumeResponse", "h460.15.channelResumeResponse",
+      { "channelResumeResponse", "h460.15.channelResumeResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_15_channelResumeAddress,
@@ -2761,7 +2761,7 @@ void proto_register_h460(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_h460_15_resetH245,
-      { "resetH245", "h460.15.resetH245",
+      { "resetH245", "h460.15.resetH245_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_15_okToSuspend,
@@ -2776,11 +2776,11 @@ void proto_register_h460(void) {
 /* --- Module SIGNALLING-TRAVERSAL --- --- ---                                */
 
     { &hf_h460_18_h460_18_IncomingCallIndication_PDU,
-      { "IncomingCallIndication", "h460.18.IncomingCallIndication",
+      { "IncomingCallIndication", "h460.18.IncomingCallIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_18_h460_18_LRQKeepAliveData_PDU,
-      { "LRQKeepAliveData", "h460.18.LRQKeepAliveData",
+      { "LRQKeepAliveData", "h460.18.LRQKeepAliveData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_18_callSignallingAddress,
@@ -2788,7 +2788,7 @@ void proto_register_h460(void) {
         FT_UINT32, BASE_DEC, VALS(h225_TransportAddress_vals), 0,
         "TransportAddress", HFILL }},
     { &hf_h460_18_callID,
-      { "callID", "h460.18.callID",
+      { "callID", "h460.18.callID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CallIdentifier", HFILL }},
     { &hf_h460_18_lrqKeepAliveInterval,
@@ -2799,7 +2799,7 @@ void proto_register_h460(void) {
 /* --- Module MEDIA-TRAVERSAL --- --- ---                                     */
 
     { &hf_h460_19_h460_19_TraversalParameters_PDU,
-      { "TraversalParameters", "h460.19.TraversalParameters",
+      { "TraversalParameters", "h460.19.TraversalParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_19_multiplexedMediaChannel,
@@ -2830,11 +2830,11 @@ void proto_register_h460(void) {
 /* --- Module MESSAGE-BROADCAST --- --- ---                                   */
 
     { &hf_h460_21_h460_21_CapabilityAdvertisement_PDU,
-      { "CapabilityAdvertisement", "h460.21.CapabilityAdvertisement",
+      { "CapabilityAdvertisement", "h460.21.CapabilityAdvertisement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_21_receiveCapabilities,
-      { "receiveCapabilities", "h460.21.receiveCapabilities",
+      { "receiveCapabilities", "h460.21.receiveCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_21_transmitCapabilities,
@@ -2842,7 +2842,7 @@ void proto_register_h460(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_256_OF_TransmitCapabilities", HFILL }},
     { &hf_h460_21_transmitCapabilities_item,
-      { "TransmitCapabilities", "h460.21.TransmitCapabilities",
+      { "TransmitCapabilities", "h460.21.TransmitCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h460_21_capabilities,
diff --git a/epan/dissectors/packet-h501.c b/epan/dissectors/packet-h501.c
index 2029766c53..7115e20418 100644
--- a/epan/dissectors/packet-h501.c
+++ b/epan/dissectors/packet-h501.c
@@ -2555,7 +2555,7 @@ void proto_register_h501(void) {
 /*--- Included file: packet-h501-hfarr.c ---*/
 #line 1 "../../asn1/h501/packet-h501-hfarr.c"
     { &hf_h501_Message_PDU,
-      { "Message", "h501.Message",
+      { "Message", "h501.Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_body,
@@ -2563,135 +2563,135 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_MessageBody_vals), 0,
         "MessageBody", HFILL }},
     { &hf_h501_common,
-      { "common", "h501.common",
+      { "common", "h501.common_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MessageCommonInfo", HFILL }},
     { &hf_h501_serviceRequest,
-      { "serviceRequest", "h501.serviceRequest",
+      { "serviceRequest", "h501.serviceRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_serviceConfirmation,
-      { "serviceConfirmation", "h501.serviceConfirmation",
+      { "serviceConfirmation", "h501.serviceConfirmation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_serviceRejection,
-      { "serviceRejection", "h501.serviceRejection",
+      { "serviceRejection", "h501.serviceRejection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_serviceRelease,
-      { "serviceRelease", "h501.serviceRelease",
+      { "serviceRelease", "h501.serviceRelease_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_descriptorRequest,
-      { "descriptorRequest", "h501.descriptorRequest",
+      { "descriptorRequest", "h501.descriptorRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_descriptorConfirmation,
-      { "descriptorConfirmation", "h501.descriptorConfirmation",
+      { "descriptorConfirmation", "h501.descriptorConfirmation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_descriptorRejection,
-      { "descriptorRejection", "h501.descriptorRejection",
+      { "descriptorRejection", "h501.descriptorRejection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_descriptorIDRequest,
-      { "descriptorIDRequest", "h501.descriptorIDRequest",
+      { "descriptorIDRequest", "h501.descriptorIDRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_descriptorIDConfirmation,
-      { "descriptorIDConfirmation", "h501.descriptorIDConfirmation",
+      { "descriptorIDConfirmation", "h501.descriptorIDConfirmation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_descriptorIDRejection,
-      { "descriptorIDRejection", "h501.descriptorIDRejection",
+      { "descriptorIDRejection", "h501.descriptorIDRejection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_descriptorUpdate,
-      { "descriptorUpdate", "h501.descriptorUpdate",
+      { "descriptorUpdate", "h501.descriptorUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_descriptorUpdateAck,
-      { "descriptorUpdateAck", "h501.descriptorUpdateAck",
+      { "descriptorUpdateAck", "h501.descriptorUpdateAck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_accessRequest,
-      { "accessRequest", "h501.accessRequest",
+      { "accessRequest", "h501.accessRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_accessConfirmation,
-      { "accessConfirmation", "h501.accessConfirmation",
+      { "accessConfirmation", "h501.accessConfirmation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_accessRejection,
-      { "accessRejection", "h501.accessRejection",
+      { "accessRejection", "h501.accessRejection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_requestInProgress,
-      { "requestInProgress", "h501.requestInProgress",
+      { "requestInProgress", "h501.requestInProgress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_nonStandardRequest,
-      { "nonStandardRequest", "h501.nonStandardRequest",
+      { "nonStandardRequest", "h501.nonStandardRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_nonStandardConfirmation,
-      { "nonStandardConfirmation", "h501.nonStandardConfirmation",
+      { "nonStandardConfirmation", "h501.nonStandardConfirmation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_nonStandardRejection,
-      { "nonStandardRejection", "h501.nonStandardRejection",
+      { "nonStandardRejection", "h501.nonStandardRejection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_unknownMessageResponse,
-      { "unknownMessageResponse", "h501.unknownMessageResponse",
+      { "unknownMessageResponse", "h501.unknownMessageResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_usageRequest,
-      { "usageRequest", "h501.usageRequest",
+      { "usageRequest", "h501.usageRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_usageConfirmation,
-      { "usageConfirmation", "h501.usageConfirmation",
+      { "usageConfirmation", "h501.usageConfirmation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_usageIndication,
-      { "usageIndication", "h501.usageIndication",
+      { "usageIndication", "h501.usageIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_usageIndicationConfirmation,
-      { "usageIndicationConfirmation", "h501.usageIndicationConfirmation",
+      { "usageIndicationConfirmation", "h501.usageIndicationConfirmation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_usageIndicationRejection,
-      { "usageIndicationRejection", "h501.usageIndicationRejection",
+      { "usageIndicationRejection", "h501.usageIndicationRejection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_usageRejection,
-      { "usageRejection", "h501.usageRejection",
+      { "usageRejection", "h501.usageRejection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_validationRequest,
-      { "validationRequest", "h501.validationRequest",
+      { "validationRequest", "h501.validationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_validationConfirmation,
-      { "validationConfirmation", "h501.validationConfirmation",
+      { "validationConfirmation", "h501.validationConfirmation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_validationRejection,
-      { "validationRejection", "h501.validationRejection",
+      { "validationRejection", "h501.validationRejection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_authenticationRequest,
-      { "authenticationRequest", "h501.authenticationRequest",
+      { "authenticationRequest", "h501.authenticationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_authenticationConfirmation,
-      { "authenticationConfirmation", "h501.authenticationConfirmation",
+      { "authenticationConfirmation", "h501.authenticationConfirmation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_authenticationRejection,
-      { "authenticationRejection", "h501.authenticationRejection",
+      { "authenticationRejection", "h501.authenticationRejection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_sequenceNumber,
@@ -2715,7 +2715,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h225_TransportAddress_vals), 0,
         NULL, HFILL }},
     { &hf_h501_integrityCheckValue,
-      { "integrityCheckValue", "h501.integrityCheckValue",
+      { "integrityCheckValue", "h501.integrityCheckValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ICV", HFILL }},
     { &hf_h501_tokens,
@@ -2723,7 +2723,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ClearToken", HFILL }},
     { &hf_h501_tokens_item,
-      { "ClearToken", "h501.ClearToken",
+      { "ClearToken", "h501.ClearToken_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_cryptoTokens,
@@ -2739,7 +2739,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_NonStandardParameter", HFILL }},
     { &hf_h501_nonStandard_item,
-      { "NonStandardParameter", "h501.NonStandardParameter",
+      { "NonStandardParameter", "h501.NonStandardParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_serviceID,
@@ -2751,11 +2751,11 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_GenericData", HFILL }},
     { &hf_h501_genericData_item,
-      { "GenericData", "h501.GenericData",
+      { "GenericData", "h501.GenericData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_featureSet,
-      { "featureSet", "h501.featureSet",
+      { "featureSet", "h501.featureSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_version,
@@ -2775,7 +2775,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_SecurityMode", HFILL }},
     { &hf_h501_securityMode_item,
-      { "SecurityMode", "h501.SecurityMode",
+      { "SecurityMode", "h501.SecurityMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_timeToLive,
@@ -2783,7 +2783,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_4294967295", HFILL }},
     { &hf_h501_usageSpec,
-      { "usageSpec", "h501.usageSpec",
+      { "usageSpec", "h501.usageSpec_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UsageSpecification", HFILL }},
     { &hf_h501_authentication,
@@ -2803,11 +2803,11 @@ void proto_register_h501(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_h501_alternates,
-      { "alternates", "h501.alternates",
+      { "alternates", "h501.alternates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlternatePEInfo", HFILL }},
     { &hf_h501_securityMode_01,
-      { "securityMode", "h501.securityMode",
+      { "securityMode", "h501.securityMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_reason,
@@ -2815,47 +2815,47 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_ServiceRejectionReason_vals), 0,
         "ServiceRejectionReason", HFILL }},
     { &hf_h501_serviceUnavailable,
-      { "serviceUnavailable", "h501.serviceUnavailable",
+      { "serviceUnavailable", "h501.serviceUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_serviceRedirected,
-      { "serviceRedirected", "h501.serviceRedirected",
+      { "serviceRedirected", "h501.serviceRedirected_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_security,
-      { "security", "h501.security",
+      { "security", "h501.security_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_continue,
-      { "continue", "h501.continue",
+      { "continue", "h501.continue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_undefined,
-      { "undefined", "h501.undefined",
+      { "undefined", "h501.undefined_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_unknownServiceID,
-      { "unknownServiceID", "h501.unknownServiceID",
+      { "unknownServiceID", "h501.unknownServiceID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_cannotSupportUsageSpec,
-      { "cannotSupportUsageSpec", "h501.cannotSupportUsageSpec",
+      { "cannotSupportUsageSpec", "h501.cannotSupportUsageSpec_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_neededFeature,
-      { "neededFeature", "h501.neededFeature",
+      { "neededFeature", "h501.neededFeature_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_genericDataReason,
-      { "genericDataReason", "h501.genericDataReason",
+      { "genericDataReason", "h501.genericDataReason_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_usageUnavailable,
-      { "usageUnavailable", "h501.usageUnavailable",
+      { "usageUnavailable", "h501.usageUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_unknownUsageSendTo,
-      { "unknownUsageSendTo", "h501.unknownUsageSendTo",
+      { "unknownUsageSendTo", "h501.unknownUsageSendTo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_reason_01,
@@ -2863,19 +2863,19 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_ServiceReleaseReason_vals), 0,
         "ServiceReleaseReason", HFILL }},
     { &hf_h501_outOfService,
-      { "outOfService", "h501.outOfService",
+      { "outOfService", "h501.outOfService_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_maintenance,
-      { "maintenance", "h501.maintenance",
+      { "maintenance", "h501.maintenance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_terminated,
-      { "terminated", "h501.terminated",
+      { "terminated", "h501.terminated_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_expired,
-      { "expired", "h501.expired",
+      { "expired", "h501.expired_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_descriptorID,
@@ -2891,7 +2891,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Descriptor", HFILL }},
     { &hf_h501_descriptor_item,
-      { "Descriptor", "h501.Descriptor",
+      { "Descriptor", "h501.Descriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_reason_02,
@@ -2903,19 +2903,19 @@ void proto_register_h501(void) {
         FT_GUID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_packetSizeExceeded,
-      { "packetSizeExceeded", "h501.packetSizeExceeded",
+      { "packetSizeExceeded", "h501.packetSizeExceeded_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_illegalID,
-      { "illegalID", "h501.illegalID",
+      { "illegalID", "h501.illegalID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_hopCountExceeded,
-      { "hopCountExceeded", "h501.hopCountExceeded",
+      { "hopCountExceeded", "h501.hopCountExceeded_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_noServiceRelationship,
-      { "noServiceRelationship", "h501.noServiceRelationship",
+      { "noServiceRelationship", "h501.noServiceRelationship_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_descriptorInfo,
@@ -2923,7 +2923,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_DescriptorInfo", HFILL }},
     { &hf_h501_descriptorInfo_item,
-      { "DescriptorInfo", "h501.DescriptorInfo",
+      { "DescriptorInfo", "h501.DescriptorInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_reason_03,
@@ -2931,7 +2931,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_DescriptorIDRejectionReason_vals), 0,
         "DescriptorIDRejectionReason", HFILL }},
     { &hf_h501_noDescriptors,
-      { "noDescriptors", "h501.noDescriptors",
+      { "noDescriptors", "h501.noDescriptors_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_sender,
@@ -2943,7 +2943,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_UpdateInformation", HFILL }},
     { &hf_h501_updateInfo_item,
-      { "UpdateInformation", "h501.UpdateInformation",
+      { "UpdateInformation", "h501.UpdateInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_descriptorInfo_01,
@@ -2951,7 +2951,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_T_descriptorInfo_vals), 0,
         NULL, HFILL }},
     { &hf_h501_descriptor_01,
-      { "descriptor", "h501.descriptor",
+      { "descriptor", "h501.descriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_updateType,
@@ -2959,27 +2959,27 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_T_updateType_vals), 0,
         NULL, HFILL }},
     { &hf_h501_added,
-      { "added", "h501.added",
+      { "added", "h501.added_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_deleted,
-      { "deleted", "h501.deleted",
+      { "deleted", "h501.deleted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_changed,
-      { "changed", "h501.changed",
+      { "changed", "h501.changed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_destinationInfo,
-      { "destinationInfo", "h501.destinationInfo",
+      { "destinationInfo", "h501.destinationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PartyInformation", HFILL }},
     { &hf_h501_sourceInfo,
-      { "sourceInfo", "h501.sourceInfo",
+      { "sourceInfo", "h501.sourceInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PartyInformation", HFILL }},
     { &hf_h501_callInfo,
-      { "callInfo", "h501.callInfo",
+      { "callInfo", "h501.callInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CallInformation", HFILL }},
     { &hf_h501_desiredProtocols,
@@ -2995,7 +2995,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_AddressTemplate", HFILL }},
     { &hf_h501_templates_item,
-      { "AddressTemplate", "h501.AddressTemplate",
+      { "AddressTemplate", "h501.AddressTemplate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_partialResponse,
@@ -3015,7 +3015,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ServiceControlSession", HFILL }},
     { &hf_h501_serviceControl_item,
-      { "ServiceControlSession", "h501.ServiceControlSession",
+      { "ServiceControlSession", "h501.ServiceControlSession_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_reason_04,
@@ -3023,27 +3023,27 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_AccessRejectionReason_vals), 0,
         "AccessRejectionReason", HFILL }},
     { &hf_h501_noMatch,
-      { "noMatch", "h501.noMatch",
+      { "noMatch", "h501.noMatch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_needCallInformation,
-      { "needCallInformation", "h501.needCallInformation",
+      { "needCallInformation", "h501.needCallInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_destinationUnavailable,
-      { "destinationUnavailable", "h501.destinationUnavailable",
+      { "destinationUnavailable", "h501.destinationUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_aliasesInconsistent,
-      { "aliasesInconsistent", "h501.aliasesInconsistent",
+      { "aliasesInconsistent", "h501.aliasesInconsistent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_resourceUnavailable,
-      { "resourceUnavailable", "h501.resourceUnavailable",
+      { "resourceUnavailable", "h501.resourceUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_incompleteAddress,
-      { "incompleteAddress", "h501.incompleteAddress",
+      { "incompleteAddress", "h501.incompleteAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_reason_05,
@@ -3067,11 +3067,11 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_UsageCallStatus_vals), 0,
         NULL, HFILL }},
     { &hf_h501_srcInfo,
-      { "srcInfo", "h501.srcInfo",
+      { "srcInfo", "h501.srcInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PartyInformation", HFILL }},
     { &hf_h501_destAddress,
-      { "destAddress", "h501.destAddress",
+      { "destAddress", "h501.destAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PartyInformation", HFILL }},
     { &hf_h501_startTime,
@@ -3083,7 +3083,7 @@ void proto_register_h501(void) {
         FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0,
         "TimeStamp", HFILL }},
     { &hf_h501_terminationCause,
-      { "terminationCause", "h501.terminationCause",
+      { "terminationCause", "h501.terminationCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_usageFields,
@@ -3091,7 +3091,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_UsageField", HFILL }},
     { &hf_h501_usageFields_item,
-      { "UsageField", "h501.UsageField",
+      { "UsageField", "h501.UsageField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_id,
@@ -3103,11 +3103,11 @@ void proto_register_h501(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_h501_invalidCall,
-      { "invalidCall", "h501.invalidCall",
+      { "invalidCall", "h501.invalidCall_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_unavailable,
-      { "unavailable", "h501.unavailable",
+      { "unavailable", "h501.unavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_reason_06,
@@ -3115,11 +3115,11 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_UsageIndicationRejectionReason_vals), 0,
         "UsageIndicationRejectionReason", HFILL }},
     { &hf_h501_unknownCall,
-      { "unknownCall", "h501.unknownCall",
+      { "unknownCall", "h501.unknownCall_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_incomplete,
-      { "incomplete", "h501.incomplete",
+      { "incomplete", "h501.incomplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_accessToken,
@@ -3135,15 +3135,15 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_ValidationRejectionReason_vals), 0,
         "ValidationRejectionReason", HFILL }},
     { &hf_h501_tokenNotValid,
-      { "tokenNotValid", "h501.tokenNotValid",
+      { "tokenNotValid", "h501.tokenNotValid_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_missingSourceInfo,
-      { "missingSourceInfo", "h501.missingSourceInfo",
+      { "missingSourceInfo", "h501.missingSourceInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_missingDestInfo,
-      { "missingDestInfo", "h501.missingDestInfo",
+      { "missingDestInfo", "h501.missingDestInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_delay,
@@ -3155,7 +3155,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_NonStandardRejectionReason_vals), 0,
         "NonStandardRejectionReason", HFILL }},
     { &hf_h501_notSupported,
-      { "notSupported", "h501.notSupported",
+      { "notSupported", "h501.notSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_unknownMessage,
@@ -3167,7 +3167,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_UnknownMessageReason_vals), 0,
         "UnknownMessageReason", HFILL }},
     { &hf_h501_notUnderstood,
-      { "notUnderstood", "h501.notUnderstood",
+      { "notUnderstood", "h501.notUnderstood_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_applicationMessage,
@@ -3179,27 +3179,27 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_AuthenticationRejectionReason_vals), 0,
         "AuthenticationRejectionReason", HFILL }},
     { &hf_h501_securityWrongSyncTime,
-      { "securityWrongSyncTime", "h501.securityWrongSyncTime",
+      { "securityWrongSyncTime", "h501.securityWrongSyncTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_securityReplay,
-      { "securityReplay", "h501.securityReplay",
+      { "securityReplay", "h501.securityReplay_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_securityWrongGeneralID,
-      { "securityWrongGeneralID", "h501.securityWrongGeneralID",
+      { "securityWrongGeneralID", "h501.securityWrongGeneralID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_securityWrongSendersID,
-      { "securityWrongSendersID", "h501.securityWrongSendersID",
+      { "securityWrongSendersID", "h501.securityWrongSendersID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_securityIntegrityFailed,
-      { "securityIntegrityFailed", "h501.securityIntegrityFailed",
+      { "securityIntegrityFailed", "h501.securityIntegrityFailed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_securityWrongOID,
-      { "securityWrongOID", "h501.securityWrongOID",
+      { "securityWrongOID", "h501.securityWrongOID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_pattern,
@@ -3215,7 +3215,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_RouteInformation", HFILL }},
     { &hf_h501_routeInfo_item,
-      { "RouteInformation", "h501.RouteInformation",
+      { "RouteInformation", "h501.RouteInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_specific,
@@ -3227,7 +3227,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0,
         "AliasAddress", HFILL }},
     { &hf_h501_range,
-      { "range", "h501.range",
+      { "range", "h501.range_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_startOfRange,
@@ -3243,15 +3243,15 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_T_messageType_vals), 0,
         NULL, HFILL }},
     { &hf_h501_sendAccessRequest,
-      { "sendAccessRequest", "h501.sendAccessRequest",
+      { "sendAccessRequest", "h501.sendAccessRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_sendSetup,
-      { "sendSetup", "h501.sendSetup",
+      { "sendSetup", "h501.sendSetup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_nonExistent,
-      { "nonExistent", "h501.nonExistent",
+      { "nonExistent", "h501.nonExistent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_callSpecific,
@@ -3263,7 +3263,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_PriceInfoSpec", HFILL }},
     { &hf_h501_priceInfo_item,
-      { "PriceInfoSpec", "h501.PriceInfoSpec",
+      { "PriceInfoSpec", "h501.PriceInfoSpec_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_contacts,
@@ -3271,15 +3271,15 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ContactInformation", HFILL }},
     { &hf_h501_contacts_item,
-      { "ContactInformation", "h501.ContactInformation",
+      { "ContactInformation", "h501.ContactInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_type,
-      { "type", "h501.type",
+      { "type", "h501.type_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EndpointType", HFILL }},
     { &hf_h501_circuitID,
-      { "circuitID", "h501.circuitID",
+      { "circuitID", "h501.circuitID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CircuitInfo", HFILL }},
     { &hf_h501_supportedCircuits,
@@ -3287,7 +3287,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_CircuitIdentifier", HFILL }},
     { &hf_h501_supportedCircuits_item,
-      { "CircuitIdentifier", "h501.CircuitIdentifier",
+      { "CircuitIdentifier", "h501.CircuitIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_transportAddress,
@@ -3307,7 +3307,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_SecurityMode", HFILL }},
     { &hf_h501_security_item,
-      { "SecurityMode", "h501.SecurityMode",
+      { "SecurityMode", "h501.SecurityMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_multipleCalls,
@@ -3343,7 +3343,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_PriceElement", HFILL }},
     { &hf_h501_priceElement_item,
-      { "PriceElement", "h501.PriceElement",
+      { "PriceElement", "h501.PriceElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_priceFormula,
@@ -3363,31 +3363,31 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h501_T_units_vals), 0,
         NULL, HFILL }},
     { &hf_h501_seconds,
-      { "seconds", "h501.seconds",
+      { "seconds", "h501.seconds_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_packets,
-      { "packets", "h501.packets",
+      { "packets", "h501.packets_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_bytes,
-      { "bytes", "h501.bytes",
+      { "bytes", "h501.bytes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_initial,
-      { "initial", "h501.initial",
+      { "initial", "h501.initial_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_minimum,
-      { "minimum", "h501.minimum",
+      { "minimum", "h501.minimum_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_maximum,
-      { "maximum", "h501.maximum",
+      { "maximum", "h501.maximum_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_descriptorInfo_02,
-      { "descriptorInfo", "h501.descriptorInfo",
+      { "descriptorInfo", "h501.descriptorInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_gatekeeperID,
@@ -3403,7 +3403,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_AlternatePE", HFILL }},
     { &hf_h501_alternatePE_item,
-      { "AlternatePE", "h501.AlternatePE",
+      { "AlternatePE", "h501.AlternatePE_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_alternateIsPermanent,
@@ -3419,7 +3419,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_127", HFILL }},
     { &hf_h501_token,
-      { "token", "h501.token",
+      { "token", "h501.token_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ClearToken", HFILL }},
     { &hf_h501_cryptoToken,
@@ -3427,11 +3427,11 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(h225_CryptoH323Token_vals), 0,
         "CryptoH323Token", HFILL }},
     { &hf_h501_genericData_01,
-      { "genericData", "h501.genericData",
+      { "genericData", "h501.genericData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_callIdentifier,
-      { "callIdentifier", "h501.callIdentifier",
+      { "callIdentifier", "h501.callIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_conferenceID,
@@ -3439,19 +3439,19 @@ void proto_register_h501(void) {
         FT_GUID, BASE_NONE, NULL, 0,
         "ConferenceIdentifier", HFILL }},
     { &hf_h501_preConnect,
-      { "preConnect", "h501.preConnect",
+      { "preConnect", "h501.preConnect_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_callInProgress,
-      { "callInProgress", "h501.callInProgress",
+      { "callInProgress", "h501.callInProgress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_callEnded,
-      { "callEnded", "h501.callEnded",
+      { "callEnded", "h501.callEnded_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_registrationLost,
-      { "registrationLost", "h501.registrationLost",
+      { "registrationLost", "h501.registrationLost_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_userIdentifier,
@@ -3471,19 +3471,19 @@ void proto_register_h501(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "ElementIdentifier", HFILL }},
     { &hf_h501_when,
-      { "when", "h501.when",
+      { "when", "h501.when_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_never,
-      { "never", "h501.never",
+      { "never", "h501.never_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_start,
-      { "start", "h501.start",
+      { "start", "h501.start_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_end,
-      { "end", "h501.end",
+      { "end", "h501.end_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_period,
@@ -3491,7 +3491,7 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_65535", HFILL }},
     { &hf_h501_failures,
-      { "failures", "h501.failures",
+      { "failures", "h501.failures_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_required,
@@ -3523,11 +3523,11 @@ void proto_register_h501(void) {
         FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0,
         NULL, HFILL }},
     { &hf_h501_endpointType,
-      { "endpointType", "h501.endpointType",
+      { "endpointType", "h501.endpointType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_userInfo,
-      { "userInfo", "h501.userInfo",
+      { "userInfo", "h501.userInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UserInformation", HFILL }},
     { &hf_h501_timeZone,
@@ -3535,15 +3535,15 @@ void proto_register_h501(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_originator,
-      { "originator", "h501.originator",
+      { "originator", "h501.originator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_destination,
-      { "destination", "h501.destination",
+      { "destination", "h501.destination_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_h501_nonStandardData,
-      { "nonStandardData", "h501.nonStandardData",
+      { "nonStandardData", "h501.nonStandardData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_h501_releaseCompleteReason,
diff --git a/epan/dissectors/packet-hnbap.c b/epan/dissectors/packet-hnbap.c
index 8b0482e431..0af509b994 100644
--- a/epan/dissectors/packet-hnbap.c
+++ b/epan/dissectors/packet-hnbap.c
@@ -2678,7 +2678,7 @@ module_t *hnbap_module;
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_CriticalityDiagnostics_PDU,
-      { "CriticalityDiagnostics", "hnbap.CriticalityDiagnostics",
+      { "CriticalityDiagnostics", "hnbap.CriticalityDiagnostics_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_CSG_ID_PDU,
@@ -2694,15 +2694,15 @@ module_t *hnbap_module;
         FT_UINT32, BASE_DEC, VALS(hnbap_HNB_Cell_Access_Mode_vals), 0,
         NULL, HFILL }},
     { &hf_hnbap_HNB_Location_Information_PDU,
-      { "HNB-Location-Information", "hnbap.HNB_Location_Information",
+      { "HNB-Location-Information", "hnbap.HNB_Location_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_HNB_Identity_PDU,
-      { "HNB-Identity", "hnbap.HNB_Identity",
+      { "HNB-Identity", "hnbap.HNB_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_IP_Address_PDU,
-      { "IP-Address", "hnbap.IP_Address",
+      { "IP-Address", "hnbap.IP_Address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_LAC_PDU,
@@ -2750,7 +2750,7 @@ module_t *hnbap_module;
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_UE_Capabilities_PDU,
-      { "UE-Capabilities", "hnbap.UE_Capabilities",
+      { "UE-Capabilities", "hnbap.UE_Capabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_UE_Identity_PDU,
@@ -2762,71 +2762,71 @@ module_t *hnbap_module;
         FT_UINT32, BASE_DEC, VALS(hnbap_Update_cause_vals), 0,
         NULL, HFILL }},
     { &hf_hnbap_HNBRegisterRequest_PDU,
-      { "HNBRegisterRequest", "hnbap.HNBRegisterRequest",
+      { "HNBRegisterRequest", "hnbap.HNBRegisterRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_HNBRegisterAccept_PDU,
-      { "HNBRegisterAccept", "hnbap.HNBRegisterAccept",
+      { "HNBRegisterAccept", "hnbap.HNBRegisterAccept_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_HNBRegisterReject_PDU,
-      { "HNBRegisterReject", "hnbap.HNBRegisterReject",
+      { "HNBRegisterReject", "hnbap.HNBRegisterReject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_HNBDe_Register_PDU,
-      { "HNBDe-Register", "hnbap.HNBDe_Register",
+      { "HNBDe-Register", "hnbap.HNBDe_Register_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_UERegisterRequest_PDU,
-      { "UERegisterRequest", "hnbap.UERegisterRequest",
+      { "UERegisterRequest", "hnbap.UERegisterRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_UERegisterAccept_PDU,
-      { "UERegisterAccept", "hnbap.UERegisterAccept",
+      { "UERegisterAccept", "hnbap.UERegisterAccept_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_UERegisterReject_PDU,
-      { "UERegisterReject", "hnbap.UERegisterReject",
+      { "UERegisterReject", "hnbap.UERegisterReject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_UEDe_Register_PDU,
-      { "UEDe-Register", "hnbap.UEDe_Register",
+      { "UEDe-Register", "hnbap.UEDe_Register_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_CSGMembershipUpdate_PDU,
-      { "CSGMembershipUpdate", "hnbap.CSGMembershipUpdate",
+      { "CSGMembershipUpdate", "hnbap.CSGMembershipUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_TNLUpdateRequest_PDU,
-      { "TNLUpdateRequest", "hnbap.TNLUpdateRequest",
+      { "TNLUpdateRequest", "hnbap.TNLUpdateRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_TNLUpdateResponse_PDU,
-      { "TNLUpdateResponse", "hnbap.TNLUpdateResponse",
+      { "TNLUpdateResponse", "hnbap.TNLUpdateResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_TNLUpdateFailure_PDU,
-      { "TNLUpdateFailure", "hnbap.TNLUpdateFailure",
+      { "TNLUpdateFailure", "hnbap.TNLUpdateFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_HNBConfigTransferRequest_PDU,
-      { "HNBConfigTransferRequest", "hnbap.HNBConfigTransferRequest",
+      { "HNBConfigTransferRequest", "hnbap.HNBConfigTransferRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_HNBConfigTransferResponse_PDU,
-      { "HNBConfigTransferResponse", "hnbap.HNBConfigTransferResponse",
+      { "HNBConfigTransferResponse", "hnbap.HNBConfigTransferResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_RelocationComplete_PDU,
-      { "RelocationComplete", "hnbap.RelocationComplete",
+      { "RelocationComplete", "hnbap.RelocationComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_ErrorIndication_PDU,
-      { "ErrorIndication", "hnbap.ErrorIndication",
+      { "ErrorIndication", "hnbap.ErrorIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_PrivateMessage_PDU,
-      { "PrivateMessage", "hnbap.PrivateMessage",
+      { "PrivateMessage", "hnbap.PrivateMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_HNBAP_PDU_PDU,
@@ -2842,7 +2842,7 @@ module_t *hnbap_module;
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_hnbap_ProtocolIE_Container_item,
-      { "ProtocolIE-Field", "hnbap.ProtocolIE_Field",
+      { "ProtocolIE-Field", "hnbap.ProtocolIE_Field_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_protocol_ie_field_id,
@@ -2854,11 +2854,11 @@ module_t *hnbap_module;
         FT_UINT32, BASE_DEC, VALS(hnbap_Criticality_vals), 0,
         NULL, HFILL }},
     { &hf_hnbap_ie_field_value,
-      { "value", "hnbap.value",
+      { "value", "hnbap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProtocolIE_Field_value", HFILL }},
     { &hf_hnbap_ProtocolExtensionContainer_item,
-      { "ProtocolExtensionField", "hnbap.ProtocolExtensionField",
+      { "ProtocolExtensionField", "hnbap.ProtocolExtensionField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_id,
@@ -2866,11 +2866,11 @@ module_t *hnbap_module;
         FT_UINT32, BASE_DEC, VALS(hnbap_ProtocolIE_ID_vals), 0,
         "ProtocolIE_ID", HFILL }},
     { &hf_hnbap_extensionValue,
-      { "extensionValue", "hnbap.extensionValue",
+      { "extensionValue", "hnbap.extensionValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_PrivateIE_Container_item,
-      { "PrivateIE-Field", "hnbap.PrivateIE_Field",
+      { "PrivateIE-Field", "hnbap.PrivateIE_Field_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_private_ie_field_id,
@@ -2878,7 +2878,7 @@ module_t *hnbap_module;
         FT_UINT32, BASE_DEC, VALS(hnbap_PrivateIE_ID_vals), 0,
         "PrivateIE_ID", HFILL }},
     { &hf_hnbap_private_value,
-      { "value", "hnbap.value",
+      { "value", "hnbap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrivateIE_Field_value", HFILL }},
     { &hf_hnbap_directionOfAltitude,
@@ -2926,7 +2926,7 @@ module_t *hnbap_module;
         FT_UINT32, BASE_DEC, NULL, 0,
         "ProtocolExtensionContainer", HFILL }},
     { &hf_hnbap_CriticalityDiagnostics_IE_List_item,
-      { "CriticalityDiagnostics-IE-List item", "hnbap.CriticalityDiagnostics_IE_List_item",
+      { "CriticalityDiagnostics-IE-List item", "hnbap.CriticalityDiagnostics_IE_List_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_iECriticality,
@@ -2954,11 +2954,11 @@ module_t *hnbap_module;
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_geographical_location_geographical_coordinates,
-      { "geographicalCoordinates", "hnbap.geographicalCoordinates",
+      { "geographicalCoordinates", "hnbap.geographicalCoordinates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_altitudeAndDirection,
-      { "altitudeAndDirection", "hnbap.altitudeAndDirection",
+      { "altitudeAndDirection", "hnbap.altitudeAndDirection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_latitudeSign,
@@ -2978,7 +2978,7 @@ module_t *hnbap_module;
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_hNB_Identity_as_Cell_Identifier,
-      { "hNB-Identity-as-Cell-Identifier", "hnbap.hNB_Identity_as_Cell_Identifier",
+      { "hNB-Identity-as-Cell-Identifier", "hnbap.hNB_Identity_as_Cell_Identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HNB_Cell_Identifier", HFILL }},
     { &hf_hnbap_hnb_RNL_Identity,
@@ -2990,11 +2990,11 @@ module_t *hnbap_module;
         FT_UINT32, BASE_DEC, VALS(hnbap_ConfigurationInformation_vals), 0,
         NULL, HFILL }},
     { &hf_hnbap_provided,
-      { "provided", "hnbap.provided",
+      { "provided", "hnbap.provided_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HNBConfigurationInformationProvided", HFILL }},
     { &hf_hnbap_missing,
-      { "missing", "hnbap.missing",
+      { "missing", "hnbap.missing_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HNBConfigurationInformationMissing", HFILL }},
     { &hf_hnbap_psc,
@@ -3018,11 +3018,11 @@ module_t *hnbap_module;
         FT_UINT32, BASE_DEC, VALS(hnbap_Cause_vals), 0,
         NULL, HFILL }},
     { &hf_hnbap_macroCoverageInfo,
-      { "macroCoverageInfo", "hnbap.macroCoverageInfo",
+      { "macroCoverageInfo", "hnbap.macroCoverageInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MacroCoverageInformation", HFILL }},
     { &hf_hnbap_hnb_location_information_geographical_coordinates,
-      { "geographicalCoordinates", "hnbap.geographicalCoordinates",
+      { "geographicalCoordinates", "hnbap.geographicalCoordinates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GeographicalLocation", HFILL }},
     { &hf_hnbap_hNB_Identity_Info,
@@ -3050,7 +3050,7 @@ module_t *hnbap_module;
         FT_BYTES, BASE_NONE, NULL, 0,
         "Ipv6Address", HFILL }},
     { &hf_hnbap_Iurh_Signalling_TNL_AddressList_item,
-      { "IP-Address", "hnbap.IP_Address",
+      { "IP-Address", "hnbap.IP_Address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_pLMNID,
@@ -3062,19 +3062,19 @@ module_t *hnbap_module;
         FT_UINT32, BASE_DEC, VALS(hnbap_MacroCellID_vals), 0,
         "MacroCellID", HFILL }},
     { &hf_hnbap_uTRANCellID,
-      { "uTRANCellID", "hnbap.uTRANCellID",
+      { "uTRANCellID", "hnbap.uTRANCellID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_gERANCellID,
-      { "gERANCellID", "hnbap.gERANCellID",
+      { "gERANCellID", "hnbap.gERANCellID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CGI", HFILL }},
     { &hf_hnbap_NeighbourInfoList_item,
-      { "HNBConfigInfo", "hnbap.HNBConfigInfo",
+      { "HNBConfigInfo", "hnbap.HNBConfigInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_NeighbourInfoRequestList_item,
-      { "NeighbourInfoRequestItem", "hnbap.NeighbourInfoRequestItem",
+      { "NeighbourInfoRequestItem", "hnbap.NeighbourInfoRequestItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_pTMSI,
@@ -3082,11 +3082,11 @@ module_t *hnbap_module;
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_rAI,
-      { "rAI", "hnbap.rAI",
+      { "rAI", "hnbap.rAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_RABList_item,
-      { "RABListItem", "hnbap.RABListItem",
+      { "RABListItem", "hnbap.RABListItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_rAB_ID,
@@ -3094,11 +3094,11 @@ module_t *hnbap_module;
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_old_transport_Info,
-      { "old-transport-Info", "hnbap.old_transport_Info",
+      { "old-transport-Info", "hnbap.old_transport_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportInfo", HFILL }},
     { &hf_hnbap_new_transport_Info,
-      { "new-transport-Info", "hnbap.new_transport_Info",
+      { "new-transport-Info", "hnbap.new_transport_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportInfo", HFILL }},
     { &hf_hnbap_cn_domain_indicator,
@@ -3106,7 +3106,7 @@ module_t *hnbap_module;
         FT_UINT32, BASE_DEC, VALS(hnbap_CN_DomainIndicator_vals), 0,
         "CN_DomainIndicator", HFILL }},
     { &hf_hnbap_lAI,
-      { "lAI", "hnbap.lAI",
+      { "lAI", "hnbap.lAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_rAC,
@@ -3150,11 +3150,11 @@ module_t *hnbap_module;
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_tMSILAI,
-      { "tMSILAI", "hnbap.tMSILAI",
+      { "tMSILAI", "hnbap.tMSILAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_pTMSIRAI,
-      { "pTMSIRAI", "hnbap.pTMSIRAI",
+      { "pTMSIRAI", "hnbap.pTMSIRAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_iMEI,
@@ -3162,7 +3162,7 @@ module_t *hnbap_module;
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_iMSIESN,
-      { "iMSIESN", "hnbap.iMSIESN",
+      { "iMSIESN", "hnbap.iMSIESN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_tMSIDS41,
@@ -3182,27 +3182,27 @@ module_t *hnbap_module;
         FT_UINT32, BASE_DEC, NULL, 0,
         "PrivateIE_Container", HFILL }},
     { &hf_hnbap_initiatingMessage,
-      { "initiatingMessage", "hnbap.initiatingMessage",
+      { "initiatingMessage", "hnbap.initiatingMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_successfulOutcome,
-      { "successfulOutcome", "hnbap.successfulOutcome",
+      { "successfulOutcome", "hnbap.successfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_unsuccessfulOutcome,
-      { "unsuccessfulOutcome", "hnbap.unsuccessfulOutcome",
+      { "unsuccessfulOutcome", "hnbap.unsuccessfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_hnbap_initiatingMessagevalue,
-      { "value", "hnbap.value",
+      { "value", "hnbap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InitiatingMessage_value", HFILL }},
     { &hf_hnbap_successfulOutcome_value,
-      { "value", "hnbap.value",
+      { "value", "hnbap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SuccessfulOutcome_value", HFILL }},
     { &hf_hnbap_unsuccessfulOutcome_value,
-      { "value", "hnbap.value",
+      { "value", "hnbap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UnsuccessfulOutcome_value", HFILL }},
 
diff --git a/epan/dissectors/packet-idmp.c b/epan/dissectors/packet-idmp.c
index ee681b426f..c995af2427 100644
--- a/epan/dissectors/packet-idmp.c
+++ b/epan/dissectors/packet-idmp.c
@@ -804,35 +804,35 @@ void proto_register_idmp(void)
 /*--- Included file: packet-idmp-hfarr.c ---*/
 #line 1 "../../asn1/idmp/packet-idmp-hfarr.c"
     { &hf_idmp_bind,
-      { "bind", "idmp.bind",
+      { "bind", "idmp.bind_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IdmBind", HFILL }},
     { &hf_idmp_bindResult,
-      { "bindResult", "idmp.bindResult",
+      { "bindResult", "idmp.bindResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IdmBindResult", HFILL }},
     { &hf_idmp_bindError,
-      { "bindError", "idmp.bindError",
+      { "bindError", "idmp.bindError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IdmBindError", HFILL }},
     { &hf_idmp_request,
-      { "request", "idmp.request",
+      { "request", "idmp.request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_idmp_idm_result,
-      { "result", "idmp.result",
+      { "result", "idmp.result_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IdmResult", HFILL }},
     { &hf_idmp_idm_error,
-      { "error", "idmp.error",
+      { "error", "idmp.error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_idmp_reject,
-      { "reject", "idmp.reject",
+      { "reject", "idmp.reject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IdmReject", HFILL }},
     { &hf_idmp_unbind,
-      { "unbind", "idmp.unbind",
+      { "unbind", "idmp.unbind_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_idmp_abort,
@@ -840,7 +840,7 @@ void proto_register_idmp(void)
         FT_UINT32, BASE_DEC, VALS(idmp_Abort_vals), 0,
         NULL, HFILL }},
     { &hf_idmp_startTLS,
-      { "startTLS", "idmp.startTLS",
+      { "startTLS", "idmp.startTLS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_idmp_tLSResponse,
@@ -860,7 +860,7 @@ void proto_register_idmp(void)
         FT_UINT32, BASE_DEC, VALS(x509ce_GeneralName_vals), 0,
         "GeneralName", HFILL }},
     { &hf_idmp_bind_argument,
-      { "argument", "idmp.argument",
+      { "argument", "idmp.argument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Bind_argument", HFILL }},
     { &hf_idmp_respondingAETitle,
@@ -868,11 +868,11 @@ void proto_register_idmp(void)
         FT_UINT32, BASE_DEC, VALS(x509ce_GeneralName_vals), 0,
         "GeneralName", HFILL }},
     { &hf_idmp_bind_result,
-      { "result", "idmp.result",
+      { "result", "idmp.result_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Bind_result", HFILL }},
     { &hf_idmp_bind_errcode,
-      { "errcode", "idmp.errcode",
+      { "errcode", "idmp.errcode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Bind_errcode", HFILL }},
     { &hf_idmp_aETitleError,
@@ -880,7 +880,7 @@ void proto_register_idmp(void)
         FT_UINT32, BASE_DEC, VALS(idmp_T_aETitleError_vals), 0,
         NULL, HFILL }},
     { &hf_idmp_bind_error,
-      { "error", "idmp.error",
+      { "error", "idmp.error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Bind_error", HFILL }},
     { &hf_idmp_invokeID,
@@ -892,7 +892,7 @@ void proto_register_idmp(void)
         FT_UINT32, BASE_DEC, VALS(idmp_Code_vals), 0,
         "Code", HFILL }},
     { &hf_idmp_argument,
-      { "argument", "idmp.argument",
+      { "argument", "idmp.argument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_idmp_idm_invokeID,
@@ -900,15 +900,15 @@ void proto_register_idmp(void)
         FT_UINT32, BASE_DEC, VALS(idmp_InvokeId_vals), 0,
         NULL, HFILL }},
     { &hf_idmp_result,
-      { "result", "idmp.result",
+      { "result", "idmp.result_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_idmp_errcode,
-      { "errcode", "idmp.errcode",
+      { "errcode", "idmp.errcode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_idmp_error,
-      { "error", "idmp.error",
+      { "error", "idmp.error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_idmp_reason,
@@ -928,7 +928,7 @@ void proto_register_idmp(void)
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_idmp_absent,
-      { "absent", "idmp.absent",
+      { "absent", "idmp.absent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c
index 4cab0e0392..f24ae6e8eb 100644
--- a/epan/dissectors/packet-inap.c
+++ b/epan/dissectors/packet-inap.c
@@ -9425,19 +9425,19 @@ void proto_register_inap(void) {
 /*--- Included file: packet-inap-hfarr.c ---*/
 #line 1 "../../asn1/inap/packet-inap-hfarr.c"
     { &hf_inap_ActivateServiceFilteringArg_PDU,
-      { "ActivateServiceFilteringArg", "inap.ActivateServiceFilteringArg",
+      { "ActivateServiceFilteringArg", "inap.ActivateServiceFilteringArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_AnalysedInformationArg_PDU,
-      { "AnalysedInformationArg", "inap.AnalysedInformationArg",
+      { "AnalysedInformationArg", "inap.AnalysedInformationArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_AnalyseInformationArg_PDU,
-      { "AnalyseInformationArg", "inap.AnalyseInformationArg",
+      { "AnalyseInformationArg", "inap.AnalyseInformationArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_ApplyChargingArg_PDU,
-      { "ApplyChargingArg", "inap.ApplyChargingArg",
+      { "ApplyChargingArg", "inap.ApplyChargingArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_ApplyChargingReportArg_PDU,
@@ -9445,27 +9445,27 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_AssistRequestInstructionsArg_PDU,
-      { "AssistRequestInstructionsArg", "inap.AssistRequestInstructionsArg",
+      { "AssistRequestInstructionsArg", "inap.AssistRequestInstructionsArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_AuthorizeTerminationArg_PDU,
-      { "AuthorizeTerminationArg", "inap.AuthorizeTerminationArg",
+      { "AuthorizeTerminationArg", "inap.AuthorizeTerminationArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_CallFilteringArg_PDU,
-      { "CallFilteringArg", "inap.CallFilteringArg",
+      { "CallFilteringArg", "inap.CallFilteringArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_CallGapArg_PDU,
-      { "CallGapArg", "inap.CallGapArg",
+      { "CallGapArg", "inap.CallGapArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_CallInformationReportArg_PDU,
-      { "CallInformationReportArg", "inap.CallInformationReportArg",
+      { "CallInformationReportArg", "inap.CallInformationReportArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_CallInformationRequestArg_PDU,
-      { "CallInformationRequestArg", "inap.CallInformationRequestArg",
+      { "CallInformationRequestArg", "inap.CallInformationRequestArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_CancelArg_PDU,
@@ -9473,51 +9473,51 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, VALS(inap_CancelArg_vals), 0,
         NULL, HFILL }},
     { &hf_inap_CancelStatusReportRequestArg_PDU,
-      { "CancelStatusReportRequestArg", "inap.CancelStatusReportRequestArg",
+      { "CancelStatusReportRequestArg", "inap.CancelStatusReportRequestArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_CollectedInformationArg_PDU,
-      { "CollectedInformationArg", "inap.CollectedInformationArg",
+      { "CollectedInformationArg", "inap.CollectedInformationArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_CollectInformationArg_PDU,
-      { "CollectInformationArg", "inap.CollectInformationArg",
+      { "CollectInformationArg", "inap.CollectInformationArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_ConnectArg_PDU,
-      { "ConnectArg", "inap.ConnectArg",
+      { "ConnectArg", "inap.ConnectArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_ConnectToResourceArg_PDU,
-      { "ConnectToResourceArg", "inap.ConnectToResourceArg",
+      { "ConnectToResourceArg", "inap.ConnectToResourceArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_ContinueWithArgumentArg_PDU,
-      { "ContinueWithArgumentArg", "inap.ContinueWithArgumentArg",
+      { "ContinueWithArgumentArg", "inap.ContinueWithArgumentArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_CreateCallSegmentAssociationArg_PDU,
-      { "CreateCallSegmentAssociationArg", "inap.CreateCallSegmentAssociationArg",
+      { "CreateCallSegmentAssociationArg", "inap.CreateCallSegmentAssociationArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_CreateCallSegmentAssociationResultArg_PDU,
-      { "CreateCallSegmentAssociationResultArg", "inap.CreateCallSegmentAssociationResultArg",
+      { "CreateCallSegmentAssociationResultArg", "inap.CreateCallSegmentAssociationResultArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_CreateOrRemoveTriggerDataArg_PDU,
-      { "CreateOrRemoveTriggerDataArg", "inap.CreateOrRemoveTriggerDataArg",
+      { "CreateOrRemoveTriggerDataArg", "inap.CreateOrRemoveTriggerDataArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_CreateOrRemoveTriggerDataResultArg_PDU,
-      { "CreateOrRemoveTriggerDataResultArg", "inap.CreateOrRemoveTriggerDataResultArg",
+      { "CreateOrRemoveTriggerDataResultArg", "inap.CreateOrRemoveTriggerDataResultArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_DisconnectForwardConnectionWithArgumentArg_PDU,
-      { "DisconnectForwardConnectionWithArgumentArg", "inap.DisconnectForwardConnectionWithArgumentArg",
+      { "DisconnectForwardConnectionWithArgumentArg", "inap.DisconnectForwardConnectionWithArgumentArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_DisconnectLegArg_PDU,
-      { "DisconnectLegArg", "inap.DisconnectLegArg",
+      { "DisconnectLegArg", "inap.DisconnectLegArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_EntityReleasedArg_PDU,
@@ -9525,23 +9525,23 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, VALS(inap_EntityReleasedArg_vals), 0,
         NULL, HFILL }},
     { &hf_inap_EstablishTemporaryConnectionArg_PDU,
-      { "EstablishTemporaryConnectionArg", "inap.EstablishTemporaryConnectionArg",
+      { "EstablishTemporaryConnectionArg", "inap.EstablishTemporaryConnectionArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_EventNotificationChargingArg_PDU,
-      { "EventNotificationChargingArg", "inap.EventNotificationChargingArg",
+      { "EventNotificationChargingArg", "inap.EventNotificationChargingArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_EventReportBCSMArg_PDU,
-      { "EventReportBCSMArg", "inap.EventReportBCSMArg",
+      { "EventReportBCSMArg", "inap.EventReportBCSMArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_EventReportFacilityArg_PDU,
-      { "EventReportFacilityArg", "inap.EventReportFacilityArg",
+      { "EventReportFacilityArg", "inap.EventReportFacilityArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_FacilitySelectedAndAvailableArg_PDU,
-      { "FacilitySelectedAndAvailableArg", "inap.FacilitySelectedAndAvailableArg",
+      { "FacilitySelectedAndAvailableArg", "inap.FacilitySelectedAndAvailableArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_FurnishChargingInformationArg_PDU,
@@ -9553,15 +9553,15 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, VALS(inap_HoldCallInNetworkArg_vals), 0,
         NULL, HFILL }},
     { &hf_inap_InitialDPArg_PDU,
-      { "InitialDPArg", "inap.InitialDPArg",
+      { "InitialDPArg", "inap.InitialDPArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_InitiateCallAttemptArg_PDU,
-      { "InitiateCallAttemptArg", "inap.InitiateCallAttemptArg",
+      { "InitiateCallAttemptArg", "inap.InitiateCallAttemptArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_ManageTriggerDataArg_PDU,
-      { "ManageTriggerDataArg", "inap.ManageTriggerDataArg",
+      { "ManageTriggerDataArg", "inap.ManageTriggerDataArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_ManageTriggerDataResultArg_PDU,
@@ -9569,63 +9569,63 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, VALS(inap_ManageTriggerDataResultArg_vals), 0,
         NULL, HFILL }},
     { &hf_inap_MergeCallSegmentsArg_PDU,
-      { "MergeCallSegmentsArg", "inap.MergeCallSegmentsArg",
+      { "MergeCallSegmentsArg", "inap.MergeCallSegmentsArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_MonitorRouteReportArg_PDU,
-      { "MonitorRouteReportArg", "inap.MonitorRouteReportArg",
+      { "MonitorRouteReportArg", "inap.MonitorRouteReportArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_MonitorRouteRequestArg_PDU,
-      { "MonitorRouteRequestArg", "inap.MonitorRouteRequestArg",
+      { "MonitorRouteRequestArg", "inap.MonitorRouteRequestArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_MoveCallSegmentsArg_PDU,
-      { "MoveCallSegmentsArg", "inap.MoveCallSegmentsArg",
+      { "MoveCallSegmentsArg", "inap.MoveCallSegmentsArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_MoveLegArg_PDU,
-      { "MoveLegArg", "inap.MoveLegArg",
+      { "MoveLegArg", "inap.MoveLegArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_OAbandonArg_PDU,
-      { "OAbandonArg", "inap.OAbandonArg",
+      { "OAbandonArg", "inap.OAbandonArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_OAnswerArg_PDU,
-      { "OAnswerArg", "inap.OAnswerArg",
+      { "OAnswerArg", "inap.OAnswerArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_OCalledPartyBusyArg_PDU,
-      { "OCalledPartyBusyArg", "inap.OCalledPartyBusyArg",
+      { "OCalledPartyBusyArg", "inap.OCalledPartyBusyArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_ODisconnectArg_PDU,
-      { "ODisconnectArg", "inap.ODisconnectArg",
+      { "ODisconnectArg", "inap.ODisconnectArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_MidCallArg_PDU,
-      { "MidCallArg", "inap.MidCallArg",
+      { "MidCallArg", "inap.MidCallArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_ONoAnswerArg_PDU,
-      { "ONoAnswerArg", "inap.ONoAnswerArg",
+      { "ONoAnswerArg", "inap.ONoAnswerArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_OriginationAttemptArg_PDU,
-      { "OriginationAttemptArg", "inap.OriginationAttemptArg",
+      { "OriginationAttemptArg", "inap.OriginationAttemptArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_OriginationAttemptAuthorizedArg_PDU,
-      { "OriginationAttemptAuthorizedArg", "inap.OriginationAttemptAuthorizedArg",
+      { "OriginationAttemptAuthorizedArg", "inap.OriginationAttemptAuthorizedArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_OSuspendedArg_PDU,
-      { "OSuspendedArg", "inap.OSuspendedArg",
+      { "OSuspendedArg", "inap.OSuspendedArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_ReconnectArg_PDU,
-      { "ReconnectArg", "inap.ReconnectArg",
+      { "ReconnectArg", "inap.ReconnectArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_ReleaseCallArg_PDU,
@@ -9633,7 +9633,7 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, VALS(inap_ReleaseCallArg_vals), 0,
         NULL, HFILL }},
     { &hf_inap_ReportUTSIArg_PDU,
-      { "ReportUTSIArg", "inap.ReportUTSIArg",
+      { "ReportUTSIArg", "inap.ReportUTSIArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_RequestCurrentStatusReportArg_PDU,
@@ -9641,15 +9641,15 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, VALS(inap_ResourceID_vals), 0,
         NULL, HFILL }},
     { &hf_inap_RequestCurrentStatusReportResultArg_PDU,
-      { "RequestCurrentStatusReportResultArg", "inap.RequestCurrentStatusReportResultArg",
+      { "RequestCurrentStatusReportResultArg", "inap.RequestCurrentStatusReportResultArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_RequestEveryStatusChangeReportArg_PDU,
-      { "RequestEveryStatusChangeReportArg", "inap.RequestEveryStatusChangeReportArg",
+      { "RequestEveryStatusChangeReportArg", "inap.RequestEveryStatusChangeReportArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_RequestFirstStatusMatchReportArg_PDU,
-      { "RequestFirstStatusMatchReportArg", "inap.RequestFirstStatusMatchReportArg",
+      { "RequestFirstStatusMatchReportArg", "inap.RequestFirstStatusMatchReportArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_RequestNotificationChargingEventArg_PDU,
@@ -9657,95 +9657,95 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_RequestReportBCSMEventArg_PDU,
-      { "RequestReportBCSMEventArg", "inap.RequestReportBCSMEventArg",
+      { "RequestReportBCSMEventArg", "inap.RequestReportBCSMEventArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_RequestReportFacilityEventArg_PDU,
-      { "RequestReportFacilityEventArg", "inap.RequestReportFacilityEventArg",
+      { "RequestReportFacilityEventArg", "inap.RequestReportFacilityEventArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_RequestReportUTSIArg_PDU,
-      { "RequestReportUTSIArg", "inap.RequestReportUTSIArg",
+      { "RequestReportUTSIArg", "inap.RequestReportUTSIArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_ResetTimerArg_PDU,
-      { "ResetTimerArg", "inap.ResetTimerArg",
+      { "ResetTimerArg", "inap.ResetTimerArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_RouteSelectFailureArg_PDU,
-      { "RouteSelectFailureArg", "inap.RouteSelectFailureArg",
+      { "RouteSelectFailureArg", "inap.RouteSelectFailureArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_SelectFacilityArg_PDU,
-      { "SelectFacilityArg", "inap.SelectFacilityArg",
+      { "SelectFacilityArg", "inap.SelectFacilityArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_SelectRouteArg_PDU,
-      { "SelectRouteArg", "inap.SelectRouteArg",
+      { "SelectRouteArg", "inap.SelectRouteArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_SendChargingInformationArg_PDU,
-      { "SendChargingInformationArg", "inap.SendChargingInformationArg",
+      { "SendChargingInformationArg", "inap.SendChargingInformationArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_SendFacilityInformationArg_PDU,
-      { "SendFacilityInformationArg", "inap.SendFacilityInformationArg",
+      { "SendFacilityInformationArg", "inap.SendFacilityInformationArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_SendSTUIArg_PDU,
-      { "SendSTUIArg", "inap.SendSTUIArg",
+      { "SendSTUIArg", "inap.SendSTUIArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_ServiceFilteringResponseArg_PDU,
-      { "ServiceFilteringResponseArg", "inap.ServiceFilteringResponseArg",
+      { "ServiceFilteringResponseArg", "inap.ServiceFilteringResponseArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_SetServiceProfileArg_PDU,
-      { "SetServiceProfileArg", "inap.SetServiceProfileArg",
+      { "SetServiceProfileArg", "inap.SetServiceProfileArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_SplitLegArg_PDU,
-      { "SplitLegArg", "inap.SplitLegArg",
+      { "SplitLegArg", "inap.SplitLegArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_StatusReportArg_PDU,
-      { "StatusReportArg", "inap.StatusReportArg",
+      { "StatusReportArg", "inap.StatusReportArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_TAnswerArg_PDU,
-      { "TAnswerArg", "inap.TAnswerArg",
+      { "TAnswerArg", "inap.TAnswerArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_TBusyArg_PDU,
-      { "TBusyArg", "inap.TBusyArg",
+      { "TBusyArg", "inap.TBusyArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_TDisconnectArg_PDU,
-      { "TDisconnectArg", "inap.TDisconnectArg",
+      { "TDisconnectArg", "inap.TDisconnectArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_TermAttemptAuthorizedArg_PDU,
-      { "TermAttemptAuthorizedArg", "inap.TermAttemptAuthorizedArg",
+      { "TermAttemptAuthorizedArg", "inap.TermAttemptAuthorizedArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_TerminationAttemptArg_PDU,
-      { "TerminationAttemptArg", "inap.TerminationAttemptArg",
+      { "TerminationAttemptArg", "inap.TerminationAttemptArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_TNoAnswerArg_PDU,
-      { "TNoAnswerArg", "inap.TNoAnswerArg",
+      { "TNoAnswerArg", "inap.TNoAnswerArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_TSuspendedArg_PDU,
-      { "TSuspendedArg", "inap.TSuspendedArg",
+      { "TSuspendedArg", "inap.TSuspendedArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_PlayAnnouncementArg_PDU,
-      { "PlayAnnouncementArg", "inap.PlayAnnouncementArg",
+      { "PlayAnnouncementArg", "inap.PlayAnnouncementArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_PromptAndCollectUserInformationArg_PDU,
-      { "PromptAndCollectUserInformationArg", "inap.PromptAndCollectUserInformationArg",
+      { "PromptAndCollectUserInformationArg", "inap.PromptAndCollectUserInformationArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_ReceivedInformationArg_PDU,
@@ -9753,39 +9753,39 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, VALS(inap_ReceivedInformationArg_vals), 0,
         NULL, HFILL }},
     { &hf_inap_PromptAndReceiveMessageArg_PDU,
-      { "PromptAndReceiveMessageArg", "inap.PromptAndReceiveMessageArg",
+      { "PromptAndReceiveMessageArg", "inap.PromptAndReceiveMessageArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_MessageReceivedArg_PDU,
-      { "MessageReceivedArg", "inap.MessageReceivedArg",
+      { "MessageReceivedArg", "inap.MessageReceivedArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_ScriptCloseArg_PDU,
-      { "ScriptCloseArg", "inap.ScriptCloseArg",
+      { "ScriptCloseArg", "inap.ScriptCloseArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_ScriptEventArg_PDU,
-      { "ScriptEventArg", "inap.ScriptEventArg",
+      { "ScriptEventArg", "inap.ScriptEventArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_ScriptInformationArg_PDU,
-      { "ScriptInformationArg", "inap.ScriptInformationArg",
+      { "ScriptInformationArg", "inap.ScriptInformationArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_ScriptRunArg_PDU,
-      { "ScriptRunArg", "inap.ScriptRunArg",
+      { "ScriptRunArg", "inap.ScriptRunArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_SpecializedResourceReportArg_PDU,
-      { "SpecializedResourceReportArg", "inap.SpecializedResourceReportArg",
+      { "SpecializedResourceReportArg", "inap.SpecializedResourceReportArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_SRFCallGapArg_PDU,
-      { "SRFCallGapArg", "inap.SRFCallGapArg",
+      { "SRFCallGapArg", "inap.SRFCallGapArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_PAR_cancelFailed_PDU,
-      { "PAR-cancelFailed", "inap.PAR_cancelFailed",
+      { "PAR-cancelFailed", "inap.PAR_cancelFailed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_PAR_requestedInfoError_PDU,
@@ -9793,11 +9793,11 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, VALS(inap_PAR_requestedInfoError_vals), 0,
         NULL, HFILL }},
     { &hf_inap_ScfTaskRefusedParameter_PDU,
-      { "ScfTaskRefusedParameter", "inap.ScfTaskRefusedParameter",
+      { "ScfTaskRefusedParameter", "inap.ScfTaskRefusedParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_ReferralParameter_PDU,
-      { "ReferralParameter", "inap.ReferralParameter",
+      { "ReferralParameter", "inap.ReferralParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_UnavailableNetworkResource_PDU,
@@ -9809,7 +9809,7 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, VALS(inap_PAR_taskRefused_vals), 0,
         NULL, HFILL }},
     { &hf_inap_Extensions_item,
-      { "ExtensionField", "inap.ExtensionField",
+      { "ExtensionField", "inap.ExtensionField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_type,
@@ -9821,7 +9821,7 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, VALS(inap_CriticalityType_vals), 0,
         "CriticalityType", HFILL }},
     { &hf_inap_value,
-      { "value", "inap.value",
+      { "value", "inap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_AlternativeIdentities_item,
@@ -9853,15 +9853,15 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Digits", HFILL }},
     { &hf_inap_gapOnService,
-      { "gapOnService", "inap.gapOnService",
+      { "gapOnService", "inap.gapOnService_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_gapAllInTraffic,
-      { "gapAllInTraffic", "inap.gapAllInTraffic",
+      { "gapAllInTraffic", "inap.gapAllInTraffic_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_calledAddressAndService,
-      { "calledAddressAndService", "inap.calledAddressAndService",
+      { "calledAddressAndService", "inap.calledAddressAndService_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_serviceKey,
@@ -9869,7 +9869,7 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_callingAddressAndService,
-      { "callingAddressAndService", "inap.callingAddressAndService",
+      { "callingAddressAndService", "inap.callingAddressAndService_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_callingAddressValue,
@@ -9957,7 +9957,7 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_1_118", HFILL }},
     { &hf_inap_relayedComponent,
-      { "relayedComponent", "inap.relayedComponent",
+      { "relayedComponent", "inap.relayedComponent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EMBEDDED_PDV", HFILL }},
     { &hf_inap_basicGapCriteria,
@@ -9977,7 +9977,7 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Integer4", HFILL }},
     { &hf_inap_CountersValue_item,
-      { "CounterAndValue", "inap.CounterAndValue",
+      { "CounterAndValue", "inap.CounterAndValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_action,
@@ -9993,7 +9993,7 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_serviceAddressInformation,
-      { "serviceAddressInformation", "inap.serviceAddressInformation",
+      { "serviceAddressInformation", "inap.serviceAddressInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_bearerCapability,
@@ -10057,7 +10057,7 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_serviceInteractionIndicatorsTwo,
-      { "serviceInteractionIndicatorsTwo", "inap.serviceInteractionIndicatorsTwo",
+      { "serviceInteractionIndicatorsTwo", "inap.serviceInteractionIndicatorsTwo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_uSIServiceIndicator,
@@ -10077,7 +10077,7 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CSAID", HFILL }},
     { &hf_inap_ipRelatedInformation,
-      { "ipRelatedInformation", "inap.ipRelatedInformation",
+      { "ipRelatedInformation", "inap.ipRelatedInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_numberOfDigits,
@@ -10093,7 +10093,7 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_numberOfDigitsTwo,
-      { "numberOfDigitsTwo", "inap.numberOfDigitsTwo",
+      { "numberOfDigitsTwo", "inap.numberOfDigitsTwo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_requestedNumberOfDigits,
@@ -10113,7 +10113,7 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Integer4", HFILL }},
     { &hf_inap_collectedInfoSpecificInfo,
-      { "collectedInfoSpecificInfo", "inap.collectedInfoSpecificInfo",
+      { "collectedInfoSpecificInfo", "inap.collectedInfoSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_calledPartynumber,
@@ -10121,11 +10121,11 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_analysedInfoSpecificInfo,
-      { "analysedInfoSpecificInfo", "inap.analysedInfoSpecificInfo",
+      { "analysedInfoSpecificInfo", "inap.analysedInfoSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_routeSelectFailureSpecificInfo,
-      { "routeSelectFailureSpecificInfo", "inap.routeSelectFailureSpecificInfo",
+      { "routeSelectFailureSpecificInfo", "inap.routeSelectFailureSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_failureCause,
@@ -10133,7 +10133,7 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Cause", HFILL }},
     { &hf_inap_oCalledPartyBusySpecificInfo,
-      { "oCalledPartyBusySpecificInfo", "inap.oCalledPartyBusySpecificInfo",
+      { "oCalledPartyBusySpecificInfo", "inap.oCalledPartyBusySpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_busyCause,
@@ -10141,7 +10141,7 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Cause", HFILL }},
     { &hf_inap_oNoAnswerSpecificInfo,
-      { "oNoAnswerSpecificInfo", "inap.oNoAnswerSpecificInfo",
+      { "oNoAnswerSpecificInfo", "inap.oNoAnswerSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_cause,
@@ -10149,7 +10149,7 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_oAnswerSpecificInfo,
-      { "oAnswerSpecificInfo", "inap.oAnswerSpecificInfo",
+      { "oAnswerSpecificInfo", "inap.oAnswerSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_backwardGVNS,
@@ -10157,7 +10157,7 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_oMidCallSpecificInfo,
-      { "oMidCallSpecificInfo", "inap.oMidCallSpecificInfo",
+      { "oMidCallSpecificInfo", "inap.oMidCallSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_connectTime,
@@ -10165,11 +10165,11 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Integer4", HFILL }},
     { &hf_inap_oMidCallInfo,
-      { "oMidCallInfo", "inap.oMidCallInfo",
+      { "oMidCallInfo", "inap.oMidCallInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MidCallInfo", HFILL }},
     { &hf_inap_oDisconnectSpecificInfo,
-      { "oDisconnectSpecificInfo", "inap.oDisconnectSpecificInfo",
+      { "oDisconnectSpecificInfo", "inap.oDisconnectSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_releaseCause,
@@ -10177,63 +10177,63 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Cause", HFILL }},
     { &hf_inap_tBusySpecificInfo,
-      { "tBusySpecificInfo", "inap.tBusySpecificInfo",
+      { "tBusySpecificInfo", "inap.tBusySpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_tNoAnswerSpecificInfo,
-      { "tNoAnswerSpecificInfo", "inap.tNoAnswerSpecificInfo",
+      { "tNoAnswerSpecificInfo", "inap.tNoAnswerSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_tAnswerSpecificInfo,
-      { "tAnswerSpecificInfo", "inap.tAnswerSpecificInfo",
+      { "tAnswerSpecificInfo", "inap.tAnswerSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_tMidCallSpecificInfo,
-      { "tMidCallSpecificInfo", "inap.tMidCallSpecificInfo",
+      { "tMidCallSpecificInfo", "inap.tMidCallSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_tMidCallInfo,
-      { "tMidCallInfo", "inap.tMidCallInfo",
+      { "tMidCallInfo", "inap.tMidCallInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MidCallInfo", HFILL }},
     { &hf_inap_tDisconnectSpecificInfo,
-      { "tDisconnectSpecificInfo", "inap.tDisconnectSpecificInfo",
+      { "tDisconnectSpecificInfo", "inap.tDisconnectSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_oTermSeizedSpecificInfo,
-      { "oTermSeizedSpecificInfo", "inap.oTermSeizedSpecificInfo",
+      { "oTermSeizedSpecificInfo", "inap.oTermSeizedSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_oSuspend,
-      { "oSuspend", "inap.oSuspend",
+      { "oSuspend", "inap.oSuspend_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_tSuspend,
-      { "tSuspend", "inap.tSuspend",
+      { "tSuspend", "inap.tSuspend_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_origAttemptAuthorized,
-      { "origAttemptAuthorized", "inap.origAttemptAuthorized",
+      { "origAttemptAuthorized", "inap.origAttemptAuthorized_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_oReAnswer,
-      { "oReAnswer", "inap.oReAnswer",
+      { "oReAnswer", "inap.oReAnswer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_tReAnswer,
-      { "tReAnswer", "inap.tReAnswer",
+      { "tReAnswer", "inap.tReAnswer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_facilitySelectedAndAvailable,
-      { "facilitySelectedAndAvailable", "inap.facilitySelectedAndAvailable",
+      { "facilitySelectedAndAvailable", "inap.facilitySelectedAndAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_callAccepted,
-      { "callAccepted", "inap.callAccepted",
+      { "callAccepted", "inap.callAccepted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_oAbandon,
-      { "oAbandon", "inap.oAbandon",
+      { "oAbandon", "inap.oAbandon_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_abandonCause,
@@ -10241,11 +10241,11 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Cause", HFILL }},
     { &hf_inap_tAbandon,
-      { "tAbandon", "inap.tAbandon",
+      { "tAbandon", "inap.tAbandon_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_authorizeRouteFailure,
-      { "authorizeRouteFailure", "inap.authorizeRouteFailure",
+      { "authorizeRouteFailure", "inap.authorizeRouteFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_authoriseRouteFailureCause,
@@ -10253,11 +10253,11 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Cause", HFILL }},
     { &hf_inap_terminationAttemptAuthorized,
-      { "terminationAttemptAuthorized", "inap.terminationAttemptAuthorized",
+      { "terminationAttemptAuthorized", "inap.terminationAttemptAuthorized_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_originationAttemptDenied,
-      { "originationAttemptDenied", "inap.originationAttemptDenied",
+      { "originationAttemptDenied", "inap.originationAttemptDenied_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_originationDeniedCause,
@@ -10265,7 +10265,7 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Cause", HFILL }},
     { &hf_inap_terminationAttemptDenied,
-      { "terminationAttemptDenied", "inap.terminationAttemptDenied",
+      { "terminationAttemptDenied", "inap.terminationAttemptDenied_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_terminationDeniedCause,
@@ -10273,11 +10273,11 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Cause", HFILL }},
     { &hf_inap_oModifyRequestSpecificInfo,
-      { "oModifyRequestSpecificInfo", "inap.oModifyRequestSpecificInfo",
+      { "oModifyRequestSpecificInfo", "inap.oModifyRequestSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_oModifyResultSpecificInfo,
-      { "oModifyResultSpecificInfo", "inap.oModifyResultSpecificInfo",
+      { "oModifyResultSpecificInfo", "inap.oModifyResultSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_modifyResultType,
@@ -10285,11 +10285,11 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, VALS(inap_ModifyResultType_vals), 0,
         NULL, HFILL }},
     { &hf_inap_tModifyRequestSpecificInfo,
-      { "tModifyRequestSpecificInfo", "inap.tModifyRequestSpecificInfo",
+      { "tModifyRequestSpecificInfo", "inap.tModifyRequestSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_tModifyResultSpecificInfo,
-      { "tModifyResultSpecificInfo", "inap.tModifyResultSpecificInfo",
+      { "tModifyResultSpecificInfo", "inap.tModifyResultSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_trunkGroupID,
@@ -10337,7 +10337,7 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Digits", HFILL }},
     { &hf_inap_addressAndService,
-      { "addressAndService", "inap.addressAndService",
+      { "addressAndService", "inap.addressAndService_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_duration,
@@ -10361,7 +10361,7 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_1", HFILL }},
     { &hf_inap_compoundCapCriteria,
-      { "compoundCapCriteria", "inap.compoundCapCriteria",
+      { "compoundCapCriteria", "inap.compoundCapCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CompoundCriteria", HFILL }},
     { &hf_inap_dpCriteria,
@@ -10373,7 +10373,7 @@ void proto_register_inap(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "Interval", HFILL }},
     { &hf_inap_both,
-      { "both", "inap.both",
+      { "both", "inap.both_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_GenericNumbers_item,
@@ -10421,11 +10421,11 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "LegType", HFILL }},
     { &hf_inap_MidCallControlInfo_item,
-      { "MidCallControlInfo item", "inap.MidCallControlInfo_item",
+      { "MidCallControlInfo item", "inap.MidCallControlInfo_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_midCallInfoType,
-      { "midCallInfoType", "inap.midCallInfoType",
+      { "midCallInfoType", "inap.midCallInfoType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_midCallReportType,
@@ -10469,7 +10469,7 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, VALS(inap_FacilityGroup_vals), 0,
         "FacilityGroup", HFILL }},
     { &hf_inap_RequestedInformationList_item,
-      { "RequestedInformation", "inap.RequestedInformation",
+      { "RequestedInformation", "inap.RequestedInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_RequestedInformationTypeList_item,
@@ -10505,7 +10505,7 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, VALS(inap_USIMonitorMode_vals), 0,
         NULL, HFILL }},
     { &hf_inap_RequestedUTSIList_item,
-      { "RequestedUTSI", "inap.RequestedUTSI",
+      { "RequestedUTSI", "inap.RequestedUTSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_lineID,
@@ -10521,7 +10521,7 @@ void proto_register_inap(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_inap_RouteCountersValue_item,
-      { "RouteCountersAndValue", "inap.RouteCountersAndValue",
+      { "RouteCountersAndValue", "inap.RouteCountersAndValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_route,
@@ -10533,7 +10533,7 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_miscCallInfo,
-      { "miscCallInfo", "inap.miscCallInfo",
+      { "miscCallInfo", "inap.miscCallInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_triggerType,
@@ -10541,11 +10541,11 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, VALS(inap_TriggerType_vals), 0,
         NULL, HFILL }},
     { &hf_inap_forwardServiceInteractionInd,
-      { "forwardServiceInteractionInd", "inap.forwardServiceInteractionInd",
+      { "forwardServiceInteractionInd", "inap.forwardServiceInteractionInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_backwardServiceInteractionInd,
-      { "backwardServiceInteractionInd", "inap.backwardServiceInteractionInd",
+      { "backwardServiceInteractionInd", "inap.backwardServiceInteractionInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_bothwayThroughConnectionInd,
@@ -10589,7 +10589,7 @@ void proto_register_inap(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_inap_redirectServiceTreatmentInd,
-      { "redirectServiceTreatmentInd", "inap.redirectServiceTreatmentInd",
+      { "redirectServiceTreatmentInd", "inap.redirectServiceTreatmentInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_redirectReason,
@@ -10597,7 +10597,7 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_nonCUGCall,
-      { "nonCUGCall", "inap.nonCUGCall",
+      { "nonCUGCall", "inap.nonCUGCall_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_oneTrigger,
@@ -10613,7 +10613,7 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_triggerPar,
-      { "triggerPar", "inap.triggerPar",
+      { "triggerPar", "inap.triggerPar_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_triggerID,
@@ -10625,7 +10625,7 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, VALS(inap_ProfileIdentifier_vals), 0,
         "ProfileIdentifier", HFILL }},
     { &hf_inap_TriggerResults_item,
-      { "TriggerResult", "inap.TriggerResult",
+      { "TriggerResult", "inap.TriggerResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_tDPIdentifer,
@@ -10637,7 +10637,7 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, VALS(inap_ActionPerformed_vals), 0,
         NULL, HFILL }},
     { &hf_inap_Triggers_item,
-      { "Trigger", "inap.Trigger",
+      { "Trigger", "inap.Trigger_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_tDPIdentifier_01,
@@ -10657,7 +10657,7 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_minUSIServiceIndicatorLength_maxUSIServiceIndicatorLength", HFILL }},
     { &hf_inap_filteredCallTreatment,
-      { "filteredCallTreatment", "inap.filteredCallTreatment",
+      { "filteredCallTreatment", "inap.filteredCallTreatment_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_filteringCharacteristics,
@@ -10677,7 +10677,7 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "DateAndTime", HFILL }},
     { &hf_inap_dpSpecificCommonParameters,
-      { "dpSpecificCommonParameters", "inap.dpSpecificCommonParameters",
+      { "dpSpecificCommonParameters", "inap.dpSpecificCommonParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_dialledDigits,
@@ -10797,7 +10797,7 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_gapIndicators,
-      { "gapIndicators", "inap.gapIndicators",
+      { "gapIndicators", "inap.gapIndicators_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_registratorIdentifier,
@@ -10833,11 +10833,11 @@ void proto_register_inap(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_allRequests,
-      { "allRequests", "inap.allRequests",
+      { "allRequests", "inap.allRequests_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_callSegmentToCancel,
-      { "callSegmentToCancel", "inap.callSegmentToCancel",
+      { "callSegmentToCancel", "inap.callSegmentToCancel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_allRequestsForCallSegment,
@@ -10893,7 +10893,7 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_bISDNParameters,
-      { "bISDNParameters", "inap.bISDNParameters",
+      { "bISDNParameters", "inap.bISDNParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_cug_Interlock,
@@ -10901,7 +10901,7 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_cug_OutgoingAccess,
-      { "cug-OutgoingAccess", "inap.cug_OutgoingAccess",
+      { "cug-OutgoingAccess", "inap.cug_OutgoingAccess_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_resourceAddress,
@@ -10913,15 +10913,15 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_ipAddressAndLegID,
-      { "ipAddressAndLegID", "inap.ipAddressAndLegID",
+      { "ipAddressAndLegID", "inap.ipAddressAndLegID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_none,
-      { "none", "inap.none",
+      { "none", "inap.none_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_ipAddressAndCallSegment,
-      { "ipAddressAndCallSegment", "inap.ipAddressAndCallSegment",
+      { "ipAddressAndCallSegment", "inap.ipAddressAndCallSegment_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_legorCSID,
@@ -10937,7 +10937,7 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_ipRelationInformation,
-      { "ipRelationInformation", "inap.ipRelationInformation",
+      { "ipRelationInformation", "inap.ipRelationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IPRelatedInformation", HFILL }},
     { &hf_inap_newCallSegmentAssociation,
@@ -10953,11 +10953,11 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, VALS(inap_TriggerDPType_vals), 0,
         NULL, HFILL }},
     { &hf_inap_triggerData,
-      { "triggerData", "inap.triggerData",
+      { "triggerData", "inap.triggerData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_defaultFaultHandling,
-      { "defaultFaultHandling", "inap.defaultFaultHandling",
+      { "defaultFaultHandling", "inap.defaultFaultHandling_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_triggerStatus,
@@ -10973,7 +10973,7 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, VALS(inap_LegID_vals), 0,
         "LegID", HFILL }},
     { &hf_inap_cSFailure,
-      { "cSFailure", "inap.cSFailure",
+      { "cSFailure", "inap.cSFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_reason,
@@ -10981,7 +10981,7 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_bCSMFailure,
-      { "bCSMFailure", "inap.bCSMFailure",
+      { "bCSMFailure", "inap.bCSMFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_assistingSSPIPRoutingAddress,
@@ -11013,7 +11013,7 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_empty,
-      { "empty", "inap.empty",
+      { "empty", "inap.empty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_highLayerCompatibility,
@@ -11073,15 +11073,15 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, VALS(inap_T_triggerDataIdentifier_vals), 0,
         NULL, HFILL }},
     { &hf_inap_profileAndDP,
-      { "profileAndDP", "inap.profileAndDP",
+      { "profileAndDP", "inap.profileAndDP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TriggerDataIdentifier", HFILL }},
     { &hf_inap_oneTriggerResult,
-      { "oneTriggerResult", "inap.oneTriggerResult",
+      { "oneTriggerResult", "inap.oneTriggerResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_severalTriggerResult,
-      { "severalTriggerResult", "inap.severalTriggerResult",
+      { "severalTriggerResult", "inap.severalTriggerResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_results,
@@ -11097,7 +11097,7 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CallSegmentID", HFILL }},
     { &hf_inap_mergeSignallingPaths,
-      { "mergeSignallingPaths", "inap.mergeSignallingPaths",
+      { "mergeSignallingPaths", "inap.mergeSignallingPaths_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_routeCounters,
@@ -11121,7 +11121,7 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_callSegments_item,
-      { "callSegments item", "inap.callSegments_item",
+      { "callSegments item", "inap.callSegments_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_legs,
@@ -11129,7 +11129,7 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_legs_item,
-      { "legs item", "inap.legs_item",
+      { "legs item", "inap.legs_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_sourceLeg,
@@ -11145,11 +11145,11 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, VALS(inap_LegID_vals), 0,
         "LegID", HFILL }},
     { &hf_inap_detachSignallingPath,
-      { "detachSignallingPath", "inap.detachSignallingPath",
+      { "detachSignallingPath", "inap.detachSignallingPath_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_exportSignallingPath,
-      { "exportSignallingPath", "inap.exportSignallingPath",
+      { "exportSignallingPath", "inap.exportSignallingPath_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_featureRequestIndicator,
@@ -11169,7 +11169,7 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Cause", HFILL }},
     { &hf_inap_callSegmentToRelease,
-      { "callSegmentToRelease", "inap.callSegmentToRelease",
+      { "callSegmentToRelease", "inap.callSegmentToRelease_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_callSegment,
@@ -11181,7 +11181,7 @@ void proto_register_inap(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_inap_allCallSegments,
-      { "allCallSegments", "inap.allCallSegments",
+      { "allCallSegments", "inap.allCallSegments_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_timeToRelease,
@@ -11197,7 +11197,7 @@ void proto_register_inap(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "Duration", HFILL }},
     { &hf_inap_RequestNotificationChargingEventArg_item,
-      { "ChargingEvent", "inap.ChargingEvent",
+      { "ChargingEvent", "inap.ChargingEvent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_bcsmEvents,
@@ -11205,7 +11205,7 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_numOfBCSMEvents_OF_BCSMEvent", HFILL }},
     { &hf_inap_bcsmEvents_item,
-      { "BCSMEvent", "inap.BCSMEvent",
+      { "BCSMEvent", "inap.BCSMEvent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_componentTypes,
@@ -11261,7 +11261,7 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_numOfINProfile_OF_INprofile", HFILL }},
     { &hf_inap_iNprofiles_item,
-      { "INprofile", "inap.INprofile",
+      { "INprofile", "inap.INprofile_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_legToBeSplit,
@@ -11325,7 +11325,7 @@ void proto_register_inap(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_inap_collectedDigits,
-      { "collectedDigits", "inap.collectedDigits",
+      { "collectedDigits", "inap.collectedDigits_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_iA5Information,
@@ -11365,7 +11365,7 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_b3__maxRecordingTime", HFILL }},
     { &hf_inap_controlDigits,
-      { "controlDigits", "inap.controlDigits",
+      { "controlDigits", "inap.controlDigits_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_endOfRecordingDigit,
@@ -11389,11 +11389,11 @@ void proto_register_inap(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_inap_inbandInfo,
-      { "inbandInfo", "inap.inbandInfo",
+      { "inbandInfo", "inap.inbandInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_tone,
-      { "tone", "inap.tone",
+      { "tone", "inap.tone_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_elementaryMessageID,
@@ -11401,7 +11401,7 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Integer4", HFILL }},
     { &hf_inap_text,
-      { "text", "inap.text",
+      { "text", "inap.text_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_messageContent,
@@ -11421,7 +11421,7 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_variableMessage,
-      { "variableMessage", "inap.variableMessage",
+      { "variableMessage", "inap.variableMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_variableParts,
@@ -11441,7 +11441,7 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, VALS(inap_Code_vals), 0,
         NULL, HFILL }},
     { &hf_inap_iPAddressAndresource,
-      { "iPAddressAndresource", "inap.iPAddressAndresource",
+      { "iPAddressAndresource", "inap.iPAddressAndresource_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_toneID,
@@ -11509,7 +11509,7 @@ void proto_register_inap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_informationToRecord,
-      { "informationToRecord", "inap.informationToRecord",
+      { "informationToRecord", "inap.informationToRecord_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_media,
@@ -11533,19 +11533,19 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, VALS(inap_Code_vals), 0,
         "Code", HFILL }},
     { &hf_inap_uIScriptSpecificInfo,
-      { "uIScriptSpecificInfo", "inap.uIScriptSpecificInfo",
+      { "uIScriptSpecificInfo", "inap.uIScriptSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_uIScriptResult,
-      { "uIScriptResult", "inap.uIScriptResult",
+      { "uIScriptResult", "inap.uIScriptResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_uIScriptSpecificInfo_01,
-      { "uIScriptSpecificInfo", "inap.uIScriptSpecificInfo",
+      { "uIScriptSpecificInfo", "inap.uIScriptSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_uIScriptSpecificInfo_01", HFILL }},
     { &hf_inap_uIScriptSpecificInfo_02,
-      { "uIScriptSpecificInfo", "inap.uIScriptSpecificInfo",
+      { "uIScriptSpecificInfo", "inap.uIScriptSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_uIScriptSpecificInfo_02", HFILL }},
     { &hf_inap_sRFgapCriteria,
@@ -11565,11 +11565,11 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, VALS(inap_T_reason_vals), 0,
         NULL, HFILL }},
     { &hf_inap_securityParameters,
-      { "securityParameters", "inap.securityParameters",
+      { "securityParameters", "inap.securityParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_tryhere,
-      { "tryhere", "inap.tryhere",
+      { "tryhere", "inap.tryhere_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AccessPointInformation", HFILL }},
     { &hf_inap_local_01,
@@ -11581,19 +11581,19 @@ void proto_register_inap(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_invoke,
-      { "invoke", "inap.invoke",
+      { "invoke", "inap.invoke_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_returnResult,
-      { "returnResult", "inap.returnResult",
+      { "returnResult", "inap.returnResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_returnError,
-      { "returnError", "inap.returnError",
+      { "returnError", "inap.returnError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_reject,
-      { "reject", "inap.reject",
+      { "reject", "inap.reject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_invokeId,
@@ -11609,7 +11609,7 @@ void proto_register_inap(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "T_linkedIdPresent", HFILL }},
     { &hf_inap_absent,
-      { "absent", "inap.absent",
+      { "absent", "inap.absent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_opcode,
@@ -11617,15 +11617,15 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, VALS(inap_Code_vals), 0,
         "Code", HFILL }},
     { &hf_inap_argument,
-      { "argument", "inap.argument",
+      { "argument", "inap.argument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_result,
-      { "result", "inap.result",
+      { "result", "inap.result_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_resultArgument,
-      { "result", "inap.result",
+      { "result", "inap.result_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ResultArgument", HFILL }},
     { &hf_inap_errcode,
@@ -11633,7 +11633,7 @@ void proto_register_inap(void) {
         FT_UINT32, BASE_DEC, VALS(inap_Code_vals), 0,
         "Code", HFILL }},
     { &hf_inap_parameter,
-      { "parameter", "inap.parameter",
+      { "parameter", "inap.parameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_inap_problem_01,
diff --git a/epan/dissectors/packet-isdn-sup.c b/epan/dissectors/packet-isdn-sup.c
index 2ca35464f7..b877e17838 100644
--- a/epan/dissectors/packet-isdn-sup.c
+++ b/epan/dissectors/packet-isdn-sup.c
@@ -2848,7 +2848,7 @@ void proto_register_isdn_sup(void) {
         FT_UINT32, BASE_DEC, VALS(isdn_sup_AOCEChargingUnitArg_vals), 0,
         NULL, HFILL }},
     { &hf_isdn_sup_CUGcallArg_PDU,
-      { "CUGcallArg", "isdn-sup.CUGcallArg",
+      { "CUGcallArg", "isdn-sup.CUGcallArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_BeginCONFArg_PDU,
@@ -2856,7 +2856,7 @@ void proto_register_isdn_sup(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_BeginCONFRes_PDU,
-      { "BeginCONFRes", "isdn-sup.BeginCONFRes",
+      { "BeginCONFRes", "isdn-sup.BeginCONFRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_AddCONFArg_PDU,
@@ -2868,7 +2868,7 @@ void proto_register_isdn_sup(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_SplitCONFArg_PDU,
-      { "SplitCONFArg", "isdn-sup.SplitCONFArg",
+      { "SplitCONFArg", "isdn-sup.SplitCONFArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_DropCONFArg_PDU,
@@ -2888,23 +2888,23 @@ void proto_register_isdn_sup(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_ActivationDiversionArg_PDU,
-      { "ActivationDiversionArg", "isdn-sup.ActivationDiversionArg",
+      { "ActivationDiversionArg", "isdn-sup.ActivationDiversionArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_DeactivationDiversionArg_PDU,
-      { "DeactivationDiversionArg", "isdn-sup.DeactivationDiversionArg",
+      { "DeactivationDiversionArg", "isdn-sup.DeactivationDiversionArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_ActivationStatusNotificationDivArg_PDU,
-      { "ActivationStatusNotificationDivArg", "isdn-sup.ActivationStatusNotificationDivArg",
+      { "ActivationStatusNotificationDivArg", "isdn-sup.ActivationStatusNotificationDivArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_DeactivationStatusNotificationDivArg_PDU,
-      { "DeactivationStatusNotificationDivArg", "isdn-sup.DeactivationStatusNotificationDivArg",
+      { "DeactivationStatusNotificationDivArg", "isdn-sup.DeactivationStatusNotificationDivArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_InterrogationDiversionArg_PDU,
-      { "InterrogationDiversionArg", "isdn-sup.InterrogationDiversionArg",
+      { "InterrogationDiversionArg", "isdn-sup.InterrogationDiversionArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_InterrogationDiversionRes_PDU,
@@ -2916,23 +2916,23 @@ void proto_register_isdn_sup(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_DiversionInformationArg_PDU,
-      { "DiversionInformationArg", "isdn-sup.DiversionInformationArg",
+      { "DiversionInformationArg", "isdn-sup.DiversionInformationArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_CallDeflectionArg_PDU,
-      { "CallDeflectionArg", "isdn-sup.CallDeflectionArg",
+      { "CallDeflectionArg", "isdn-sup.CallDeflectionArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_CallRerouteingArg_PDU,
-      { "CallRerouteingArg", "isdn-sup.CallRerouteingArg",
+      { "CallRerouteingArg", "isdn-sup.CallRerouteingArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_DivertingLegInformation1Arg_PDU,
-      { "DivertingLegInformation1Arg", "isdn-sup.DivertingLegInformation1Arg",
+      { "DivertingLegInformation1Arg", "isdn-sup.DivertingLegInformation1Arg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_DivertingLegInformation2Arg_PDU,
-      { "DivertingLegInformation2Arg", "isdn-sup.DivertingLegInformation2Arg",
+      { "DivertingLegInformation2Arg", "isdn-sup.DivertingLegInformation2Arg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_DivertingLegInformation3Arg_PDU,
@@ -2940,7 +2940,7 @@ void proto_register_isdn_sup(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_UserUserServiceArg_PDU,
-      { "UserUserServiceArg", "isdn-sup.UserUserServiceArg",
+      { "UserUserServiceArg", "isdn-sup.UserUserServiceArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_CalledFreephoneNrArg_PDU,
@@ -2948,47 +2948,47 @@ void proto_register_isdn_sup(void) {
         FT_UINT32, BASE_DEC, VALS(isdn_sup_PartyNumber_vals), 0,
         NULL, HFILL }},
     { &hf_isdn_sup_Monitor_T_FPHArg_PDU,
-      { "Monitor-T-FPHArg", "isdn-sup.Monitor_T_FPHArg",
+      { "Monitor-T-FPHArg", "isdn-sup.Monitor_T_FPHArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_Free_T_FPHArg_PDU,
-      { "Free-T-FPHArg", "isdn-sup.Free_T_FPHArg",
+      { "Free-T-FPHArg", "isdn-sup.Free_T_FPHArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_Call_T_FPHArg_PDU,
-      { "Call-T-FPHArg", "isdn-sup.Call_T_FPHArg",
+      { "Call-T-FPHArg", "isdn-sup.Call_T_FPHArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_presentationAllowedAddress,
-      { "presentationAllowedAddress", "isdn-sup.presentationAllowedAddress",
+      { "presentationAllowedAddress", "isdn-sup.presentationAllowedAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AddressScreened", HFILL }},
     { &hf_isdn_sup_presentationRestricted,
-      { "presentationRestricted", "isdn-sup.presentationRestricted",
+      { "presentationRestricted", "isdn-sup.presentationRestricted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_numberNotAvailableDueToInterworking,
-      { "numberNotAvailableDueToInterworking", "isdn-sup.numberNotAvailableDueToInterworking",
+      { "numberNotAvailableDueToInterworking", "isdn-sup.numberNotAvailableDueToInterworking_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_presentationRestrictedAddress,
-      { "presentationRestrictedAddress", "isdn-sup.presentationRestrictedAddress",
+      { "presentationRestrictedAddress", "isdn-sup.presentationRestrictedAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AddressScreened", HFILL }},
     { &hf_isdn_sup_presentationAllowedAddress_01,
-      { "presentationAllowedAddress", "isdn-sup.presentationAllowedAddress",
+      { "presentationAllowedAddress", "isdn-sup.presentationAllowedAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Address", HFILL }},
     { &hf_isdn_sup_presentationRestrictedAddress_01,
-      { "presentationRestrictedAddress", "isdn-sup.presentationRestrictedAddress",
+      { "presentationRestrictedAddress", "isdn-sup.presentationRestrictedAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Address", HFILL }},
     { &hf_isdn_sup_presentationAllowedNumber,
-      { "presentationAllowedNumber", "isdn-sup.presentationAllowedNumber",
+      { "presentationAllowedNumber", "isdn-sup.presentationAllowedNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NumberScreened", HFILL }},
     { &hf_isdn_sup_presentationRestrictedNumber,
-      { "presentationRestrictedNumber", "isdn-sup.presentationRestrictedNumber",
+      { "presentationRestrictedNumber", "isdn-sup.presentationRestrictedNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NumberScreened", HFILL }},
     { &hf_isdn_sup_presentationAllowedNumber_01,
@@ -3016,7 +3016,7 @@ void proto_register_isdn_sup(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "NumberDigits", HFILL }},
     { &hf_isdn_sup_publicPartyNumber,
-      { "publicPartyNumber", "isdn-sup.publicPartyNumber",
+      { "publicPartyNumber", "isdn-sup.publicPartyNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_nsapEncodedNumber,
@@ -3032,7 +3032,7 @@ void proto_register_isdn_sup(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "NumberDigits", HFILL }},
     { &hf_isdn_sup_privatePartyNumber,
-      { "privatePartyNumber", "isdn-sup.privatePartyNumber",
+      { "privatePartyNumber", "isdn-sup.privatePartyNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_nationalStandardPartyNumber,
@@ -3056,7 +3056,7 @@ void proto_register_isdn_sup(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "NumberDigits", HFILL }},
     { &hf_isdn_sup_userSpecifiedSubaddress,
-      { "userSpecifiedSubaddress", "isdn-sup.userSpecifiedSubaddress",
+      { "userSpecifiedSubaddress", "isdn-sup.userSpecifiedSubaddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_nSAPSubaddress,
@@ -3080,11 +3080,11 @@ void proto_register_isdn_sup(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_chargingInfoFollows,
-      { "chargingInfoFollows", "isdn-sup.chargingInfoFollows",
+      { "chargingInfoFollows", "isdn-sup.chargingInfoFollows_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_chargeNotAvailable,
-      { "chargeNotAvailable", "isdn-sup.chargeNotAvailable",
+      { "chargeNotAvailable", "isdn-sup.chargeNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_aOCDCurrencyInfo,
@@ -3096,15 +3096,15 @@ void proto_register_isdn_sup(void) {
         FT_UINT32, BASE_DEC, VALS(isdn_sup_AOCDChargingUnitInfo_vals), 0,
         NULL, HFILL }},
     { &hf_isdn_sup_aOCECurrencyInfo,
-      { "aOCECurrencyInfo", "isdn-sup.aOCECurrencyInfo",
+      { "aOCECurrencyInfo", "isdn-sup.aOCECurrencyInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_aOCEChargingUnitInfo,
-      { "aOCEChargingUnitInfo", "isdn-sup.aOCEChargingUnitInfo",
+      { "aOCEChargingUnitInfo", "isdn-sup.aOCEChargingUnitInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_AOCSCurrencyInfoList_item,
-      { "AOCSCurrencyInfo", "isdn-sup.AOCSCurrencyInfo",
+      { "AOCSCurrencyInfo", "isdn-sup.AOCSCurrencyInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_chargedItem,
@@ -3120,15 +3120,15 @@ void proto_register_isdn_sup(void) {
         FT_UINT32, BASE_DEC, VALS(isdn_sup_T_specificCurrency_vals), 0,
         NULL, HFILL }},
     { &hf_isdn_sup_durationCurrency,
-      { "durationCurrency", "isdn-sup.durationCurrency",
+      { "durationCurrency", "isdn-sup.durationCurrency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_flatRateCurrency,
-      { "flatRateCurrency", "isdn-sup.flatRateCurrency",
+      { "flatRateCurrency", "isdn-sup.flatRateCurrency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_volumeRateCurrency,
-      { "volumeRateCurrency", "isdn-sup.volumeRateCurrency",
+      { "volumeRateCurrency", "isdn-sup.volumeRateCurrency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_specialChargingCode,
@@ -3136,11 +3136,11 @@ void proto_register_isdn_sup(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_freeOfCharge,
-      { "freeOfCharge", "isdn-sup.freeOfCharge",
+      { "freeOfCharge", "isdn-sup.freeOfCharge_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_currencyInfoNotAvailable,
-      { "currencyInfoNotAvailable", "isdn-sup.currencyInfoNotAvailable",
+      { "currencyInfoNotAvailable", "isdn-sup.currencyInfoNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_dCurrency,
@@ -3148,7 +3148,7 @@ void proto_register_isdn_sup(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "Currency", HFILL }},
     { &hf_isdn_sup_dAmount,
-      { "dAmount", "isdn-sup.dAmount",
+      { "dAmount", "isdn-sup.dAmount_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Amount", HFILL }},
     { &hf_isdn_sup_dChargingType,
@@ -3156,11 +3156,11 @@ void proto_register_isdn_sup(void) {
         FT_UINT32, BASE_DEC, VALS(isdn_sup_ChargingType_vals), 0,
         "ChargingType", HFILL }},
     { &hf_isdn_sup_dTime,
-      { "dTime", "isdn-sup.dTime",
+      { "dTime", "isdn-sup.dTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Time", HFILL }},
     { &hf_isdn_sup_dGranularity,
-      { "dGranularity", "isdn-sup.dGranularity",
+      { "dGranularity", "isdn-sup.dGranularity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Time", HFILL }},
     { &hf_isdn_sup_fRCurrency,
@@ -3168,7 +3168,7 @@ void proto_register_isdn_sup(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "Currency", HFILL }},
     { &hf_isdn_sup_fRAmount,
-      { "fRAmount", "isdn-sup.fRAmount",
+      { "fRAmount", "isdn-sup.fRAmount_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Amount", HFILL }},
     { &hf_isdn_sup_vRCurrency,
@@ -3176,7 +3176,7 @@ void proto_register_isdn_sup(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "Currency", HFILL }},
     { &hf_isdn_sup_vRAmount,
-      { "vRAmount", "isdn-sup.vRAmount",
+      { "vRAmount", "isdn-sup.vRAmount_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Amount", HFILL }},
     { &hf_isdn_sup_vRVolumeUnit,
@@ -3184,11 +3184,11 @@ void proto_register_isdn_sup(void) {
         FT_UINT32, BASE_DEC, VALS(isdn_sup_VolumeUnit_vals), 0,
         "VolumeUnit", HFILL }},
     { &hf_isdn_sup_specificCurrency_01,
-      { "specificCurrency", "isdn-sup.specificCurrency",
+      { "specificCurrency", "isdn-sup.specificCurrency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_specificCurrency_01", HFILL }},
     { &hf_isdn_sup_recordedCurrency,
-      { "recordedCurrency", "isdn-sup.recordedCurrency",
+      { "recordedCurrency", "isdn-sup.recordedCurrency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_typeOfChargingInfo,
@@ -3200,7 +3200,7 @@ void proto_register_isdn_sup(void) {
         FT_UINT32, BASE_DEC, VALS(isdn_sup_AOCDBillingId_vals), 0,
         NULL, HFILL }},
     { &hf_isdn_sup_specificChargingUnits,
-      { "specificChargingUnits", "isdn-sup.specificChargingUnits",
+      { "specificChargingUnits", "isdn-sup.specificChargingUnits_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_recordedUnitsList,
@@ -3212,11 +3212,11 @@ void proto_register_isdn_sup(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "Currency", HFILL }},
     { &hf_isdn_sup_rAmount,
-      { "rAmount", "isdn-sup.rAmount",
+      { "rAmount", "isdn-sup.rAmount_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Amount", HFILL }},
     { &hf_isdn_sup_RecordedUnitsList_item,
-      { "RecordedUnits", "isdn-sup.RecordedUnits",
+      { "RecordedUnits", "isdn-sup.RecordedUnits_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_cc,
@@ -3228,7 +3228,7 @@ void proto_register_isdn_sup(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "NumberOfUnits", HFILL }},
     { &hf_isdn_sup_notAvailable,
-      { "notAvailable", "isdn-sup.notAvailable",
+      { "notAvailable", "isdn-sup.notAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_recordedTypeOfUnits,
@@ -3240,7 +3240,7 @@ void proto_register_isdn_sup(void) {
         FT_UINT32, BASE_DEC, VALS(isdn_sup_T_cc_01_vals), 0,
         "T_cc_01", HFILL }},
     { &hf_isdn_sup_specificCurrency_02,
-      { "specificCurrency", "isdn-sup.specificCurrency",
+      { "specificCurrency", "isdn-sup.specificCurrency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_specificCurrency_02", HFILL }},
     { &hf_isdn_sup_aOCEBillingId,
@@ -3256,7 +3256,7 @@ void proto_register_isdn_sup(void) {
         FT_UINT32, BASE_DEC, VALS(isdn_sup_T_cc_02_vals), 0,
         "T_cc_02", HFILL }},
     { &hf_isdn_sup_specificChargingUnits_01,
-      { "specificChargingUnits", "isdn-sup.specificChargingUnits",
+      { "specificChargingUnits", "isdn-sup.specificChargingUnits_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_specificChargingUnits_01", HFILL }},
     { &hf_isdn_sup_currencyAmount,
@@ -3308,7 +3308,7 @@ void proto_register_isdn_sup(void) {
         FT_UINT32, BASE_DEC, VALS(isdn_sup_BasicService_vals), 0,
         NULL, HFILL }},
     { &hf_isdn_sup_forwardedToAddress,
-      { "forwardedToAddress", "isdn-sup.forwardedToAddress",
+      { "forwardedToAddress", "isdn-sup.forwardedToAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Address", HFILL }},
     { &hf_isdn_sup_servedUserNr,
@@ -3320,7 +3320,7 @@ void proto_register_isdn_sup(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_forwardedToAddresss,
-      { "forwardedToAddresss", "isdn-sup.forwardedToAddresss",
+      { "forwardedToAddresss", "isdn-sup.forwardedToAddresss_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Address", HFILL }},
     { &hf_isdn_sup_diversionReason,
@@ -3352,7 +3352,7 @@ void proto_register_isdn_sup(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Q931InformationElement", HFILL }},
     { &hf_isdn_sup_deflectionAddress,
-      { "deflectionAddress", "isdn-sup.deflectionAddress",
+      { "deflectionAddress", "isdn-sup.deflectionAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Address", HFILL }},
     { &hf_isdn_sup_presentationAllowedDivertedToUser,
@@ -3364,7 +3364,7 @@ void proto_register_isdn_sup(void) {
         FT_UINT32, BASE_DEC, VALS(isdn_sup_DiversionReason_vals), 0,
         "DiversionReason", HFILL }},
     { &hf_isdn_sup_calledAddress,
-      { "calledAddress", "isdn-sup.calledAddress",
+      { "calledAddress", "isdn-sup.calledAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Address", HFILL }},
     { &hf_isdn_sup_rerouteingCounter,
@@ -3400,7 +3400,7 @@ void proto_register_isdn_sup(void) {
         FT_UINT32, BASE_DEC, VALS(isdn_sup_PresentedNumberUnscreened_vals), 0,
         "PresentedNumberUnscreened", HFILL }},
     { &hf_isdn_sup_IntResultList_item,
-      { "IntResult", "isdn-sup.IntResult",
+      { "IntResult", "isdn-sup.IntResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_individualNumber,
@@ -3408,7 +3408,7 @@ void proto_register_isdn_sup(void) {
         FT_UINT32, BASE_DEC, VALS(isdn_sup_PartyNumber_vals), 0,
         "PartyNumber", HFILL }},
     { &hf_isdn_sup_allNumbers,
-      { "allNumbers", "isdn-sup.allNumbers",
+      { "allNumbers", "isdn-sup.allNumbers_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_isdn_sup_ServedUserNumberList_item,
diff --git a/epan/dissectors/packet-lcsap.c b/epan/dissectors/packet-lcsap.c
index df3001817d..52d8ea2fdc 100644
--- a/epan/dissectors/packet-lcsap.c
+++ b/epan/dissectors/packet-lcsap.c
@@ -2381,7 +2381,7 @@ void proto_register_lcsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_E_CGI_PDU,
-      { "E-CGI", "lcsap.E_CGI",
+      { "E-CGI", "lcsap.E_CGI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_Geographical_Area_PDU,
@@ -2417,7 +2417,7 @@ void proto_register_lcsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_LCS_QoS_PDU,
-      { "LCS-QoS", "lcsap.LCS_QoS",
+      { "LCS-QoS", "lcsap.LCS_QoS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_LCS_Service_Type_ID_PDU,
@@ -2437,7 +2437,7 @@ void proto_register_lcsap(void) {
         FT_UINT32, BASE_DEC, VALS(lcsap_Payload_Type_vals), 0,
         NULL, HFILL }},
     { &hf_lcsap_Positioning_Data_PDU,
-      { "Positioning-Data", "lcsap.Positioning_Data",
+      { "Positioning-Data", "lcsap.Positioning_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_Return_Error_Type_PDU,
@@ -2449,7 +2449,7 @@ void proto_register_lcsap(void) {
         FT_UINT32, BASE_DEC, VALS(lcsap_Return_Error_Cause_vals), 0,
         NULL, HFILL }},
     { &hf_lcsap_UE_Positioning_Capability_PDU,
-      { "UE-Positioning-Capability", "lcsap.UE_Positioning_Capability",
+      { "UE-Positioning-Capability", "lcsap.UE_Positioning_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_Velocity_Estimate_PDU,
@@ -2457,31 +2457,31 @@ void proto_register_lcsap(void) {
         FT_UINT32, BASE_DEC, VALS(lcsap_Velocity_Estimate_vals), 0,
         NULL, HFILL }},
     { &hf_lcsap_Location_Request_PDU,
-      { "Location-Request", "lcsap.Location_Request",
+      { "Location-Request", "lcsap.Location_Request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_Location_Response_PDU,
-      { "Location-Response", "lcsap.Location_Response",
+      { "Location-Response", "lcsap.Location_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_Location_Abort_Request_PDU,
-      { "Location-Abort-Request", "lcsap.Location_Abort_Request",
+      { "Location-Abort-Request", "lcsap.Location_Abort_Request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_Connection_Oriented_Information_PDU,
-      { "Connection-Oriented-Information", "lcsap.Connection_Oriented_Information",
+      { "Connection-Oriented-Information", "lcsap.Connection_Oriented_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_Connectionless_Information_PDU,
-      { "Connectionless-Information", "lcsap.Connectionless_Information",
+      { "Connectionless-Information", "lcsap.Connectionless_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_Reset_Request_PDU,
-      { "Reset-Request", "lcsap.Reset_Request",
+      { "Reset-Request", "lcsap.Reset_Request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_Reset_Acknowledge_PDU,
-      { "Reset-Acknowledge", "lcsap.Reset_Acknowledge",
+      { "Reset-Acknowledge", "lcsap.Reset_Acknowledge_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_LCS_AP_PDU_PDU,
@@ -2489,7 +2489,7 @@ void proto_register_lcsap(void) {
         FT_UINT32, BASE_DEC, VALS(lcsap_LCS_AP_PDU_vals), 0,
         NULL, HFILL }},
     { &hf_lcsap_ProtocolIE_Container_item,
-      { "ProtocolIE-Field", "lcsap.ProtocolIE_Field",
+      { "ProtocolIE-Field", "lcsap.ProtocolIE_Field_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_id,
@@ -2501,11 +2501,11 @@ void proto_register_lcsap(void) {
         FT_UINT32, BASE_DEC, VALS(lcsap_Criticality_vals), 0,
         NULL, HFILL }},
     { &hf_lcsap_ie_field_value,
-      { "value", "lcsap.value",
+      { "value", "lcsap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ie_field_value", HFILL }},
     { &hf_lcsap_ProtocolExtensionContainer_item,
-      { "ProtocolExtensionField", "lcsap.ProtocolExtensionField",
+      { "ProtocolExtensionField", "lcsap.ProtocolExtensionField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_ext_id,
@@ -2513,7 +2513,7 @@ void proto_register_lcsap(void) {
         FT_UINT8, BASE_DEC, VALS(lcsap_ProtocolIE_ID_vals), 0,
         "ProtocolExtensionID", HFILL }},
     { &hf_lcsap_extensionValue,
-      { "extensionValue", "lcsap.extensionValue",
+      { "extensionValue", "lcsap.extensionValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_direction_Of_Altitude,
@@ -2537,11 +2537,11 @@ void proto_register_lcsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ProtocolExtensionContainer", HFILL }},
     { &hf_lcsap_geographical_Coordinates,
-      { "geographical-Coordinates", "lcsap.geographical_Coordinates",
+      { "geographical-Coordinates", "lcsap.geographical_Coordinates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_uncertainty_Ellipse,
-      { "uncertainty-Ellipse", "lcsap.uncertainty_Ellipse",
+      { "uncertainty-Ellipse", "lcsap.uncertainty_Ellipse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_confidence,
@@ -2549,7 +2549,7 @@ void proto_register_lcsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_altitude_And_Direction,
-      { "altitude-And-Direction", "lcsap.altitude_And_Direction",
+      { "altitude-And-Direction", "lcsap.altitude_And_Direction_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_uncertainty_Altitude,
@@ -2581,15 +2581,15 @@ void proto_register_lcsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_point,
-      { "point", "lcsap.point",
+      { "point", "lcsap.point_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_point_With_Uncertainty,
-      { "point-With-Uncertainty", "lcsap.point_With_Uncertainty",
+      { "point-With-Uncertainty", "lcsap.point_With_Uncertainty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_ellipsoidPoint_With_Uncertainty_Ellipse,
-      { "ellipsoidPoint-With-Uncertainty-Ellipse", "lcsap.ellipsoidPoint_With_Uncertainty_Ellipse",
+      { "ellipsoidPoint-With-Uncertainty-Ellipse", "lcsap.ellipsoidPoint_With_Uncertainty_Ellipse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ellipsoid_Point_With_Uncertainty_Ellipse", HFILL }},
     { &hf_lcsap_polygon,
@@ -2597,15 +2597,15 @@ void proto_register_lcsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_ellipsoid_Point_With_Altitude,
-      { "ellipsoid-Point-With-Altitude", "lcsap.ellipsoid_Point_With_Altitude",
+      { "ellipsoid-Point-With-Altitude", "lcsap.ellipsoid_Point_With_Altitude_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_ellipsoid_Point_With_Altitude_And_Uncertainty_Ellipsoid,
-      { "ellipsoid-Point-With-Altitude-And-Uncertainty-Ellipsoid", "lcsap.ellipsoid_Point_With_Altitude_And_Uncertainty_Ellipsoid",
+      { "ellipsoid-Point-With-Altitude-And-Uncertainty-Ellipsoid", "lcsap.ellipsoid_Point_With_Altitude_And_Uncertainty_Ellipsoid_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_ellipsoid_Arc,
-      { "ellipsoid-Arc", "lcsap.ellipsoid_Arc",
+      { "ellipsoid-Arc", "lcsap.ellipsoid_Arc_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_latitudeSign,
@@ -2641,11 +2641,11 @@ void proto_register_lcsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_2047", HFILL }},
     { &hf_lcsap_horizontal_Speed_And_Bearing,
-      { "horizontal-Speed-And-Bearing", "lcsap.horizontal_Speed_And_Bearing",
+      { "horizontal-Speed-And-Bearing", "lcsap.horizontal_Speed_And_Bearing_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_vertical_Velocity,
-      { "vertical-Velocity", "lcsap.vertical_Velocity",
+      { "vertical-Velocity", "lcsap.vertical_Velocity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_uncertainty_Speed,
@@ -2697,7 +2697,7 @@ void proto_register_lcsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_global_eNB_ID,
-      { "global-eNB-ID", "lcsap.global_eNB_ID",
+      { "global-eNB-ID", "lcsap.global_eNB_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_e_SMLC_ID,
@@ -2709,7 +2709,7 @@ void proto_register_lcsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_Polygon_item,
-      { "Polygon-Point", "lcsap.Polygon_Point",
+      { "Polygon-Point", "lcsap.Polygon_Point_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_positioning_Data_Set,
@@ -2741,19 +2741,19 @@ void proto_register_lcsap(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lcsap_horizontal_Velocity,
-      { "horizontal-Velocity", "lcsap.horizontal_Velocity",
+      { "horizontal-Velocity", "lcsap.horizontal_Velocity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_horizontal_With_Vertical_Velocity,
-      { "horizontal-With-Vertical-Velocity", "lcsap.horizontal_With_Vertical_Velocity",
+      { "horizontal-With-Vertical-Velocity", "lcsap.horizontal_With_Vertical_Velocity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_horizontal_Velocity_With_Uncertainty,
-      { "horizontal-Velocity-With-Uncertainty", "lcsap.horizontal_Velocity_With_Uncertainty",
+      { "horizontal-Velocity-With-Uncertainty", "lcsap.horizontal_Velocity_With_Uncertainty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_horizontal_With_Vertical_Velocity_And_Uncertainty,
-      { "horizontal-With-Vertical-Velocity-And-Uncertainty", "lcsap.horizontal_With_Vertical_Velocity_And_Uncertainty",
+      { "horizontal-With-Vertical-Velocity-And-Uncertainty", "lcsap.horizontal_With_Vertical_Velocity_And_Uncertainty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_vertical_Speed,
@@ -2773,15 +2773,15 @@ void proto_register_lcsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ProtocolExtensionContainer", HFILL }},
     { &hf_lcsap_initiatingMessage,
-      { "initiatingMessage", "lcsap.initiatingMessage",
+      { "initiatingMessage", "lcsap.initiatingMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_successfulOutcome,
-      { "successfulOutcome", "lcsap.successfulOutcome",
+      { "successfulOutcome", "lcsap.successfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_unsuccessfulOutcome,
-      { "unsuccessfulOutcome", "lcsap.unsuccessfulOutcome",
+      { "unsuccessfulOutcome", "lcsap.unsuccessfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lcsap_procedureCode,
@@ -2789,15 +2789,15 @@ void proto_register_lcsap(void) {
         FT_UINT32, BASE_DEC, VALS(lcsap_ProcedureCode_vals), 0,
         NULL, HFILL }},
     { &hf_lcsap_initiatingMessagevalue,
-      { "value", "lcsap.value",
+      { "value", "lcsap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InitiatingMessage_value", HFILL }},
     { &hf_lcsap_successfulOutcome_value,
-      { "value", "lcsap.value",
+      { "value", "lcsap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SuccessfulOutcome_value", HFILL }},
     { &hf_lcsap_unsuccessfulOutcome_value,
-      { "value", "lcsap.value",
+      { "value", "lcsap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UnsuccessfulOutcome_value", HFILL }},
 
diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c
index 632f2937d4..503a969a18 100644
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -5194,11 +5194,11 @@ void proto_register_ldap(void) {
 /*--- Included file: packet-ldap-hfarr.c ---*/
 #line 1 "../../asn1/ldap/packet-ldap-hfarr.c"
     { &hf_ldap_LDAPMessage_PDU,
-      { "LDAPMessage", "ldap.LDAPMessage",
+      { "LDAPMessage", "ldap.LDAPMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_SearchControlValue_PDU,
-      { "SearchControlValue", "ldap.SearchControlValue",
+      { "SearchControlValue", "ldap.SearchControlValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_SortKeyList_PDU,
@@ -5206,31 +5206,31 @@ void proto_register_ldap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_SortResult_PDU,
-      { "SortResult", "ldap.SortResult",
+      { "SortResult", "ldap.SortResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_DirSyncControlValue_PDU,
-      { "DirSyncControlValue", "ldap.DirSyncControlValue",
+      { "DirSyncControlValue", "ldap.DirSyncControlValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_PasswdModifyRequestValue_PDU,
-      { "PasswdModifyRequestValue", "ldap.PasswdModifyRequestValue",
+      { "PasswdModifyRequestValue", "ldap.PasswdModifyRequestValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_CancelRequestValue_PDU,
-      { "CancelRequestValue", "ldap.CancelRequestValue",
+      { "CancelRequestValue", "ldap.CancelRequestValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_SyncRequestValue_PDU,
-      { "SyncRequestValue", "ldap.SyncRequestValue",
+      { "SyncRequestValue", "ldap.SyncRequestValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_SyncStateValue_PDU,
-      { "SyncStateValue", "ldap.SyncStateValue",
+      { "SyncStateValue", "ldap.SyncStateValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_SyncDoneValue_PDU,
-      { "SyncDoneValue", "ldap.SyncDoneValue",
+      { "SyncDoneValue", "ldap.SyncDoneValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_SyncInfoValue_PDU,
@@ -5238,7 +5238,7 @@ void proto_register_ldap(void) {
         FT_UINT32, BASE_DEC, VALS(ldap_SyncInfoValue_vals), 0,
         NULL, HFILL }},
     { &hf_ldap_PasswordPolicyResponseValue_PDU,
-      { "PasswordPolicyResponseValue", "ldap.PasswordPolicyResponseValue",
+      { "PasswordPolicyResponseValue", "ldap.PasswordPolicyResponseValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_messageID,
@@ -5254,27 +5254,27 @@ void proto_register_ldap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_bindRequest,
-      { "bindRequest", "ldap.bindRequest",
+      { "bindRequest", "ldap.bindRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_bindResponse,
-      { "bindResponse", "ldap.bindResponse",
+      { "bindResponse", "ldap.bindResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_unbindRequest,
-      { "unbindRequest", "ldap.unbindRequest",
+      { "unbindRequest", "ldap.unbindRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_searchRequest,
-      { "searchRequest", "ldap.searchRequest",
+      { "searchRequest", "ldap.searchRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_searchResEntry,
-      { "searchResEntry", "ldap.searchResEntry",
+      { "searchResEntry", "ldap.searchResEntry_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SearchResultEntry", HFILL }},
     { &hf_ldap_searchResDone,
-      { "searchResDone", "ldap.searchResDone",
+      { "searchResDone", "ldap.searchResDone_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SearchResultDone", HFILL }},
     { &hf_ldap_searchResRef,
@@ -5282,19 +5282,19 @@ void proto_register_ldap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SearchResultReference", HFILL }},
     { &hf_ldap_modifyRequest,
-      { "modifyRequest", "ldap.modifyRequest",
+      { "modifyRequest", "ldap.modifyRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_modifyResponse,
-      { "modifyResponse", "ldap.modifyResponse",
+      { "modifyResponse", "ldap.modifyResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_addRequest,
-      { "addRequest", "ldap.addRequest",
+      { "addRequest", "ldap.addRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_addResponse,
-      { "addResponse", "ldap.addResponse",
+      { "addResponse", "ldap.addResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_delRequest,
@@ -5302,23 +5302,23 @@ void proto_register_ldap(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_delResponse,
-      { "delResponse", "ldap.delResponse",
+      { "delResponse", "ldap.delResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_modDNRequest,
-      { "modDNRequest", "ldap.modDNRequest",
+      { "modDNRequest", "ldap.modDNRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ModifyDNRequest", HFILL }},
     { &hf_ldap_modDNResponse,
-      { "modDNResponse", "ldap.modDNResponse",
+      { "modDNResponse", "ldap.modDNResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ModifyDNResponse", HFILL }},
     { &hf_ldap_compareRequest,
-      { "compareRequest", "ldap.compareRequest",
+      { "compareRequest", "ldap.compareRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_compareResponse,
-      { "compareResponse", "ldap.compareResponse",
+      { "compareResponse", "ldap.compareResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_abandonRequest,
@@ -5326,15 +5326,15 @@ void proto_register_ldap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_extendedReq,
-      { "extendedReq", "ldap.extendedReq",
+      { "extendedReq", "ldap.extendedReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ExtendedRequest", HFILL }},
     { &hf_ldap_extendedResp,
-      { "extendedResp", "ldap.extendedResp",
+      { "extendedResp", "ldap.extendedResp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ExtendedResponse", HFILL }},
     { &hf_ldap_intermediateResponse,
-      { "intermediateResponse", "ldap.intermediateResponse",
+      { "intermediateResponse", "ldap.intermediateResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_AttributeDescriptionList_item,
@@ -5382,7 +5382,7 @@ void proto_register_ldap(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_Controls_item,
-      { "Control", "ldap.Control",
+      { "Control", "ldap.Control_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_controlType,
@@ -5414,7 +5414,7 @@ void proto_register_ldap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_sasl,
-      { "sasl", "ldap.sasl",
+      { "sasl", "ldap.sasl_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SaslCredentials", HFILL }},
     { &hf_ldap_ntlmsspNegotiate,
@@ -5498,19 +5498,19 @@ void proto_register_ldap(void) {
         FT_UINT32, BASE_DEC, VALS(ldap_Filter_vals), 0,
         NULL, HFILL }},
     { &hf_ldap_equalityMatch,
-      { "equalityMatch", "ldap.equalityMatch",
+      { "equalityMatch", "ldap.equalityMatch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_substrings,
-      { "substrings", "ldap.substrings",
+      { "substrings", "ldap.substrings_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SubstringFilter", HFILL }},
     { &hf_ldap_greaterOrEqual,
-      { "greaterOrEqual", "ldap.greaterOrEqual",
+      { "greaterOrEqual", "ldap.greaterOrEqual_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_lessOrEqual,
-      { "lessOrEqual", "ldap.lessOrEqual",
+      { "lessOrEqual", "ldap.lessOrEqual_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_present,
@@ -5518,11 +5518,11 @@ void proto_register_ldap(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_approxMatch,
-      { "approxMatch", "ldap.approxMatch",
+      { "approxMatch", "ldap.approxMatch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_extensibleMatch,
-      { "extensibleMatch", "ldap.extensibleMatch",
+      { "extensibleMatch", "ldap.extensibleMatch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_substringFilter_substrings,
@@ -5566,7 +5566,7 @@ void proto_register_ldap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PartialAttributeList", HFILL }},
     { &hf_ldap_PartialAttributeList_item,
-      { "PartialAttributeList item", "ldap.PartialAttributeList_item",
+      { "PartialAttributeList item", "ldap.PartialAttributeList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap__untag_item,
@@ -5582,7 +5582,7 @@ void proto_register_ldap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ModifyRequest_modification", HFILL }},
     { &hf_ldap_modifyRequest_modification_item,
-      { "modification item", "ldap.modification_item",
+      { "modification item", "ldap.modification_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_modifyRequest_modification_item", HFILL }},
     { &hf_ldap_operation,
@@ -5590,7 +5590,7 @@ void proto_register_ldap(void) {
         FT_UINT32, BASE_DEC, VALS(ldap_T_operation_vals), 0,
         NULL, HFILL }},
     { &hf_ldap_modification,
-      { "modification", "ldap.modification",
+      { "modification", "ldap.modification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeTypeAndValues", HFILL }},
     { &hf_ldap_entry,
@@ -5602,7 +5602,7 @@ void proto_register_ldap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "AttributeList", HFILL }},
     { &hf_ldap_AttributeList_item,
-      { "AttributeList item", "ldap.AttributeList_item",
+      { "AttributeList item", "ldap.AttributeList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_newrdn,
@@ -5618,7 +5618,7 @@ void proto_register_ldap(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "LDAPDN", HFILL }},
     { &hf_ldap_ava,
-      { "ava", "ldap.ava",
+      { "ava", "ldap.ava_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeValueAssertion", HFILL }},
     { &hf_ldap_requestName,
@@ -5654,7 +5654,7 @@ void proto_register_ldap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_ldap_SortKeyList_item,
-      { "SortKeyList item", "ldap.SortKeyList_item",
+      { "SortKeyList item", "ldap.SortKeyList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_attributeType,
@@ -5730,7 +5730,7 @@ void proto_register_ldap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_ldap_refreshDelete,
-      { "refreshDelete", "ldap.refreshDelete",
+      { "refreshDelete", "ldap.refreshDelete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_refreshDone,
@@ -5738,11 +5738,11 @@ void proto_register_ldap(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_ldap_refreshPresent,
-      { "refreshPresent", "ldap.refreshPresent",
+      { "refreshPresent", "ldap.refreshPresent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_syncIdSet,
-      { "syncIdSet", "ldap.syncIdSet",
+      { "syncIdSet", "ldap.syncIdSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ldap_syncUUIDs,
diff --git a/epan/dissectors/packet-logotypecertextn.c b/epan/dissectors/packet-logotypecertextn.c
index 2eb2a97232..45700beb8d 100644
--- a/epan/dissectors/packet-logotypecertextn.c
+++ b/epan/dissectors/packet-logotypecertextn.c
@@ -528,7 +528,7 @@ void proto_register_logotypecertextn(void) {
 /*--- Included file: packet-logotypecertextn-hfarr.c ---*/
 #line 1 "../../asn1/logotypecertextn/packet-logotypecertextn-hfarr.c"
     { &hf_logotypecertextn_LogotypeExtn_PDU,
-      { "LogotypeExtn", "logotypecertextn.LogotypeExtn",
+      { "LogotypeExtn", "logotypecertextn.LogotypeExtn_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_logotypecertextn_communityLogos,
@@ -552,15 +552,15 @@ void proto_register_logotypecertextn(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_OtherLogotypeInfo", HFILL }},
     { &hf_logotypecertextn_otherLogos_item,
-      { "OtherLogotypeInfo", "logotypecertextn.OtherLogotypeInfo",
+      { "OtherLogotypeInfo", "logotypecertextn.OtherLogotypeInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_logotypecertextn_direct,
-      { "direct", "logotypecertextn.direct",
+      { "direct", "logotypecertextn.direct_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LogotypeData", HFILL }},
     { &hf_logotypecertextn_indirect,
-      { "indirect", "logotypecertextn.indirect",
+      { "indirect", "logotypecertextn.indirect_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LogotypeReference", HFILL }},
     { &hf_logotypecertextn_image,
@@ -568,7 +568,7 @@ void proto_register_logotypecertextn(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_LogotypeImage", HFILL }},
     { &hf_logotypecertextn_image_item,
-      { "LogotypeImage", "logotypecertextn.LogotypeImage",
+      { "LogotypeImage", "logotypecertextn.LogotypeImage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_logotypecertextn_audio,
@@ -576,23 +576,23 @@ void proto_register_logotypecertextn(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_LogotypeAudio", HFILL }},
     { &hf_logotypecertextn_audio_item,
-      { "LogotypeAudio", "logotypecertextn.LogotypeAudio",
+      { "LogotypeAudio", "logotypecertextn.LogotypeAudio_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_logotypecertextn_imageDetails,
-      { "imageDetails", "logotypecertextn.imageDetails",
+      { "imageDetails", "logotypecertextn.imageDetails_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LogotypeDetails", HFILL }},
     { &hf_logotypecertextn_imageInfo,
-      { "imageInfo", "logotypecertextn.imageInfo",
+      { "imageInfo", "logotypecertextn.imageInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LogotypeImageInfo", HFILL }},
     { &hf_logotypecertextn_audioDetails,
-      { "audioDetails", "logotypecertextn.audioDetails",
+      { "audioDetails", "logotypecertextn.audioDetails_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LogotypeDetails", HFILL }},
     { &hf_logotypecertextn_audioInfo,
-      { "audioInfo", "logotypecertextn.audioInfo",
+      { "audioInfo", "logotypecertextn.audioInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LogotypeAudioInfo", HFILL }},
     { &hf_logotypecertextn_mediaType,
@@ -604,7 +604,7 @@ void proto_register_logotypecertextn(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue", HFILL }},
     { &hf_logotypecertextn_logotypeHash_item,
-      { "HashAlgAndValue", "logotypecertextn.HashAlgAndValue",
+      { "HashAlgAndValue", "logotypecertextn.HashAlgAndValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_logotypecertextn_logotypeURI,
@@ -672,7 +672,7 @@ void proto_register_logotypecertextn(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue", HFILL }},
     { &hf_logotypecertextn_refStructHash_item,
-      { "HashAlgAndValue", "logotypecertextn.HashAlgAndValue",
+      { "HashAlgAndValue", "logotypecertextn.HashAlgAndValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_logotypecertextn_refStructURI,
@@ -684,7 +684,7 @@ void proto_register_logotypecertextn(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_logotypecertextn_hashAlg,
-      { "hashAlg", "logotypecertextn.hashAlg",
+      { "hashAlg", "logotypecertextn.hashAlg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_logotypecertextn_hashValue,
diff --git a/epan/dissectors/packet-lpp.c b/epan/dissectors/packet-lpp.c
index 9ed10982b6..73cb1fc56c 100644
--- a/epan/dissectors/packet-lpp.c
+++ b/epan/dissectors/packet-lpp.c
@@ -8211,35 +8211,35 @@ void proto_register_lpp(void) {
 /*--- Included file: packet-lpp-hfarr.c ---*/
 #line 1 "../../asn1/lpp/packet-lpp-hfarr.c"
     { &hf_lpp_LPP_Message_PDU,
-      { "LPP-Message", "lpp.LPP_Message",
+      { "LPP-Message", "lpp.LPP_Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_lpp_Ellipsoid_Point_PDU,
-      { "Ellipsoid-Point", "lpp.Ellipsoid_Point",
+      { "Ellipsoid-Point", "lpp.Ellipsoid_Point_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_lpp_Ellipsoid_PointWithUncertaintyCircle_PDU,
-      { "Ellipsoid-PointWithUncertaintyCircle", "lpp.Ellipsoid_PointWithUncertaintyCircle",
+      { "Ellipsoid-PointWithUncertaintyCircle", "lpp.Ellipsoid_PointWithUncertaintyCircle_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_lpp_EllipsoidPointWithUncertaintyEllipse_PDU,
-      { "EllipsoidPointWithUncertaintyEllipse", "lpp.EllipsoidPointWithUncertaintyEllipse",
+      { "EllipsoidPointWithUncertaintyEllipse", "lpp.EllipsoidPointWithUncertaintyEllipse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_lpp_EllipsoidPointWithAltitude_PDU,
-      { "EllipsoidPointWithAltitude", "lpp.EllipsoidPointWithAltitude",
+      { "EllipsoidPointWithAltitude", "lpp.EllipsoidPointWithAltitude_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_lpp_EllipsoidPointWithAltitudeAndUncertaintyEllipsoid_PDU,
-      { "EllipsoidPointWithAltitudeAndUncertaintyEllipsoid", "lpp.EllipsoidPointWithAltitudeAndUncertaintyEllipsoid",
+      { "EllipsoidPointWithAltitudeAndUncertaintyEllipsoid", "lpp.EllipsoidPointWithAltitudeAndUncertaintyEllipsoid_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_lpp_EllipsoidArc_PDU,
-      { "EllipsoidArc", "lpp.EllipsoidArc",
+      { "EllipsoidArc", "lpp.EllipsoidArc_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_lpp_HorizontalVelocity_PDU,
-      { "HorizontalVelocity", "lpp.HorizontalVelocity",
+      { "HorizontalVelocity", "lpp.HorizontalVelocity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_lpp_Polygon_PDU,
@@ -8247,7 +8247,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_transactionID,
-      { "transactionID", "lpp.transactionID",
+      { "transactionID", "lpp.transactionID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LPP_TransactionID", HFILL }},
     { &hf_lpp_endTransaction,
@@ -8259,7 +8259,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_acknowledgement,
-      { "acknowledgement", "lpp.acknowledgement",
+      { "acknowledgement", "lpp.acknowledgement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_lpp_MessageBody,
@@ -8279,31 +8279,31 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_T_c1_vals), 0,
         NULL, HFILL }},
     { &hf_lpp_requestCapabilities,
-      { "requestCapabilities", "lpp.requestCapabilities",
+      { "requestCapabilities", "lpp.requestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_provideCapabilities,
-      { "provideCapabilities", "lpp.provideCapabilities",
+      { "provideCapabilities", "lpp.provideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_requestAssistanceData,
-      { "requestAssistanceData", "lpp.requestAssistanceData",
+      { "requestAssistanceData", "lpp.requestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_provideAssistanceData,
-      { "provideAssistanceData", "lpp.provideAssistanceData",
+      { "provideAssistanceData", "lpp.provideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_requestLocationInformation,
-      { "requestLocationInformation", "lpp.requestLocationInformation",
+      { "requestLocationInformation", "lpp.requestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_provideLocationInformation,
-      { "provideLocationInformation", "lpp.provideLocationInformation",
+      { "provideLocationInformation", "lpp.provideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_abort,
-      { "abort", "lpp.abort",
+      { "abort", "lpp.abort_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_error,
@@ -8311,39 +8311,39 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_Error_vals), 0,
         NULL, HFILL }},
     { &hf_lpp_spare7,
-      { "spare7", "lpp.spare7",
+      { "spare7", "lpp.spare7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_spare6,
-      { "spare6", "lpp.spare6",
+      { "spare6", "lpp.spare6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_spare5,
-      { "spare5", "lpp.spare5",
+      { "spare5", "lpp.spare5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_spare4,
-      { "spare4", "lpp.spare4",
+      { "spare4", "lpp.spare4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_spare3,
-      { "spare3", "lpp.spare3",
+      { "spare3", "lpp.spare3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_spare2,
-      { "spare2", "lpp.spare2",
+      { "spare2", "lpp.spare2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_spare1,
-      { "spare1", "lpp.spare1",
+      { "spare1", "lpp.spare1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_spare0,
-      { "spare0", "lpp.spare0",
+      { "spare0", "lpp.spare0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_messageClassExtension,
-      { "messageClassExtension", "lpp.messageClassExtension",
+      { "messageClassExtension", "lpp.messageClassExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_initiator,
@@ -8363,27 +8363,27 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_T_c1_01_vals), 0,
         "T_c1_01", HFILL }},
     { &hf_lpp_requestCapabilities_r9,
-      { "requestCapabilities-r9", "lpp.requestCapabilities_r9",
+      { "requestCapabilities-r9", "lpp.requestCapabilities_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RequestCapabilities_r9_IEs", HFILL }},
     { &hf_lpp_criticalExtensionsFuture,
-      { "criticalExtensionsFuture", "lpp.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lpp.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_commonIEsRequestCapabilities,
-      { "commonIEsRequestCapabilities", "lpp.commonIEsRequestCapabilities",
+      { "commonIEsRequestCapabilities", "lpp.commonIEsRequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_a_gnss_RequestCapabilities,
-      { "a-gnss-RequestCapabilities", "lpp.a_gnss_RequestCapabilities",
+      { "a-gnss-RequestCapabilities", "lpp.a_gnss_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_otdoa_RequestCapabilities,
-      { "otdoa-RequestCapabilities", "lpp.otdoa_RequestCapabilities",
+      { "otdoa-RequestCapabilities", "lpp.otdoa_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_ecid_RequestCapabilities,
-      { "ecid-RequestCapabilities", "lpp.ecid_RequestCapabilities",
+      { "ecid-RequestCapabilities", "lpp.ecid_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_epdu_RequestCapabilities,
@@ -8399,27 +8399,27 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_T_c1_02_vals), 0,
         "T_c1_02", HFILL }},
     { &hf_lpp_provideCapabilities_r9,
-      { "provideCapabilities-r9", "lpp.provideCapabilities_r9",
+      { "provideCapabilities-r9", "lpp.provideCapabilities_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProvideCapabilities_r9_IEs", HFILL }},
     { &hf_lpp_criticalExtensionsFuture_01,
-      { "criticalExtensionsFuture", "lpp.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lpp.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_01", HFILL }},
     { &hf_lpp_commonIEsProvideCapabilities,
-      { "commonIEsProvideCapabilities", "lpp.commonIEsProvideCapabilities",
+      { "commonIEsProvideCapabilities", "lpp.commonIEsProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_a_gnss_ProvideCapabilities,
-      { "a-gnss-ProvideCapabilities", "lpp.a_gnss_ProvideCapabilities",
+      { "a-gnss-ProvideCapabilities", "lpp.a_gnss_ProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_otdoa_ProvideCapabilities,
-      { "otdoa-ProvideCapabilities", "lpp.otdoa_ProvideCapabilities",
+      { "otdoa-ProvideCapabilities", "lpp.otdoa_ProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_ecid_ProvideCapabilities,
-      { "ecid-ProvideCapabilities", "lpp.ecid_ProvideCapabilities",
+      { "ecid-ProvideCapabilities", "lpp.ecid_ProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_epdu_ProvideCapabilities,
@@ -8435,23 +8435,23 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_T_c1_03_vals), 0,
         "T_c1_03", HFILL }},
     { &hf_lpp_requestAssistanceData_r9,
-      { "requestAssistanceData-r9", "lpp.requestAssistanceData_r9",
+      { "requestAssistanceData-r9", "lpp.requestAssistanceData_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RequestAssistanceData_r9_IEs", HFILL }},
     { &hf_lpp_criticalExtensionsFuture_02,
-      { "criticalExtensionsFuture", "lpp.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lpp.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_02", HFILL }},
     { &hf_lpp_commonIEsRequestAssistanceData,
-      { "commonIEsRequestAssistanceData", "lpp.commonIEsRequestAssistanceData",
+      { "commonIEsRequestAssistanceData", "lpp.commonIEsRequestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_a_gnss_RequestAssistanceData,
-      { "a-gnss-RequestAssistanceData", "lpp.a_gnss_RequestAssistanceData",
+      { "a-gnss-RequestAssistanceData", "lpp.a_gnss_RequestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_otdoa_RequestAssistanceData,
-      { "otdoa-RequestAssistanceData", "lpp.otdoa_RequestAssistanceData",
+      { "otdoa-RequestAssistanceData", "lpp.otdoa_RequestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_epdu_RequestAssistanceData,
@@ -8467,23 +8467,23 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_T_c1_04_vals), 0,
         "T_c1_04", HFILL }},
     { &hf_lpp_provideAssistanceData_r9,
-      { "provideAssistanceData-r9", "lpp.provideAssistanceData_r9",
+      { "provideAssistanceData-r9", "lpp.provideAssistanceData_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProvideAssistanceData_r9_IEs", HFILL }},
     { &hf_lpp_criticalExtensionsFuture_03,
-      { "criticalExtensionsFuture", "lpp.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lpp.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_03", HFILL }},
     { &hf_lpp_commonIEsProvideAssistanceData,
-      { "commonIEsProvideAssistanceData", "lpp.commonIEsProvideAssistanceData",
+      { "commonIEsProvideAssistanceData", "lpp.commonIEsProvideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_a_gnss_ProvideAssistanceData,
-      { "a-gnss-ProvideAssistanceData", "lpp.a_gnss_ProvideAssistanceData",
+      { "a-gnss-ProvideAssistanceData", "lpp.a_gnss_ProvideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_otdoa_ProvideAssistanceData,
-      { "otdoa-ProvideAssistanceData", "lpp.otdoa_ProvideAssistanceData",
+      { "otdoa-ProvideAssistanceData", "lpp.otdoa_ProvideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_epdu_Provide_Assistance_Data,
@@ -8499,27 +8499,27 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_T_c1_05_vals), 0,
         "T_c1_05", HFILL }},
     { &hf_lpp_requestLocationInformation_r9,
-      { "requestLocationInformation-r9", "lpp.requestLocationInformation_r9",
+      { "requestLocationInformation-r9", "lpp.requestLocationInformation_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RequestLocationInformation_r9_IEs", HFILL }},
     { &hf_lpp_criticalExtensionsFuture_04,
-      { "criticalExtensionsFuture", "lpp.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lpp.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_04", HFILL }},
     { &hf_lpp_commonIEsRequestLocationInformation,
-      { "commonIEsRequestLocationInformation", "lpp.commonIEsRequestLocationInformation",
+      { "commonIEsRequestLocationInformation", "lpp.commonIEsRequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_a_gnss_RequestLocationInformation,
-      { "a-gnss-RequestLocationInformation", "lpp.a_gnss_RequestLocationInformation",
+      { "a-gnss-RequestLocationInformation", "lpp.a_gnss_RequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_otdoa_RequestLocationInformation,
-      { "otdoa-RequestLocationInformation", "lpp.otdoa_RequestLocationInformation",
+      { "otdoa-RequestLocationInformation", "lpp.otdoa_RequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_ecid_RequestLocationInformation,
-      { "ecid-RequestLocationInformation", "lpp.ecid_RequestLocationInformation",
+      { "ecid-RequestLocationInformation", "lpp.ecid_RequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_epdu_RequestLocationInformation,
@@ -8535,27 +8535,27 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_T_c1_06_vals), 0,
         "T_c1_06", HFILL }},
     { &hf_lpp_provideLocationInformation_r9,
-      { "provideLocationInformation-r9", "lpp.provideLocationInformation_r9",
+      { "provideLocationInformation-r9", "lpp.provideLocationInformation_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProvideLocationInformation_r9_IEs", HFILL }},
     { &hf_lpp_criticalExtensionsFuture_05,
-      { "criticalExtensionsFuture", "lpp.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lpp.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_05", HFILL }},
     { &hf_lpp_commonIEsProvideLocationInformation,
-      { "commonIEsProvideLocationInformation", "lpp.commonIEsProvideLocationInformation",
+      { "commonIEsProvideLocationInformation", "lpp.commonIEsProvideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_a_gnss_ProvideLocationInformation,
-      { "a-gnss-ProvideLocationInformation", "lpp.a_gnss_ProvideLocationInformation",
+      { "a-gnss-ProvideLocationInformation", "lpp.a_gnss_ProvideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_otdoa_ProvideLocationInformation,
-      { "otdoa-ProvideLocationInformation", "lpp.otdoa_ProvideLocationInformation",
+      { "otdoa-ProvideLocationInformation", "lpp.otdoa_ProvideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_ecid_ProvideLocationInformation,
-      { "ecid-ProvideLocationInformation", "lpp.ecid_ProvideLocationInformation",
+      { "ecid-ProvideLocationInformation", "lpp.ecid_ProvideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_epdu_ProvideLocationInformation,
@@ -8571,15 +8571,15 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_T_c1_07_vals), 0,
         "T_c1_07", HFILL }},
     { &hf_lpp_abort_r9,
-      { "abort-r9", "lpp.abort_r9",
+      { "abort-r9", "lpp.abort_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Abort_r9_IEs", HFILL }},
     { &hf_lpp_criticalExtensionsFuture_06,
-      { "criticalExtensionsFuture", "lpp.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lpp.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_06", HFILL }},
     { &hf_lpp_commonIEsAbort,
-      { "commonIEsAbort", "lpp.commonIEsAbort",
+      { "commonIEsAbort", "lpp.commonIEsAbort_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_epdu_Abort,
@@ -8587,15 +8587,15 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "EPDU_Sequence", HFILL }},
     { &hf_lpp_error_r9,
-      { "error-r9", "lpp.error_r9",
+      { "error-r9", "lpp.error_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Error_r9_IEs", HFILL }},
     { &hf_lpp_criticalExtensionsFuture_07,
-      { "criticalExtensionsFuture", "lpp.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lpp.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_07", HFILL }},
     { &hf_lpp_commonIEsError,
-      { "commonIEsError", "lpp.commonIEsError",
+      { "commonIEsError", "lpp.commonIEsError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_epdu_Error,
@@ -8607,7 +8607,7 @@ void proto_register_lpp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_plmn_Identity,
-      { "plmn-Identity", "lpp.plmn_Identity",
+      { "plmn-Identity", "lpp.plmn_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_mcc,
@@ -8639,7 +8639,7 @@ void proto_register_lpp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_32", HFILL }},
     { &hf_lpp_plmn_Identity_01,
-      { "plmn-Identity", "lpp.plmn_Identity",
+      { "plmn-Identity", "lpp.plmn_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_plmn_Identity_01", HFILL }},
     { &hf_lpp_mcc_01,
@@ -8755,11 +8755,11 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_179", HFILL }},
     { &hf_lpp_EPDU_Sequence_item,
-      { "EPDU", "lpp.EPDU",
+      { "EPDU", "lpp.EPDU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_ePDU_Identifier,
-      { "ePDU-Identifier", "lpp.ePDU_Identifier",
+      { "ePDU-Identifier", "lpp.ePDU_Identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_ePDU_Body,
@@ -8835,7 +8835,7 @@ void proto_register_lpp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lpp_Polygon_item,
-      { "PolygonPoints", "lpp.PolygonPoints",
+      { "PolygonPoints", "lpp.PolygonPoints_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_latitudeSign_06,
@@ -8863,7 +8863,7 @@ void proto_register_lpp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lpp_primaryCellID,
-      { "primaryCellID", "lpp.primaryCellID",
+      { "primaryCellID", "lpp.primaryCellID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ECGI", HFILL }},
     { &hf_lpp_locationInformationType,
@@ -8871,11 +8871,11 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_LocationInformationType_vals), 0,
         NULL, HFILL }},
     { &hf_lpp_triggeredReporting,
-      { "triggeredReporting", "lpp.triggeredReporting",
+      { "triggeredReporting", "lpp.triggeredReporting_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TriggeredReportingCriteria", HFILL }},
     { &hf_lpp_periodicalReporting,
-      { "periodicalReporting", "lpp.periodicalReporting",
+      { "periodicalReporting", "lpp.periodicalReporting_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PeriodicalReportingCriteria", HFILL }},
     { &hf_lpp_additionalInformation,
@@ -8883,7 +8883,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_AdditionalInformation_vals), 0,
         NULL, HFILL }},
     { &hf_lpp_qos,
-      { "qos", "lpp.qos",
+      { "qos", "lpp.qos_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_environment,
@@ -8891,11 +8891,11 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_Environment_vals), 0,
         NULL, HFILL }},
     { &hf_lpp_locationCoordinateTypes,
-      { "locationCoordinateTypes", "lpp.locationCoordinateTypes",
+      { "locationCoordinateTypes", "lpp.locationCoordinateTypes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_velocityTypes,
-      { "velocityTypes", "lpp.velocityTypes",
+      { "velocityTypes", "lpp.velocityTypes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_reportingAmount,
@@ -8915,7 +8915,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_horizontalAccuracy,
-      { "horizontalAccuracy", "lpp.horizontalAccuracy",
+      { "horizontalAccuracy", "lpp.horizontalAccuracy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_verticalCoordinateRequest,
@@ -8923,11 +8923,11 @@ void proto_register_lpp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lpp_verticalAccuracy,
-      { "verticalAccuracy", "lpp.verticalAccuracy",
+      { "verticalAccuracy", "lpp.verticalAccuracy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_responseTime,
-      { "responseTime", "lpp.responseTime",
+      { "responseTime", "lpp.responseTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_velocityRequest,
@@ -8951,19 +8951,19 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_Velocity_vals), 0,
         "Velocity", HFILL }},
     { &hf_lpp_locationError,
-      { "locationError", "lpp.locationError",
+      { "locationError", "lpp.locationError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_ellipsoidPoint_01,
-      { "ellipsoidPoint", "lpp.ellipsoidPoint",
+      { "ellipsoidPoint", "lpp.ellipsoidPoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ellipsoid_Point", HFILL }},
     { &hf_lpp_ellipsoidPointWithUncertaintyCircle_01,
-      { "ellipsoidPointWithUncertaintyCircle", "lpp.ellipsoidPointWithUncertaintyCircle",
+      { "ellipsoidPointWithUncertaintyCircle", "lpp.ellipsoidPointWithUncertaintyCircle_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ellipsoid_PointWithUncertaintyCircle", HFILL }},
     { &hf_lpp_ellipsoidPointWithUncertaintyEllipse_01,
-      { "ellipsoidPointWithUncertaintyEllipse", "lpp.ellipsoidPointWithUncertaintyEllipse",
+      { "ellipsoidPointWithUncertaintyEllipse", "lpp.ellipsoidPointWithUncertaintyEllipse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_polygon_01,
@@ -8971,31 +8971,31 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_ellipsoidPointWithAltitude_01,
-      { "ellipsoidPointWithAltitude", "lpp.ellipsoidPointWithAltitude",
+      { "ellipsoidPointWithAltitude", "lpp.ellipsoidPointWithAltitude_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_ellipsoidPointWithAltitudeAndUncertaintyEllipsoid_01,
-      { "ellipsoidPointWithAltitudeAndUncertaintyEllipsoid", "lpp.ellipsoidPointWithAltitudeAndUncertaintyEllipsoid",
+      { "ellipsoidPointWithAltitudeAndUncertaintyEllipsoid", "lpp.ellipsoidPointWithAltitudeAndUncertaintyEllipsoid_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_ellipsoidArc_01,
-      { "ellipsoidArc", "lpp.ellipsoidArc",
+      { "ellipsoidArc", "lpp.ellipsoidArc_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_horizontalVelocity_01,
-      { "horizontalVelocity", "lpp.horizontalVelocity",
+      { "horizontalVelocity", "lpp.horizontalVelocity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_horizontalWithVerticalVelocity_01,
-      { "horizontalWithVerticalVelocity", "lpp.horizontalWithVerticalVelocity",
+      { "horizontalWithVerticalVelocity", "lpp.horizontalWithVerticalVelocity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_horizontalVelocityWithUncertainty_01,
-      { "horizontalVelocityWithUncertainty", "lpp.horizontalVelocityWithUncertainty",
+      { "horizontalVelocityWithUncertainty", "lpp.horizontalVelocityWithUncertainty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_horizontalWithVerticalVelocityAndUncertainty_01,
-      { "horizontalWithVerticalVelocityAndUncertainty", "lpp.horizontalWithVerticalVelocityAndUncertainty",
+      { "horizontalWithVerticalVelocityAndUncertainty", "lpp.horizontalWithVerticalVelocityAndUncertainty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_locationfailurecause,
@@ -9011,7 +9011,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_T_errorCause_vals), 0,
         NULL, HFILL }},
     { &hf_lpp_otdoa_ReferenceCellInfo,
-      { "otdoa-ReferenceCellInfo", "lpp.otdoa_ReferenceCellInfo",
+      { "otdoa-ReferenceCellInfo", "lpp.otdoa_ReferenceCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_otdoa_NeighbourCellInfo,
@@ -9027,7 +9027,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_503", HFILL }},
     { &hf_lpp_cellGlobalId,
-      { "cellGlobalId", "lpp.cellGlobalId",
+      { "cellGlobalId", "lpp.cellGlobalId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ECGI", HFILL }},
     { &hf_lpp_earfcnRef,
@@ -9043,7 +9043,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_T_cpLength_vals), 0,
         NULL, HFILL }},
     { &hf_lpp_prsInfo,
-      { "prsInfo", "lpp.prsInfo",
+      { "prsInfo", "lpp.prsInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PRS_Info", HFILL }},
     { &hf_lpp_earfcnRef_v9a0,
@@ -9087,7 +9087,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_OTDOA_NeighbourFreqInfo_item,
-      { "OTDOA-NeighbourCellInfoElement", "lpp.OTDOA_NeighbourCellInfoElement",
+      { "OTDOA-NeighbourCellInfoElement", "lpp.OTDOA_NeighbourCellInfoElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_earfcn,
@@ -9123,7 +9123,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ARFCN_ValueEUTRA_v9a0", HFILL }},
     { &hf_lpp_otdoaSignalMeasurementInformation,
-      { "otdoaSignalMeasurementInformation", "lpp.otdoaSignalMeasurementInformation",
+      { "otdoaSignalMeasurementInformation", "lpp.otdoaSignalMeasurementInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OTDOA_SignalMeasurementInformation", HFILL }},
     { &hf_lpp_systemFrameNumber,
@@ -9135,11 +9135,11 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_503", HFILL }},
     { &hf_lpp_cellGlobalIdRef,
-      { "cellGlobalIdRef", "lpp.cellGlobalIdRef",
+      { "cellGlobalIdRef", "lpp.cellGlobalIdRef_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ECGI", HFILL }},
     { &hf_lpp_referenceQuality,
-      { "referenceQuality", "lpp.referenceQuality",
+      { "referenceQuality", "lpp.referenceQuality_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OTDOA_MeasQuality", HFILL }},
     { &hf_lpp_neighbourMeasurementList,
@@ -9147,7 +9147,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_NeighbourMeasurementList_item,
-      { "NeighbourMeasurementElement", "lpp.NeighbourMeasurementElement",
+      { "NeighbourMeasurementElement", "lpp.NeighbourMeasurementElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_physCellIdNeighbor,
@@ -9155,7 +9155,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_503", HFILL }},
     { &hf_lpp_cellGlobalIdNeighbour,
-      { "cellGlobalIdNeighbour", "lpp.cellGlobalIdNeighbour",
+      { "cellGlobalIdNeighbour", "lpp.cellGlobalIdNeighbour_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ECGI", HFILL }},
     { &hf_lpp_earfcnNeighbour,
@@ -9167,7 +9167,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_12711", HFILL }},
     { &hf_lpp_rstd_Quality,
-      { "rstd-Quality", "lpp.rstd_Quality",
+      { "rstd-Quality", "lpp.rstd_Quality_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OTDOA_MeasQuality", HFILL }},
     { &hf_lpp_earfcnNeighbour_v9a0,
@@ -9199,7 +9199,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxBands_OF_SupportedBandEUTRA", HFILL }},
     { &hf_lpp_supportedBandListEUTRA_item,
-      { "SupportedBandEUTRA", "lpp.SupportedBandEUTRA",
+      { "SupportedBandEUTRA", "lpp.SupportedBandEUTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_supportedBandListEUTRA_v9a0,
@@ -9207,7 +9207,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxBands_OF_SupportedBandEUTRA_v9a0", HFILL }},
     { &hf_lpp_supportedBandListEUTRA_v9a0_item,
-      { "SupportedBandEUTRA-v9a0", "lpp.SupportedBandEUTRA_v9a0",
+      { "SupportedBandEUTRA-v9a0", "lpp.SupportedBandEUTRA_v9a0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_bandEUTRA,
@@ -9219,11 +9219,11 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_maxFBI_Plus1_maxFBI2", HFILL }},
     { &hf_lpp_locationServerErrorCauses,
-      { "locationServerErrorCauses", "lpp.locationServerErrorCauses",
+      { "locationServerErrorCauses", "lpp.locationServerErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OTDOA_LocationServerErrorCauses", HFILL }},
     { &hf_lpp_targetDeviceErrorCauses,
-      { "targetDeviceErrorCauses", "lpp.targetDeviceErrorCauses",
+      { "targetDeviceErrorCauses", "lpp.targetDeviceErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OTDOA_TargetDeviceErrorCauses", HFILL }},
     { &hf_lpp_cause,
@@ -9235,7 +9235,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_T_cause_01_vals), 0,
         "T_cause_01", HFILL }},
     { &hf_lpp_gnss_CommonAssistData,
-      { "gnss-CommonAssistData", "lpp.gnss_CommonAssistData",
+      { "gnss-CommonAssistData", "lpp.gnss_CommonAssistData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_GenericAssistData,
@@ -9247,31 +9247,31 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_A_GNSS_Error_vals), 0,
         "A_GNSS_Error", HFILL }},
     { &hf_lpp_gnss_ReferenceTime,
-      { "gnss-ReferenceTime", "lpp.gnss_ReferenceTime",
+      { "gnss-ReferenceTime", "lpp.gnss_ReferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_ReferenceLocation,
-      { "gnss-ReferenceLocation", "lpp.gnss_ReferenceLocation",
+      { "gnss-ReferenceLocation", "lpp.gnss_ReferenceLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_IonosphericModel,
-      { "gnss-IonosphericModel", "lpp.gnss_IonosphericModel",
+      { "gnss-IonosphericModel", "lpp.gnss_IonosphericModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_EarthOrientationParameters,
-      { "gnss-EarthOrientationParameters", "lpp.gnss_EarthOrientationParameters",
+      { "gnss-EarthOrientationParameters", "lpp.gnss_EarthOrientationParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_GNSS_GenericAssistData_item,
-      { "GNSS-GenericAssistDataElement", "lpp.GNSS_GenericAssistDataElement",
+      { "GNSS-GenericAssistDataElement", "lpp.GNSS_GenericAssistDataElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_ID,
-      { "gnss-ID", "lpp.gnss_ID",
+      { "gnss-ID", "lpp.gnss_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_sbas_ID,
-      { "sbas-ID", "lpp.sbas_ID",
+      { "sbas-ID", "lpp.sbas_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_TimeModels,
@@ -9279,27 +9279,27 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GNSS_TimeModelList", HFILL }},
     { &hf_lpp_gnss_DifferentialCorrections,
-      { "gnss-DifferentialCorrections", "lpp.gnss_DifferentialCorrections",
+      { "gnss-DifferentialCorrections", "lpp.gnss_DifferentialCorrections_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_NavigationModel,
-      { "gnss-NavigationModel", "lpp.gnss_NavigationModel",
+      { "gnss-NavigationModel", "lpp.gnss_NavigationModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_RealTimeIntegrity,
-      { "gnss-RealTimeIntegrity", "lpp.gnss_RealTimeIntegrity",
+      { "gnss-RealTimeIntegrity", "lpp.gnss_RealTimeIntegrity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_DataBitAssistance,
-      { "gnss-DataBitAssistance", "lpp.gnss_DataBitAssistance",
+      { "gnss-DataBitAssistance", "lpp.gnss_DataBitAssistance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_AcquisitionAssistance,
-      { "gnss-AcquisitionAssistance", "lpp.gnss_AcquisitionAssistance",
+      { "gnss-AcquisitionAssistance", "lpp.gnss_AcquisitionAssistance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_Almanac,
-      { "gnss-Almanac", "lpp.gnss_Almanac",
+      { "gnss-Almanac", "lpp.gnss_Almanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_UTC_Model,
@@ -9311,7 +9311,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_GNSS_AuxiliaryInformation_vals), 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_SystemTime,
-      { "gnss-SystemTime", "lpp.gnss_SystemTime",
+      { "gnss-SystemTime", "lpp.gnss_SystemTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_referenceTimeUnc,
@@ -9323,11 +9323,11 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_16_OF_GNSS_ReferenceTimeForOneCell", HFILL }},
     { &hf_lpp_gnss_ReferenceTimeForCells_item,
-      { "GNSS-ReferenceTimeForOneCell", "lpp.GNSS_ReferenceTimeForOneCell",
+      { "GNSS-ReferenceTimeForOneCell", "lpp.GNSS_ReferenceTimeForOneCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_networkTime,
-      { "networkTime", "lpp.networkTime",
+      { "networkTime", "lpp.networkTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_bsAlign,
@@ -9335,7 +9335,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_T_bsAlign_vals), 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_TimeID,
-      { "gnss-TimeID", "lpp.gnss_TimeID",
+      { "gnss-TimeID", "lpp.gnss_TimeID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_ID", HFILL }},
     { &hf_lpp_gnss_DayNumber,
@@ -9359,7 +9359,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_GPS_TOW_Assist_item,
-      { "GPS-TOW-AssistElement", "lpp.GPS_TOW_AssistElement",
+      { "GPS-TOW-AssistElement", "lpp.GPS_TOW_AssistElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_satelliteID,
@@ -9399,15 +9399,15 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_T_cellID_vals), 0,
         NULL, HFILL }},
     { &hf_lpp_eUTRA,
-      { "eUTRA", "lpp.eUTRA",
+      { "eUTRA", "lpp.eUTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_cellGlobalIdEUTRA,
-      { "cellGlobalIdEUTRA", "lpp.cellGlobalIdEUTRA",
+      { "cellGlobalIdEUTRA", "lpp.cellGlobalIdEUTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellGlobalIdEUTRA_AndUTRA", HFILL }},
     { &hf_lpp_uTRA,
-      { "uTRA", "lpp.uTRA",
+      { "uTRA", "lpp.uTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_mode,
@@ -9415,7 +9415,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_T_mode_vals), 0,
         NULL, HFILL }},
     { &hf_lpp_fdd,
-      { "fdd", "lpp.fdd",
+      { "fdd", "lpp.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_primary_CPICH_Info,
@@ -9423,7 +9423,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_511", HFILL }},
     { &hf_lpp_tdd,
-      { "tdd", "lpp.tdd",
+      { "tdd", "lpp.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_cellParameters,
@@ -9431,7 +9431,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_127", HFILL }},
     { &hf_lpp_cellGlobalIdUTRA,
-      { "cellGlobalIdUTRA", "lpp.cellGlobalIdUTRA",
+      { "cellGlobalIdUTRA", "lpp.cellGlobalIdUTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellGlobalIdEUTRA_AndUTRA", HFILL }},
     { &hf_lpp_uarfcn,
@@ -9439,7 +9439,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ARFCN_ValueUTRA", HFILL }},
     { &hf_lpp_gSM,
-      { "gSM", "lpp.gSM",
+      { "gSM", "lpp.gSM_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_bcchCarrier,
@@ -9451,19 +9451,19 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_63", HFILL }},
     { &hf_lpp_cellGlobalIdGERAN,
-      { "cellGlobalIdGERAN", "lpp.cellGlobalIdGERAN",
+      { "cellGlobalIdGERAN", "lpp.cellGlobalIdGERAN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_threeDlocation,
-      { "threeDlocation", "lpp.threeDlocation",
+      { "threeDlocation", "lpp.threeDlocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EllipsoidPointWithAltitudeAndUncertaintyEllipsoid", HFILL }},
     { &hf_lpp_klobucharModel,
-      { "klobucharModel", "lpp.klobucharModel",
+      { "klobucharModel", "lpp.klobucharModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "KlobucharModelParameter", HFILL }},
     { &hf_lpp_neQuickModel,
-      { "neQuickModel", "lpp.neQuickModel",
+      { "neQuickModel", "lpp.neQuickModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NeQuickModelParameter", HFILL }},
     { &hf_lpp_dataID,
@@ -9563,7 +9563,7 @@ void proto_register_lpp(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M262144_262143", HFILL }},
     { &hf_lpp_GNSS_TimeModelList_item,
-      { "GNSS-TimeModelElement", "lpp.GNSS_TimeModelElement",
+      { "GNSS-TimeModelElement", "lpp.GNSS_TimeModelElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_TimeModelRefTime,
@@ -9603,11 +9603,11 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_DGNSS_SgnTypeList_item,
-      { "DGNSS-SgnTypeElement", "lpp.DGNSS_SgnTypeElement",
+      { "DGNSS-SgnTypeElement", "lpp.DGNSS_SgnTypeElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_SignalID,
-      { "gnss-SignalID", "lpp.gnss_SignalID",
+      { "gnss-SignalID", "lpp.gnss_SignalID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_StatusHealth,
@@ -9619,11 +9619,11 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_DGNSS_SatList_item,
-      { "DGNSS-CorrectionsElement", "lpp.DGNSS_CorrectionsElement",
+      { "DGNSS-CorrectionsElement", "lpp.DGNSS_CorrectionsElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_svID,
-      { "svID", "lpp.svID",
+      { "svID", "lpp.svID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SV_ID", HFILL }},
     { &hf_lpp_iod,
@@ -9659,7 +9659,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GNSS_NavModelSatelliteList", HFILL }},
     { &hf_lpp_GNSS_NavModelSatelliteList_item,
-      { "GNSS-NavModelSatelliteElement", "lpp.GNSS_NavModelSatelliteElement",
+      { "GNSS-NavModelSatelliteElement", "lpp.GNSS_NavModelSatelliteElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_svHealth,
@@ -9679,43 +9679,43 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_nav_ClockModel,
-      { "nav-ClockModel", "lpp.nav_ClockModel",
+      { "nav-ClockModel", "lpp.nav_ClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_cnav_ClockModel,
-      { "cnav-ClockModel", "lpp.cnav_ClockModel",
+      { "cnav-ClockModel", "lpp.cnav_ClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_glonass_ClockModel,
-      { "glonass-ClockModel", "lpp.glonass_ClockModel",
+      { "glonass-ClockModel", "lpp.glonass_ClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_sbas_ClockModel,
-      { "sbas-ClockModel", "lpp.sbas_ClockModel",
+      { "sbas-ClockModel", "lpp.sbas_ClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_keplerianSet,
-      { "keplerianSet", "lpp.keplerianSet",
+      { "keplerianSet", "lpp.keplerianSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NavModelKeplerianSet", HFILL }},
     { &hf_lpp_nav_KeplerianSet,
-      { "nav-KeplerianSet", "lpp.nav_KeplerianSet",
+      { "nav-KeplerianSet", "lpp.nav_KeplerianSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NavModelNAV_KeplerianSet", HFILL }},
     { &hf_lpp_cnav_KeplerianSet,
-      { "cnav-KeplerianSet", "lpp.cnav_KeplerianSet",
+      { "cnav-KeplerianSet", "lpp.cnav_KeplerianSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NavModelCNAV_KeplerianSet", HFILL }},
     { &hf_lpp_glonass_ECEF,
-      { "glonass-ECEF", "lpp.glonass_ECEF",
+      { "glonass-ECEF", "lpp.glonass_ECEF_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NavModel_GLONASS_ECEF", HFILL }},
     { &hf_lpp_sbas_ECEF,
-      { "sbas-ECEF", "lpp.sbas_ECEF",
+      { "sbas-ECEF", "lpp.sbas_ECEF_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NavModel_SBAS_ECEF", HFILL }},
     { &hf_lpp_StandardClockModelList_item,
-      { "StandardClockModelElement", "lpp.StandardClockModelElement",
+      { "StandardClockModelElement", "lpp.StandardClockModelElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_stanClockToc,
@@ -9983,7 +9983,7 @@ void proto_register_lpp(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M32768_32767", HFILL }},
     { &hf_lpp_addNAVparam,
-      { "addNAVparam", "lpp.addNAVparam",
+      { "addNAVparam", "lpp.addNAVparam_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_ephemCodeOnL2,
@@ -9995,7 +9995,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_1", HFILL }},
     { &hf_lpp_ephemSF1Rsvd,
-      { "ephemSF1Rsvd", "lpp.ephemSF1Rsvd",
+      { "ephemSF1Rsvd", "lpp.ephemSF1Rsvd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_reserved1,
@@ -10187,15 +10187,15 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_GNSS_BadSignalList_item,
-      { "BadSignalElement", "lpp.BadSignalElement",
+      { "BadSignalElement", "lpp.BadSignalElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_badSVID,
-      { "badSVID", "lpp.badSVID",
+      { "badSVID", "lpp.badSVID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SV_ID", HFILL }},
     { &hf_lpp_badSignalID,
-      { "badSignalID", "lpp.badSignalID",
+      { "badSignalID", "lpp.badSignalID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SignalIDs", HFILL }},
     { &hf_lpp_gnss_TOD,
@@ -10211,7 +10211,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_GNSS_DataBitsSatList_item,
-      { "GNSS-DataBitsSatElement", "lpp.GNSS_DataBitsSatElement",
+      { "GNSS-DataBitsSatElement", "lpp.GNSS_DataBitsSatElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_DataBitsSgnList,
@@ -10219,11 +10219,11 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_GNSS_DataBitsSgnList_item,
-      { "GNSS-DataBitsSgnElement", "lpp.GNSS_DataBitsSgnElement",
+      { "GNSS-DataBitsSgnElement", "lpp.GNSS_DataBitsSgnElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_SignalType,
-      { "gnss-SignalType", "lpp.gnss_SignalType",
+      { "gnss-SignalType", "lpp.gnss_SignalType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SignalID", HFILL }},
     { &hf_lpp_gnss_DataBits,
@@ -10239,7 +10239,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_100", HFILL }},
     { &hf_lpp_GNSS_AcquisitionAssistList_item,
-      { "GNSS-AcquisitionAssistElement", "lpp.GNSS_AcquisitionAssistElement",
+      { "GNSS-AcquisitionAssistElement", "lpp.GNSS_AcquisitionAssistElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_doppler0,
@@ -10307,27 +10307,27 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_GNSS_AlmanacElement_vals), 0,
         NULL, HFILL }},
     { &hf_lpp_keplerianAlmanacSet,
-      { "keplerianAlmanacSet", "lpp.keplerianAlmanacSet",
+      { "keplerianAlmanacSet", "lpp.keplerianAlmanacSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlmanacKeplerianSet", HFILL }},
     { &hf_lpp_keplerianNAV_Almanac,
-      { "keplerianNAV-Almanac", "lpp.keplerianNAV_Almanac",
+      { "keplerianNAV-Almanac", "lpp.keplerianNAV_Almanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlmanacNAV_KeplerianSet", HFILL }},
     { &hf_lpp_keplerianReducedAlmanac,
-      { "keplerianReducedAlmanac", "lpp.keplerianReducedAlmanac",
+      { "keplerianReducedAlmanac", "lpp.keplerianReducedAlmanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlmanacReducedKeplerianSet", HFILL }},
     { &hf_lpp_keplerianMidiAlmanac,
-      { "keplerianMidiAlmanac", "lpp.keplerianMidiAlmanac",
+      { "keplerianMidiAlmanac", "lpp.keplerianMidiAlmanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlmanacMidiAlmanacSet", HFILL }},
     { &hf_lpp_keplerianGLONASS,
-      { "keplerianGLONASS", "lpp.keplerianGLONASS",
+      { "keplerianGLONASS", "lpp.keplerianGLONASS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlmanacGLONASS_AlmanacSet", HFILL }},
     { &hf_lpp_ecef_SBAS_Almanac,
-      { "ecef-SBAS-Almanac", "lpp.ecef_SBAS_Almanac",
+      { "ecef-SBAS-Almanac", "lpp.ecef_SBAS_Almanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlmanacECEF_SBAS_AlmanacSet", HFILL }},
     { &hf_lpp_kepAlmanacE,
@@ -10571,19 +10571,19 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_2047", HFILL }},
     { &hf_lpp_utcModel1,
-      { "utcModel1", "lpp.utcModel1",
+      { "utcModel1", "lpp.utcModel1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTC_ModelSet1", HFILL }},
     { &hf_lpp_utcModel2,
-      { "utcModel2", "lpp.utcModel2",
+      { "utcModel2", "lpp.utcModel2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTC_ModelSet2", HFILL }},
     { &hf_lpp_utcModel3,
-      { "utcModel3", "lpp.utcModel3",
+      { "utcModel3", "lpp.utcModel3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTC_ModelSet3", HFILL }},
     { &hf_lpp_utcModel4,
-      { "utcModel4", "lpp.utcModel4",
+      { "utcModel4", "lpp.utcModel4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTC_ModelSet4", HFILL }},
     { &hf_lpp_gnss_Utc_A1,
@@ -10707,15 +10707,15 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_GNSS_ID_GPS_item,
-      { "GNSS-ID-GPS-SatElement", "lpp.GNSS_ID_GPS_SatElement",
+      { "GNSS-ID-GPS-SatElement", "lpp.GNSS_ID_GPS_SatElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_signalsAvailable,
-      { "signalsAvailable", "lpp.signalsAvailable",
+      { "signalsAvailable", "lpp.signalsAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SignalIDs", HFILL }},
     { &hf_lpp_GNSS_ID_GLONASS_item,
-      { "GNSS-ID-GLONASS-SatElement", "lpp.GNSS_ID_GLONASS_SatElement",
+      { "GNSS-ID-GLONASS-SatElement", "lpp.GNSS_ID_GLONASS_SatElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_channelNumber,
@@ -10723,7 +10723,7 @@ void proto_register_lpp(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M7_13", HFILL }},
     { &hf_lpp_gnss_CommonAssistDataReq,
-      { "gnss-CommonAssistDataReq", "lpp.gnss_CommonAssistDataReq",
+      { "gnss-CommonAssistDataReq", "lpp.gnss_CommonAssistDataReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_GenericAssistDataReq,
@@ -10731,23 +10731,23 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_ReferenceTimeReq,
-      { "gnss-ReferenceTimeReq", "lpp.gnss_ReferenceTimeReq",
+      { "gnss-ReferenceTimeReq", "lpp.gnss_ReferenceTimeReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_ReferenceLocationReq,
-      { "gnss-ReferenceLocationReq", "lpp.gnss_ReferenceLocationReq",
+      { "gnss-ReferenceLocationReq", "lpp.gnss_ReferenceLocationReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_IonosphericModelReq,
-      { "gnss-IonosphericModelReq", "lpp.gnss_IonosphericModelReq",
+      { "gnss-IonosphericModelReq", "lpp.gnss_IonosphericModelReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_EarthOrientationParametersReq,
-      { "gnss-EarthOrientationParametersReq", "lpp.gnss_EarthOrientationParametersReq",
+      { "gnss-EarthOrientationParametersReq", "lpp.gnss_EarthOrientationParametersReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_GNSS_GenericAssistDataReq_item,
-      { "GNSS-GenericAssistDataReqElement", "lpp.GNSS_GenericAssistDataReqElement",
+      { "GNSS-GenericAssistDataReqElement", "lpp.GNSS_GenericAssistDataReqElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_TimeModelsReq,
@@ -10755,7 +10755,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GNSS_TimeModelListReq", HFILL }},
     { &hf_lpp_gnss_DifferentialCorrectionsReq,
-      { "gnss-DifferentialCorrectionsReq", "lpp.gnss_DifferentialCorrectionsReq",
+      { "gnss-DifferentialCorrectionsReq", "lpp.gnss_DifferentialCorrectionsReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_NavigationModelReq,
@@ -10763,27 +10763,27 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_GNSS_NavigationModelReq_vals), 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_RealTimeIntegrityReq,
-      { "gnss-RealTimeIntegrityReq", "lpp.gnss_RealTimeIntegrityReq",
+      { "gnss-RealTimeIntegrityReq", "lpp.gnss_RealTimeIntegrityReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_DataBitAssistanceReq,
-      { "gnss-DataBitAssistanceReq", "lpp.gnss_DataBitAssistanceReq",
+      { "gnss-DataBitAssistanceReq", "lpp.gnss_DataBitAssistanceReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_AcquisitionAssistanceReq,
-      { "gnss-AcquisitionAssistanceReq", "lpp.gnss_AcquisitionAssistanceReq",
+      { "gnss-AcquisitionAssistanceReq", "lpp.gnss_AcquisitionAssistanceReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_AlmanacReq,
-      { "gnss-AlmanacReq", "lpp.gnss_AlmanacReq",
+      { "gnss-AlmanacReq", "lpp.gnss_AlmanacReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_UTCModelReq,
-      { "gnss-UTCModelReq", "lpp.gnss_UTCModelReq",
+      { "gnss-UTCModelReq", "lpp.gnss_UTCModelReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_UTC_ModelReq", HFILL }},
     { &hf_lpp_gnss_AuxiliaryInformationReq,
-      { "gnss-AuxiliaryInformationReq", "lpp.gnss_AuxiliaryInformationReq",
+      { "gnss-AuxiliaryInformationReq", "lpp.gnss_AuxiliaryInformationReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_TimeReqPrefList,
@@ -10791,7 +10791,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_8_OF_GNSS_ID", HFILL }},
     { &hf_lpp_gnss_TimeReqPrefList_item,
-      { "GNSS-ID", "lpp.GNSS_ID",
+      { "GNSS-ID", "lpp.GNSS_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gps_TOW_assistReq,
@@ -10807,11 +10807,11 @@ void proto_register_lpp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_2", HFILL }},
     { &hf_lpp_neQuickModelReq,
-      { "neQuickModelReq", "lpp.neQuickModelReq",
+      { "neQuickModelReq", "lpp.neQuickModelReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_GNSS_TimeModelListReq_item,
-      { "GNSS-TimeModelElementReq", "lpp.GNSS_TimeModelElementReq",
+      { "GNSS-TimeModelElementReq", "lpp.GNSS_TimeModelElementReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_TO_IDsReq,
@@ -10823,7 +10823,7 @@ void proto_register_lpp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lpp_dgnss_SignalsReq,
-      { "dgnss-SignalsReq", "lpp.dgnss_SignalsReq",
+      { "dgnss-SignalsReq", "lpp.dgnss_SignalsReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SignalIDs", HFILL }},
     { &hf_lpp_dgnss_ValidityTimeReq,
@@ -10831,11 +10831,11 @@ void proto_register_lpp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lpp_storedNavList,
-      { "storedNavList", "lpp.storedNavList",
+      { "storedNavList", "lpp.storedNavList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "StoredNavListInfo", HFILL }},
     { &hf_lpp_reqNavList,
-      { "reqNavList", "lpp.reqNavList",
+      { "reqNavList", "lpp.reqNavList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReqNavListInfo", HFILL }},
     { &hf_lpp_gnss_WeekOrDay,
@@ -10855,7 +10855,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_SatListRelatedDataList_item,
-      { "SatListRelatedDataElement", "lpp.SatListRelatedDataElement",
+      { "SatListRelatedDataElement", "lpp.SatListRelatedDataElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_clockModelID,
@@ -10903,7 +10903,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_15", HFILL }},
     { &hf_lpp_gnss_SignalType_01,
-      { "gnss-SignalType", "lpp.gnss_SignalType",
+      { "gnss-SignalType", "lpp.gnss_SignalType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SignalIDs", HFILL }},
     { &hf_lpp_gnss_DataBitsReq,
@@ -10911,11 +10911,11 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GNSS_DataBitsReqSatList", HFILL }},
     { &hf_lpp_GNSS_DataBitsReqSatList_item,
-      { "GNSS-DataBitsReqSatElement", "lpp.GNSS_DataBitsReqSatElement",
+      { "GNSS-DataBitsReqSatElement", "lpp.GNSS_DataBitsReqSatElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_SignalID_Req,
-      { "gnss-SignalID-Req", "lpp.gnss_SignalID_Req",
+      { "gnss-SignalID-Req", "lpp.gnss_SignalID_Req_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SignalID", HFILL }},
     { &hf_lpp_modelID,
@@ -10923,15 +10923,15 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_8", HFILL }},
     { &hf_lpp_gnss_SignalMeasurementInformation,
-      { "gnss-SignalMeasurementInformation", "lpp.gnss_SignalMeasurementInformation",
+      { "gnss-SignalMeasurementInformation", "lpp.gnss_SignalMeasurementInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_LocationInformation,
-      { "gnss-LocationInformation", "lpp.gnss_LocationInformation",
+      { "gnss-LocationInformation", "lpp.gnss_LocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_measurementReferenceTime,
-      { "measurementReferenceTime", "lpp.measurementReferenceTime",
+      { "measurementReferenceTime", "lpp.measurementReferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_MeasurementList,
@@ -10955,15 +10955,15 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_T_networkTime_vals), 0,
         NULL, HFILL }},
     { &hf_lpp_eUTRA_01,
-      { "eUTRA", "lpp.eUTRA",
+      { "eUTRA", "lpp.eUTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_eUTRA_01", HFILL }},
     { &hf_lpp_cellGlobalId_01,
-      { "cellGlobalId", "lpp.cellGlobalId",
+      { "cellGlobalId", "lpp.cellGlobalId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellGlobalIdEUTRA_AndUTRA", HFILL }},
     { &hf_lpp_uTRA_01,
-      { "uTRA", "lpp.uTRA",
+      { "uTRA", "lpp.uTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_uTRA_01", HFILL }},
     { &hf_lpp_mode_01,
@@ -10971,11 +10971,11 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_T_mode_01_vals), 0,
         "T_mode_01", HFILL }},
     { &hf_lpp_fdd_01,
-      { "fdd", "lpp.fdd",
+      { "fdd", "lpp.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_01", HFILL }},
     { &hf_lpp_tdd_01,
-      { "tdd", "lpp.tdd",
+      { "tdd", "lpp.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_01", HFILL }},
     { &hf_lpp_referenceSystemFrameNumber,
@@ -10983,15 +10983,15 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_4095", HFILL }},
     { &hf_lpp_gSM_01,
-      { "gSM", "lpp.gSM",
+      { "gSM", "lpp.gSM_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_gSM_01", HFILL }},
     { &hf_lpp_cellGlobalId_02,
-      { "cellGlobalId", "lpp.cellGlobalId",
+      { "cellGlobalId", "lpp.cellGlobalId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellGlobalIdGERAN", HFILL }},
     { &hf_lpp_referenceFrame,
-      { "referenceFrame", "lpp.referenceFrame",
+      { "referenceFrame", "lpp.referenceFrame_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_referenceFN,
@@ -11007,7 +11007,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_127", HFILL }},
     { &hf_lpp_GNSS_MeasurementList_item,
-      { "GNSS-MeasurementForOneGNSS", "lpp.GNSS_MeasurementForOneGNSS",
+      { "GNSS-MeasurementForOneGNSS", "lpp.GNSS_MeasurementForOneGNSS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_SgnMeasList,
@@ -11015,7 +11015,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_GNSS_SgnMeasList_item,
-      { "GNSS-SgnMeasElement", "lpp.GNSS_SgnMeasElement",
+      { "GNSS-SgnMeasElement", "lpp.GNSS_SgnMeasElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_CodePhaseAmbiguity,
@@ -11027,7 +11027,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_GNSS_SatMeasList_item,
-      { "GNSS-SatMeasElement", "lpp.GNSS_SatMeasElement",
+      { "GNSS-SatMeasElement", "lpp.GNSS_SatMeasElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_cNo,
@@ -11063,15 +11063,15 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_33554431", HFILL }},
     { &hf_lpp_agnss_List,
-      { "agnss-List", "lpp.agnss_List",
+      { "agnss-List", "lpp.agnss_List_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_ID_Bitmap", HFILL }},
     { &hf_lpp_gnss_PositioningInstructions,
-      { "gnss-PositioningInstructions", "lpp.gnss_PositioningInstructions",
+      { "gnss-PositioningInstructions", "lpp.gnss_PositioningInstructions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_Methods,
-      { "gnss-Methods", "lpp.gnss_Methods",
+      { "gnss-Methods", "lpp.gnss_Methods_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_ID_Bitmap", HFILL }},
     { &hf_lpp_fineTimeAssistanceMeasReq,
@@ -11091,35 +11091,35 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_assistanceDataSupportList,
-      { "assistanceDataSupportList", "lpp.assistanceDataSupportList",
+      { "assistanceDataSupportList", "lpp.assistanceDataSupportList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_GNSS_SupportList_item,
-      { "GNSS-SupportElement", "lpp.GNSS_SupportElement",
+      { "GNSS-SupportElement", "lpp.GNSS_SupportElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_sbas_IDs,
-      { "sbas-IDs", "lpp.sbas_IDs",
+      { "sbas-IDs", "lpp.sbas_IDs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_agnss_Modes,
-      { "agnss-Modes", "lpp.agnss_Modes",
+      { "agnss-Modes", "lpp.agnss_Modes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PositioningModes", HFILL }},
     { &hf_lpp_gnss_Signals,
-      { "gnss-Signals", "lpp.gnss_Signals",
+      { "gnss-Signals", "lpp.gnss_Signals_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SignalIDs", HFILL }},
     { &hf_lpp_fta_MeasSupport,
-      { "fta-MeasSupport", "lpp.fta_MeasSupport",
+      { "fta-MeasSupport", "lpp.fta_MeasSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_cellTime,
-      { "cellTime", "lpp.cellTime",
+      { "cellTime", "lpp.cellTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AccessTypes", HFILL }},
     { &hf_lpp_mode_02,
-      { "mode", "lpp.mode",
+      { "mode", "lpp.mode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PositioningModes", HFILL }},
     { &hf_lpp_adr_Support,
@@ -11131,7 +11131,7 @@ void proto_register_lpp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lpp_gnss_CommonAssistanceDataSupport,
-      { "gnss-CommonAssistanceDataSupport", "lpp.gnss_CommonAssistanceDataSupport",
+      { "gnss-CommonAssistanceDataSupport", "lpp.gnss_CommonAssistanceDataSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_GenericAssistanceDataSupport,
@@ -11139,27 +11139,27 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_ReferenceTimeSupport,
-      { "gnss-ReferenceTimeSupport", "lpp.gnss_ReferenceTimeSupport",
+      { "gnss-ReferenceTimeSupport", "lpp.gnss_ReferenceTimeSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_ReferenceLocationSupport,
-      { "gnss-ReferenceLocationSupport", "lpp.gnss_ReferenceLocationSupport",
+      { "gnss-ReferenceLocationSupport", "lpp.gnss_ReferenceLocationSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_IonosphericModelSupport,
-      { "gnss-IonosphericModelSupport", "lpp.gnss_IonosphericModelSupport",
+      { "gnss-IonosphericModelSupport", "lpp.gnss_IonosphericModelSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_EarthOrientationParametersSupport,
-      { "gnss-EarthOrientationParametersSupport", "lpp.gnss_EarthOrientationParametersSupport",
+      { "gnss-EarthOrientationParametersSupport", "lpp.gnss_EarthOrientationParametersSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_SystemTime_01,
-      { "gnss-SystemTime", "lpp.gnss_SystemTime",
+      { "gnss-SystemTime", "lpp.gnss_SystemTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_ID_Bitmap", HFILL }},
     { &hf_lpp_fta_Support,
-      { "fta-Support", "lpp.fta_Support",
+      { "fta-Support", "lpp.fta_Support_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AccessTypes", HFILL }},
     { &hf_lpp_ionoModel,
@@ -11167,47 +11167,47 @@ void proto_register_lpp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_GNSS_GenericAssistanceDataSupport_item,
-      { "GNSS-GenericAssistDataSupportElement", "lpp.GNSS_GenericAssistDataSupportElement",
+      { "GNSS-GenericAssistDataSupportElement", "lpp.GNSS_GenericAssistDataSupportElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_TimeModelsSupport,
-      { "gnss-TimeModelsSupport", "lpp.gnss_TimeModelsSupport",
+      { "gnss-TimeModelsSupport", "lpp.gnss_TimeModelsSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_TimeModelListSupport", HFILL }},
     { &hf_lpp_gnss_DifferentialCorrectionsSupport,
-      { "gnss-DifferentialCorrectionsSupport", "lpp.gnss_DifferentialCorrectionsSupport",
+      { "gnss-DifferentialCorrectionsSupport", "lpp.gnss_DifferentialCorrectionsSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_NavigationModelSupport,
-      { "gnss-NavigationModelSupport", "lpp.gnss_NavigationModelSupport",
+      { "gnss-NavigationModelSupport", "lpp.gnss_NavigationModelSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_RealTimeIntegritySupport,
-      { "gnss-RealTimeIntegritySupport", "lpp.gnss_RealTimeIntegritySupport",
+      { "gnss-RealTimeIntegritySupport", "lpp.gnss_RealTimeIntegritySupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_DataBitAssistanceSupport,
-      { "gnss-DataBitAssistanceSupport", "lpp.gnss_DataBitAssistanceSupport",
+      { "gnss-DataBitAssistanceSupport", "lpp.gnss_DataBitAssistanceSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_AcquisitionAssistanceSupport,
-      { "gnss-AcquisitionAssistanceSupport", "lpp.gnss_AcquisitionAssistanceSupport",
+      { "gnss-AcquisitionAssistanceSupport", "lpp.gnss_AcquisitionAssistanceSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_AlmanacSupport,
-      { "gnss-AlmanacSupport", "lpp.gnss_AlmanacSupport",
+      { "gnss-AlmanacSupport", "lpp.gnss_AlmanacSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_UTC_ModelSupport,
-      { "gnss-UTC-ModelSupport", "lpp.gnss_UTC_ModelSupport",
+      { "gnss-UTC-ModelSupport", "lpp.gnss_UTC_ModelSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_AuxiliaryInformationSupport,
-      { "gnss-AuxiliaryInformationSupport", "lpp.gnss_AuxiliaryInformationSupport",
+      { "gnss-AuxiliaryInformationSupport", "lpp.gnss_AuxiliaryInformationSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnssSignalIDs,
-      { "gnssSignalIDs", "lpp.gnssSignalIDs",
+      { "gnssSignalIDs", "lpp.gnssSignalIDs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SignalIDs", HFILL }},
     { &hf_lpp_dgnss_ValidityTimeSup,
@@ -11251,11 +11251,11 @@ void proto_register_lpp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lpp_locationServerErrorCauses_01,
-      { "locationServerErrorCauses", "lpp.locationServerErrorCauses",
+      { "locationServerErrorCauses", "lpp.locationServerErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_LocationServerErrorCauses", HFILL }},
     { &hf_lpp_targetDeviceErrorCauses_01,
-      { "targetDeviceErrorCauses", "lpp.targetDeviceErrorCauses",
+      { "targetDeviceErrorCauses", "lpp.targetDeviceErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_TargetDeviceErrorCauses", HFILL }},
     { &hf_lpp_cause_02,
@@ -11267,15 +11267,15 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_T_cause_03_vals), 0,
         "T_cause_03", HFILL }},
     { &hf_lpp_fineTimeAssistanceMeasurementsNotPossible,
-      { "fineTimeAssistanceMeasurementsNotPossible", "lpp.fineTimeAssistanceMeasurementsNotPossible",
+      { "fineTimeAssistanceMeasurementsNotPossible", "lpp.fineTimeAssistanceMeasurementsNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_adrMeasurementsNotPossible,
-      { "adrMeasurementsNotPossible", "lpp.adrMeasurementsNotPossible",
+      { "adrMeasurementsNotPossible", "lpp.adrMeasurementsNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_multiFrequencyMeasurementsNotPossible,
-      { "multiFrequencyMeasurementsNotPossible", "lpp.multiFrequencyMeasurementsNotPossible",
+      { "multiFrequencyMeasurementsNotPossible", "lpp.multiFrequencyMeasurementsNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_gnss_id,
@@ -11307,7 +11307,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_63", HFILL }},
     { &hf_lpp_ecid_SignalMeasurementInformation,
-      { "ecid-SignalMeasurementInformation", "lpp.ecid_SignalMeasurementInformation",
+      { "ecid-SignalMeasurementInformation", "lpp.ecid_SignalMeasurementInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_ecid_Error,
@@ -11315,7 +11315,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_ECID_Error_vals), 0,
         NULL, HFILL }},
     { &hf_lpp_primaryCellMeasuredResults,
-      { "primaryCellMeasuredResults", "lpp.primaryCellMeasuredResults",
+      { "primaryCellMeasuredResults", "lpp.primaryCellMeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasuredResultsElement", HFILL }},
     { &hf_lpp_measuredResultsList,
@@ -11323,7 +11323,7 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_MeasuredResultsList_item,
-      { "MeasuredResultsElement", "lpp.MeasuredResultsElement",
+      { "MeasuredResultsElement", "lpp.MeasuredResultsElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_arfcnEUTRA,
@@ -11355,11 +11355,11 @@ void proto_register_lpp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_locationServerErrorCauses_02,
-      { "locationServerErrorCauses", "lpp.locationServerErrorCauses",
+      { "locationServerErrorCauses", "lpp.locationServerErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ECID_LocationServerErrorCauses", HFILL }},
     { &hf_lpp_targetDeviceErrorCauses_02,
-      { "targetDeviceErrorCauses", "lpp.targetDeviceErrorCauses",
+      { "targetDeviceErrorCauses", "lpp.targetDeviceErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ECID_TargetDeviceErrorCauses", HFILL }},
     { &hf_lpp_cause_04,
@@ -11371,15 +11371,15 @@ void proto_register_lpp(void) {
         FT_UINT32, BASE_DEC, VALS(lpp_T_cause_05_vals), 0,
         "T_cause_05", HFILL }},
     { &hf_lpp_rsrpMeasurementNotPossible,
-      { "rsrpMeasurementNotPossible", "lpp.rsrpMeasurementNotPossible",
+      { "rsrpMeasurementNotPossible", "lpp.rsrpMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_rsrqMeasurementNotPossible,
-      { "rsrqMeasurementNotPossible", "lpp.rsrqMeasurementNotPossible",
+      { "rsrqMeasurementNotPossible", "lpp.rsrqMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_ueRxTxMeasurementNotPossible,
-      { "ueRxTxMeasurementNotPossible", "lpp.ueRxTxMeasurementNotPossible",
+      { "ueRxTxMeasurementNotPossible", "lpp.ueRxTxMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lpp_T_accessTypes_eutra,
diff --git a/epan/dissectors/packet-lppa.c b/epan/dissectors/packet-lppa.c
index c2125ea3f5..114c83abc1 100644
--- a/epan/dissectors/packet-lppa.c
+++ b/epan/dissectors/packet-lppa.c
@@ -1916,11 +1916,11 @@ void proto_register_lppa(void) {
         FT_UINT32, BASE_DEC, VALS(lppa_Cause_vals), 0,
         NULL, HFILL }},
     { &hf_lppa_CriticalityDiagnostics_PDU,
-      { "CriticalityDiagnostics", "lppa.CriticalityDiagnostics",
+      { "CriticalityDiagnostics", "lppa.CriticalityDiagnostics_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_E_CID_MeasurementResult_PDU,
-      { "E-CID-MeasurementResult", "lppa.E_CID_MeasurementResult",
+      { "E-CID-MeasurementResult", "lppa.E_CID_MeasurementResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_Measurement_ID_PDU,
@@ -1936,7 +1936,7 @@ void proto_register_lppa(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_MeasurementQuantities_Item_PDU,
-      { "MeasurementQuantities-Item", "lppa.MeasurementQuantities_Item",
+      { "MeasurementQuantities-Item", "lppa.MeasurementQuantities_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_OTDOACells_PDU,
@@ -1948,31 +1948,31 @@ void proto_register_lppa(void) {
         FT_UINT32, BASE_DEC, VALS(lppa_ReportCharacteristics_vals), 0,
         NULL, HFILL }},
     { &hf_lppa_E_CIDMeasurementInitiationRequest_PDU,
-      { "E-CIDMeasurementInitiationRequest", "lppa.E_CIDMeasurementInitiationRequest",
+      { "E-CIDMeasurementInitiationRequest", "lppa.E_CIDMeasurementInitiationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_E_CIDMeasurementInitiationResponse_PDU,
-      { "E-CIDMeasurementInitiationResponse", "lppa.E_CIDMeasurementInitiationResponse",
+      { "E-CIDMeasurementInitiationResponse", "lppa.E_CIDMeasurementInitiationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_E_CIDMeasurementInitiationFailure_PDU,
-      { "E-CIDMeasurementInitiationFailure", "lppa.E_CIDMeasurementInitiationFailure",
+      { "E-CIDMeasurementInitiationFailure", "lppa.E_CIDMeasurementInitiationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_E_CIDMeasurementFailureIndication_PDU,
-      { "E-CIDMeasurementFailureIndication", "lppa.E_CIDMeasurementFailureIndication",
+      { "E-CIDMeasurementFailureIndication", "lppa.E_CIDMeasurementFailureIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_E_CIDMeasurementReport_PDU,
-      { "E-CIDMeasurementReport", "lppa.E_CIDMeasurementReport",
+      { "E-CIDMeasurementReport", "lppa.E_CIDMeasurementReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_E_CIDMeasurementTerminationCommand_PDU,
-      { "E-CIDMeasurementTerminationCommand", "lppa.E_CIDMeasurementTerminationCommand",
+      { "E-CIDMeasurementTerminationCommand", "lppa.E_CIDMeasurementTerminationCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_OTDOAInformationRequest_PDU,
-      { "OTDOAInformationRequest", "lppa.OTDOAInformationRequest",
+      { "OTDOAInformationRequest", "lppa.OTDOAInformationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_OTDOA_Information_Type_PDU,
@@ -1980,23 +1980,23 @@ void proto_register_lppa(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_OTDOA_Information_Type_Item_PDU,
-      { "OTDOA-Information-Type-Item", "lppa.OTDOA_Information_Type_Item",
+      { "OTDOA-Information-Type-Item", "lppa.OTDOA_Information_Type_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_OTDOAInformationResponse_PDU,
-      { "OTDOAInformationResponse", "lppa.OTDOAInformationResponse",
+      { "OTDOAInformationResponse", "lppa.OTDOAInformationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_OTDOAInformationFailure_PDU,
-      { "OTDOAInformationFailure", "lppa.OTDOAInformationFailure",
+      { "OTDOAInformationFailure", "lppa.OTDOAInformationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_ErrorIndication_PDU,
-      { "ErrorIndication", "lppa.ErrorIndication",
+      { "ErrorIndication", "lppa.ErrorIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_PrivateMessage_PDU,
-      { "PrivateMessage", "lppa.PrivateMessage",
+      { "PrivateMessage", "lppa.PrivateMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_local,
@@ -2008,7 +2008,7 @@ void proto_register_lppa(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_lppa_ProtocolIE_Container_item,
-      { "ProtocolIE-Field", "lppa.ProtocolIE_Field",
+      { "ProtocolIE-Field", "lppa.ProtocolIE_Field_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_id,
@@ -2020,19 +2020,19 @@ void proto_register_lppa(void) {
         FT_UINT32, BASE_DEC, VALS(lppa_Criticality_vals), 0,
         NULL, HFILL }},
     { &hf_lppa_ie_field_value,
-      { "value", "lppa.value",
+      { "value", "lppa.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ie_field_value", HFILL }},
     { &hf_lppa_ProtocolExtensionContainer_item,
-      { "ProtocolExtensionField", "lppa.ProtocolExtensionField",
+      { "ProtocolExtensionField", "lppa.ProtocolExtensionField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_extensionValue,
-      { "extensionValue", "lppa.extensionValue",
+      { "extensionValue", "lppa.extensionValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_PrivateIE_Container_item,
-      { "PrivateIE-Field", "lppa.PrivateIE_Field",
+      { "PrivateIE-Field", "lppa.PrivateIE_Field_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_id_01,
@@ -2040,19 +2040,19 @@ void proto_register_lppa(void) {
         FT_UINT32, BASE_DEC, VALS(lppa_PrivateIE_ID_vals), 0,
         "PrivateIE_ID", HFILL }},
     { &hf_lppa_value,
-      { "value", "lppa.value",
+      { "value", "lppa.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_initiatingMessage,
-      { "initiatingMessage", "lppa.initiatingMessage",
+      { "initiatingMessage", "lppa.initiatingMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_successfulOutcome,
-      { "successfulOutcome", "lppa.successfulOutcome",
+      { "successfulOutcome", "lppa.successfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_unsuccessfulOutcome,
-      { "unsuccessfulOutcome", "lppa.unsuccessfulOutcome",
+      { "unsuccessfulOutcome", "lppa.unsuccessfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_procedureCode,
@@ -2064,15 +2064,15 @@ void proto_register_lppa(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_initiatingMessagevalue,
-      { "value", "lppa.value",
+      { "value", "lppa.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InitiatingMessage_value", HFILL }},
     { &hf_lppa_successfulOutcome_value,
-      { "value", "lppa.value",
+      { "value", "lppa.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SuccessfulOutcome_value", HFILL }},
     { &hf_lppa_unsuccessfulOutcome_value,
-      { "value", "lppa.value",
+      { "value", "lppa.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UnsuccessfulOutcome_value", HFILL }},
     { &hf_lppa_radioNetwork,
@@ -2104,7 +2104,7 @@ void proto_register_lppa(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ProtocolExtensionContainer", HFILL }},
     { &hf_lppa_CriticalityDiagnostics_IE_List_item,
-      { "CriticalityDiagnostics-IE-List item", "lppa.CriticalityDiagnostics_IE_List_item",
+      { "CriticalityDiagnostics-IE-List item", "lppa.CriticalityDiagnostics_IE_List_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_iECriticality,
@@ -2120,7 +2120,7 @@ void proto_register_lppa(void) {
         FT_UINT32, BASE_DEC, VALS(lppa_TypeOfError_vals), 0,
         NULL, HFILL }},
     { &hf_lppa_servingCell_ID,
-      { "servingCell-ID", "lppa.servingCell_ID",
+      { "servingCell-ID", "lppa.servingCell_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ECGI", HFILL }},
     { &hf_lppa_servingCellTAC,
@@ -2128,7 +2128,7 @@ void proto_register_lppa(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "TAC", HFILL }},
     { &hf_lppa_e_UTRANAccessPointPosition,
-      { "e-UTRANAccessPointPosition", "lppa.e_UTRANAccessPointPosition",
+      { "e-UTRANAccessPointPosition", "lppa.e_UTRANAccessPointPosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_measuredResults,
@@ -2184,7 +2184,7 @@ void proto_register_lppa(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_100", HFILL }},
     { &hf_lppa_MeasurementQuantities_item,
-      { "ProtocolIE-Single-Container", "lppa.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "lppa.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_measurementQuantitiesValue,
@@ -2216,7 +2216,7 @@ void proto_register_lppa(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_OTDOACells_item,
-      { "OTDOACells item", "lppa.OTDOACells_item",
+      { "OTDOACells item", "lppa.OTDOACells_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_oTDOACellInfo,
@@ -2232,7 +2232,7 @@ void proto_register_lppa(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_cellId,
-      { "cellId", "lppa.cellId",
+      { "cellId", "lppa.cellId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ECGI", HFILL }},
     { &hf_lppa_tAC,
@@ -2288,11 +2288,11 @@ void proto_register_lppa(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_16", HFILL }},
     { &hf_lppa_ResultRSRP_item,
-      { "ResultRSRP-Item", "lppa.ResultRSRP_Item",
+      { "ResultRSRP-Item", "lppa.ResultRSRP_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_eCGI,
-      { "eCGI", "lppa.eCGI",
+      { "eCGI", "lppa.eCGI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_valueRSRP,
@@ -2300,7 +2300,7 @@ void proto_register_lppa(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_ResultRSRQ_item,
-      { "ResultRSRQ-Item", "lppa.ResultRSRQ_Item",
+      { "ResultRSRQ-Item", "lppa.ResultRSRQ_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_valueRSRQ,
@@ -2312,7 +2312,7 @@ void proto_register_lppa(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ProtocolIE_Container", HFILL }},
     { &hf_lppa_OTDOA_Information_Type_item,
-      { "ProtocolIE-Single-Container", "lppa.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "lppa.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppa_oTDOA_Information_Type_Item,
diff --git a/epan/dissectors/packet-lppe.c b/epan/dissectors/packet-lppe.c
index 24c8674347..839cd44cea 100644
--- a/epan/dissectors/packet-lppe.c
+++ b/epan/dissectors/packet-lppe.c
@@ -14971,7 +14971,7 @@ void proto_register_lppe(void) {
 /*--- Included file: packet-lppe-hfarr.c ---*/
 #line 1 "../../asn1/lppe/packet-lppe-hfarr.c"
     { &hf_lppe_OMA_LPPe_MessageExtension_PDU,
-      { "OMA-LPPe-MessageExtension", "lppe.OMA_LPPe_MessageExtension",
+      { "OMA-LPPe-MessageExtension", "lppe.OMA_LPPe_MessageExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_lppeCompatibilityLevel,
@@ -14979,7 +14979,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_LPPeCompatibilityLevel", HFILL }},
     { &hf_lppe_lppeVersion,
-      { "lppeVersion", "lppe.lppeVersion",
+      { "lppeVersion", "lppe.lppeVersion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_LPPeVersion", HFILL }},
     { &hf_lppe_lppeMode,
@@ -14999,327 +14999,327 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_255", HFILL }},
     { &hf_lppe_requestCapabilities,
-      { "requestCapabilities", "lppe.requestCapabilities",
+      { "requestCapabilities", "lppe.requestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RequestCapabilities", HFILL }},
     { &hf_lppe_provideCapabilities,
-      { "provideCapabilities", "lppe.provideCapabilities",
+      { "provideCapabilities", "lppe.provideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ProvideCapabilities", HFILL }},
     { &hf_lppe_requestAssistanceData,
-      { "requestAssistanceData", "lppe.requestAssistanceData",
+      { "requestAssistanceData", "lppe.requestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RequestAssistanceData", HFILL }},
     { &hf_lppe_provideAssistanceData,
-      { "provideAssistanceData", "lppe.provideAssistanceData",
+      { "provideAssistanceData", "lppe.provideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ProvideAssistanceData", HFILL }},
     { &hf_lppe_requestLocationInformation,
-      { "requestLocationInformation", "lppe.requestLocationInformation",
+      { "requestLocationInformation", "lppe.requestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RequestLocationInformation", HFILL }},
     { &hf_lppe_provideLocationInformation,
-      { "provideLocationInformation", "lppe.provideLocationInformation",
+      { "provideLocationInformation", "lppe.provideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ProvideLocationInformation", HFILL }},
     { &hf_lppe_error,
-      { "error", "lppe.error",
+      { "error", "lppe.error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_Error", HFILL }},
     { &hf_lppe_abort,
-      { "abort", "lppe.abort",
+      { "abort", "lppe.abort_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_Abort", HFILL }},
     { &hf_lppe_commonIEsRequestCapabilities,
-      { "commonIEsRequestCapabilities", "lppe.commonIEsRequestCapabilities",
+      { "commonIEsRequestCapabilities", "lppe.commonIEsRequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CommonIEsRequestCapabilities", HFILL }},
     { &hf_lppe_agnss_RequestCapabilities,
-      { "agnss-RequestCapabilities", "lppe.agnss_RequestCapabilities",
+      { "agnss-RequestCapabilities", "lppe.agnss_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_RequestCapabilities", HFILL }},
     { &hf_lppe_otdoa_RequestCapabilities,
-      { "otdoa-RequestCapabilities", "lppe.otdoa_RequestCapabilities",
+      { "otdoa-RequestCapabilities", "lppe.otdoa_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_RequestCapabilities", HFILL }},
     { &hf_lppe_eotd_RequestCapabilities,
-      { "eotd-RequestCapabilities", "lppe.eotd_RequestCapabilities",
+      { "eotd-RequestCapabilities", "lppe.eotd_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_RequestCapabilities", HFILL }},
     { &hf_lppe_otdoa_utra_RequestCapabilities,
-      { "otdoa-utra-RequestCapabilities", "lppe.otdoa_utra_RequestCapabilities",
+      { "otdoa-utra-RequestCapabilities", "lppe.otdoa_utra_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_RequestCapabilities", HFILL }},
     { &hf_lppe_ecid_lte_RequestCapabilities,
-      { "ecid-lte-RequestCapabilities", "lppe.ecid_lte_RequestCapabilities",
+      { "ecid-lte-RequestCapabilities", "lppe.ecid_lte_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_LTE_RequestCapabilities", HFILL }},
     { &hf_lppe_ecid_gsm_RequestCapabilities,
-      { "ecid-gsm-RequestCapabilities", "lppe.ecid_gsm_RequestCapabilities",
+      { "ecid-gsm-RequestCapabilities", "lppe.ecid_gsm_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_GSM_RequestCapabilities", HFILL }},
     { &hf_lppe_ecid_utra_RequestCapabilities,
-      { "ecid-utra-RequestCapabilities", "lppe.ecid_utra_RequestCapabilities",
+      { "ecid-utra-RequestCapabilities", "lppe.ecid_utra_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_UTRA_RequestCapabilities", HFILL }},
     { &hf_lppe_wlan_ap_RequestCapabilities,
-      { "wlan-ap-RequestCapabilities", "lppe.wlan_ap_RequestCapabilities",
+      { "wlan-ap-RequestCapabilities", "lppe.wlan_ap_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_RequestCapabilities", HFILL }},
     { &hf_lppe_ecid_wimax_RequestCapabilities,
-      { "ecid-wimax-RequestCapabilities", "lppe.ecid_wimax_RequestCapabilities",
+      { "ecid-wimax-RequestCapabilities", "lppe.ecid_wimax_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_WiMax_RequestCapabilities", HFILL }},
     { &hf_lppe_sensor_RequestCapabilities,
-      { "sensor-RequestCapabilities", "lppe.sensor_RequestCapabilities",
+      { "sensor-RequestCapabilities", "lppe.sensor_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_Sensor_RequestCapabilities", HFILL }},
     { &hf_lppe_srn_RequestCapabilities,
-      { "srn-RequestCapabilities", "lppe.srn_RequestCapabilities",
+      { "srn-RequestCapabilities", "lppe.srn_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_RequestCapabilities", HFILL }},
     { &hf_lppe_commonIEsProvideCapabilities,
-      { "commonIEsProvideCapabilities", "lppe.commonIEsProvideCapabilities",
+      { "commonIEsProvideCapabilities", "lppe.commonIEsProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CommonIEsProvideCapabilities", HFILL }},
     { &hf_lppe_agnss_ProvideCapabilities,
-      { "agnss-ProvideCapabilities", "lppe.agnss_ProvideCapabilities",
+      { "agnss-ProvideCapabilities", "lppe.agnss_ProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_ProvideCapabilities", HFILL }},
     { &hf_lppe_otdoa_ProvideCapabilities,
-      { "otdoa-ProvideCapabilities", "lppe.otdoa_ProvideCapabilities",
+      { "otdoa-ProvideCapabilities", "lppe.otdoa_ProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_ProvideCapabilities", HFILL }},
     { &hf_lppe_eotd_ProvideCapabilities,
-      { "eotd-ProvideCapabilities", "lppe.eotd_ProvideCapabilities",
+      { "eotd-ProvideCapabilities", "lppe.eotd_ProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_ProvideCapabilities", HFILL }},
     { &hf_lppe_otdoa_utra_ProvideCapabilities,
-      { "otdoa-utra-ProvideCapabilities", "lppe.otdoa_utra_ProvideCapabilities",
+      { "otdoa-utra-ProvideCapabilities", "lppe.otdoa_utra_ProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_ProvideCapabilities", HFILL }},
     { &hf_lppe_ecid_lte_ProvideCapabilities,
-      { "ecid-lte-ProvideCapabilities", "lppe.ecid_lte_ProvideCapabilities",
+      { "ecid-lte-ProvideCapabilities", "lppe.ecid_lte_ProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_LTE_ProvideCapabilities", HFILL }},
     { &hf_lppe_ecid_gsm_ProvideCapabilities,
-      { "ecid-gsm-ProvideCapabilities", "lppe.ecid_gsm_ProvideCapabilities",
+      { "ecid-gsm-ProvideCapabilities", "lppe.ecid_gsm_ProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_GSM_ProvideCapabilities", HFILL }},
     { &hf_lppe_ecid_utra_ProvideCapabilities,
-      { "ecid-utra-ProvideCapabilities", "lppe.ecid_utra_ProvideCapabilities",
+      { "ecid-utra-ProvideCapabilities", "lppe.ecid_utra_ProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_UTRA_ProvideCapabilities", HFILL }},
     { &hf_lppe_wlan_ap_ProvideCapabilities,
-      { "wlan-ap-ProvideCapabilities", "lppe.wlan_ap_ProvideCapabilities",
+      { "wlan-ap-ProvideCapabilities", "lppe.wlan_ap_ProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_ProvideCapabilities", HFILL }},
     { &hf_lppe_ecid_wimax_ProvideCapabilities,
-      { "ecid-wimax-ProvideCapabilities", "lppe.ecid_wimax_ProvideCapabilities",
+      { "ecid-wimax-ProvideCapabilities", "lppe.ecid_wimax_ProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_WiMax_ProvideCapabilities", HFILL }},
     { &hf_lppe_sensor_ProvideCapabilities,
-      { "sensor-ProvideCapabilities", "lppe.sensor_ProvideCapabilities",
+      { "sensor-ProvideCapabilities", "lppe.sensor_ProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_Sensor_ProvideCapabilities", HFILL }},
     { &hf_lppe_srn_ProvideCapabilities,
-      { "srn-ProvideCapabilities", "lppe.srn_ProvideCapabilities",
+      { "srn-ProvideCapabilities", "lppe.srn_ProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_ProvideCapabilities", HFILL }},
     { &hf_lppe_commonIEsRequestAssistanceData,
-      { "commonIEsRequestAssistanceData", "lppe.commonIEsRequestAssistanceData",
+      { "commonIEsRequestAssistanceData", "lppe.commonIEsRequestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CommonIEsRequestAssistanceData", HFILL }},
     { &hf_lppe_agnss_RequestAssistanceData,
-      { "agnss-RequestAssistanceData", "lppe.agnss_RequestAssistanceData",
+      { "agnss-RequestAssistanceData", "lppe.agnss_RequestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_RequestAssistanceData", HFILL }},
     { &hf_lppe_otdoa_RequestAssistanceData,
-      { "otdoa-RequestAssistanceData", "lppe.otdoa_RequestAssistanceData",
+      { "otdoa-RequestAssistanceData", "lppe.otdoa_RequestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_RequestAssistanceData", HFILL }},
     { &hf_lppe_eotd_RequestAssistanceData,
-      { "eotd-RequestAssistanceData", "lppe.eotd_RequestAssistanceData",
+      { "eotd-RequestAssistanceData", "lppe.eotd_RequestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_RequestAssistanceData", HFILL }},
     { &hf_lppe_otdoa_utra_RequestAssistanceData,
-      { "otdoa-utra-RequestAssistanceData", "lppe.otdoa_utra_RequestAssistanceData",
+      { "otdoa-utra-RequestAssistanceData", "lppe.otdoa_utra_RequestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_RequestAssistanceData", HFILL }},
     { &hf_lppe_ecid_lte_RequestAssistanceData,
-      { "ecid-lte-RequestAssistanceData", "lppe.ecid_lte_RequestAssistanceData",
+      { "ecid-lte-RequestAssistanceData", "lppe.ecid_lte_RequestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_LTE_RequestAssistanceData", HFILL }},
     { &hf_lppe_ecid_gsm_RequestAssistanceData,
-      { "ecid-gsm-RequestAssistanceData", "lppe.ecid_gsm_RequestAssistanceData",
+      { "ecid-gsm-RequestAssistanceData", "lppe.ecid_gsm_RequestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_GSM_RequestAssistanceData", HFILL }},
     { &hf_lppe_ecid_utra_RequestAssistanceData,
-      { "ecid-utra-RequestAssistanceData", "lppe.ecid_utra_RequestAssistanceData",
+      { "ecid-utra-RequestAssistanceData", "lppe.ecid_utra_RequestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_UTRA_RequestAssistanceData", HFILL }},
     { &hf_lppe_wlan_ap_RequestAssistanceData,
-      { "wlan-ap-RequestAssistanceData", "lppe.wlan_ap_RequestAssistanceData",
+      { "wlan-ap-RequestAssistanceData", "lppe.wlan_ap_RequestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_RequestAssistanceData", HFILL }},
     { &hf_lppe_sensor_RequestAssistanceData,
-      { "sensor-RequestAssistanceData", "lppe.sensor_RequestAssistanceData",
+      { "sensor-RequestAssistanceData", "lppe.sensor_RequestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_Sensor_RequestAssistanceData", HFILL }},
     { &hf_lppe_srn_RequestAssistanceData,
-      { "srn-RequestAssistanceData", "lppe.srn_RequestAssistanceData",
+      { "srn-RequestAssistanceData", "lppe.srn_RequestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_RequestAssistanceData", HFILL }},
     { &hf_lppe_commonIEsProvideAssistanceData,
-      { "commonIEsProvideAssistanceData", "lppe.commonIEsProvideAssistanceData",
+      { "commonIEsProvideAssistanceData", "lppe.commonIEsProvideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CommonIEsProvideAssistanceData", HFILL }},
     { &hf_lppe_agnss_ProvideAssistanceData,
-      { "agnss-ProvideAssistanceData", "lppe.agnss_ProvideAssistanceData",
+      { "agnss-ProvideAssistanceData", "lppe.agnss_ProvideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_ProvideAssistanceData", HFILL }},
     { &hf_lppe_otdoa_ProvideAssistanceData,
-      { "otdoa-ProvideAssistanceData", "lppe.otdoa_ProvideAssistanceData",
+      { "otdoa-ProvideAssistanceData", "lppe.otdoa_ProvideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_ProvideAssistanceData", HFILL }},
     { &hf_lppe_eotd_ProvideAssistanceData,
-      { "eotd-ProvideAssistanceData", "lppe.eotd_ProvideAssistanceData",
+      { "eotd-ProvideAssistanceData", "lppe.eotd_ProvideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_ProvideAssistanceData", HFILL }},
     { &hf_lppe_otdoa_utra_ProvideAssistanceData,
-      { "otdoa-utra-ProvideAssistanceData", "lppe.otdoa_utra_ProvideAssistanceData",
+      { "otdoa-utra-ProvideAssistanceData", "lppe.otdoa_utra_ProvideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_ProvideAssistanceData", HFILL }},
     { &hf_lppe_ecid_lte_ProvideAssistanceData,
-      { "ecid-lte-ProvideAssistanceData", "lppe.ecid_lte_ProvideAssistanceData",
+      { "ecid-lte-ProvideAssistanceData", "lppe.ecid_lte_ProvideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_LTE_ProvideAssistanceData", HFILL }},
     { &hf_lppe_ecid_gsm_ProvideAssistanceData,
-      { "ecid-gsm-ProvideAssistanceData", "lppe.ecid_gsm_ProvideAssistanceData",
+      { "ecid-gsm-ProvideAssistanceData", "lppe.ecid_gsm_ProvideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_GSM_ProvideAssistanceData", HFILL }},
     { &hf_lppe_ecid_utra_ProvideAssistanceData,
-      { "ecid-utra-ProvideAssistanceData", "lppe.ecid_utra_ProvideAssistanceData",
+      { "ecid-utra-ProvideAssistanceData", "lppe.ecid_utra_ProvideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_UTRA_ProvideAssistanceData", HFILL }},
     { &hf_lppe_wlan_ap_ProvideAssistanceData,
-      { "wlan-ap-ProvideAssistanceData", "lppe.wlan_ap_ProvideAssistanceData",
+      { "wlan-ap-ProvideAssistanceData", "lppe.wlan_ap_ProvideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_ProvideAssistanceData", HFILL }},
     { &hf_lppe_sensor_ProvideAssistanceData,
-      { "sensor-ProvideAssistanceData", "lppe.sensor_ProvideAssistanceData",
+      { "sensor-ProvideAssistanceData", "lppe.sensor_ProvideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_Sensor_ProvideAssistanceData", HFILL }},
     { &hf_lppe_srn_ProvideAssistanceData,
-      { "srn-ProvideAssistanceData", "lppe.srn_ProvideAssistanceData",
+      { "srn-ProvideAssistanceData", "lppe.srn_ProvideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_ProvideAssistanceData", HFILL }},
     { &hf_lppe_commonIEsRequestLocationInformation,
-      { "commonIEsRequestLocationInformation", "lppe.commonIEsRequestLocationInformation",
+      { "commonIEsRequestLocationInformation", "lppe.commonIEsRequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CommonIEsRequestLocationInformation", HFILL }},
     { &hf_lppe_agnss_RequestLocationInformation,
-      { "agnss-RequestLocationInformation", "lppe.agnss_RequestLocationInformation",
+      { "agnss-RequestLocationInformation", "lppe.agnss_RequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_RequestLocationInformation", HFILL }},
     { &hf_lppe_otdoa_RequestLocationInformation,
-      { "otdoa-RequestLocationInformation", "lppe.otdoa_RequestLocationInformation",
+      { "otdoa-RequestLocationInformation", "lppe.otdoa_RequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_RequestLocationInformation", HFILL }},
     { &hf_lppe_eotd_RequestLocationInformation,
-      { "eotd-RequestLocationInformation", "lppe.eotd_RequestLocationInformation",
+      { "eotd-RequestLocationInformation", "lppe.eotd_RequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_RequestLocationInformation", HFILL }},
     { &hf_lppe_otdoa_utra_RequestLocationInformation,
-      { "otdoa-utra-RequestLocationInformation", "lppe.otdoa_utra_RequestLocationInformation",
+      { "otdoa-utra-RequestLocationInformation", "lppe.otdoa_utra_RequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_RequestLocationInformation", HFILL }},
     { &hf_lppe_ecid_lte_RequestLocationInformation,
-      { "ecid-lte-RequestLocationInformation", "lppe.ecid_lte_RequestLocationInformation",
+      { "ecid-lte-RequestLocationInformation", "lppe.ecid_lte_RequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_LTE_RequestLocationInformation", HFILL }},
     { &hf_lppe_ecid_gsm_RequestLocationInformation,
-      { "ecid-gsm-RequestLocationInformation", "lppe.ecid_gsm_RequestLocationInformation",
+      { "ecid-gsm-RequestLocationInformation", "lppe.ecid_gsm_RequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_GSM_RequestLocationInformation", HFILL }},
     { &hf_lppe_ecid_utra_RequestLocationInformation,
-      { "ecid-utra-RequestLocationInformation", "lppe.ecid_utra_RequestLocationInformation",
+      { "ecid-utra-RequestLocationInformation", "lppe.ecid_utra_RequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_UTRA_RequestLocationInformation", HFILL }},
     { &hf_lppe_wlan_ap_RequestLocationInformation,
-      { "wlan-ap-RequestLocationInformation", "lppe.wlan_ap_RequestLocationInformation",
+      { "wlan-ap-RequestLocationInformation", "lppe.wlan_ap_RequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_RequestLocationInformation", HFILL }},
     { &hf_lppe_ecid_wimax_RequestLocationInformation,
-      { "ecid-wimax-RequestLocationInformation", "lppe.ecid_wimax_RequestLocationInformation",
+      { "ecid-wimax-RequestLocationInformation", "lppe.ecid_wimax_RequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_WiMax_RequestLocationInformation", HFILL }},
     { &hf_lppe_sensor_RequestLocationInformation,
-      { "sensor-RequestLocationInformation", "lppe.sensor_RequestLocationInformation",
+      { "sensor-RequestLocationInformation", "lppe.sensor_RequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_Sensor_RequestLocationInformation", HFILL }},
     { &hf_lppe_srn_RequestLocationInformation,
-      { "srn-RequestLocationInformation", "lppe.srn_RequestLocationInformation",
+      { "srn-RequestLocationInformation", "lppe.srn_RequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_RequestLocationInformation", HFILL }},
     { &hf_lppe_commonIEsProvideLocationInformation,
-      { "commonIEsProvideLocationInformation", "lppe.commonIEsProvideLocationInformation",
+      { "commonIEsProvideLocationInformation", "lppe.commonIEsProvideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CommonIEsProvideLocationInformation", HFILL }},
     { &hf_lppe_agnss_ProvideLocationInformation,
-      { "agnss-ProvideLocationInformation", "lppe.agnss_ProvideLocationInformation",
+      { "agnss-ProvideLocationInformation", "lppe.agnss_ProvideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_ProvideLocationInformation", HFILL }},
     { &hf_lppe_otdoa_ProvideLocationInformation,
-      { "otdoa-ProvideLocationInformation", "lppe.otdoa_ProvideLocationInformation",
+      { "otdoa-ProvideLocationInformation", "lppe.otdoa_ProvideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_ProvideLocationInformation", HFILL }},
     { &hf_lppe_eotd_ProvideLocationInformation,
-      { "eotd-ProvideLocationInformation", "lppe.eotd_ProvideLocationInformation",
+      { "eotd-ProvideLocationInformation", "lppe.eotd_ProvideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_ProvideLocationInformation", HFILL }},
     { &hf_lppe_otdoa_utra_ProvideLocationInformation,
-      { "otdoa-utra-ProvideLocationInformation", "lppe.otdoa_utra_ProvideLocationInformation",
+      { "otdoa-utra-ProvideLocationInformation", "lppe.otdoa_utra_ProvideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_ProvideLocationInformation", HFILL }},
     { &hf_lppe_ecid_lte_ProvideLocationInformation,
-      { "ecid-lte-ProvideLocationInformation", "lppe.ecid_lte_ProvideLocationInformation",
+      { "ecid-lte-ProvideLocationInformation", "lppe.ecid_lte_ProvideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_LTE_ProvideLocationInformation", HFILL }},
     { &hf_lppe_ecid_gsm_ProvideLocationInformation,
-      { "ecid-gsm-ProvideLocationInformation", "lppe.ecid_gsm_ProvideLocationInformation",
+      { "ecid-gsm-ProvideLocationInformation", "lppe.ecid_gsm_ProvideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_GSM_ProvideLocationInformation", HFILL }},
     { &hf_lppe_ecid_utra_ProvideLocationInformation,
-      { "ecid-utra-ProvideLocationInformation", "lppe.ecid_utra_ProvideLocationInformation",
+      { "ecid-utra-ProvideLocationInformation", "lppe.ecid_utra_ProvideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_UTRA_ProvideLocationInformation", HFILL }},
     { &hf_lppe_wlan_ap_ProvideLocationInformastion,
-      { "wlan-ap-ProvideLocationInformastion", "lppe.wlan_ap_ProvideLocationInformastion",
+      { "wlan-ap-ProvideLocationInformastion", "lppe.wlan_ap_ProvideLocationInformastion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_ProvideLocationInformation", HFILL }},
     { &hf_lppe_ecid_wimax_ProvideLocationInformastion,
-      { "ecid-wimax-ProvideLocationInformastion", "lppe.ecid_wimax_ProvideLocationInformastion",
+      { "ecid-wimax-ProvideLocationInformastion", "lppe.ecid_wimax_ProvideLocationInformastion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_WiMax_ProvideLocationInformation", HFILL }},
     { &hf_lppe_sensor_ProvideLocationInformation,
-      { "sensor-ProvideLocationInformation", "lppe.sensor_ProvideLocationInformation",
+      { "sensor-ProvideLocationInformation", "lppe.sensor_ProvideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_Sensor_ProvideLocationInformation", HFILL }},
     { &hf_lppe_srn_ProvideLocationInformation,
-      { "srn-ProvideLocationInformation", "lppe.srn_ProvideLocationInformation",
+      { "srn-ProvideLocationInformation", "lppe.srn_ProvideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_ProvideLocationInformation", HFILL }},
     { &hf_lppe_commonIEsAbort,
-      { "commonIEsAbort", "lppe.commonIEsAbort",
+      { "commonIEsAbort", "lppe.commonIEsAbort_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CommonIEsAbort", HFILL }},
     { &hf_lppe_agnssAbort,
-      { "agnssAbort", "lppe.agnssAbort",
+      { "agnssAbort", "lppe.agnssAbort_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_Abort", HFILL }},
     { &hf_lppe_commonIEsError,
-      { "commonIEsError", "lppe.commonIEsError",
+      { "commonIEsError", "lppe.commonIEsError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CommonIEsError", HFILL }},
     { &hf_lppe_dataSerialNumber,
@@ -15331,11 +15331,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_65535", HFILL }},
     { &hf_lppe_OMA_LPPe_AssistanceContainerProvideList_item,
-      { "OMA-LPPe-AssistanceContainerProvide", "lppe.OMA_LPPe_AssistanceContainerProvide",
+      { "OMA-LPPe-AssistanceContainerProvide", "lppe.OMA_LPPe_AssistanceContainerProvide_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_dataIdentifier,
-      { "dataIdentifier", "lppe.dataIdentifier",
+      { "dataIdentifier", "lppe.dataIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_VendorOrOperatorAssistanceDataIdentifier", HFILL }},
     { &hf_lppe_checkOrUpdateOrError,
@@ -15351,15 +15351,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_5000", HFILL }},
     { &hf_lppe_data,
-      { "data", "lppe.data",
+      { "data", "lppe.data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AssistanceContainerData", HFILL }},
     { &hf_lppe_errorCode,
-      { "errorCode", "lppe.errorCode",
+      { "errorCode", "lppe.errorCode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AssistanceContainerProvideError", HFILL }},
     { &hf_lppe_dataSerialNumber_01,
-      { "dataSerialNumber", "lppe.dataSerialNumber",
+      { "dataSerialNumber", "lppe.dataSerialNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AssistanceContainer_DataSerialNumber", HFILL }},
     { &hf_lppe_data_01,
@@ -15367,11 +15367,11 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_lppe_validityPeriod,
-      { "validityPeriod", "lppe.validityPeriod",
+      { "validityPeriod", "lppe.validityPeriod_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ValidityPeriod", HFILL }},
     { &hf_lppe_validityArea,
-      { "validityArea", "lppe.validityArea",
+      { "validityArea", "lppe.validityArea_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ValidityArea", HFILL }},
     { &hf_lppe_serverError,
@@ -15379,7 +15379,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_serverError_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_AssistanceContainerRequestList_item,
-      { "OMA-LPPe-AssistanceContainerRequest", "lppe.OMA_LPPe_AssistanceContainerRequest",
+      { "OMA-LPPe-AssistanceContainerRequest", "lppe.OMA_LPPe_AssistanceContainerRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_simulatedReq,
@@ -15387,11 +15387,11 @@ void proto_register_lppe(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lppe_checkOrUpdateReq,
-      { "checkOrUpdateReq", "lppe.checkOrUpdateReq",
+      { "checkOrUpdateReq", "lppe.checkOrUpdateReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AssistanceContainerCheckOrUpdateReq", HFILL }},
     { &hf_lppe_validityTimeRequest,
-      { "validityTimeRequest", "lppe.validityTimeRequest",
+      { "validityTimeRequest", "lppe.validityTimeRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ValidityPeriod", HFILL }},
     { &hf_lppe_proprietaryRequestParameters,
@@ -15427,7 +15427,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_CivicAddressElementList", HFILL }},
     { &hf_lppe_OMA_LPPe_CivicAddressElementList_item,
-      { "OMA-LPPe-CivicAddressElement", "lppe.OMA_LPPe_CivicAddressElement",
+      { "OMA-LPPe-CivicAddressElement", "lppe.OMA_LPPe_CivicAddressElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_caType,
@@ -15487,7 +15487,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_99", HFILL }},
     { &hf_lppe_enu_origin,
-      { "enu-origin", "lppe.enu_origin",
+      { "enu-origin", "lppe.enu_origin_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_HighAccuracy3Dposition", HFILL }},
     { &hf_lppe_east_component,
@@ -15495,7 +15495,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_511", HFILL }},
     { &hf_lppe_negative_sign_east,
-      { "negative-sign-east", "lppe.negative_sign_east",
+      { "negative-sign-east", "lppe.negative_sign_east_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_north_component,
@@ -15503,7 +15503,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_511", HFILL }},
     { &hf_lppe_negative_sign_north,
-      { "negative-sign-north", "lppe.negative_sign_north",
+      { "negative-sign-north", "lppe.negative_sign_north_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_up_component,
@@ -15511,7 +15511,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_511", HFILL }},
     { &hf_lppe_negative_sign_up,
-      { "negative-sign-up", "lppe.negative_sign_up",
+      { "negative-sign-up", "lppe.negative_sign_up_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_uncertainty_up_component,
@@ -15531,11 +15531,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_LocationInformationContainerDataList", HFILL }},
     { &hf_lppe_OMA_LPPe_LocationInformationContainerDataList_item,
-      { "OMA-LPPe-LocationInformationContainerData", "lppe.OMA_LPPe_LocationInformationContainerData",
+      { "OMA-LPPe-LocationInformationContainerData", "lppe.OMA_LPPe_LocationInformationContainerData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_containerID_01,
-      { "containerID", "lppe.containerID",
+      { "containerID", "lppe.containerID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_LocationInformationContainerID", HFILL }},
     { &hf_lppe_containerData,
@@ -15547,7 +15547,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_LocationInformationContainerRequestList", HFILL }},
     { &hf_lppe_OMA_LPPe_LocationInformationContainerRequestList_item,
-      { "OMA-LPPe-LocationInformationContainerRequestItem", "lppe.OMA_LPPe_LocationInformationContainerRequestItem",
+      { "OMA-LPPe-LocationInformationContainerRequestItem", "lppe.OMA_LPPe_LocationInformationContainerRequestItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_additionalInformation,
@@ -15555,7 +15555,7 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_lppe_dataID,
-      { "dataID", "lppe.dataID",
+      { "dataID", "lppe.dataID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AssistanceContainerID", HFILL }},
     { &hf_lppe_mapReference,
@@ -15567,7 +15567,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_5000", HFILL }},
     { &hf_lppe_eulerAngles,
-      { "eulerAngles", "lppe.eulerAngles",
+      { "eulerAngles", "lppe.eulerAngles_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_alpha,
@@ -15583,7 +15583,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_359", HFILL }},
     { &hf_lppe_referencePointUniqueID,
-      { "referencePointUniqueID", "lppe.referencePointUniqueID",
+      { "referencePointUniqueID", "lppe.referencePointUniqueID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ReferencePointUniqueID", HFILL }},
     { &hf_lppe_referencePointGeographicLocation,
@@ -15591,19 +15591,19 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_referencePointGeographicLocation_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_location3D,
-      { "location3D", "lppe.location3D",
+      { "location3D", "lppe.location3D_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EllipsoidPointWithAltitude", HFILL }},
     { &hf_lppe_location3DwithUncertainty,
-      { "location3DwithUncertainty", "lppe.location3DwithUncertainty",
+      { "location3DwithUncertainty", "lppe.location3DwithUncertainty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EllipsoidPointWithAltitudeAndUncertaintyEllipsoid", HFILL }},
     { &hf_lppe_locationwithhighaccuracy,
-      { "locationwithhighaccuracy", "lppe.locationwithhighaccuracy",
+      { "locationwithhighaccuracy", "lppe.locationwithhighaccuracy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_HighAccuracy3Dposition", HFILL }},
     { &hf_lppe_referencePointCivicLocation,
-      { "referencePointCivicLocation", "lppe.referencePointCivicLocation",
+      { "referencePointCivicLocation", "lppe.referencePointCivicLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CivicLocation", HFILL }},
     { &hf_lppe_referencePointFloorLevel,
@@ -15615,7 +15615,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_8_OF_OMA_LPPe_ReferencePointRelationship", HFILL }},
     { &hf_lppe_relatedReferencePoints_item,
-      { "OMA-LPPe-ReferencePointRelationship", "lppe.OMA_LPPe_ReferencePointRelationship",
+      { "OMA-LPPe-ReferencePointRelationship", "lppe.OMA_LPPe_ReferencePointRelationship_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mapDataInformation,
@@ -15623,7 +15623,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_MapDataInformation", HFILL }},
     { &hf_lppe_OMA_LPPe_MapDataInformation_item,
-      { "OMA-LPPe-MapDataReferenceElement", "lppe.OMA_LPPe_MapDataReferenceElement",
+      { "OMA-LPPe-MapDataReferenceElement", "lppe.OMA_LPPe_MapDataReferenceElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mapDataUrl,
@@ -15635,7 +15635,7 @@ void proto_register_lppe(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "OMA_LPPe_Uri", HFILL }},
     { &hf_lppe_mapDataRef,
-      { "mapDataRef", "lppe.mapDataRef",
+      { "mapDataRef", "lppe.mapDataRef_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_MapDataReference", HFILL }},
     { &hf_lppe_mapProvider,
@@ -15643,7 +15643,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_mapProvider_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_sameAsRefPointProvider,
-      { "sameAsRefPointProvider", "lppe.sameAsRefPointProvider",
+      { "sameAsRefPointProvider", "lppe.sameAsRefPointProvider_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_notSameAsRefPointProvider,
@@ -15655,7 +15655,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_mapAssociation_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_referencePointUniqueID_01,
-      { "referencePointUniqueID", "lppe.referencePointUniqueID",
+      { "referencePointUniqueID", "lppe.referencePointUniqueID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_otherID,
@@ -15663,11 +15663,11 @@ void proto_register_lppe(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "VisibleString_SIZE_1_64", HFILL }},
     { &hf_lppe_mapOffset,
-      { "mapOffset", "lppe.mapOffset",
+      { "mapOffset", "lppe.mapOffset_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RelativeLocation", HFILL }},
     { &hf_lppe_origin,
-      { "origin", "lppe.origin",
+      { "origin", "lppe.origin_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mapHorizontalOrientation,
@@ -15675,7 +15675,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_359", HFILL }},
     { &hf_lppe_relativeLocation,
-      { "relativeLocation", "lppe.relativeLocation",
+      { "relativeLocation", "lppe.relativeLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RelativeLocation", HFILL }},
     { &hf_lppe_providerID,
@@ -15707,11 +15707,11 @@ void proto_register_lppe(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M524288_524287", HFILL }},
     { &hf_lppe_relativeAltitude,
-      { "relativeAltitude", "lppe.relativeAltitude",
+      { "relativeAltitude", "lppe.relativeAltitude_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RelativeAltitude", HFILL }},
     { &hf_lppe_horizontalUncertainty,
-      { "horizontalUncertainty", "lppe.horizontalUncertainty",
+      { "horizontalUncertainty", "lppe.horizontalUncertainty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_HorizontalUncertaintyAndConfidence", HFILL }},
     { &hf_lppe_uncShape,
@@ -15723,7 +15723,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_127", HFILL }},
     { &hf_lppe_ellipse,
-      { "ellipse", "lppe.ellipse",
+      { "ellipse", "lppe.ellipse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_semimajor,
@@ -15743,11 +15743,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_99", HFILL }},
     { &hf_lppe_geodeticRelativeAltitude,
-      { "geodeticRelativeAltitude", "lppe.geodeticRelativeAltitude",
+      { "geodeticRelativeAltitude", "lppe.geodeticRelativeAltitude_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_GeodeticRelativeAltitude", HFILL }},
     { &hf_lppe_civicRelativeAltitude,
-      { "civicRelativeAltitude", "lppe.civicRelativeAltitude",
+      { "civicRelativeAltitude", "lppe.civicRelativeAltitude_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CivicRelativeAltitude", HFILL }},
     { &hf_lppe_geodetic_height_depth,
@@ -15755,7 +15755,7 @@ void proto_register_lppe(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M32768_32767", HFILL }},
     { &hf_lppe_geodetic_uncertainty_and_confidence,
-      { "geodetic-uncertainty-and-confidence", "lppe.geodetic_uncertainty_and_confidence",
+      { "geodetic-uncertainty-and-confidence", "lppe.geodetic_uncertainty_and_confidence_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_GeodeticUncertaintyAndConfidence", HFILL }},
     { &hf_lppe_uncertainty,
@@ -15767,7 +15767,7 @@ void proto_register_lppe(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M255_256", HFILL }},
     { &hf_lppe_civic_uncertainty_and_confidence,
-      { "civic-uncertainty-and-confidence", "lppe.civic_uncertainty_and_confidence",
+      { "civic-uncertainty-and-confidence", "lppe.civic_uncertainty_and_confidence_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CivicUncertaintyAndConfidence", HFILL }},
     { &hf_lppe_provider_ID,
@@ -15807,7 +15807,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_255", HFILL }},
     { &hf_lppe_beginTime,
-      { "beginTime", "lppe.beginTime",
+      { "beginTime", "lppe.beginTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SystemTime", HFILL }},
     { &hf_lppe_beginTimeAlt,
@@ -15819,7 +15819,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_2881", HFILL }},
     { &hf_lppe_assistanceDataID,
-      { "assistanceDataID", "lppe.assistanceDataID",
+      { "assistanceDataID", "lppe.assistanceDataID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AssistanceContainerID", HFILL }},
     { &hf_lppe_standard_VendorOrOperatorID,
@@ -15827,7 +15827,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_1024", HFILL }},
     { &hf_lppe_nonStandard_VendorOrOperatorID,
-      { "nonStandard-VendorOrOperatorID", "lppe.nonStandard_VendorOrOperatorID",
+      { "nonStandard-VendorOrOperatorID", "lppe.nonStandard_VendorOrOperatorID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_NonStandard_VendorOrOperatorID", HFILL }},
     { &hf_lppe_encodedID,
@@ -15855,11 +15855,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_16_OF_OMA_LPPe_WLANFemtoCoverageAreaElement", HFILL }},
     { &hf_lppe_componentList_item,
-      { "OMA-LPPe-WLANFemtoCoverageAreaElement", "lppe.OMA_LPPe_WLANFemtoCoverageAreaElement",
+      { "OMA-LPPe-WLANFemtoCoverageAreaElement", "lppe.OMA_LPPe_WLANFemtoCoverageAreaElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_refPointAndArea,
-      { "refPointAndArea", "lppe.refPointAndArea",
+      { "refPointAndArea", "lppe.refPointAndArea_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_referenceLocation,
@@ -15867,11 +15867,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_referenceLocation_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_referencePoint,
-      { "referencePoint", "lppe.referencePoint",
+      { "referencePoint", "lppe.referencePoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ReferencePointUniqueID", HFILL }},
     { &hf_lppe_locationAndArea,
-      { "locationAndArea", "lppe.locationAndArea",
+      { "locationAndArea", "lppe.locationAndArea_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RelativeLocation", HFILL }},
     { &hf_lppe_type,
@@ -15883,43 +15883,43 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_100", HFILL }},
     { &hf_lppe_iP_Address_RequestCapabilities,
-      { "iP-Address-RequestCapabilities", "lppe.iP_Address_RequestCapabilities",
+      { "iP-Address-RequestCapabilities", "lppe.iP_Address_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_IP_Address_RequestCapabilities", HFILL }},
     { &hf_lppe_assistanceContainerSupportReq,
-      { "assistanceContainerSupportReq", "lppe.assistanceContainerSupportReq",
+      { "assistanceContainerSupportReq", "lppe.assistanceContainerSupportReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AssistanceContainerSupportReq", HFILL }},
     { &hf_lppe_locationInformationContainerSupportReq,
-      { "locationInformationContainerSupportReq", "lppe.locationInformationContainerSupportReq",
+      { "locationInformationContainerSupportReq", "lppe.locationInformationContainerSupportReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_LocationInformationContainerSupportReq", HFILL }},
     { &hf_lppe_relativeLocationChange_RequestCapabilities,
-      { "relativeLocationChange-RequestCapabilities", "lppe.relativeLocationChange_RequestCapabilities",
+      { "relativeLocationChange-RequestCapabilities", "lppe.relativeLocationChange_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RelativeLocationChange_RequestCapabilities", HFILL }},
     { &hf_lppe_highAccuracyFormatCapabilitiesReq,
-      { "highAccuracyFormatCapabilitiesReq", "lppe.highAccuracyFormatCapabilitiesReq",
+      { "highAccuracyFormatCapabilitiesReq", "lppe.highAccuracyFormatCapabilitiesReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_HighAccuracyFormatCapabilitiesReq", HFILL }},
     { &hf_lppe_segmentedAssistanceData_ReqCapabilities,
-      { "segmentedAssistanceData-ReqCapabilities", "lppe.segmentedAssistanceData_ReqCapabilities",
+      { "segmentedAssistanceData-ReqCapabilities", "lppe.segmentedAssistanceData_ReqCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SegmentedAssistanceData_ReqCapabilities", HFILL }},
     { &hf_lppe_referencePointCapabilitiesReq,
-      { "referencePointCapabilitiesReq", "lppe.referencePointCapabilitiesReq",
+      { "referencePointCapabilitiesReq", "lppe.referencePointCapabilitiesReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ReferencePointCapabilitiesReq", HFILL }},
     { &hf_lppe_scheduledLocation_RequestCapabilities,
-      { "scheduledLocation-RequestCapabilities", "lppe.scheduledLocation_RequestCapabilities",
+      { "scheduledLocation-RequestCapabilities", "lppe.scheduledLocation_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ScheduledLocation_RequestCapabilities", HFILL }},
     { &hf_lppe_accessCapabilitiesReq,
-      { "accessCapabilitiesReq", "lppe.accessCapabilitiesReq",
+      { "accessCapabilitiesReq", "lppe.accessCapabilitiesReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AccessCapabilitiesReq", HFILL }},
     { &hf_lppe_segmentedLocationInformation_ReqCapabilities,
-      { "segmentedLocationInformation-ReqCapabilities", "lppe.segmentedLocationInformation_ReqCapabilities",
+      { "segmentedLocationInformation-ReqCapabilities", "lppe.segmentedLocationInformation_ReqCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SegmentedLocationInformation_ReqCapabilities", HFILL }},
     { &hf_lppe_vendorOrOperatorIDList,
@@ -15939,7 +15939,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_VendorOrOperatorID_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_iP_Address_Capabilities,
-      { "iP-Address-Capabilities", "lppe.iP_Address_Capabilities",
+      { "iP-Address-Capabilities", "lppe.iP_Address_Capabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_IP_Address_Capabilities", HFILL }},
     { &hf_lppe_assistanceContainerSupport,
@@ -15951,7 +15951,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_LocationInformationContainerSupport", HFILL }},
     { &hf_lppe_relativeLocationChange_Capabilities,
-      { "relativeLocationChange-Capabilities", "lppe.relativeLocationChange_Capabilities",
+      { "relativeLocationChange-Capabilities", "lppe.relativeLocationChange_Capabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RelativeLocationChange_Capabilities", HFILL }},
     { &hf_lppe_highAccuracyFormatCapabilities,
@@ -15959,23 +15959,23 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OMA_LPPe_HighAccuracyFormatCapabilities", HFILL }},
     { &hf_lppe_segmentedAssistanceData_ProvideCapabs,
-      { "segmentedAssistanceData-ProvideCapabs", "lppe.segmentedAssistanceData_ProvideCapabs",
+      { "segmentedAssistanceData-ProvideCapabs", "lppe.segmentedAssistanceData_ProvideCapabs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SegmentedAssistanceData_ProvideCapabs", HFILL }},
     { &hf_lppe_referencePointCapabilities,
-      { "referencePointCapabilities", "lppe.referencePointCapabilities",
+      { "referencePointCapabilities", "lppe.referencePointCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ReferencePointCapabilities", HFILL }},
     { &hf_lppe_scheduledLocation_Capabilities,
-      { "scheduledLocation-Capabilities", "lppe.scheduledLocation_Capabilities",
+      { "scheduledLocation-Capabilities", "lppe.scheduledLocation_Capabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ScheduledLocation_Capabilities", HFILL }},
     { &hf_lppe_accessCapabilities,
-      { "accessCapabilities", "lppe.accessCapabilities",
+      { "accessCapabilities", "lppe.accessCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AccessCapabilities", HFILL }},
     { &hf_lppe_segmentedLocationInformation_ProvideCapabs,
-      { "segmentedLocationInformation-ProvideCapabs", "lppe.segmentedLocationInformation_ProvideCapabs",
+      { "segmentedLocationInformation-ProvideCapabs", "lppe.segmentedLocationInformation_ProvideCapabs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SegmentedLocationInformation_ProvideCapabs", HFILL }},
     { &hf_lppe_iP_Address_support,
@@ -15983,7 +15983,7 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_AssistanceContainerSupport_item,
-      { "OMA-LPPe-VendorOrOperatorAssistanceContainerList", "lppe.OMA_LPPe_VendorOrOperatorAssistanceContainerList",
+      { "OMA-LPPe-VendorOrOperatorAssistanceContainerList", "lppe.OMA_LPPe_VendorOrOperatorAssistanceContainerList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_assistanceContainerList,
@@ -15991,11 +15991,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AssistanceContainerList", HFILL }},
     { &hf_lppe_OMA_LPPe_AssistanceContainerList_item,
-      { "OMA-LPPe-AssistanceContainerID", "lppe.OMA_LPPe_AssistanceContainerID",
+      { "OMA-LPPe-AssistanceContainerID", "lppe.OMA_LPPe_AssistanceContainerID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_LocationInformationContainerSupport_item,
-      { "OMA-LPPe-VendorOrOperatorLocationInformationContainerList", "lppe.OMA_LPPe_VendorOrOperatorLocationInformationContainerList",
+      { "OMA-LPPe-VendorOrOperatorLocationInformationContainerList", "lppe.OMA_LPPe_VendorOrOperatorLocationInformationContainerList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_locationInformationContainerList,
@@ -16003,7 +16003,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_LocationInformationContainerList", HFILL }},
     { &hf_lppe_OMA_LPPe_LocationInformationContainerList_item,
-      { "OMA-LPPe-LocationInformationContainerID", "lppe.OMA_LPPe_LocationInformationContainerID",
+      { "OMA-LPPe-LocationInformationContainerID", "lppe.OMA_LPPe_LocationInformationContainerID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_numberOfChanges,
@@ -16023,7 +16023,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_5000", HFILL }},
     { &hf_lppe_resume,
-      { "resume", "lppe.resume",
+      { "resume", "lppe.resume_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_relativeLocationReportingSupport,
@@ -16035,7 +16035,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_128_OF_OMA_LPPe_ReferencePointProviderSupportElement", HFILL }},
     { &hf_lppe_referencePointProviderSupportList_item,
-      { "OMA-LPPe-ReferencePointProviderSupportElement", "lppe.OMA_LPPe_ReferencePointProviderSupportElement",
+      { "OMA-LPPe-ReferencePointProviderSupportElement", "lppe.OMA_LPPe_ReferencePointProviderSupportElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_referencePointProvider,
@@ -16043,7 +16043,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_VendorOrOperatorID_vals), 0,
         "OMA_LPPe_VendorOrOperatorID", HFILL }},
     { &hf_lppe_mapDataSupport,
-      { "mapDataSupport", "lppe.mapDataSupport",
+      { "mapDataSupport", "lppe.mapDataSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mapDataFormat,
@@ -16055,7 +16055,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_1024", HFILL }},
     { &hf_lppe_gnssTimeReference,
-      { "gnssTimeReference", "lppe.gnssTimeReference",
+      { "gnssTimeReference", "lppe.gnssTimeReference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_ID_Bitmap", HFILL }},
     { &hf_lppe_networkTimeReference,
@@ -16063,7 +16063,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_networkTimeReference_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_accessTypeUnknown,
-      { "accessTypeUnknown", "lppe.accessTypeUnknown",
+      { "accessTypeUnknown", "lppe.accessTypeUnknown_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_fixedAccessTypes,
@@ -16075,7 +16075,7 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OMA_LPPe_WirelessAccessTypes", HFILL }},
     { &hf_lppe_approximate_location,
-      { "approximate-location", "lppe.approximate_location",
+      { "approximate-location", "lppe.approximate_location_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EllipsoidPointWithAltitudeAndUncertaintyEllipsoid", HFILL }},
     { &hf_lppe_assistanceContainerRequestList,
@@ -16083,7 +16083,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AssistanceContainerRequestList", HFILL }},
     { &hf_lppe_requestPeriodicADwithUpdate,
-      { "requestPeriodicADwithUpdate", "lppe.requestPeriodicADwithUpdate",
+      { "requestPeriodicADwithUpdate", "lppe.requestPeriodicADwithUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RequestPeriodicADwithUpdate", HFILL }},
     { &hf_lppe_segmentedADpreference,
@@ -16091,11 +16091,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_segmentedADpreference_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_segmentedADResume,
-      { "segmentedADResume", "lppe.segmentedADResume",
+      { "segmentedADResume", "lppe.segmentedADResume_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SegmentedADResume", HFILL }},
     { &hf_lppe_referencePointAssistanceReq,
-      { "referencePointAssistanceReq", "lppe.referencePointAssistanceReq",
+      { "referencePointAssistanceReq", "lppe.referencePointAssistanceReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ReferencePointAssistanceReq", HFILL }},
     { &hf_lppe_periodicAD_session_ID,
@@ -16107,7 +16107,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_TypeOfADRequest_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_segmentedAD_session_ID,
-      { "segmentedAD-session-ID", "lppe.segmentedAD_session_ID",
+      { "segmentedAD-session-ID", "lppe.segmentedAD_session_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_Session_ID", HFILL }},
     { &hf_lppe_next_segment_number,
@@ -16119,7 +16119,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_16_OF_OMA_LPPe_ReferencePointAssistanceReqElement", HFILL }},
     { &hf_lppe_referencePointReq_item,
-      { "OMA-LPPe-ReferencePointAssistanceReqElement", "lppe.OMA_LPPe_ReferencePointAssistanceReqElement",
+      { "OMA-LPPe-ReferencePointAssistanceReqElement", "lppe.OMA_LPPe_ReferencePointAssistanceReqElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mapDataReq,
@@ -16131,15 +16131,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AssistanceContainerProvideList", HFILL }},
     { &hf_lppe_providePeriodicADwithUpdate,
-      { "providePeriodicADwithUpdate", "lppe.providePeriodicADwithUpdate",
+      { "providePeriodicADwithUpdate", "lppe.providePeriodicADwithUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ProvidePeriodicADwithUpdate", HFILL }},
     { &hf_lppe_segmentedADTransfer,
-      { "segmentedADTransfer", "lppe.segmentedADTransfer",
+      { "segmentedADTransfer", "lppe.segmentedADTransfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SegmentedADTransfer", HFILL }},
     { &hf_lppe_default_reference_point,
-      { "default-reference-point", "lppe.default_reference_point",
+      { "default-reference-point", "lppe.default_reference_point_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ReferencePoint", HFILL }},
     { &hf_lppe_typeOfADProvide,
@@ -16151,31 +16151,31 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_4096", HFILL }},
     { &hf_lppe_iP_Address_Request,
-      { "iP-Address-Request", "lppe.iP_Address_Request",
+      { "iP-Address-Request", "lppe.iP_Address_Request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_IP_Address_Request", HFILL }},
     { &hf_lppe_locationInformationContainerRequest,
-      { "locationInformationContainerRequest", "lppe.locationInformationContainerRequest",
+      { "locationInformationContainerRequest", "lppe.locationInformationContainerRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_LocationInformationContainerRequest", HFILL }},
     { &hf_lppe_requestPeriodicLocInfoWithUpdate,
-      { "requestPeriodicLocInfoWithUpdate", "lppe.requestPeriodicLocInfoWithUpdate",
+      { "requestPeriodicLocInfoWithUpdate", "lppe.requestPeriodicLocInfoWithUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RequestPeriodicLocInfoWithUpdate", HFILL }},
     { &hf_lppe_relativeLocationChange_Request,
-      { "relativeLocationChange-Request", "lppe.relativeLocationChange_Request",
+      { "relativeLocationChange-Request", "lppe.relativeLocationChange_Request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RelativeLocationChange_Request", HFILL }},
     { &hf_lppe_localPositionRequest,
-      { "localPositionRequest", "lppe.localPositionRequest",
+      { "localPositionRequest", "lppe.localPositionRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_LocalPositionRequest", HFILL }},
     { &hf_lppe_scheduledLocation_Request,
-      { "scheduledLocation-Request", "lppe.scheduledLocation_Request",
+      { "scheduledLocation-Request", "lppe.scheduledLocation_Request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ScheduledLocation_Request", HFILL }},
     { &hf_lppe_accessTypeRequest,
-      { "accessTypeRequest", "lppe.accessTypeRequest",
+      { "accessTypeRequest", "lppe.accessTypeRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AccessTypeRequest", HFILL }},
     { &hf_lppe_segmentedLIpreference,
@@ -16183,7 +16183,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_segmentedLIpreference_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_segmentedLIResume,
-      { "segmentedLIResume", "lppe.segmentedLIResume",
+      { "segmentedLIResume", "lppe.segmentedLIResume_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SegmentedLIResume", HFILL }},
     { &hf_lppe_session_ID_01,
@@ -16203,15 +16203,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_8_OF_OMA_LPPe_ReferencePointUniqueID", HFILL }},
     { &hf_lppe_referencePointReq_item_01,
-      { "OMA-LPPe-ReferencePointUniqueID", "lppe.OMA_LPPe_ReferencePointUniqueID",
+      { "OMA-LPPe-ReferencePointUniqueID", "lppe.OMA_LPPe_ReferencePointUniqueID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_gnssTime,
-      { "gnssTime", "lppe.gnssTime",
+      { "gnssTime", "lppe.gnssTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SystemTime", HFILL }},
     { &hf_lppe_networkTime,
-      { "networkTime", "lppe.networkTime",
+      { "networkTime", "lppe.networkTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_relativeTime,
@@ -16227,15 +16227,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_256", HFILL }},
     { &hf_lppe_highAccuracy3Dposition,
-      { "highAccuracy3Dposition", "lppe.highAccuracy3Dposition",
+      { "highAccuracy3Dposition", "lppe.highAccuracy3Dposition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_HighAccuracy3Dposition", HFILL }},
     { &hf_lppe_localPosition,
-      { "localPosition", "lppe.localPosition",
+      { "localPosition", "lppe.localPosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_LocalPosition", HFILL }},
     { &hf_lppe_highAccuracy3Dvelocity,
-      { "highAccuracy3Dvelocity", "lppe.highAccuracy3Dvelocity",
+      { "highAccuracy3Dvelocity", "lppe.highAccuracy3Dvelocity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_HighAccuracy3Dvelocity", HFILL }},
     { &hf_lppe_iP_Address_List,
@@ -16243,11 +16243,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_IP_Address_List", HFILL }},
     { &hf_lppe_locationInformationContainer,
-      { "locationInformationContainer", "lppe.locationInformationContainer",
+      { "locationInformationContainer", "lppe.locationInformationContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_LocationInformationContainer", HFILL }},
     { &hf_lppe_providePeriodicLocInfoWithUpdate,
-      { "providePeriodicLocInfoWithUpdate", "lppe.providePeriodicLocInfoWithUpdate",
+      { "providePeriodicLocInfoWithUpdate", "lppe.providePeriodicLocInfoWithUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ProvidePeriodicLocInfowithUpdate", HFILL }},
     { &hf_lppe_relativeLocationChangeList,
@@ -16255,15 +16255,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_RelativeLocationChangeList", HFILL }},
     { &hf_lppe_scheduledLocation,
-      { "scheduledLocation", "lppe.scheduledLocation",
+      { "scheduledLocation", "lppe.scheduledLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ScheduledLocation", HFILL }},
     { &hf_lppe_accessTypes,
-      { "accessTypes", "lppe.accessTypes",
+      { "accessTypes", "lppe.accessTypes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AccessTypes", HFILL }},
     { &hf_lppe_segmentedLITransfer,
-      { "segmentedLITransfer", "lppe.segmentedLITransfer",
+      { "segmentedLITransfer", "lppe.segmentedLITransfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SegmentedLITransfer", HFILL }},
     { &hf_lppe_locationInformationTimeStamp,
@@ -16271,11 +16271,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_TimeStamp_vals), 0,
         "OMA_LPPe_TimeStamp", HFILL }},
     { &hf_lppe_subjectLocation,
-      { "subjectLocation", "lppe.subjectLocation",
+      { "subjectLocation", "lppe.subjectLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RelativeLocation", HFILL }},
     { &hf_lppe_OMA_LPPe_IP_Address_List_item,
-      { "OMA-LPPe-IP-Address", "lppe.OMA_LPPe_IP_Address",
+      { "OMA-LPPe-IP-Address", "lppe.OMA_LPPe_IP_Address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_local_IP_Address,
@@ -16303,7 +16303,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_TypeOfLocInfoProvide_vals), 0,
         "OMA_LPPe_TypeOfLocInfoProvide", HFILL }},
     { &hf_lppe_OMA_LPPe_RelativeLocationChangeList_item,
-      { "OMA-LPPe-RelativeLocationChange", "lppe.OMA_LPPe_RelativeLocationChange",
+      { "OMA-LPPe-RelativeLocationChange", "lppe.OMA_LPPe_RelativeLocationChange_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_relativeTime_01,
@@ -16319,7 +16319,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_disposition_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_actualWindow,
-      { "actualWindow", "lppe.actualWindow",
+      { "actualWindow", "lppe.actualWindow_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_start,
@@ -16343,7 +16343,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_256", HFILL }},
     { &hf_lppe_commonAssistData,
-      { "commonAssistData", "lppe.commonAssistData",
+      { "commonAssistData", "lppe.commonAssistData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_CommonAssistData", HFILL }},
     { &hf_lppe_genericAssistData,
@@ -16359,7 +16359,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_AGNSS_IonosphericModel_vals), 0,
         "OMA_LPPe_AGNSS_IonosphericModel", HFILL }},
     { &hf_lppe_troposphereModel,
-      { "troposphereModel", "lppe.troposphereModel",
+      { "troposphereModel", "lppe.troposphereModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_TroposphereModel", HFILL }},
     { &hf_lppe_altitudeAssistance,
@@ -16367,7 +16367,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AGNSS_AltitudeAssistanceList", HFILL }},
     { &hf_lppe_solarRadiation,
-      { "solarRadiation", "lppe.solarRadiation",
+      { "solarRadiation", "lppe.solarRadiation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_SolarRadiation", HFILL }},
     { &hf_lppe_ccpAssistCommonProvide,
@@ -16375,11 +16375,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_AGNSS_CCPassistCommonProvide_vals), 0,
         "OMA_LPPe_AGNSS_CCPassistCommonProvide", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_GenericAssistData_item,
-      { "OMA-LPPe-AGNSS-GenericAssistDataElement", "lppe.OMA_LPPe_AGNSS_GenericAssistDataElement",
+      { "OMA-LPPe-AGNSS-GenericAssistDataElement", "lppe.OMA_LPPe_AGNSS_GenericAssistDataElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_gnss_ID,
-      { "gnss-ID", "lppe.gnss_ID",
+      { "gnss-ID", "lppe.gnss_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_wideAreaIonoSurfacePerSVlist,
@@ -16403,11 +16403,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AGNSS_CCPassistGenericProvide", HFILL }},
     { &hf_lppe_navModelList,
-      { "navModelList", "lppe.navModelList",
+      { "navModelList", "lppe.navModelList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModelList", HFILL }},
     { &hf_lppe_staticModels,
-      { "staticModels", "lppe.staticModels",
+      { "staticModels", "lppe.staticModels_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_localKlobucharModelList,
@@ -16415,7 +16415,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AGNSS_LocalKlobucharModelList", HFILL }},
     { &hf_lppe_ionoStormIndication,
-      { "ionoStormIndication", "lppe.ionoStormIndication",
+      { "ionoStormIndication", "lppe.ionoStormIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_IonoStormIndication", HFILL }},
     { &hf_lppe_waIono,
@@ -16423,15 +16423,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_waIono_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_controlParameters,
-      { "controlParameters", "lppe.controlParameters",
+      { "controlParameters", "lppe.controlParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_WideAreaIonoSurfaceControlParametersProvide", HFILL }},
     { &hf_lppe_commonProvide,
-      { "commonProvide", "lppe.commonProvide",
+      { "commonProvide", "lppe.commonProvide_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_WideAreaIonoSurfaceCommon", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_LocalKlobucharModelList_item,
-      { "OMA-LPPe-AGNSS-LocalKlobucharModelElement", "lppe.OMA_LPPe_AGNSS_LocalKlobucharModelElement",
+      { "OMA-LPPe-AGNSS-LocalKlobucharModelElement", "lppe.OMA_LPPe_AGNSS_LocalKlobucharModelElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_klobucharModel,
@@ -16439,7 +16439,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_8_OF_OMA_LPPe_AGNSS_LocalKlobucharModel", HFILL }},
     { &hf_lppe_klobucharModel_item,
-      { "OMA-LPPe-AGNSS-LocalKlobucharModel", "lppe.OMA_LPPe_AGNSS_LocalKlobucharModel",
+      { "OMA-LPPe-AGNSS-LocalKlobucharModel", "lppe.OMA_LPPe_AGNSS_LocalKlobucharModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_alfa0,
@@ -16475,7 +16475,7 @@ void proto_register_lppe(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M128_127", HFILL }},
     { &hf_lppe_area,
-      { "area", "lppe.area",
+      { "area", "lppe.area_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ValidityArea", HFILL }},
     { &hf_lppe_stormList,
@@ -16483,7 +16483,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AGNSS_StormList", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_StormList_item,
-      { "OMA-LPPe-AGNSS-StormElement", "lppe.OMA_LPPe_AGNSS_StormElement",
+      { "OMA-LPPe-AGNSS-StormElement", "lppe.OMA_LPPe_AGNSS_StormElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_rleListIono,
@@ -16491,7 +16491,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AGNSS_RleListIono", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_RleListIono_item,
-      { "OMA-LPPe-AGNSS-RleIonoElement", "lppe.OMA_LPPe_AGNSS_RleIonoElement",
+      { "OMA-LPPe-AGNSS-RleIonoElement", "lppe.OMA_LPPe_AGNSS_RleIonoElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_regionCount,
@@ -16507,7 +16507,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_AGNSS_NoaaScales_vals), 0,
         "OMA_LPPe_AGNSS_NoaaScales", HFILL }},
     { &hf_lppe_duration_03,
-      { "duration", "lppe.duration",
+      { "duration", "lppe.duration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_Duration", HFILL }},
     { &hf_lppe_rate,
@@ -16515,15 +16515,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_64", HFILL }},
     { &hf_lppe_referencePosition,
-      { "referencePosition", "lppe.referencePosition",
+      { "referencePosition", "lppe.referencePosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ellipsoid_Point", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_WideAreaIonoSurfacePerSVlist_item,
-      { "OMA-LPPe-AGNSS-WideAreaIonoSurfacePerSVelement", "lppe.OMA_LPPe_AGNSS_WideAreaIonoSurfacePerSVelement",
+      { "OMA-LPPe-AGNSS-WideAreaIonoSurfacePerSVelement", "lppe.OMA_LPPe_AGNSS_WideAreaIonoSurfacePerSVelement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_svID,
-      { "svID", "lppe.svID",
+      { "svID", "lppe.svID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SV_ID", HFILL }},
     { &hf_lppe_a0,
@@ -16559,7 +16559,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AGNSS_LocalSurfaceParametersList", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_LocalTroposphereDelayList_item,
-      { "OMA-LPPe-AGNSS-LocalTroposphereDelayAreaElement", "lppe.OMA_LPPe_AGNSS_LocalTroposphereDelayAreaElement",
+      { "OMA-LPPe-AGNSS-LocalTroposphereDelayAreaElement", "lppe.OMA_LPPe_AGNSS_LocalTroposphereDelayAreaElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_refAltitude,
@@ -16567,7 +16567,7 @@ void proto_register_lppe(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M1000_8192", HFILL }},
     { &hf_lppe_gradientReferencePosition,
-      { "gradientReferencePosition", "lppe.gradientReferencePosition",
+      { "gradientReferencePosition", "lppe.gradientReferencePosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ellipsoid_Point", HFILL }},
     { &hf_lppe_delayList,
@@ -16575,7 +16575,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_8_OF_OMA_LPPe_AGNSS_LocalTroposphereDelayTimeElement", HFILL }},
     { &hf_lppe_delayList_item,
-      { "OMA-LPPe-AGNSS-LocalTroposphereDelayTimeElement", "lppe.OMA_LPPe_AGNSS_LocalTroposphereDelayTimeElement",
+      { "OMA-LPPe-AGNSS-LocalTroposphereDelayTimeElement", "lppe.OMA_LPPe_AGNSS_LocalTroposphereDelayTimeElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_zh0,
@@ -16603,11 +16603,11 @@ void proto_register_lppe(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M8192_8191", HFILL }},
     { &hf_lppe_mappingFunctionParameters,
-      { "mappingFunctionParameters", "lppe.mappingFunctionParameters",
+      { "mappingFunctionParameters", "lppe.mappingFunctionParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_MappingFunctionParameters", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_LocalSurfaceParametersList_item,
-      { "OMA-LPPe-AGNSS-LocalSurfaceParametersAreaElement", "lppe.OMA_LPPe_AGNSS_LocalSurfaceParametersAreaElement",
+      { "OMA-LPPe-AGNSS-LocalSurfaceParametersAreaElement", "lppe.OMA_LPPe_AGNSS_LocalSurfaceParametersAreaElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_parameterList,
@@ -16615,7 +16615,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_8_OF_OMA_LPPe_AGNSS_LocalSurfaceParametersTimeElement", HFILL }},
     { &hf_lppe_parameterList_item,
-      { "OMA-LPPe-AGNSS-LocalSurfaceParametersTimeElement", "lppe.OMA_LPPe_AGNSS_LocalSurfaceParametersTimeElement",
+      { "OMA-LPPe-AGNSS-LocalSurfaceParametersTimeElement", "lppe.OMA_LPPe_AGNSS_LocalSurfaceParametersTimeElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_pressure,
@@ -16675,11 +16675,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_16383", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_AltitudeAssistanceList_item,
-      { "OMA-LPPe-AGNSS-AltitudeAssistanceAreaElement", "lppe.OMA_LPPe_AGNSS_AltitudeAssistanceAreaElement",
+      { "OMA-LPPe-AGNSS-AltitudeAssistanceAreaElement", "lppe.OMA_LPPe_AGNSS_AltitudeAssistanceAreaElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_gradientReferencePosition_01,
-      { "gradientReferencePosition", "lppe.gradientReferencePosition",
+      { "gradientReferencePosition", "lppe.gradientReferencePosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EllipsoidPointWithAltitudeAndUncertaintyEllipsoid", HFILL }},
     { &hf_lppe_pressureAssistanceList,
@@ -16687,7 +16687,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_16_OF_OMA_LPPe_AGNSS_PressureAssistanceElement", HFILL }},
     { &hf_lppe_pressureAssistanceList_item,
-      { "OMA-LPPe-AGNSS-PressureAssistanceElement", "lppe.OMA_LPPe_AGNSS_PressureAssistanceElement",
+      { "OMA-LPPe-AGNSS-PressureAssistanceElement", "lppe.OMA_LPPe_AGNSS_PressureAssistanceElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_gN_01,
@@ -16703,11 +16703,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1000_2000", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_MechanicsForAllSVs_item,
-      { "OMA-LPPe-AGNSS-MechanicsElement", "lppe.OMA_LPPe_AGNSS_MechanicsElement",
+      { "OMA-LPPe-AGNSS-MechanicsElement", "lppe.OMA_LPPe_AGNSS_MechanicsElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_svid,
-      { "svid", "lppe.svid",
+      { "svid", "lppe.svid_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SV_ID", HFILL }},
     { &hf_lppe_mass,
@@ -16719,11 +16719,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_511", HFILL }},
     { &hf_lppe_pco,
-      { "pco", "lppe.pco",
+      { "pco", "lppe.pco_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_PCOelement", HFILL }},
     { &hf_lppe_svInfo,
-      { "svInfo", "lppe.svInfo",
+      { "svInfo", "lppe.svInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_svType,
@@ -16747,15 +16747,15 @@ void proto_register_lppe(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M30000_30000", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_DCBsForAllSVs_item,
-      { "OMA-LPPe-AGNSS-DCBlistElement", "lppe.OMA_LPPe_AGNSS_DCBlistElement",
+      { "OMA-LPPe-AGNSS-DCBlistElement", "lppe.OMA_LPPe_AGNSS_DCBlistElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_reference,
-      { "reference", "lppe.reference",
+      { "reference", "lppe.reference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_signal,
-      { "signal", "lppe.signal",
+      { "signal", "lppe.signal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SignalID", HFILL }},
     { &hf_lppe_pd,
@@ -16767,7 +16767,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AGNSS_DCBlist", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_DCBlist_item,
-      { "OMA-LPPe-AGNSS-DCBelement", "lppe.OMA_LPPe_AGNSS_DCBelement",
+      { "OMA-LPPe-AGNSS-DCBelement", "lppe.OMA_LPPe_AGNSS_DCBelement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_pd_01,
@@ -16779,15 +16779,15 @@ void proto_register_lppe(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M4096_4095", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_NavModelDegradationModelList_item,
-      { "OMA-LPPe-AGNSS-NavModelDegradationModelElement", "lppe.OMA_LPPe_AGNSS_NavModelDegradationModelElement",
+      { "OMA-LPPe-AGNSS-NavModelDegradationModelElement", "lppe.OMA_LPPe_AGNSS_NavModelDegradationModelElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_clockDegradationModel,
-      { "clockDegradationModel", "lppe.clockDegradationModel",
+      { "clockDegradationModel", "lppe.clockDegradationModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_ClockModelDegradationModel", HFILL }},
     { &hf_lppe_orbitDegradationModel,
-      { "orbitDegradationModel", "lppe.orbitDegradationModel",
+      { "orbitDegradationModel", "lppe.orbitDegradationModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_OrbitModelDegradationModel", HFILL }},
     { &hf_lppe_clockRMS0,
@@ -16807,19 +16807,19 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_7", HFILL }},
     { &hf_lppe_ccpProvideCommonParameters,
-      { "ccpProvideCommonParameters", "lppe.ccpProvideCommonParameters",
+      { "ccpProvideCommonParameters", "lppe.ccpProvideCommonParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_CCPprovideCommonParameters", HFILL }},
     { &hf_lppe_ccpProvideControlParameters,
-      { "ccpProvideControlParameters", "lppe.ccpProvideControlParameters",
+      { "ccpProvideControlParameters", "lppe.ccpProvideControlParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_CCPprovideControlParameters", HFILL }},
     { &hf_lppe_ccpReferenceTime,
-      { "ccpReferenceTime", "lppe.ccpReferenceTime",
+      { "ccpReferenceTime", "lppe.ccpReferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SystemTime", HFILL }},
     { &hf_lppe_ccpSupportArea,
-      { "ccpSupportArea", "lppe.ccpSupportArea",
+      { "ccpSupportArea", "lppe.ccpSupportArea_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_CCPsupportArea", HFILL }},
     { &hf_lppe_ccpNeighborList,
@@ -16831,7 +16831,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AGNSS_CCPreferenceStationList", HFILL }},
     { &hf_lppe_areaDescription,
-      { "areaDescription", "lppe.areaDescription",
+      { "areaDescription", "lppe.areaDescription_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ValidityArea", HFILL }},
     { &hf_lppe_signalSupport,
@@ -16839,35 +16839,35 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_8_OF_OMA_LPPe_AGNSS_CCPsignalSupport", HFILL }},
     { &hf_lppe_signalSupport_item,
-      { "OMA-LPPe-AGNSS-CCPsignalSupport", "lppe.OMA_LPPe_AGNSS_CCPsignalSupport",
+      { "OMA-LPPe-AGNSS-CCPsignalSupport", "lppe.OMA_LPPe_AGNSS_CCPsignalSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_gnss,
-      { "gnss", "lppe.gnss",
+      { "gnss", "lppe.gnss_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_ID", HFILL }},
     { &hf_lppe_signals,
-      { "signals", "lppe.signals",
+      { "signals", "lppe.signals_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SignalIDs", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_CCPreferenceStationList_item,
-      { "OMA-LPPe-AGNSS-CCPreferenceStationElement", "lppe.OMA_LPPe_AGNSS_CCPreferenceStationElement",
+      { "OMA-LPPe-AGNSS-CCPreferenceStationElement", "lppe.OMA_LPPe_AGNSS_CCPreferenceStationElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_referenceStationID,
-      { "referenceStationID", "lppe.referenceStationID",
+      { "referenceStationID", "lppe.referenceStationID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_CCPreferenceStationID", HFILL }},
     { &hf_lppe_referenceStationLocation,
-      { "referenceStationLocation", "lppe.referenceStationLocation",
+      { "referenceStationLocation", "lppe.referenceStationLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_HighAccuracy3Dposition", HFILL }},
     { &hf_lppe_antennaDescription,
-      { "antennaDescription", "lppe.antennaDescription",
+      { "antennaDescription", "lppe.antennaDescription_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_AntennaDescription", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_CCPassistGenericProvide_item,
-      { "OMA-LPPe-AGNSS-CCPassistGenericProvideElement", "lppe.OMA_LPPe_AGNSS_CCPassistGenericProvideElement",
+      { "OMA-LPPe-AGNSS-CCPassistGenericProvideElement", "lppe.OMA_LPPe_AGNSS_CCPassistGenericProvideElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ccpPerSignalList,
@@ -16875,11 +16875,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_8_OF_OMA_LPPe_AGNSS_CCPperSignalElement", HFILL }},
     { &hf_lppe_ccpPerSignalList_item,
-      { "OMA-LPPe-AGNSS-CCPperSignalElement", "lppe.OMA_LPPe_AGNSS_CCPperSignalElement",
+      { "OMA-LPPe-AGNSS-CCPperSignalElement", "lppe.OMA_LPPe_AGNSS_CCPperSignalElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_signal_ID,
-      { "signal-ID", "lppe.signal_ID",
+      { "signal-ID", "lppe.signal_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SignalID", HFILL }},
     { &hf_lppe_ccpPerSVlist,
@@ -16887,7 +16887,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_64_OF_OMA_LPPe_AGNSS_CCPperSVelement", HFILL }},
     { &hf_lppe_ccpPerSVlist_item,
-      { "OMA-LPPe-AGNSS-CCPperSVelement", "lppe.OMA_LPPe_AGNSS_CCPperSVelement",
+      { "OMA-LPPe-AGNSS-CCPperSVelement", "lppe.OMA_LPPe_AGNSS_CCPperSVelement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_integerCodePhase,
@@ -16923,11 +16923,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_255", HFILL }},
     { &hf_lppe_coordinateBased,
-      { "coordinateBased", "lppe.coordinateBased",
+      { "coordinateBased", "lppe.coordinateBased_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModel_CoordinateBased", HFILL }},
     { &hf_lppe_fixedInterval,
-      { "fixedInterval", "lppe.fixedInterval",
+      { "fixedInterval", "lppe.fixedInterval_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_interval,
@@ -16935,7 +16935,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_30", HFILL }},
     { &hf_lppe_bases,
-      { "bases", "lppe.bases",
+      { "bases", "lppe.bases_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_baseForPosVel,
@@ -16943,7 +16943,7 @@ void proto_register_lppe(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M100000000_100000000", HFILL }},
     { &hf_lppe_baseForCcRate,
-      { "baseForCcRate", "lppe.baseForCcRate",
+      { "baseForCcRate", "lppe.baseForCcRate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModel_BigNumber", HFILL }},
     { &hf_lppe_referencedTo,
@@ -16955,11 +16955,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_97_OF_OMA_LPPe_AGNSS_NavModel_CoordinateBasedElement", HFILL }},
     { &hf_lppe_pointList_item,
-      { "OMA-LPPe-AGNSS-NavModel-CoordinateBasedElement", "lppe.OMA_LPPe_AGNSS_NavModel_CoordinateBasedElement",
+      { "OMA-LPPe-AGNSS-NavModel-CoordinateBasedElement", "lppe.OMA_LPPe_AGNSS_NavModel_CoordinateBasedElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_time_of_record,
-      { "time-of-record", "lppe.time_of_record",
+      { "time-of-record", "lppe.time_of_record_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SystemTime", HFILL }},
     { &hf_lppe_svIdList,
@@ -16967,51 +16967,51 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_64_OF_OMA_LPPe_AGNSS_NavModel_PVTelement", HFILL }},
     { &hf_lppe_svIdList_item,
-      { "OMA-LPPe-AGNSS-NavModel-PVTelement", "lppe.OMA_LPPe_AGNSS_NavModel_PVTelement",
+      { "OMA-LPPe-AGNSS-NavModel-PVTelement", "lppe.OMA_LPPe_AGNSS_NavModel_PVTelement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_svClockOffset,
-      { "svClockOffset", "lppe.svClockOffset",
+      { "svClockOffset", "lppe.svClockOffset_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModel_BigNumber", HFILL }},
     { &hf_lppe_ecefPositionX,
-      { "ecefPositionX", "lppe.ecefPositionX",
+      { "ecefPositionX", "lppe.ecefPositionX_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModel_BigNumber", HFILL }},
     { &hf_lppe_ecefPositionY,
-      { "ecefPositionY", "lppe.ecefPositionY",
+      { "ecefPositionY", "lppe.ecefPositionY_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModel_BigNumber", HFILL }},
     { &hf_lppe_ecefPositionZ,
-      { "ecefPositionZ", "lppe.ecefPositionZ",
+      { "ecefPositionZ", "lppe.ecefPositionZ_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModel_BigNumber", HFILL }},
     { &hf_lppe_clockPosSTD,
-      { "clockPosSTD", "lppe.clockPosSTD",
+      { "clockPosSTD", "lppe.clockPosSTD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModel_STDmatrix", HFILL }},
     { &hf_lppe_rateRecord,
-      { "rateRecord", "lppe.rateRecord",
+      { "rateRecord", "lppe.rateRecord_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_svClockRate,
-      { "svClockRate", "lppe.svClockRate",
+      { "svClockRate", "lppe.svClockRate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModel_BigNumber", HFILL }},
     { &hf_lppe_ecefVelocityX,
-      { "ecefVelocityX", "lppe.ecefVelocityX",
+      { "ecefVelocityX", "lppe.ecefVelocityX_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModel_BigNumber", HFILL }},
     { &hf_lppe_ecefVelocityY,
-      { "ecefVelocityY", "lppe.ecefVelocityY",
+      { "ecefVelocityY", "lppe.ecefVelocityY_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModel_BigNumber", HFILL }},
     { &hf_lppe_ecefVelocityZ,
-      { "ecefVelocityZ", "lppe.ecefVelocityZ",
+      { "ecefVelocityZ", "lppe.ecefVelocityZ_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModel_BigNumber", HFILL }},
     { &hf_lppe_clockRateVelSTD,
-      { "clockRateVelSTD", "lppe.clockRateVelSTD",
+      { "clockRateVelSTD", "lppe.clockRateVelSTD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModel_STDmatrix", HFILL }},
     { &hf_lppe_msb,
@@ -17063,7 +17063,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_10000000", HFILL }},
     { &hf_lppe_commonAssistDataReq,
-      { "commonAssistDataReq", "lppe.commonAssistDataReq",
+      { "commonAssistDataReq", "lppe.commonAssistDataReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_CommonAssistanceDataReq", HFILL }},
     { &hf_lppe_genericAssistDataReq,
@@ -17075,51 +17075,51 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_AGNSS_IonosphericModelReq_vals), 0,
         "OMA_LPPe_AGNSS_IonosphericModelReq", HFILL }},
     { &hf_lppe_troposphereModelReq,
-      { "troposphereModelReq", "lppe.troposphereModelReq",
+      { "troposphereModelReq", "lppe.troposphereModelReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_TroposphereModelReq", HFILL }},
     { &hf_lppe_altitudeAssistanceReq,
-      { "altitudeAssistanceReq", "lppe.altitudeAssistanceReq",
+      { "altitudeAssistanceReq", "lppe.altitudeAssistanceReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_AltitudeAssistanceReq", HFILL }},
     { &hf_lppe_solarRadiationRequest,
-      { "solarRadiationRequest", "lppe.solarRadiationRequest",
+      { "solarRadiationRequest", "lppe.solarRadiationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_SolarRadiationReq", HFILL }},
     { &hf_lppe_ccpRequestControlParameters,
-      { "ccpRequestControlParameters", "lppe.ccpRequestControlParameters",
+      { "ccpRequestControlParameters", "lppe.ccpRequestControlParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_CCPrequestControlParameters", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_GenericAssistanceDataReq_item,
-      { "OMA-LPPe-AGNSS-GenericAssistDataReqElement", "lppe.OMA_LPPe_AGNSS_GenericAssistDataReqElement",
+      { "OMA-LPPe-AGNSS-GenericAssistDataReqElement", "lppe.OMA_LPPe_AGNSS_GenericAssistDataReqElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_waIonoSurfaceReq,
-      { "waIonoSurfaceReq", "lppe.waIonoSurfaceReq",
+      { "waIonoSurfaceReq", "lppe.waIonoSurfaceReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_WaIonoSurfaceRequest", HFILL }},
     { &hf_lppe_mechanicsReq,
-      { "mechanicsReq", "lppe.mechanicsReq",
+      { "mechanicsReq", "lppe.mechanicsReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_MechanicsReq", HFILL }},
     { &hf_lppe_dcbReq,
-      { "dcbReq", "lppe.dcbReq",
+      { "dcbReq", "lppe.dcbReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_DCBreq", HFILL }},
     { &hf_lppe_navModelDegradationModelReq,
-      { "navModelDegradationModelReq", "lppe.navModelDegradationModelReq",
+      { "navModelDegradationModelReq", "lppe.navModelDegradationModelReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModelDegradationModelReq", HFILL }},
     { &hf_lppe_ccpAssistGenericReq,
-      { "ccpAssistGenericReq", "lppe.ccpAssistGenericReq",
+      { "ccpAssistGenericReq", "lppe.ccpAssistGenericReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_CCPassistGenericReq", HFILL }},
     { &hf_lppe_navigationModelReq,
-      { "navigationModelReq", "lppe.navigationModelReq",
+      { "navigationModelReq", "lppe.navigationModelReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavigationModelReq", HFILL }},
     { &hf_lppe_staticModels_01,
-      { "staticModels", "lppe.staticModels",
+      { "staticModels", "lppe.staticModels_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_staticModels_01", HFILL }},
     { &hf_lppe_ionoreq,
@@ -17127,15 +17127,15 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_requestBeginTime,
-      { "requestBeginTime", "lppe.requestBeginTime",
+      { "requestBeginTime", "lppe.requestBeginTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SystemTime", HFILL }},
     { &hf_lppe_periodicModels,
-      { "periodicModels", "lppe.periodicModels",
+      { "periodicModels", "lppe.periodicModels_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_waIonoSurface,
-      { "waIonoSurface", "lppe.waIonoSurface",
+      { "waIonoSurface", "lppe.waIonoSurface_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_WideAreaIonoSurfaceControlParametersRequest", HFILL }},
     { &hf_lppe_troposphereModelReq_01,
@@ -17147,7 +17147,7 @@ void proto_register_lppe(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lppe_reference_01,
-      { "reference", "lppe.reference",
+      { "reference", "lppe.reference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_reference_01", HFILL }},
     { &hf_lppe_pd_02,
@@ -17171,15 +17171,15 @@ void proto_register_lppe(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lppe_ccpSupportAreaRequest,
-      { "ccpSupportAreaRequest", "lppe.ccpSupportAreaRequest",
+      { "ccpSupportAreaRequest", "lppe.ccpSupportAreaRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ccpNeighborListRequest,
-      { "ccpNeighborListRequest", "lppe.ccpNeighborListRequest",
+      { "ccpNeighborListRequest", "lppe.ccpNeighborListRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ccpCommonRequest,
-      { "ccpCommonRequest", "lppe.ccpCommonRequest",
+      { "ccpCommonRequest", "lppe.ccpCommonRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_refStation,
@@ -17187,11 +17187,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_refStation_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_posBasedReferenceStationRequest,
-      { "posBasedReferenceStationRequest", "lppe.posBasedReferenceStationRequest",
+      { "posBasedReferenceStationRequest", "lppe.posBasedReferenceStationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_requestedReferenceStationLocation,
-      { "requestedReferenceStationLocation", "lppe.requestedReferenceStationLocation",
+      { "requestedReferenceStationLocation", "lppe.requestedReferenceStationLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_HighAccuracy3Dposition", HFILL }},
     { &hf_lppe_qor,
@@ -17207,11 +17207,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AGNSS_ReferenceStationIDlist", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_ReferenceStationIDlist_item,
-      { "OMA-LPPe-AGNSS-CCPreferenceStationID", "lppe.OMA_LPPe_AGNSS_CCPreferenceStationID",
+      { "OMA-LPPe-AGNSS-CCPreferenceStationID", "lppe.OMA_LPPe_AGNSS_CCPreferenceStationID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ccpAssist_SignalsReq,
-      { "ccpAssist-SignalsReq", "lppe.ccpAssist_SignalsReq",
+      { "ccpAssist-SignalsReq", "lppe.ccpAssist_SignalsReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SignalIDs", HFILL }},
     { &hf_lppe_navModelID_PrefList,
@@ -17223,7 +17223,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_8", HFILL }},
     { &hf_lppe_highAccuracyReferenceTime,
-      { "highAccuracyReferenceTime", "lppe.highAccuracyReferenceTime",
+      { "highAccuracyReferenceTime", "lppe.highAccuracyReferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SystemTime", HFILL }},
     { &hf_lppe_highAccuracyMeasurements,
@@ -17231,31 +17231,31 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_AGNSS_HAgnssProvide_vals), 0,
         "OMA_LPPe_AGNSS_HAgnssProvide", HFILL }},
     { &hf_lppe_ionosphereMeasurements,
-      { "ionosphereMeasurements", "lppe.ionosphereMeasurements",
+      { "ionosphereMeasurements", "lppe.ionosphereMeasurements_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_IonosphereMeasurements", HFILL }},
     { &hf_lppe_localSurfaceMeasurements,
-      { "localSurfaceMeasurements", "lppe.localSurfaceMeasurements",
+      { "localSurfaceMeasurements", "lppe.localSurfaceMeasurements_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_LocalSurfaceMeasurements", HFILL }},
     { &hf_lppe_controlParameters_01,
-      { "controlParameters", "lppe.controlParameters",
+      { "controlParameters", "lppe.controlParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_measurements,
-      { "measurements", "lppe.measurements",
+      { "measurements", "lppe.measurements_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_position,
-      { "position", "lppe.position",
+      { "position", "lppe.position_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EllipsoidPointWithAltitudeAndUncertaintyEllipsoid", HFILL }},
     { &hf_lppe_referenceTime,
-      { "referenceTime", "lppe.referenceTime",
+      { "referenceTime", "lppe.referenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SystemTime", HFILL }},
     { &hf_lppe_localPressure,
-      { "localPressure", "lppe.localPressure",
+      { "localPressure", "lppe.localPressure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_pressureUncertainty,
@@ -17271,7 +17271,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_16_OF_OMA_LPPe_AGNSS_HAgnssMeasurementElement", HFILL }},
     { &hf_lppe_signalMeasurements_item,
-      { "OMA-LPPe-AGNSS-HAgnssMeasurementElement", "lppe.OMA_LPPe_AGNSS_HAgnssMeasurementElement",
+      { "OMA-LPPe-AGNSS-HAgnssMeasurementElement", "lppe.OMA_LPPe_AGNSS_HAgnssMeasurementElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_haGNSSperSignalList,
@@ -17279,7 +17279,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_8_OF_OMA_LPPe_HAgnssPerSignalElement", HFILL }},
     { &hf_lppe_haGNSSperSignalList_item,
-      { "OMA-LPPe-HAgnssPerSignalElement", "lppe.OMA_LPPe_HAgnssPerSignalElement",
+      { "OMA-LPPe-HAgnssPerSignalElement", "lppe.OMA_LPPe_HAgnssPerSignalElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_haGNSSperSVlist,
@@ -17287,7 +17287,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_64_OF_OMA_LPPe_HAgnssPerSVelement", HFILL }},
     { &hf_lppe_haGNSSperSVlist_item,
-      { "OMA-LPPe-HAgnssPerSVelement", "lppe.OMA_LPPe_HAgnssPerSVelement",
+      { "OMA-LPPe-HAgnssPerSVelement", "lppe.OMA_LPPe_HAgnssPerSVelement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_multipathDetection,
@@ -17307,11 +17307,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AGNSS_TECPerSV", HFILL }},
     { &hf_lppe_tecAtZenith,
-      { "tecAtZenith", "lppe.tecAtZenith",
+      { "tecAtZenith", "lppe.tecAtZenith_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_TECAtZenith", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_TECPerSV_item,
-      { "OMA-LPPe-AGNSS-TECPerSVElement", "lppe.OMA_LPPe_AGNSS_TECPerSVElement",
+      { "OMA-LPPe-AGNSS-TECPerSVElement", "lppe.OMA_LPPe_AGNSS_TECPerSVElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_azimuth,
@@ -17339,7 +17339,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_63", HFILL }},
     { &hf_lppe_temperatureMeasurement,
-      { "temperatureMeasurement", "lppe.temperatureMeasurement",
+      { "temperatureMeasurement", "lppe.temperatureMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_temperatureUncertainty,
@@ -17347,7 +17347,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_7", HFILL }},
     { &hf_lppe_positioningInstructions,
-      { "positioningInstructions", "lppe.positioningInstructions",
+      { "positioningInstructions", "lppe.positioningInstructions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_PositioningInstructions", HFILL }},
     { &hf_lppe_ionosphereMeasurementsReq,
@@ -17355,7 +17355,7 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_localSurfaceMeasurementReq,
-      { "localSurfaceMeasurementReq", "lppe.localSurfaceMeasurementReq",
+      { "localSurfaceMeasurementReq", "lppe.localSurfaceMeasurementReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_LocalSurfaceMeasurementReq", HFILL }},
     { &hf_lppe_highAccuracyMethodRequested,
@@ -17363,7 +17363,7 @@ void proto_register_lppe(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lppe_haGNSSreq,
-      { "haGNSSreq", "lppe.haGNSSreq",
+      { "haGNSSreq", "lppe.haGNSSreq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_HAgnssRequestControlParameters", HFILL }},
     { &hf_lppe_rate_01,
@@ -17383,27 +17383,27 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_16_OF_OMA_LPPe_AGNSS_HAgnssSignalReqElement", HFILL }},
     { &hf_lppe_signalReqList_item,
-      { "OMA-LPPe-AGNSS-HAgnssSignalReqElement", "lppe.OMA_LPPe_AGNSS_HAgnssSignalReqElement",
+      { "OMA-LPPe-AGNSS-HAgnssSignalReqElement", "lppe.OMA_LPPe_AGNSS_HAgnssSignalReqElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_gnssID,
-      { "gnssID", "lppe.gnssID",
+      { "gnssID", "lppe.gnssID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_ID", HFILL }},
     { &hf_lppe_assistanceDataSupportList,
-      { "assistanceDataSupportList", "lppe.assistanceDataSupportList",
+      { "assistanceDataSupportList", "lppe.assistanceDataSupportList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_AssistanceDataSupportList", HFILL }},
     { &hf_lppe_environmentObservationSupportList,
-      { "environmentObservationSupportList", "lppe.environmentObservationSupportList",
+      { "environmentObservationSupportList", "lppe.environmentObservationSupportList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_EnvironmentObservationSupportList", HFILL }},
     { &hf_lppe_haGNSSsupport,
-      { "haGNSSsupport", "lppe.haGNSSsupport",
+      { "haGNSSsupport", "lppe.haGNSSsupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_HAgnssSupport", HFILL }},
     { &hf_lppe_commonAssistanceDataSupport,
-      { "commonAssistanceDataSupport", "lppe.commonAssistanceDataSupport",
+      { "commonAssistanceDataSupport", "lppe.commonAssistanceDataSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_CommonAssistanceDataSupport", HFILL }},
     { &hf_lppe_genericAssistanceDataSupport,
@@ -17423,23 +17423,23 @@ void proto_register_lppe(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lppe_ionosphericModelSupport,
-      { "ionosphericModelSupport", "lppe.ionosphericModelSupport",
+      { "ionosphericModelSupport", "lppe.ionosphericModelSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_IonosphericModelSupport", HFILL }},
     { &hf_lppe_troposphereModelSupport,
-      { "troposphereModelSupport", "lppe.troposphereModelSupport",
+      { "troposphereModelSupport", "lppe.troposphereModelSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_TroposphereModelSupport", HFILL }},
     { &hf_lppe_altitudeAssistanceSupport,
-      { "altitudeAssistanceSupport", "lppe.altitudeAssistanceSupport",
+      { "altitudeAssistanceSupport", "lppe.altitudeAssistanceSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_AltitudeAssistanceSupport", HFILL }},
     { &hf_lppe_solarRadiationSupport,
-      { "solarRadiationSupport", "lppe.solarRadiationSupport",
+      { "solarRadiationSupport", "lppe.solarRadiationSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_SolarRadiationSupport", HFILL }},
     { &hf_lppe_ccpSupport,
-      { "ccpSupport", "lppe.ccpSupport",
+      { "ccpSupport", "lppe.ccpSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_CCPsupport", HFILL }},
     { &hf_lppe_ionoModel,
@@ -17459,27 +17459,27 @@ void proto_register_lppe(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_GenericAssistanceDataSupport_item,
-      { "OMA-LPPe-AGNSS-GenericAssistDataSupportElement", "lppe.OMA_LPPe_AGNSS_GenericAssistDataSupportElement",
+      { "OMA-LPPe-AGNSS-GenericAssistDataSupportElement", "lppe.OMA_LPPe_AGNSS_GenericAssistDataSupportElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mechnanicsSupport,
-      { "mechnanicsSupport", "lppe.mechnanicsSupport",
+      { "mechnanicsSupport", "lppe.mechnanicsSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_MechanicsSupport", HFILL }},
     { &hf_lppe_dcbSupport,
-      { "dcbSupport", "lppe.dcbSupport",
+      { "dcbSupport", "lppe.dcbSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_DCBsupport", HFILL }},
     { &hf_lppe_navModelAccuracyModelDegradationSupport,
-      { "navModelAccuracyModelDegradationSupport", "lppe.navModelAccuracyModelDegradationSupport",
+      { "navModelAccuracyModelDegradationSupport", "lppe.navModelAccuracyModelDegradationSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModelAccuracyModelDegradationSupport", HFILL }},
     { &hf_lppe_ccpAssistanceSuppport,
-      { "ccpAssistanceSuppport", "lppe.ccpAssistanceSuppport",
+      { "ccpAssistanceSuppport", "lppe.ccpAssistanceSuppport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SignalIDs", HFILL }},
     { &hf_lppe_navModelSupport,
-      { "navModelSupport", "lppe.navModelSupport",
+      { "navModelSupport", "lppe.navModelSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModelSupport", HFILL }},
     { &hf_lppe_navModelSupport_01,
@@ -17507,31 +17507,31 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_8_OF_OMA_LPPe_AGNSS_HAgnssPerGNSSsupport", HFILL }},
     { &hf_lppe_haGNSSperGNSSsupport_item,
-      { "OMA-LPPe-AGNSS-HAgnssPerGNSSsupport", "lppe.OMA_LPPe_AGNSS_HAgnssPerGNSSsupport",
+      { "OMA-LPPe-AGNSS-HAgnssPerGNSSsupport", "lppe.OMA_LPPe_AGNSS_HAgnssPerGNSSsupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_haGNSSsignalSupport,
-      { "haGNSSsignalSupport", "lppe.haGNSSsignalSupport",
+      { "haGNSSsignalSupport", "lppe.haGNSSsignalSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SignalIDs", HFILL }},
     { &hf_lppe_assistanceDataSupportListReq,
-      { "assistanceDataSupportListReq", "lppe.assistanceDataSupportListReq",
+      { "assistanceDataSupportListReq", "lppe.assistanceDataSupportListReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_environmentObservationSupportListReq,
-      { "environmentObservationSupportListReq", "lppe.environmentObservationSupportListReq",
+      { "environmentObservationSupportListReq", "lppe.environmentObservationSupportListReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_haGNSSsupportReq,
-      { "haGNSSsupportReq", "lppe.haGNSSsupportReq",
+      { "haGNSSsupportReq", "lppe.haGNSSsupportReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_agnss_locationServerErrorCauses,
-      { "agnss-locationServerErrorCauses", "lppe.agnss_locationServerErrorCauses",
+      { "agnss-locationServerErrorCauses", "lppe.agnss_locationServerErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_LocationServerErrorCauses", HFILL }},
     { &hf_lppe_agnss_targetDeviceErrorCauses,
-      { "agnss-targetDeviceErrorCauses", "lppe.agnss_targetDeviceErrorCauses",
+      { "agnss-targetDeviceErrorCauses", "lppe.agnss_targetDeviceErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_TargetDeviceErrorCauses", HFILL }},
     { &hf_lppe_waIonoErrorCauses,
@@ -17583,7 +17583,7 @@ void proto_register_lppe(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "OMA_LPPe_CharArray", HFILL }},
     { &hf_lppe_targetDeviceAbortCauses,
-      { "targetDeviceAbortCauses", "lppe.targetDeviceAbortCauses",
+      { "targetDeviceAbortCauses", "lppe.targetDeviceAbortCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ccpAbort,
@@ -17595,7 +17595,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_waIonoAbort_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_otdoa_ReferenceCellInfo,
-      { "otdoa-ReferenceCellInfo", "lppe.otdoa_ReferenceCellInfo",
+      { "otdoa-ReferenceCellInfo", "lppe.otdoa_ReferenceCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_ReferenceCellInfo", HFILL }},
     { &hf_lppe_otdoa_NeighbourCellInfo,
@@ -17607,11 +17607,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_OTDOA_Error_vals), 0,
         "OMA_LPPe_OTDOA_Error", HFILL }},
     { &hf_lppe_referenceCellInfo,
-      { "referenceCellInfo", "lppe.referenceCellInfo",
+      { "referenceCellInfo", "lppe.referenceCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OTDOA_ReferenceCellInfo", HFILL }},
     { &hf_lppe_positionCalculationInfoRef,
-      { "positionCalculationInfoRef", "lppe.positionCalculationInfoRef",
+      { "positionCalculationInfoRef", "lppe.positionCalculationInfoRef_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_PositionCalculationInfoRef", HFILL }},
     { &hf_lppe_systemFrameNumber,
@@ -17619,23 +17619,23 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_10", HFILL }},
     { &hf_lppe_rtdReferenceStd,
-      { "rtdReferenceStd", "lppe.rtdReferenceStd",
+      { "rtdReferenceStd", "lppe.rtdReferenceStd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_RTDquality", HFILL }},
     { &hf_lppe_cellLocation,
-      { "cellLocation", "lppe.cellLocation",
+      { "cellLocation", "lppe.cellLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_reference_point,
-      { "reference-point", "lppe.reference_point",
+      { "reference-point", "lppe.reference_point_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ReferencePoint", HFILL }},
     { &hf_lppe_relative_location,
-      { "relative-location", "lppe.relative_location",
+      { "relative-location", "lppe.relative_location_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RelativeLocation", HFILL }},
     { &hf_lppe_femtoCellInfo,
-      { "femtoCellInfo", "lppe.femtoCellInfo",
+      { "femtoCellInfo", "lppe.femtoCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_location_reliability,
@@ -17643,7 +17643,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_100", HFILL }},
     { &hf_lppe_OMA_LPPe_OTDOA_NeighbourCellInfoList_item,
-      { "OMA-LPPe-OTDOA-NeighbourFreqCellInfoList", "lppe.OMA_LPPe_OTDOA_NeighbourFreqCellInfoList",
+      { "OMA-LPPe-OTDOA-NeighbourFreqCellInfoList", "lppe.OMA_LPPe_OTDOA_NeighbourFreqCellInfoList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_neighbourCellInfoList_eNB,
@@ -17651,7 +17651,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxLTEeNBs_OF_OMA_LPPe_OTDOA_NeighbourCellInfoElement_eNB", HFILL }},
     { &hf_lppe_neighbourCellInfoList_eNB_item,
-      { "OMA-LPPe-OTDOA-NeighbourCellInfoElement-eNB", "lppe.OMA_LPPe_OTDOA_NeighbourCellInfoElement_eNB",
+      { "OMA-LPPe-OTDOA-NeighbourCellInfoElement-eNB", "lppe.OMA_LPPe_OTDOA_NeighbourCellInfoElement_eNB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_neighbourCellInfoList_HeNB,
@@ -17659,11 +17659,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxLTEHeNBs_OF_OMA_LPPe_OTDOA_NeighbourCellInfoElement_HeNB", HFILL }},
     { &hf_lppe_neighbourCellInfoList_HeNB_item,
-      { "OMA-LPPe-OTDOA-NeighbourCellInfoElement-HeNB", "lppe.OMA_LPPe_OTDOA_NeighbourCellInfoElement_HeNB",
+      { "OMA-LPPe-OTDOA-NeighbourCellInfoElement-HeNB", "lppe.OMA_LPPe_OTDOA_NeighbourCellInfoElement_HeNB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_relative_Location,
-      { "relative-Location", "lppe.relative_Location",
+      { "relative-Location", "lppe.relative_Location_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RelativeLocation", HFILL }},
     { &hf_lppe_otdoa_eNB_CellDataList,
@@ -17671,19 +17671,19 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxLTEMacroCells_OF_OMA_LPPe_OTDOA_CellData", HFILL }},
     { &hf_lppe_otdoa_eNB_CellDataList_item,
-      { "OMA-LPPe-OTDOA-CellData", "lppe.OMA_LPPe_OTDOA_CellData",
+      { "OMA-LPPe-OTDOA-CellData", "lppe.OMA_LPPe_OTDOA_CellData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_otdoa_HeNB_CellDataList,
-      { "otdoa-HeNB-CellDataList", "lppe.otdoa_HeNB_CellDataList",
+      { "otdoa-HeNB-CellDataList", "lppe.otdoa_HeNB_CellDataList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_CellData", HFILL }},
     { &hf_lppe_otdoa_NeighbourCellInfoElement,
-      { "otdoa-NeighbourCellInfoElement", "lppe.otdoa_NeighbourCellInfoElement",
+      { "otdoa-NeighbourCellInfoElement", "lppe.otdoa_NeighbourCellInfoElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_rtdInfo,
-      { "rtdInfo", "lppe.rtdInfo",
+      { "rtdInfo", "lppe.rtdInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_subframeOffset,
@@ -17695,7 +17695,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_99999", HFILL }},
     { &hf_lppe_fineRTDstd,
-      { "fineRTDstd", "lppe.fineRTDstd",
+      { "fineRTDstd", "lppe.fineRTDstd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_RTDquality", HFILL }},
     { &hf_lppe_fineRTDdriftRate,
@@ -17711,7 +17711,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_127", HFILL }},
     { &hf_lppe_lteCell,
-      { "lteCell", "lppe.lteCell",
+      { "lteCell", "lppe.lteCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_physCellId,
@@ -17723,7 +17723,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ARFCN_ValueEUTRA", HFILL }},
     { &hf_lppe_ecgi,
-      { "ecgi", "lppe.ecgi",
+      { "ecgi", "lppe.ecgi_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellGlobalIdEUTRA_AndUTRA", HFILL }},
     { &hf_lppe_requestedCells,
@@ -17731,7 +17731,7 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_otdoaLocationInformation,
-      { "otdoaLocationInformation", "lppe.otdoaLocationInformation",
+      { "otdoaLocationInformation", "lppe.otdoaLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_LocationInformation", HFILL }},
     { &hf_lppe_otdoaError,
@@ -17739,7 +17739,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_OTDOA_Error_vals), 0,
         "OMA_LPPe_OTDOA_Error", HFILL }},
     { &hf_lppe_cellGlobalId,
-      { "cellGlobalId", "lppe.cellGlobalId",
+      { "cellGlobalId", "lppe.cellGlobalId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellGlobalIdEUTRA_AndUTRA", HFILL }},
     { &hf_lppe_assistanceAvailability,
@@ -17747,19 +17747,19 @@ void proto_register_lppe(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lppe_eNodeB_AD_sup,
-      { "eNodeB-AD-sup", "lppe.eNodeB_AD_sup",
+      { "eNodeB-AD-sup", "lppe.eNodeB_AD_sup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_home_eNodeB_AD_sup,
-      { "home-eNodeB-AD-sup", "lppe.home_eNodeB_AD_sup",
+      { "home-eNodeB-AD-sup", "lppe.home_eNodeB_AD_sup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_locationServerErrorCauses,
-      { "locationServerErrorCauses", "lppe.locationServerErrorCauses",
+      { "locationServerErrorCauses", "lppe.locationServerErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_LocationServerErrorCauses", HFILL }},
     { &hf_lppe_targetDeviceErrorCauses,
-      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses",
+      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_TargetDeviceErrorCauses", HFILL }},
     { &hf_lppe_cause,
@@ -17771,7 +17771,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_cause_01_vals), 0,
         "T_cause_01", HFILL }},
     { &hf_lppe_referenceBTS,
-      { "referenceBTS", "lppe.referenceBTS",
+      { "referenceBTS", "lppe.referenceBTS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_ReferenceBTSForAssistance", HFILL }},
     { &hf_lppe_msrAssistDataList,
@@ -17787,7 +17787,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_EOTD_Error_vals), 0,
         "OMA_LPPe_EOTD_Error", HFILL }},
     { &hf_lppe_bsicAndCarrier,
-      { "bsicAndCarrier", "lppe.bsicAndCarrier",
+      { "bsicAndCarrier", "lppe.bsicAndCarrier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CellNonUniqueIDGERAN", HFILL }},
     { &hf_lppe_timeSlotScheme,
@@ -17799,15 +17799,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_btsPosition_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_ellipsoidPoint,
-      { "ellipsoidPoint", "lppe.ellipsoidPoint",
+      { "ellipsoidPoint", "lppe.ellipsoidPoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ellipsoid_Point", HFILL }},
     { &hf_lppe_ellipsoidPointWithAltitudeAndUncertaintyEllipsoid,
-      { "ellipsoidPointWithAltitudeAndUncertaintyEllipsoid", "lppe.ellipsoidPointWithAltitudeAndUncertaintyEllipsoid",
+      { "ellipsoidPointWithAltitudeAndUncertaintyEllipsoid", "lppe.ellipsoidPointWithAltitudeAndUncertaintyEllipsoid_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_EOTD_MsrAssistDataList_item,
-      { "OMA-LPPe-EOTD-MsrAssistBTS", "lppe.OMA_LPPe_EOTD_MsrAssistBTS",
+      { "OMA-LPPe-EOTD-MsrAssistBTS", "lppe.OMA_LPPe_EOTD_MsrAssistBTS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_multiFrameOffset,
@@ -17819,11 +17819,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_EOTD_RoughRTD", HFILL }},
     { &hf_lppe_expectedOTD,
-      { "expectedOTD", "lppe.expectedOTD",
+      { "expectedOTD", "lppe.expectedOTD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_ExpectedOTD", HFILL }},
     { &hf_lppe_calcAssistanceBTS,
-      { "calcAssistanceBTS", "lppe.calcAssistanceBTS",
+      { "calcAssistanceBTS", "lppe.calcAssistanceBTS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_CalcAssistanceBTS", HFILL }},
     { &hf_lppe_OMA_LPPe_EOTD_SystemInfoAssistDataList_item,
@@ -17831,11 +17831,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_EOTD_SystemInfoAssistBTS_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_notPresent,
-      { "notPresent", "lppe.notPresent",
+      { "notPresent", "lppe.notPresent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_present,
-      { "present", "lppe.present",
+      { "present", "lppe.present_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_AssistBTSData", HFILL }},
     { &hf_lppe_fineRTD_01,
@@ -17843,7 +17843,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_EOTD_FineRTD", HFILL }},
     { &hf_lppe_relativePos,
-      { "relativePos", "lppe.relativePos",
+      { "relativePos", "lppe.relativePos_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_relativePos", HFILL }},
     { &hf_lppe_relativeNorth_01,
@@ -17863,7 +17863,7 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_eotdMsrElement,
-      { "eotdMsrElement", "lppe.eotdMsrElement",
+      { "eotdMsrElement", "lppe.eotdMsrElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_MsrElement", HFILL }},
     { &hf_lppe_refFrameNumber,
@@ -17875,7 +17875,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_EOTD_ModuloTimeSlot", HFILL }},
     { &hf_lppe_toaMeasurementsOfRef,
-      { "toaMeasurementsOfRef", "lppe.toaMeasurementsOfRef",
+      { "toaMeasurementsOfRef", "lppe.toaMeasurementsOfRef_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_TOA_MeasurementsOfRef", HFILL }},
     { &hf_lppe_stdResolution,
@@ -17891,7 +17891,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_15_OF_OMA_LPPe_EOTD_MeasurementWithID", HFILL }},
     { &hf_lppe_otd_FirstSetMsrs_item,
-      { "OMA-LPPe-EOTD-MeasurementWithID", "lppe.OMA_LPPe_EOTD_MeasurementWithID",
+      { "OMA-LPPe-EOTD-MeasurementWithID", "lppe.OMA_LPPe_EOTD_MeasurementWithID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_refQuality,
@@ -17911,7 +17911,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_EOTD_ModuloTimeSlot", HFILL }},
     { &hf_lppe_eotdQuality,
-      { "eotdQuality", "lppe.eotdQuality",
+      { "eotdQuality", "lppe.eotdQuality_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_EOTDQuality", HFILL }},
     { &hf_lppe_otdValue,
@@ -17923,7 +17923,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_EOTD_CellID", HFILL }},
     { &hf_lppe_multiFrameCarrier,
-      { "multiFrameCarrier", "lppe.multiFrameCarrier",
+      { "multiFrameCarrier", "lppe.multiFrameCarrier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_MultiFrameCarrier", HFILL }},
     { &hf_lppe_requestIndex,
@@ -17935,7 +17935,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_EOTD_SystemInfoIndex", HFILL }},
     { &hf_lppe_ciAndLac,
-      { "ciAndLac", "lppe.ciAndLac",
+      { "ciAndLac", "lppe.ciAndLac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CellLocalIdGERAN", HFILL }},
     { &hf_lppe_nbrOfMeasurements,
@@ -17955,11 +17955,11 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_locationServerErrorCauses_01,
-      { "locationServerErrorCauses", "lppe.locationServerErrorCauses",
+      { "locationServerErrorCauses", "lppe.locationServerErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_LocationServerErrorCauses", HFILL }},
     { &hf_lppe_targetDeviceErrorCauses_01,
-      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses",
+      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_TargetDeviceErrorCauses", HFILL }},
     { &hf_lppe_cause_02,
@@ -17979,7 +17979,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_7", HFILL }},
     { &hf_lppe_referenceCellInfo_01,
-      { "referenceCellInfo", "lppe.referenceCellInfo",
+      { "referenceCellInfo", "lppe.referenceCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_ReferenceCellInfo", HFILL }},
     { &hf_lppe_neigborCellList,
@@ -17999,31 +17999,31 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_modeSpecificInfo_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_fdd,
-      { "fdd", "lppe.fdd",
+      { "fdd", "lppe.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_primaryCPICH_info,
-      { "primaryCPICH-info", "lppe.primaryCPICH_info",
+      { "primaryCPICH-info", "lppe.primaryCPICH_info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_PrimaryCPICH_Info", HFILL }},
     { &hf_lppe_tdd,
-      { "tdd", "lppe.tdd",
+      { "tdd", "lppe.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_cellAndChannelIdentity,
-      { "cellAndChannelIdentity", "lppe.cellAndChannelIdentity",
+      { "cellAndChannelIdentity", "lppe.cellAndChannelIdentity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_CellAndChannelIdentity", HFILL }},
     { &hf_lppe_frequencyInfo,
-      { "frequencyInfo", "lppe.frequencyInfo",
+      { "frequencyInfo", "lppe.frequencyInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_UTRA_FrequencyInfo", HFILL }},
     { &hf_lppe_refPosAssist,
-      { "refPosAssist", "lppe.refPosAssist",
+      { "refPosAssist", "lppe.refPosAssist_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_RefPosAssist", HFILL }},
     { &hf_lppe_ipdl_parameters,
-      { "ipdl-parameters", "lppe.ipdl_parameters",
+      { "ipdl-parameters", "lppe.ipdl_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_IPDL_Parameters", HFILL }},
     { &hf_lppe_cellPosition,
@@ -18031,7 +18031,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_cellPosition_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_ellipsoidPointWithAltitude,
-      { "ellipsoidPointWithAltitude", "lppe.ellipsoidPointWithAltitude",
+      { "ellipsoidPointWithAltitude", "lppe.ellipsoidPointWithAltitude_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_roundTripTime,
@@ -18043,7 +18043,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_70274", HFILL }},
     { &hf_lppe_OMA_LPPe_OTDOA_UTRA_NeighborCellList_item,
-      { "OMA-LPPe-OTDOA-UTRA-NeighborCellInfo", "lppe.OMA_LPPe_OTDOA_UTRA_NeighborCellInfo",
+      { "OMA-LPPe-OTDOA-UTRA-NeighborCellInfo", "lppe.OMA_LPPe_OTDOA_UTRA_NeighborCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_modeSpecificInfo_01,
@@ -18051,15 +18051,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_modeSpecificInfo_01_vals), 0,
         "T_modeSpecificInfo_01", HFILL }},
     { &hf_lppe_fdd_01,
-      { "fdd", "lppe.fdd",
+      { "fdd", "lppe.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_01", HFILL }},
     { &hf_lppe_tdd_01,
-      { "tdd", "lppe.tdd",
+      { "tdd", "lppe.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_01", HFILL }},
     { &hf_lppe_sfn_SFN_relTimeDifference,
-      { "sfn-SFN-relTimeDifference", "lppe.sfn_SFN_relTimeDifference",
+      { "sfn-SFN-relTimeDifference", "lppe.sfn_SFN_relTimeDifference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_SFN_SFN_RelTimeDifference1", HFILL }},
     { &hf_lppe_sfn_offsetValidity,
@@ -18075,7 +18075,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_OTDOA_UTRA_SearchWindowSize_vals), 0,
         "OMA_LPPe_OTDOA_UTRA_SearchWindowSize", HFILL }},
     { &hf_lppe_positioningAssistance,
-      { "positioningAssistance", "lppe.positioningAssistance",
+      { "positioningAssistance", "lppe.positioningAssistance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_PositioningAssistance", HFILL }},
     { &hf_lppe_sfn_offset,
@@ -18107,7 +18107,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_modeSpecificInfo_02_vals), 0,
         "T_modeSpecificInfo_02", HFILL }},
     { &hf_lppe_fdd_02,
-      { "fdd", "lppe.fdd",
+      { "fdd", "lppe.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_02", HFILL }},
     { &hf_lppe_ip_spacing,
@@ -18127,11 +18127,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_63", HFILL }},
     { &hf_lppe_burstModeParameters,
-      { "burstModeParameters", "lppe.burstModeParameters",
+      { "burstModeParameters", "lppe.burstModeParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_BurstModeParameters", HFILL }},
     { &hf_lppe_tdd_02,
-      { "tdd", "lppe.tdd",
+      { "tdd", "lppe.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_02", HFILL }},
     { &hf_lppe_ip_spacing_tdd,
@@ -18167,11 +18167,11 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_otdoaUtraMeasurement,
-      { "otdoaUtraMeasurement", "lppe.otdoaUtraMeasurement",
+      { "otdoaUtraMeasurement", "lppe.otdoaUtraMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_Measurement", HFILL }},
     { &hf_lppe_timeStampData,
-      { "timeStampData", "lppe.timeStampData",
+      { "timeStampData", "lppe.timeStampData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_TimeStampData", HFILL }},
     { &hf_lppe_modeSpecificInfoMeas,
@@ -18179,19 +18179,19 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_modeSpecificInfoMeas_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_fdd_03,
-      { "fdd", "lppe.fdd",
+      { "fdd", "lppe.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_03", HFILL }},
     { &hf_lppe_referenceCellIdentity,
-      { "referenceCellIdentity", "lppe.referenceCellIdentity",
+      { "referenceCellIdentity", "lppe.referenceCellIdentity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_PrimaryCPICH_Info", HFILL }},
     { &hf_lppe_ue_RX_TX_TimeDifferenceType2Info,
-      { "ue-RX-TX-TimeDifferenceType2Info", "lppe.ue_RX_TX_TimeDifferenceType2Info",
+      { "ue-RX-TX-TimeDifferenceType2Info", "lppe.ue_RX_TX_TimeDifferenceType2Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_UE_RX_TX_TimeDifferenceType2Info", HFILL }},
     { &hf_lppe_tdd_03,
-      { "tdd", "lppe.tdd",
+      { "tdd", "lppe.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_03", HFILL }},
     { &hf_lppe_neighborList,
@@ -18203,11 +18203,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_TimeDifferenceType2", HFILL }},
     { &hf_lppe_neighborQuality,
-      { "neighborQuality", "lppe.neighborQuality",
+      { "neighborQuality", "lppe.neighborQuality_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_NeighborQuality", HFILL }},
     { &hf_lppe_OMA_LPPe_OTDOA_UTRA_NeighborList_item,
-      { "OMA-LPPe-OTDOA-UTRA-Neighbor", "lppe.OMA_LPPe_OTDOA_UTRA_Neighbor",
+      { "OMA-LPPe-OTDOA-UTRA-Neighbor", "lppe.OMA_LPPe_OTDOA_UTRA_Neighbor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_modeSpecificInfo_03,
@@ -18215,19 +18215,19 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_modeSpecificInfo_03_vals), 0,
         "T_modeSpecificInfo_03", HFILL }},
     { &hf_lppe_fdd_04,
-      { "fdd", "lppe.fdd",
+      { "fdd", "lppe.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_04", HFILL }},
     { &hf_lppe_neighborIdentity_01,
-      { "neighborIdentity", "lppe.neighborIdentity",
+      { "neighborIdentity", "lppe.neighborIdentity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_PrimaryCPICH_Info", HFILL }},
     { &hf_lppe_ue_RX_TX_timeDifferenceType2Info,
-      { "ue-RX-TX-timeDifferenceType2Info", "lppe.ue_RX_TX_timeDifferenceType2Info",
+      { "ue-RX-TX-timeDifferenceType2Info", "lppe.ue_RX_TX_timeDifferenceType2Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_UE_RX_TX_TimeDifferenceType2Info", HFILL }},
     { &hf_lppe_tdd_04,
-      { "tdd", "lppe.tdd",
+      { "tdd", "lppe.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_04", HFILL }},
     { &hf_lppe_uarfcn,
@@ -18239,7 +18239,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_SFN_SFN_ObsTimeDifference2", HFILL }},
     { &hf_lppe_quality_01,
-      { "quality", "lppe.quality",
+      { "quality", "lppe.quality_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_Quality", HFILL }},
     { &hf_lppe_numberOfOTDOA_Measurements,
@@ -18251,7 +18251,7 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_5", HFILL }},
     { &hf_lppe_utraCellGlobalID,
-      { "utraCellGlobalID", "lppe.utraCellGlobalID",
+      { "utraCellGlobalID", "lppe.utraCellGlobalID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellGlobalIdEUTRA_AndUTRA", HFILL }},
     { &hf_lppe_nonUniqueCellID,
@@ -18279,11 +18279,11 @@ void proto_register_lppe(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lppe_locationServerErrorCauses_02,
-      { "locationServerErrorCauses", "lppe.locationServerErrorCauses",
+      { "locationServerErrorCauses", "lppe.locationServerErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_LocationServerErrorCauses", HFILL }},
     { &hf_lppe_targetDeviceErrorCauses_02,
-      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses",
+      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_TargetDeviceErrorCauses", HFILL }},
     { &hf_lppe_cause_04,
@@ -18315,7 +18315,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxLTENetworks_OF_OMA_LPPe_ECID_LTE_NetworkData", HFILL }},
     { &hf_lppe_ecid_LTE_NetworkData_item,
-      { "OMA-LPPe-ECID-LTE-NetworkData", "lppe.OMA_LPPe_ECID_LTE_NetworkData",
+      { "OMA-LPPe-ECID-LTE-NetworkData", "lppe.OMA_LPPe_ECID_LTE_NetworkData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_LTE_Error,
@@ -18323,7 +18323,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_ECID_LTE_Error_vals), 0,
         "OMA_LPPe_ECID_LTE_Error", HFILL }},
     { &hf_lppe_plmn_Identity,
-      { "plmn-Identity", "lppe.plmn_Identity",
+      { "plmn-Identity", "lppe.plmn_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mcc,
@@ -18347,7 +18347,7 @@ void proto_register_lppe(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lppe_reference_location,
-      { "reference-location", "lppe.reference_location",
+      { "reference-location", "lppe.reference_location_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ReferencePoint", HFILL }},
     { &hf_lppe_ecid_lte_eNodeB_list,
@@ -18355,7 +18355,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxLTEeNBs_OF_OMA_LPPe_ECID_LTE_eNodeBData", HFILL }},
     { &hf_lppe_ecid_lte_eNodeB_list_item,
-      { "OMA-LPPe-ECID-LTE-eNodeBData", "lppe.OMA_LPPe_ECID_LTE_eNodeBData",
+      { "OMA-LPPe-ECID-LTE-eNodeBData", "lppe.OMA_LPPe_ECID_LTE_eNodeBData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_lte_HeNB_list,
@@ -18363,7 +18363,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxLTEHeNBs_OF_OMA_LPPe_ECID_LTE_HeNBData", HFILL }},
     { &hf_lppe_ecid_lte_HeNB_list_item,
-      { "OMA-LPPe-ECID-LTE-HeNBData", "lppe.OMA_LPPe_ECID_LTE_HeNBData",
+      { "OMA-LPPe-ECID-LTE-HeNBData", "lppe.OMA_LPPe_ECID_LTE_HeNBData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_lte_eNodeB_CellData,
@@ -18371,15 +18371,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxLTEMacroCells_OF_OMA_LPPe_ECID_LTE_CellData", HFILL }},
     { &hf_lppe_ecid_lte_eNodeB_CellData_item,
-      { "OMA-LPPe-ECID-LTE-CellData", "lppe.OMA_LPPe_ECID_LTE_CellData",
+      { "OMA-LPPe-ECID-LTE-CellData", "lppe.OMA_LPPe_ECID_LTE_CellData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_coverageArea,
-      { "coverageArea", "lppe.coverageArea",
+      { "coverageArea", "lppe.coverageArea_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLANFemtoCoverageArea", HFILL }},
     { &hf_lppe_ecid_lte_HeNB_CellData,
-      { "ecid-lte-HeNB-CellData", "lppe.ecid_lte_HeNB_CellData",
+      { "ecid-lte-HeNB-CellData", "lppe.ecid_lte_HeNB_CellData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_LTE_CellData", HFILL }},
     { &hf_lppe_cellIdentity_01,
@@ -18427,11 +18427,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxLTEECIDSize_OF_OMA_LPPe_ECID_LTE_LocationInformationList", HFILL }},
     { &hf_lppe_ecid_LTE_CombinedLocationInformation_item,
-      { "OMA-LPPe-ECID-LTE-LocationInformationList", "lppe.OMA_LPPe_ECID_LTE_LocationInformationList",
+      { "OMA-LPPe-ECID-LTE-LocationInformationList", "lppe.OMA_LPPe_ECID_LTE_LocationInformationList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_LTE_LocationInformation,
-      { "ecid-LTE-LocationInformation", "lppe.ecid_LTE_LocationInformation",
+      { "ecid-LTE-LocationInformation", "lppe.ecid_LTE_LocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_LTE_LocationInformation", HFILL }},
     { &hf_lppe_relativeTimeStamp,
@@ -18443,7 +18443,7 @@ void proto_register_lppe(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lppe_lpp_ECID_SignalMeasurementInformation,
-      { "lpp-ECID-SignalMeasurementInformation", "lppe.lpp_ECID_SignalMeasurementInformation",
+      { "lpp-ECID-SignalMeasurementInformation", "lppe.lpp_ECID_SignalMeasurementInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ECID_SignalMeasurementInformation", HFILL }},
     { &hf_lppe_requestedMeasurements,
@@ -18463,11 +18463,11 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_locationServerErrorCauses_03,
-      { "locationServerErrorCauses", "lppe.locationServerErrorCauses",
+      { "locationServerErrorCauses", "lppe.locationServerErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_LTE_LocationServerErrorCauses", HFILL }},
     { &hf_lppe_targetDeviceErrorCauses_03,
-      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses",
+      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_LTE_TargetDeviceErrorCauses", HFILL }},
     { &hf_lppe_cause_06,
@@ -18475,71 +18475,71 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_cause_06_vals), 0,
         "T_cause_06", HFILL }},
     { &hf_lppe_eNodeBMandatoryDataUnavailable,
-      { "eNodeBMandatoryDataUnavailable", "lppe.eNodeBMandatoryDataUnavailable",
+      { "eNodeBMandatoryDataUnavailable", "lppe.eNodeBMandatoryDataUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_eNodeBLocationsUnavailable,
-      { "eNodeBLocationsUnavailable", "lppe.eNodeBLocationsUnavailable",
+      { "eNodeBLocationsUnavailable", "lppe.eNodeBLocationsUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_eNodeBcellTransmitPowerUnavailable,
-      { "eNodeBcellTransmitPowerUnavailable", "lppe.eNodeBcellTransmitPowerUnavailable",
+      { "eNodeBcellTransmitPowerUnavailable", "lppe.eNodeBcellTransmitPowerUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_eNodeBcellAntennaPortConfigUnavailable,
-      { "eNodeBcellAntennaPortConfigUnavailable", "lppe.eNodeBcellAntennaPortConfigUnavailable",
+      { "eNodeBcellAntennaPortConfigUnavailable", "lppe.eNodeBcellAntennaPortConfigUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_eNodeBcallAntennaGainUnavailable,
-      { "eNodeBcallAntennaGainUnavailable", "lppe.eNodeBcallAntennaGainUnavailable",
+      { "eNodeBcallAntennaGainUnavailable", "lppe.eNodeBcallAntennaGainUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_eNodeBcellBeamWidthUnavailable,
-      { "eNodeBcellBeamWidthUnavailable", "lppe.eNodeBcellBeamWidthUnavailable",
+      { "eNodeBcellBeamWidthUnavailable", "lppe.eNodeBcellBeamWidthUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_eNodeBcellTransmitDirectionUnavailable,
-      { "eNodeBcellTransmitDirectionUnavailable", "lppe.eNodeBcellTransmitDirectionUnavailable",
+      { "eNodeBcellTransmitDirectionUnavailable", "lppe.eNodeBcellTransmitDirectionUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_eNodeBcellFrequencyAccuracyUnavailable,
-      { "eNodeBcellFrequencyAccuracyUnavailable", "lppe.eNodeBcellFrequencyAccuracyUnavailable",
+      { "eNodeBcellFrequencyAccuracyUnavailable", "lppe.eNodeBcellFrequencyAccuracyUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_eNodeBnonservingADUnavailable,
-      { "eNodeBnonservingADUnavailable", "lppe.eNodeBnonservingADUnavailable",
+      { "eNodeBnonservingADUnavailable", "lppe.eNodeBnonservingADUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_heNBMandatoryDataUnavailable,
-      { "heNBMandatoryDataUnavailable", "lppe.heNBMandatoryDataUnavailable",
+      { "heNBMandatoryDataUnavailable", "lppe.heNBMandatoryDataUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_heNBLocationUnavailable,
-      { "heNBLocationUnavailable", "lppe.heNBLocationUnavailable",
+      { "heNBLocationUnavailable", "lppe.heNBLocationUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_heNBLocationReliabilityUnavailable,
-      { "heNBLocationReliabilityUnavailable", "lppe.heNBLocationReliabilityUnavailable",
+      { "heNBLocationReliabilityUnavailable", "lppe.heNBLocationReliabilityUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_heNBcellTransmitPowerUnavailable,
-      { "heNBcellTransmitPowerUnavailable", "lppe.heNBcellTransmitPowerUnavailable",
+      { "heNBcellTransmitPowerUnavailable", "lppe.heNBcellTransmitPowerUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_heNBcellAntennaPortConfigUnavailable,
-      { "heNBcellAntennaPortConfigUnavailable", "lppe.heNBcellAntennaPortConfigUnavailable",
+      { "heNBcellAntennaPortConfigUnavailable", "lppe.heNBcellAntennaPortConfigUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_heNBcellFrequencyAccuracyUnavailable,
-      { "heNBcellFrequencyAccuracyUnavailable", "lppe.heNBcellFrequencyAccuracyUnavailable",
+      { "heNBcellFrequencyAccuracyUnavailable", "lppe.heNBcellFrequencyAccuracyUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_heNBCoverageAreaUnavailable,
-      { "heNBCoverageAreaUnavailable", "lppe.heNBCoverageAreaUnavailable",
+      { "heNBCoverageAreaUnavailable", "lppe.heNBCoverageAreaUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_heNBnonservingADUnavailable,
-      { "heNBnonservingADUnavailable", "lppe.heNBnonservingADUnavailable",
+      { "heNBnonservingADUnavailable", "lppe.heNBnonservingADUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_cause_07,
@@ -18547,23 +18547,23 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_cause_07_vals), 0,
         "T_cause_07", HFILL }},
     { &hf_lppe_rsrpMeasurementNotPossible,
-      { "rsrpMeasurementNotPossible", "lppe.rsrpMeasurementNotPossible",
+      { "rsrpMeasurementNotPossible", "lppe.rsrpMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_rsrqMeasurementNotPossible,
-      { "rsrqMeasurementNotPossible", "lppe.rsrqMeasurementNotPossible",
+      { "rsrqMeasurementNotPossible", "lppe.rsrqMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ueRxTxMeasurementNotPossible,
-      { "ueRxTxMeasurementNotPossible", "lppe.ueRxTxMeasurementNotPossible",
+      { "ueRxTxMeasurementNotPossible", "lppe.ueRxTxMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_non_servingMeasurementsNotAvailable,
-      { "non-servingMeasurementsNotAvailable", "lppe.non_servingMeasurementsNotAvailable",
+      { "non-servingMeasurementsNotAvailable", "lppe.non_servingMeasurementsNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_historicMeasurementsNotAvailable,
-      { "historicMeasurementsNotAvailable", "lppe.historicMeasurementsNotAvailable",
+      { "historicMeasurementsNotAvailable", "lppe.historicMeasurementsNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_gsm_NetworkData,
@@ -18571,7 +18571,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxGSMNetworks_OF_OMA_LPPe_ECID_GSM_NetworkData", HFILL }},
     { &hf_lppe_ecid_gsm_NetworkData_item,
-      { "OMA-LPPe-ECID-GSM-NetworkData", "lppe.OMA_LPPe_ECID_GSM_NetworkData",
+      { "OMA-LPPe-ECID-GSM-NetworkData", "lppe.OMA_LPPe_ECID_GSM_NetworkData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_gsm_Error,
@@ -18579,7 +18579,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_ECID_GSM_Error_vals), 0,
         "OMA_LPPe_ECID_GSM_Error", HFILL }},
     { &hf_lppe_plmn_Identity_01,
-      { "plmn-Identity", "lppe.plmn_Identity",
+      { "plmn-Identity", "lppe.plmn_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_plmn_Identity_01", HFILL }},
     { &hf_lppe_mcc_01,
@@ -18595,7 +18595,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxGSMBaseStations_OF_OMA_LPPe_ECID_GSM_BaseStationData", HFILL }},
     { &hf_lppe_base_station_list_item,
-      { "OMA-LPPe-ECID-GSM-BaseStationData", "lppe.OMA_LPPe_ECID_GSM_BaseStationData",
+      { "OMA-LPPe-ECID-GSM-BaseStationData", "lppe.OMA_LPPe_ECID_GSM_BaseStationData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_gsm_CellData,
@@ -18603,15 +18603,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxGSMCells_OF_OMA_LPPe_ECID_GSM_CellData", HFILL }},
     { &hf_lppe_ecid_gsm_CellData_item,
-      { "OMA-LPPe-ECID-GSM-CellData", "lppe.OMA_LPPe_ECID_GSM_CellData",
+      { "OMA-LPPe-ECID-GSM-CellData", "lppe.OMA_LPPe_ECID_GSM_CellData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_cellNonUniqueIDGERAN,
-      { "cellNonUniqueIDGERAN", "lppe.cellNonUniqueIDGERAN",
+      { "cellNonUniqueIDGERAN", "lppe.cellNonUniqueIDGERAN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CellNonUniqueIDGERAN", HFILL }},
     { &hf_lppe_cellLocalIDGERAN,
-      { "cellLocalIDGERAN", "lppe.cellLocalIDGERAN",
+      { "cellLocalIDGERAN", "lppe.cellLocalIDGERAN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CellLocalIdGERAN", HFILL }},
     { &hf_lppe_transmit_power,
@@ -18627,7 +18627,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxGSMECIDSize_OF_OMA_LPPe_ECID_GSM_LocationInformationList", HFILL }},
     { &hf_lppe_ecid_GSM_CombinedLocationInformation_item,
-      { "OMA-LPPe-ECID-GSM-LocationInformationList", "lppe.OMA_LPPe_ECID_GSM_LocationInformationList",
+      { "OMA-LPPe-ECID-GSM-LocationInformationList", "lppe.OMA_LPPe_ECID_GSM_LocationInformationList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_GSM_Error,
@@ -18635,11 +18635,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_ECID_GSM_Error_vals), 0,
         "OMA_LPPe_ECID_GSM_Error", HFILL }},
     { &hf_lppe_ecid_GSM_LocationInformation,
-      { "ecid-GSM-LocationInformation", "lppe.ecid_GSM_LocationInformation",
+      { "ecid-GSM-LocationInformation", "lppe.ecid_GSM_LocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_GSM_LocationInformation", HFILL }},
     { &hf_lppe_cellGlobalIdGERAN,
-      { "cellGlobalIdGERAN", "lppe.cellGlobalIdGERAN",
+      { "cellGlobalIdGERAN", "lppe.cellGlobalIdGERAN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_rxLevel,
@@ -18655,7 +18655,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_NMR_GERAN", HFILL }},
     { &hf_lppe_OMA_LPPe_NMR_GERAN_item,
-      { "OMA-LPPe-NMR-GERAN item", "lppe.OMA_LPPe_NMR_GERAN_item",
+      { "OMA-LPPe-NMR-GERAN item", "lppe.OMA_LPPe_NMR_GERAN_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_requestedMeasurements_01,
@@ -18671,11 +18671,11 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_locationServerErrorCauses_04,
-      { "locationServerErrorCauses", "lppe.locationServerErrorCauses",
+      { "locationServerErrorCauses", "lppe.locationServerErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_GSM_LocationServerErrorCauses", HFILL }},
     { &hf_lppe_targetDeviceErrorCauses_04,
-      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses",
+      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_GSM_TargetDeviceErrorCauses", HFILL }},
     { &hf_lppe_cause_08,
@@ -18683,35 +18683,35 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_cause_08_vals), 0,
         "T_cause_08", HFILL }},
     { &hf_lppe_mandatoryDataUnavailable,
-      { "mandatoryDataUnavailable", "lppe.mandatoryDataUnavailable",
+      { "mandatoryDataUnavailable", "lppe.mandatoryDataUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_bsLocationsUnavailable,
-      { "bsLocationsUnavailable", "lppe.bsLocationsUnavailable",
+      { "bsLocationsUnavailable", "lppe.bsLocationsUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_cellTransmitPowerUnavailable,
-      { "cellTransmitPowerUnavailable", "lppe.cellTransmitPowerUnavailable",
+      { "cellTransmitPowerUnavailable", "lppe.cellTransmitPowerUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_callAntennaGainUnavailable,
-      { "callAntennaGainUnavailable", "lppe.callAntennaGainUnavailable",
+      { "callAntennaGainUnavailable", "lppe.callAntennaGainUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_cellBeamWidthUnavailable,
-      { "cellBeamWidthUnavailable", "lppe.cellBeamWidthUnavailable",
+      { "cellBeamWidthUnavailable", "lppe.cellBeamWidthUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_cellTransmitDirectionUnavailable,
-      { "cellTransmitDirectionUnavailable", "lppe.cellTransmitDirectionUnavailable",
+      { "cellTransmitDirectionUnavailable", "lppe.cellTransmitDirectionUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_cellFrequencyAccuracyUnavailable,
-      { "cellFrequencyAccuracyUnavailable", "lppe.cellFrequencyAccuracyUnavailable",
+      { "cellFrequencyAccuracyUnavailable", "lppe.cellFrequencyAccuracyUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nonservingADUnavailable,
-      { "nonservingADUnavailable", "lppe.nonservingADUnavailable",
+      { "nonservingADUnavailable", "lppe.nonservingADUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_cause_09,
@@ -18719,15 +18719,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_cause_09_vals), 0,
         "T_cause_09", HFILL }},
     { &hf_lppe_rxLevelMeasurementNotPossible,
-      { "rxLevelMeasurementNotPossible", "lppe.rxLevelMeasurementNotPossible",
+      { "rxLevelMeasurementNotPossible", "lppe.rxLevelMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_taMeasurementNotPossible,
-      { "taMeasurementNotPossible", "lppe.taMeasurementNotPossible",
+      { "taMeasurementNotPossible", "lppe.taMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nMRMeasurementNotPossible,
-      { "nMRMeasurementNotPossible", "lppe.nMRMeasurementNotPossible",
+      { "nMRMeasurementNotPossible", "lppe.nMRMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_UTRA_NetworkData,
@@ -18735,7 +18735,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxUTRANetworks_OF_OMA_LPPe_ECID_UTRA_NetworkData", HFILL }},
     { &hf_lppe_ecid_UTRA_NetworkData_item,
-      { "OMA-LPPe-ECID-UTRA-NetworkData", "lppe.OMA_LPPe_ECID_UTRA_NetworkData",
+      { "OMA-LPPe-ECID-UTRA-NetworkData", "lppe.OMA_LPPe_ECID_UTRA_NetworkData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_UTRA_Error,
@@ -18743,7 +18743,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_ECID_UTRA_Error_vals), 0,
         "OMA_LPPe_ECID_UTRA_Error", HFILL }},
     { &hf_lppe_plmn_Identity_02,
-      { "plmn-Identity", "lppe.plmn_Identity",
+      { "plmn-Identity", "lppe.plmn_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_plmn_Identity_02", HFILL }},
     { &hf_lppe_mcc_02,
@@ -18759,7 +18759,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxUTRAnodeBs_OF_OMA_LPPe_ECID_UTRA_NodeBData", HFILL }},
     { &hf_lppe_ecid_utra_nodeB_list_item,
-      { "OMA-LPPe-ECID-UTRA-NodeBData", "lppe.OMA_LPPe_ECID_UTRA_NodeBData",
+      { "OMA-LPPe-ECID-UTRA-NodeBData", "lppe.OMA_LPPe_ECID_UTRA_NodeBData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_utra_HNB_list,
@@ -18767,7 +18767,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxUTRAHNBs_OF_OMA_LPPe_ECID_UTRA_HNBData", HFILL }},
     { &hf_lppe_ecid_utra_HNB_list_item,
-      { "OMA-LPPe-ECID-UTRA-HNBData", "lppe.OMA_LPPe_ECID_UTRA_HNBData",
+      { "OMA-LPPe-ECID-UTRA-HNBData", "lppe.OMA_LPPe_ECID_UTRA_HNBData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_utra_nodeB_CellData,
@@ -18775,11 +18775,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxUTRAMacroCells_OF_OMA_LPPe_ECID_UTRA_CellData", HFILL }},
     { &hf_lppe_ecid_utra_nodeB_CellData_item,
-      { "OMA-LPPe-ECID-UTRA-CellData", "lppe.OMA_LPPe_ECID_UTRA_CellData",
+      { "OMA-LPPe-ECID-UTRA-CellData", "lppe.OMA_LPPe_ECID_UTRA_CellData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_utra_HNB_CellData,
-      { "ecid-utra-HNB-CellData", "lppe.ecid_utra_HNB_CellData",
+      { "ecid-utra-HNB-CellData", "lppe.ecid_utra_HNB_CellData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_UTRA_CellData", HFILL }},
     { &hf_lppe_cellIdentity_02,
@@ -18791,7 +18791,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_modeSpecificInfo_04_vals), 0,
         "T_modeSpecificInfo_04", HFILL }},
     { &hf_lppe_fdd_05,
-      { "fdd", "lppe.fdd",
+      { "fdd", "lppe.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_05", HFILL }},
     { &hf_lppe_primaryCPICH_Scrambling_Code,
@@ -18807,7 +18807,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ARFCN_ValueUTRA", HFILL }},
     { &hf_lppe_tdd_05,
-      { "tdd", "lppe.tdd",
+      { "tdd", "lppe.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_05", HFILL }},
     { &hf_lppe_primaryCCPCH_Tx_Power,
@@ -18831,7 +18831,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxECIDUTRASize_OF_OMA_LPPe_ECID_UTRA_LocationInformationList", HFILL }},
     { &hf_lppe_ecid_UTRA_CombinedLocationInformation_item,
-      { "OMA-LPPe-ECID-UTRA-LocationInformationList", "lppe.OMA_LPPe_ECID_UTRA_LocationInformationList",
+      { "OMA-LPPe-ECID-UTRA-LocationInformationList", "lppe.OMA_LPPe_ECID_UTRA_LocationInformationList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_Error,
@@ -18839,11 +18839,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_ECID_UTRA_Error_vals), 0,
         "OMA_LPPe_ECID_UTRA_Error", HFILL }},
     { &hf_lppe_ecid_utra_LocationInformation,
-      { "ecid-utra-LocationInformation", "lppe.ecid_utra_LocationInformation",
+      { "ecid-utra-LocationInformation", "lppe.ecid_utra_LocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_UTRA_LocationInformation", HFILL }},
     { &hf_lppe_cellGlobalIdUTRA,
-      { "cellGlobalIdUTRA", "lppe.cellGlobalIdUTRA",
+      { "cellGlobalIdUTRA", "lppe.cellGlobalIdUTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellGlobalIdEUTRA_AndUTRA", HFILL }},
     { &hf_lppe_measuredResultsList,
@@ -18851,7 +18851,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_ECID_UTRA_MeasuredResultsList", HFILL }},
     { &hf_lppe_utratimingAdvance,
-      { "utratimingAdvance", "lppe.utratimingAdvance",
+      { "utratimingAdvance", "lppe.utratimingAdvance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_UTRA_UTRATimingAdvance", HFILL }},
     { &hf_lppe_tA_01,
@@ -18871,11 +18871,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_UTRA_ModeSpecificInfo_vals), 0,
         "OMA_LPPe_UTRA_ModeSpecificInfo", HFILL }},
     { &hf_lppe_fdd_06,
-      { "fdd", "lppe.fdd",
+      { "fdd", "lppe.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_UTRA_FrequencyInfoFDD", HFILL }},
     { &hf_lppe_tdd_06,
-      { "tdd", "lppe.tdd",
+      { "tdd", "lppe.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_UTRA_FrequencyInfoTDD", HFILL }},
     { &hf_lppe_uarfcn_UL,
@@ -18891,7 +18891,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ARFCN_ValueUTRA", HFILL }},
     { &hf_lppe_OMA_LPPe_ECID_UTRA_MeasuredResultsList_item,
-      { "OMA-LPPe-ECID-UTRA-MeasuredResults", "lppe.OMA_LPPe_ECID_UTRA_MeasuredResults",
+      { "OMA-LPPe-ECID-UTRA-MeasuredResults", "lppe.OMA_LPPe_ECID_UTRA_MeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_utra_CarrierRSSI,
@@ -18903,7 +18903,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_ECID_UTRA_CellMeasuredResultsList", HFILL }},
     { &hf_lppe_OMA_LPPe_ECID_UTRA_CellMeasuredResultsList_item,
-      { "OMA-LPPe-ECID-UTRA-CellMeasuredResults", "lppe.OMA_LPPe_ECID_UTRA_CellMeasuredResults",
+      { "OMA-LPPe-ECID-UTRA-CellMeasuredResults", "lppe.OMA_LPPe_ECID_UTRA_CellMeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_modeSpecificInfo_06,
@@ -18911,7 +18911,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_modeSpecificInfo_05_vals), 0,
         "T_modeSpecificInfo_05", HFILL }},
     { &hf_lppe_fdd_07,
-      { "fdd", "lppe.fdd",
+      { "fdd", "lppe.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_06", HFILL }},
     { &hf_lppe_primaryCPICH_Info,
@@ -18931,7 +18931,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_ECID_UTRA_Pathloss", HFILL }},
     { &hf_lppe_tdd_07,
-      { "tdd", "lppe.tdd",
+      { "tdd", "lppe.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_06", HFILL }},
     { &hf_lppe_primaryCCPCH_RSCP,
@@ -18955,11 +18955,11 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_locationServerErrorCauses_05,
-      { "locationServerErrorCauses", "lppe.locationServerErrorCauses",
+      { "locationServerErrorCauses", "lppe.locationServerErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_UTRA_LocationServerErrorCauses", HFILL }},
     { &hf_lppe_targetDeviceErrorCauses_05,
-      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses",
+      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_UTRA_TargetDeviceErrorCauses", HFILL }},
     { &hf_lppe_cause_10,
@@ -18967,63 +18967,63 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_cause_10_vals), 0,
         "T_cause_10", HFILL }},
     { &hf_lppe_nodeBMandatoryDataUnavailable,
-      { "nodeBMandatoryDataUnavailable", "lppe.nodeBMandatoryDataUnavailable",
+      { "nodeBMandatoryDataUnavailable", "lppe.nodeBMandatoryDataUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nodeBLocationUnavailable,
-      { "nodeBLocationUnavailable", "lppe.nodeBLocationUnavailable",
+      { "nodeBLocationUnavailable", "lppe.nodeBLocationUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nodeBcellTransmitPowerUnavailable,
-      { "nodeBcellTransmitPowerUnavailable", "lppe.nodeBcellTransmitPowerUnavailable",
+      { "nodeBcellTransmitPowerUnavailable", "lppe.nodeBcellTransmitPowerUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nodeBcallAntennaGainUnavailable,
-      { "nodeBcallAntennaGainUnavailable", "lppe.nodeBcallAntennaGainUnavailable",
+      { "nodeBcallAntennaGainUnavailable", "lppe.nodeBcallAntennaGainUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nodeBcellBeamWidthUnavailable,
-      { "nodeBcellBeamWidthUnavailable", "lppe.nodeBcellBeamWidthUnavailable",
+      { "nodeBcellBeamWidthUnavailable", "lppe.nodeBcellBeamWidthUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nodeBcellTransmitDirectionUnavailable,
-      { "nodeBcellTransmitDirectionUnavailable", "lppe.nodeBcellTransmitDirectionUnavailable",
+      { "nodeBcellTransmitDirectionUnavailable", "lppe.nodeBcellTransmitDirectionUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nodeBcellFrequencyAccuracyUnavailable,
-      { "nodeBcellFrequencyAccuracyUnavailable", "lppe.nodeBcellFrequencyAccuracyUnavailable",
+      { "nodeBcellFrequencyAccuracyUnavailable", "lppe.nodeBcellFrequencyAccuracyUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nodeBnonservingADUnavailable,
-      { "nodeBnonservingADUnavailable", "lppe.nodeBnonservingADUnavailable",
+      { "nodeBnonservingADUnavailable", "lppe.nodeBnonservingADUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_hNBMandatoryDataUnavailable,
-      { "hNBMandatoryDataUnavailable", "lppe.hNBMandatoryDataUnavailable",
+      { "hNBMandatoryDataUnavailable", "lppe.hNBMandatoryDataUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_hNBLocationUnavailable,
-      { "hNBLocationUnavailable", "lppe.hNBLocationUnavailable",
+      { "hNBLocationUnavailable", "lppe.hNBLocationUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_hNBLocationReliabilityUnavailable,
-      { "hNBLocationReliabilityUnavailable", "lppe.hNBLocationReliabilityUnavailable",
+      { "hNBLocationReliabilityUnavailable", "lppe.hNBLocationReliabilityUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_hNBcellTransmitPowerUnavailable,
-      { "hNBcellTransmitPowerUnavailable", "lppe.hNBcellTransmitPowerUnavailable",
+      { "hNBcellTransmitPowerUnavailable", "lppe.hNBcellTransmitPowerUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_hNBcellFrequencyAccuracyUnavailable,
-      { "hNBcellFrequencyAccuracyUnavailable", "lppe.hNBcellFrequencyAccuracyUnavailable",
+      { "hNBcellFrequencyAccuracyUnavailable", "lppe.hNBcellFrequencyAccuracyUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_hNBCoverageAreaUnavailable,
-      { "hNBCoverageAreaUnavailable", "lppe.hNBCoverageAreaUnavailable",
+      { "hNBCoverageAreaUnavailable", "lppe.hNBCoverageAreaUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_hNBnonservingADUnavailable,
-      { "hNBnonservingADUnavailable", "lppe.hNBnonservingADUnavailable",
+      { "hNBnonservingADUnavailable", "lppe.hNBnonservingADUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_cause_11,
@@ -19031,35 +19031,35 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_cause_11_vals), 0,
         "T_cause_11", HFILL }},
     { &hf_lppe_mRLMeasurementsNotPossible,
-      { "mRLMeasurementsNotPossible", "lppe.mRLMeasurementsNotPossible",
+      { "mRLMeasurementsNotPossible", "lppe.mRLMeasurementsNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_tdd_timingAdvanceMeasurementNotPossible,
-      { "tdd-timingAdvanceMeasurementNotPossible", "lppe.tdd_timingAdvanceMeasurementNotPossible",
+      { "tdd-timingAdvanceMeasurementNotPossible", "lppe.tdd_timingAdvanceMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mRL_utra_CarrierRSSIMeasurementNotPossible,
-      { "mRL-utra-CarrierRSSIMeasurementNotPossible", "lppe.mRL_utra_CarrierRSSIMeasurementNotPossible",
+      { "mRL-utra-CarrierRSSIMeasurementNotPossible", "lppe.mRL_utra_CarrierRSSIMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mRL_FDD_cpich_Ec_N0MeasurementNotPossible,
-      { "mRL-FDD-cpich-Ec-N0MeasurementNotPossible", "lppe.mRL_FDD_cpich_Ec_N0MeasurementNotPossible",
+      { "mRL-FDD-cpich-Ec-N0MeasurementNotPossible", "lppe.mRL_FDD_cpich_Ec_N0MeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mRL_FDD_cpich_RSCPMeasurementNotPossible,
-      { "mRL-FDD-cpich-RSCPMeasurementNotPossible", "lppe.mRL_FDD_cpich_RSCPMeasurementNotPossible",
+      { "mRL-FDD-cpich-RSCPMeasurementNotPossible", "lppe.mRL_FDD_cpich_RSCPMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mRL_FDD_pathlossMeasurementNotPossible,
-      { "mRL-FDD-pathlossMeasurementNotPossible", "lppe.mRL_FDD_pathlossMeasurementNotPossible",
+      { "mRL-FDD-pathlossMeasurementNotPossible", "lppe.mRL_FDD_pathlossMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mRL_TDD_primaryCCPCH_RSCPMeasurementNotPossible,
-      { "mRL-TDD-primaryCCPCH-RSCPMeasurementNotPossible", "lppe.mRL_TDD_primaryCCPCH_RSCPMeasurementNotPossible",
+      { "mRL-TDD-primaryCCPCH-RSCPMeasurementNotPossible", "lppe.mRL_TDD_primaryCCPCH_RSCPMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mRL_TDD_pathlossMeasurementNotPossible,
-      { "mRL-TDD-pathlossMeasurementNotPossible", "lppe.mRL_TDD_pathlossMeasurementNotPossible",
+      { "mRL-TDD-pathlossMeasurementNotPossible", "lppe.mRL_TDD_pathlossMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_wlan_DataSet,
@@ -19067,7 +19067,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxWLANDataSets_OF_OMA_LPPe_WLAN_DataSet", HFILL }},
     { &hf_lppe_wlan_DataSet_item,
-      { "OMA-LPPe-WLAN-DataSet", "lppe.OMA_LPPe_WLAN_DataSet",
+      { "OMA-LPPe-WLAN-DataSet", "lppe.OMA_LPPe_WLAN_DataSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_wlan_AP_Error,
@@ -19075,7 +19075,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_WLAN_AP_Error_vals), 0,
         "OMA_LPPe_WLAN_AP_Error", HFILL }},
     { &hf_lppe_plmn_Identity_03,
-      { "plmn-Identity", "lppe.plmn_Identity",
+      { "plmn-Identity", "lppe.plmn_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_plmn_Identity_03", HFILL }},
     { &hf_lppe_mcc_03,
@@ -19087,11 +19087,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_mnc_03", HFILL }},
     { &hf_lppe_supported_channels_11a,
-      { "supported-channels-11a", "lppe.supported_channels_11a",
+      { "supported-channels-11a", "lppe.supported_channels_11a_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_supported_channels_11bg,
-      { "supported-channels-11bg", "lppe.supported_channels_11bg",
+      { "supported-channels-11bg", "lppe.supported_channels_11bg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_wlan_ap_list,
@@ -19099,7 +19099,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxWLANAPs_OF_OMA_LPPe_WLAN_AP_Data", HFILL }},
     { &hf_lppe_wlan_ap_list_item,
-      { "OMA-LPPe-WLAN-AP-Data", "lppe.OMA_LPPe_WLAN_AP_Data",
+      { "OMA-LPPe-WLAN-AP-Data", "lppe.OMA_LPPe_WLAN_AP_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ch34,
@@ -19223,7 +19223,7 @@ void proto_register_lppe(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lppe_wlan_ap_id,
-      { "wlan-ap-id", "lppe.wlan_ap_id",
+      { "wlan-ap-id", "lppe.wlan_ap_id_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_ID", HFILL }},
     { &hf_lppe_wlan_ap_Type_Data,
@@ -19231,7 +19231,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxWLANTypes_OF_OMA_LPPe_WLAN_AP_Type_Data", HFILL }},
     { &hf_lppe_wlan_ap_Type_Data_item,
-      { "OMA-LPPe-WLAN-AP-Type-Data", "lppe.OMA_LPPe_WLAN_AP_Type_Data",
+      { "OMA-LPPe-WLAN-AP-Type-Data", "lppe.OMA_LPPe_WLAN_AP_Type_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_wlan_AP_Type,
@@ -19251,15 +19251,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxWLANAPSize_OF_OMA_LPPe_WLAN_AP_LocationInformationList", HFILL }},
     { &hf_lppe_wlan_AP_CombinedLocationInformation_item,
-      { "OMA-LPPe-WLAN-AP-LocationInformationList", "lppe.OMA_LPPe_WLAN_AP_LocationInformationList",
+      { "OMA-LPPe-WLAN-AP-LocationInformationList", "lppe.OMA_LPPe_WLAN_AP_LocationInformationList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_wlan_AP_LocationInformation,
-      { "wlan-AP-LocationInformation", "lppe.wlan_AP_LocationInformation",
+      { "wlan-AP-LocationInformation", "lppe.wlan_AP_LocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_LocationInformation", HFILL }},
     { &hf_lppe_apMACAddress,
-      { "apMACAddress", "lppe.apMACAddress",
+      { "apMACAddress", "lppe.apMACAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_ID", HFILL }},
     { &hf_lppe_apSSID,
@@ -19287,7 +19287,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_256", HFILL }},
     { &hf_lppe_apRoundTripDelay,
-      { "apRoundTripDelay", "lppe.apRoundTripDelay",
+      { "apRoundTripDelay", "lppe.apRoundTripDelay_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_RTD", HFILL }},
     { &hf_lppe_ueTransmitPower,
@@ -19299,7 +19299,7 @@ void proto_register_lppe(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M127_128", HFILL }},
     { &hf_lppe_apReportedLocation,
-      { "apReportedLocation", "lppe.apReportedLocation",
+      { "apReportedLocation", "lppe.apReportedLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_ReportedLocation", HFILL }},
     { &hf_lppe_rTDValue,
@@ -19315,7 +19315,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_255", HFILL }},
     { &hf_lppe_locationDataLCI,
-      { "locationDataLCI", "lppe.locationDataLCI",
+      { "locationDataLCI", "lppe.locationDataLCI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_LocationDataLCI", HFILL }},
     { &hf_lppe_latitudeResolution,
@@ -19363,7 +19363,7 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_Type_List", HFILL }},
     { &hf_lppe_ap_Capability,
-      { "ap-Capability", "lppe.ap_Capability",
+      { "ap-Capability", "lppe.ap_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_Capability", HFILL }},
     { &hf_lppe_wlan_ap_ADSupported,
@@ -19375,11 +19375,11 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_Type_List", HFILL }},
     { &hf_lppe_locationServerErrorCauses_06,
-      { "locationServerErrorCauses", "lppe.locationServerErrorCauses",
+      { "locationServerErrorCauses", "lppe.locationServerErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_LocationServerErrorCauses", HFILL }},
     { &hf_lppe_targetDeviceErrorCauses_06,
-      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses",
+      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_TargetDeviceErrorCauses", HFILL }},
     { &hf_lppe_cause_12,
@@ -19387,27 +19387,27 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_cause_12_vals), 0,
         "T_cause_12", HFILL }},
     { &hf_lppe_apMandatoryDataUnavailable,
-      { "apMandatoryDataUnavailable", "lppe.apMandatoryDataUnavailable",
+      { "apMandatoryDataUnavailable", "lppe.apMandatoryDataUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_apLocationsUnavailable,
-      { "apLocationsUnavailable", "lppe.apLocationsUnavailable",
+      { "apLocationsUnavailable", "lppe.apLocationsUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_apLocationReliabilityUnavailable,
-      { "apLocationReliabilityUnavailable", "lppe.apLocationReliabilityUnavailable",
+      { "apLocationReliabilityUnavailable", "lppe.apLocationReliabilityUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_apTransmitPowerUnavailable,
-      { "apTransmitPowerUnavailable", "lppe.apTransmitPowerUnavailable",
+      { "apTransmitPowerUnavailable", "lppe.apTransmitPowerUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_apAntennaGainUnavailable,
-      { "apAntennaGainUnavailable", "lppe.apAntennaGainUnavailable",
+      { "apAntennaGainUnavailable", "lppe.apAntennaGainUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_apCoverageAreaUnavailable,
-      { "apCoverageAreaUnavailable", "lppe.apCoverageAreaUnavailable",
+      { "apCoverageAreaUnavailable", "lppe.apCoverageAreaUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_cause_13,
@@ -19415,43 +19415,43 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_cause_13_vals), 0,
         "T_cause_13", HFILL }},
     { &hf_lppe_apSSIDnotAvailable,
-      { "apSSIDnotAvailable", "lppe.apSSIDnotAvailable",
+      { "apSSIDnotAvailable", "lppe.apSSIDnotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_apSNMeasurementNotPossible,
-      { "apSNMeasurementNotPossible", "lppe.apSNMeasurementNotPossible",
+      { "apSNMeasurementNotPossible", "lppe.apSNMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_apDevTypeNotAvailable,
-      { "apDevTypeNotAvailable", "lppe.apDevTypeNotAvailable",
+      { "apDevTypeNotAvailable", "lppe.apDevTypeNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_apPhyTypeNotAvailable,
-      { "apPhyTypeNotAvailable", "lppe.apPhyTypeNotAvailable",
+      { "apPhyTypeNotAvailable", "lppe.apPhyTypeNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_apRSSIMeasurementNotPossible,
-      { "apRSSIMeasurementNotPossible", "lppe.apRSSIMeasurementNotPossible",
+      { "apRSSIMeasurementNotPossible", "lppe.apRSSIMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_apChanFreqNotAvailable,
-      { "apChanFreqNotAvailable", "lppe.apChanFreqNotAvailable",
+      { "apChanFreqNotAvailable", "lppe.apChanFreqNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_apRTDMeasurementNotPossible,
-      { "apRTDMeasurementNotPossible", "lppe.apRTDMeasurementNotPossible",
+      { "apRTDMeasurementNotPossible", "lppe.apRTDMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ueTPNotAvailable,
-      { "ueTPNotAvailable", "lppe.ueTPNotAvailable",
+      { "ueTPNotAvailable", "lppe.ueTPNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ueAGNotAvailable,
-      { "ueAGNotAvailable", "lppe.ueAGNotAvailable",
+      { "ueAGNotAvailable", "lppe.ueAGNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_apRecLocNotAvailable,
-      { "apRecLocNotAvailable", "lppe.apRecLocNotAvailable",
+      { "apRecLocNotAvailable", "lppe.apRecLocNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_wimax_CombinedLocationInformation,
@@ -19459,7 +19459,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxWiMaxECIDSize_OF_OMA_LPPe_ECID_WiMax_LocationInformationList", HFILL }},
     { &hf_lppe_ecid_wimax_CombinedLocationInformation_item,
-      { "OMA-LPPe-ECID-WiMax-LocationInformationList", "lppe.OMA_LPPe_ECID_WiMax_LocationInformationList",
+      { "OMA-LPPe-ECID-WiMax-LocationInformationList", "lppe.OMA_LPPe_ECID_WiMax_LocationInformationList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_wimax_Error,
@@ -19467,15 +19467,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_ECID_WiMax_Error_vals), 0,
         "OMA_LPPe_ECID_WiMax_Error", HFILL }},
     { &hf_lppe_ecid_wimax_LocationInformation,
-      { "ecid-wimax-LocationInformation", "lppe.ecid_wimax_LocationInformation",
+      { "ecid-wimax-LocationInformation", "lppe.ecid_wimax_LocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_WiMax_LocationInformation", HFILL }},
     { &hf_lppe_wimaxBsID,
-      { "wimaxBsID", "lppe.wimaxBsID",
+      { "wimaxBsID", "lppe.wimaxBsID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_WiMax_WimaxBsID", HFILL }},
     { &hf_lppe_wimaxRTD,
-      { "wimaxRTD", "lppe.wimaxRTD",
+      { "wimaxRTD", "lppe.wimaxRTD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_WiMax_WimaxRTD", HFILL }},
     { &hf_lppe_wimaxNMRList,
@@ -19499,7 +19499,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_1023", HFILL }},
     { &hf_lppe_OMA_LPPe_ECID_WiMax_WimaxNMRList_item,
-      { "OMA-LPPe-ECID-WiMax-WimaxNMR", "lppe.OMA_LPPe_ECID_WiMax_WimaxNMR",
+      { "OMA-LPPe-ECID-WiMax-WimaxNMR", "lppe.OMA_LPPe_ECID_WiMax_WimaxNMR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_relDelay,
@@ -19531,7 +19531,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_63", HFILL }},
     { &hf_lppe_bSLocation,
-      { "bSLocation", "lppe.bSLocation",
+      { "bSLocation", "lppe.bSLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_ReportedLocation", HFILL }},
     { &hf_lppe_requestedMeasurements_04,
@@ -19543,11 +19543,11 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_locationServerErrorCauses_07,
-      { "locationServerErrorCauses", "lppe.locationServerErrorCauses",
+      { "locationServerErrorCauses", "lppe.locationServerErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_WiMax_LocationServerErrorCauses", HFILL }},
     { &hf_lppe_targetDeviceErrorCauses_07,
-      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses",
+      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_WiMax_TargetDeviceErrorCauses", HFILL }},
     { &hf_lppe_cause_14,
@@ -19559,43 +19559,43 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_cause_15_vals), 0,
         "T_cause_15", HFILL }},
     { &hf_lppe_rTDMeasurementNotPossible,
-      { "rTDMeasurementNotPossible", "lppe.rTDMeasurementNotPossible",
+      { "rTDMeasurementNotPossible", "lppe.rTDMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_rTDstdMeasurementNotPossible,
-      { "rTDstdMeasurementNotPossible", "lppe.rTDstdMeasurementNotPossible",
+      { "rTDstdMeasurementNotPossible", "lppe.rTDstdMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nMRrelDelayMeasurementNotPossible,
-      { "nMRrelDelayMeasurementNotPossible", "lppe.nMRrelDelayMeasurementNotPossible",
+      { "nMRrelDelayMeasurementNotPossible", "lppe.nMRrelDelayMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nMRrelDelaystdMeasurementNotPossible,
-      { "nMRrelDelaystdMeasurementNotPossible", "lppe.nMRrelDelaystdMeasurementNotPossible",
+      { "nMRrelDelaystdMeasurementNotPossible", "lppe.nMRrelDelaystdMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nMRrSSIMeasurementNotPossible,
-      { "nMRrSSIMeasurementNotPossible", "lppe.nMRrSSIMeasurementNotPossible",
+      { "nMRrSSIMeasurementNotPossible", "lppe.nMRrSSIMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nMRrSSIstdMeasurementNotPossible,
-      { "nMRrSSIstdMeasurementNotPossible", "lppe.nMRrSSIstdMeasurementNotPossible",
+      { "nMRrSSIstdMeasurementNotPossible", "lppe.nMRrSSIstdMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nMRbSTxPowerMeasurementNotPossible,
-      { "nMRbSTxPowerMeasurementNotPossible", "lppe.nMRbSTxPowerMeasurementNotPossible",
+      { "nMRbSTxPowerMeasurementNotPossible", "lppe.nMRbSTxPowerMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nMRcINRMeasurementNotPossible,
-      { "nMRcINRMeasurementNotPossible", "lppe.nMRcINRMeasurementNotPossible",
+      { "nMRcINRMeasurementNotPossible", "lppe.nMRcINRMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nMRcINRstdMeasurementNotPossible,
-      { "nMRcINRstdMeasurementNotPossible", "lppe.nMRcINRstdMeasurementNotPossible",
+      { "nMRcINRstdMeasurementNotPossible", "lppe.nMRcINRstdMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nMRbSLocationNotAvailable,
-      { "nMRbSLocationNotAvailable", "lppe.nMRbSLocationNotAvailable",
+      { "nMRbSLocationNotAvailable", "lppe.nMRbSLocationNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_motionStateList,
@@ -19607,7 +19607,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_Sensor_Error_vals), 0,
         "OMA_LPPe_Sensor_Error", HFILL }},
     { &hf_lppe_OMA_LPPe_Sensor_MotionStateList_item,
-      { "OMA-LPPe-Sensor-MotionStateElement", "lppe.OMA_LPPe_Sensor_MotionStateElement",
+      { "OMA-LPPe-Sensor-MotionStateElement", "lppe.OMA_LPPe_Sensor_MotionStateElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_primaryMotionState,
@@ -19619,23 +19619,23 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_motionStateReq,
-      { "motionStateReq", "lppe.motionStateReq",
+      { "motionStateReq", "lppe.motionStateReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_Sensor_MotionStateRequest", HFILL }},
     { &hf_lppe_secondaryMotionStateRequest,
-      { "secondaryMotionStateRequest", "lppe.secondaryMotionStateRequest",
+      { "secondaryMotionStateRequest", "lppe.secondaryMotionStateRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_motionStateSupport,
-      { "motionStateSupport", "lppe.motionStateSupport",
+      { "motionStateSupport", "lppe.motionStateSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_secondarySupport,
-      { "secondarySupport", "lppe.secondarySupport",
+      { "secondarySupport", "lppe.secondarySupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_targetError,
-      { "targetError", "lppe.targetError",
+      { "targetError", "lppe.targetError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_Sensor_TargetError", HFILL }},
     { &hf_lppe_motionStateError,
@@ -19651,7 +19651,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_srnGroup_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_srnGroupList,
-      { "srnGroupList", "lppe.srnGroupList",
+      { "srnGroupList", "lppe.srnGroupList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_SRNgroupList", HFILL }},
     { &hf_lppe_srnGroupUpdateResponse,
@@ -19671,7 +19671,7 @@ void proto_register_lppe(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lppe_defaultReferencePoint,
-      { "defaultReferencePoint", "lppe.defaultReferencePoint",
+      { "defaultReferencePoint", "lppe.defaultReferencePoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ReferencePoint", HFILL }},
     { &hf_lppe_groupList,
@@ -19679,23 +19679,23 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_64_OF_OMA_LPPe_SRN_SRNgroup", HFILL }},
     { &hf_lppe_groupList_item,
-      { "OMA-LPPe-SRN-SRNgroup", "lppe.OMA_LPPe_SRN_SRNgroup",
+      { "OMA-LPPe-SRN-SRNgroup", "lppe.OMA_LPPe_SRN_SRNgroup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_srnGroupID,
-      { "srnGroupID", "lppe.srnGroupID",
+      { "srnGroupID", "lppe.srnGroupID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_SRNgroupUniqueID", HFILL }},
     { &hf_lppe_defaultSRNtype,
-      { "defaultSRNtype", "lppe.defaultSRNtype",
+      { "defaultSRNtype", "lppe.defaultSRNtype_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_SRNtype", HFILL }},
     { &hf_lppe_referencePoint_01,
-      { "referencePoint", "lppe.referencePoint",
+      { "referencePoint", "lppe.referencePoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ReferencePoint", HFILL }},
     { &hf_lppe_globalOrientation,
-      { "globalOrientation", "lppe.globalOrientation",
+      { "globalOrientation", "lppe.globalOrientation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_srnsInGroupList,
@@ -19703,19 +19703,19 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_1024_OF_OMA_LPPe_SRN_SRNinfo", HFILL }},
     { &hf_lppe_srnsInGroupList_item,
-      { "OMA-LPPe-SRN-SRNinfo", "lppe.OMA_LPPe_SRN_SRNinfo",
+      { "OMA-LPPe-SRN-SRNinfo", "lppe.OMA_LPPe_SRN_SRNinfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_srnID,
-      { "srnID", "lppe.srnID",
+      { "srnID", "lppe.srnID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_SRNid", HFILL }},
     { &hf_lppe_srnType,
-      { "srnType", "lppe.srnType",
+      { "srnType", "lppe.srnType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_SRNtype", HFILL }},
     { &hf_lppe_relativePosition,
-      { "relativePosition", "lppe.relativePosition",
+      { "relativePosition", "lppe.relativePosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RelativeLocation", HFILL }},
     { &hf_lppe_orientation,
@@ -19723,7 +19723,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_Orientation_vals), 0,
         "OMA_LPPe_Orientation", HFILL }},
     { &hf_lppe_OMA_LPPe_SRN_SRNgroupUpdateResponse_item,
-      { "OMA-LPPe-SRN-SRNgroupUpdateResponseElement", "lppe.OMA_LPPe_SRN_SRNgroupUpdateResponseElement",
+      { "OMA-LPPe-SRN-SRNgroupUpdateResponseElement", "lppe.OMA_LPPe_SRN_SRNgroupUpdateResponseElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_targetDataValidity,
@@ -19731,15 +19731,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_targetDataValidity_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_updatedSRNgroup,
-      { "updatedSRNgroup", "lppe.updatedSRNgroup",
+      { "updatedSRNgroup", "lppe.updatedSRNgroup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_SRNgroup", HFILL }},
     { &hf_lppe_OMA_LPPe_SRN_AntennaPattern_item,
-      { "OMA-LPPe-SRN-AntennaPatternElement", "lppe.OMA_LPPe_SRN_AntennaPatternElement",
+      { "OMA-LPPe-SRN-AntennaPatternElement", "lppe.OMA_LPPe_SRN_AntennaPatternElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_identification,
-      { "identification", "lppe.identification",
+      { "identification", "lppe.identification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_vendorOrOperator,
@@ -19755,7 +19755,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_antennaData_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_antennaPattern_01,
-      { "antennaPattern", "lppe.antennaPattern",
+      { "antennaPattern", "lppe.antennaPattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_AntennaPatternForChannels", HFILL }},
     { &hf_lppe_antennaContainer,
@@ -19763,7 +19763,7 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_lppe_evenGrid,
-      { "evenGrid", "lppe.evenGrid",
+      { "evenGrid", "lppe.evenGrid_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_inAzimuth,
@@ -19779,7 +19779,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxChannels_OF_OMA_LPPe_SRN_ChannelResponse", HFILL }},
     { &hf_lppe_patternList_item,
-      { "OMA-LPPe-SRN-ChannelResponse", "lppe.OMA_LPPe_SRN_ChannelResponse",
+      { "OMA-LPPe-SRN-ChannelResponse", "lppe.OMA_LPPe_SRN_ChannelResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_channelNumber,
@@ -19791,7 +19791,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_7_901_OF_OMA_LPPe_SRN_ResponseInElevation", HFILL }},
     { &hf_lppe_responseInElevation_item,
-      { "OMA-LPPe-SRN-ResponseInElevation", "lppe.OMA_LPPe_SRN_ResponseInElevation",
+      { "OMA-LPPe-SRN-ResponseInElevation", "lppe.OMA_LPPe_SRN_ResponseInElevation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_elevation_01,
@@ -19803,7 +19803,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_18_3601_OF_OMA_LPPe_SRN_ResponseInAzimuth", HFILL }},
     { &hf_lppe_responseInAzimuth_item,
-      { "OMA-LPPe-SRN-ResponseInAzimuth", "lppe.OMA_LPPe_SRN_ResponseInAzimuth",
+      { "OMA-LPPe-SRN-ResponseInAzimuth", "lppe.OMA_LPPe_SRN_ResponseInAzimuth_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_azimuth_01,
@@ -19811,7 +19811,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_3599", HFILL }},
     { &hf_lppe_response,
-      { "response", "lppe.response",
+      { "response", "lppe.response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ComplexNumber", HFILL }},
     { &hf_lppe_amplitude,
@@ -19827,7 +19827,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_srnGroup_01_vals), 0,
         "T_srnGroup_01", HFILL }},
     { &hf_lppe_srnGroupRequest,
-      { "srnGroupRequest", "lppe.srnGroupRequest",
+      { "srnGroupRequest", "lppe.srnGroupRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_SRNgroupRequest", HFILL }},
     { &hf_lppe_srnGroupUpdateRequest,
@@ -19839,11 +19839,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_SRN_AntennaPatternRequest", HFILL }},
     { &hf_lppe_doNotProvideList,
-      { "doNotProvideList", "lppe.doNotProvideList",
+      { "doNotProvideList", "lppe.doNotProvideList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_SRNProvideList", HFILL }},
     { &hf_lppe_doProvideList,
-      { "doProvideList", "lppe.doProvideList",
+      { "doProvideList", "lppe.doProvideList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_SRNProvideList", HFILL }},
     { &hf_lppe_groupList_01,
@@ -19851,7 +19851,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_256_OF_OMA_LPPe_SRN_SRNgroupUniqueID", HFILL }},
     { &hf_lppe_groupList_item_01,
-      { "OMA-LPPe-SRN-SRNgroupUniqueID", "lppe.OMA_LPPe_SRN_SRNgroupUniqueID",
+      { "OMA-LPPe-SRN-SRNgroupUniqueID", "lppe.OMA_LPPe_SRN_SRNgroupUniqueID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_categoryList,
@@ -19859,15 +19859,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_16_OF_OMA_LPPe_SRN_Category", HFILL }},
     { &hf_lppe_categoryList_item,
-      { "OMA-LPPe-SRN-Category", "lppe.OMA_LPPe_SRN_Category",
+      { "OMA-LPPe-SRN-Category", "lppe.OMA_LPPe_SRN_Category_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_SRN_SRNgroupUpdateRequest_item,
-      { "OMA-LPPe-SRN-SRNgroupUpdateRequestElement", "lppe.OMA_LPPe_SRN_SRNgroupUpdateRequestElement",
+      { "OMA-LPPe-SRN-SRNgroupUpdateRequestElement", "lppe.OMA_LPPe_SRN_SRNgroupUpdateRequestElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_provideIndicationOnly,
-      { "provideIndicationOnly", "lppe.provideIndicationOnly",
+      { "provideIndicationOnly", "lppe.provideIndicationOnly_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_inTheGroup,
@@ -19875,15 +19875,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_1024_OF_OMA_LPPe_SRN_SRNid", HFILL }},
     { &hf_lppe_inTheGroup_item,
-      { "OMA-LPPe-SRN-SRNid", "lppe.OMA_LPPe_SRN_SRNid",
+      { "OMA-LPPe-SRN-SRNid", "lppe.OMA_LPPe_SRN_SRNid_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_SRN_AntennaPatternRequest_item,
-      { "OMA-LPPe-SRN-AntennaPatternRequestElement", "lppe.OMA_LPPe_SRN_AntennaPatternRequestElement",
+      { "OMA-LPPe-SRN-AntennaPatternRequestElement", "lppe.OMA_LPPe_SRN_AntennaPatternRequestElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_antennaPatternID_01,
-      { "antennaPatternID", "lppe.antennaPatternID",
+      { "antennaPatternID", "lppe.antennaPatternID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_srnMeasurementList,
@@ -19891,11 +19891,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_64_OF_OMA_LPPe_SRN_MeasurementElement", HFILL }},
     { &hf_lppe_srnMeasurementList_item,
-      { "OMA-LPPe-SRN-MeasurementElement", "lppe.OMA_LPPe_SRN_MeasurementElement",
+      { "OMA-LPPe-SRN-MeasurementElement", "lppe.OMA_LPPe_SRN_MeasurementElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_srnCategory,
-      { "srnCategory", "lppe.srnCategory",
+      { "srnCategory", "lppe.srnCategory_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_Category", HFILL }},
     { &hf_lppe_measurementList,
@@ -19903,7 +19903,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_64_OF_OMA_LPPe_SRN_srnMeasurementElement", HFILL }},
     { &hf_lppe_measurementList_item,
-      { "OMA-LPPe-SRN-srnMeasurementElement", "lppe.OMA_LPPe_SRN_srnMeasurementElement",
+      { "OMA-LPPe-SRN-srnMeasurementElement", "lppe.OMA_LPPe_SRN_srnMeasurementElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_relativeTimeStamp_01,
@@ -19915,7 +19915,7 @@ void proto_register_lppe(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M128_127", HFILL }},
     { &hf_lppe_rtd,
-      { "rtd", "lppe.rtd",
+      { "rtd", "lppe.rtd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_RTD", HFILL }},
     { &hf_lppe_requestInfo,
@@ -19923,11 +19923,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_16_OF_OMA_LPPe_SRN_ReqLocInfo_Category", HFILL }},
     { &hf_lppe_requestInfo_item,
-      { "OMA-LPPe-SRN-ReqLocInfo-Category", "lppe.OMA_LPPe_SRN_ReqLocInfo_Category",
+      { "OMA-LPPe-SRN-ReqLocInfo-Category", "lppe.OMA_LPPe_SRN_ReqLocInfo_Category_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_category,
-      { "category", "lppe.category",
+      { "category", "lppe.category_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_Category", HFILL }},
     { &hf_lppe_multipleMeasurements,
@@ -19935,11 +19935,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_multipleMeasurements_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_allowedMeasurements,
-      { "allowedMeasurements", "lppe.allowedMeasurements",
+      { "allowedMeasurements", "lppe.allowedMeasurements_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_MeasurementMask", HFILL }},
     { &hf_lppe_historicMeasurementsRequested,
-      { "historicMeasurementsRequested", "lppe.historicMeasurementsRequested",
+      { "historicMeasurementsRequested", "lppe.historicMeasurementsRequested_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_capabilitiesPerSRNCategory,
@@ -19947,11 +19947,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_16_OF_OMA_LPPe_SRN_ProvideCapabilitiesElement", HFILL }},
     { &hf_lppe_capabilitiesPerSRNCategory_item,
-      { "OMA-LPPe-SRN-ProvideCapabilitiesElement", "lppe.OMA_LPPe_SRN_ProvideCapabilitiesElement",
+      { "OMA-LPPe-SRN-ProvideCapabilitiesElement", "lppe.OMA_LPPe_SRN_ProvideCapabilitiesElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_supportedMeasurements,
-      { "supportedMeasurements", "lppe.supportedMeasurements",
+      { "supportedMeasurements", "lppe.supportedMeasurements_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_MeasurementMask", HFILL }},
     { &hf_lppe_supportedAssistanceData,
@@ -19959,7 +19959,7 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_historicMeasurementsSupported,
-      { "historicMeasurementsSupported", "lppe.historicMeasurementsSupported",
+      { "historicMeasurementsSupported", "lppe.historicMeasurementsSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_capabilitiesRequestedFor,
@@ -19967,15 +19967,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_16_OF_OMA_LPPe_SRN_Category", HFILL }},
     { &hf_lppe_capabilitiesRequestedFor_item,
-      { "OMA-LPPe-SRN-Category", "lppe.OMA_LPPe_SRN_Category",
+      { "OMA-LPPe-SRN-Category", "lppe.OMA_LPPe_SRN_Category_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_srnLocationServerErrorCauses,
-      { "srnLocationServerErrorCauses", "lppe.srnLocationServerErrorCauses",
+      { "srnLocationServerErrorCauses", "lppe.srnLocationServerErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_LocationServerErrorCauses", HFILL }},
     { &hf_lppe_srnTargetDeviceErrorCauses,
-      { "srnTargetDeviceErrorCauses", "lppe.srnTargetDeviceErrorCauses",
+      { "srnTargetDeviceErrorCauses", "lppe.srnTargetDeviceErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_TargetDeviceErrorCauses", HFILL }},
     { &hf_lppe_groupErrors,
@@ -19995,7 +19995,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_16_OF_OMA_LPPe_SRN_TargetDeviceError", HFILL }},
     { &hf_lppe_srnErrorsPerCategory_item,
-      { "OMA-LPPe-SRN-TargetDeviceError", "lppe.OMA_LPPe_SRN_TargetDeviceError",
+      { "OMA-LPPe-SRN-TargetDeviceError", "lppe.OMA_LPPe_SRN_TargetDeviceError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_srnErrors,
@@ -20003,15 +20003,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_srnErrors_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_rssiNotAvailable,
-      { "rssiNotAvailable", "lppe.rssiNotAvailable",
+      { "rssiNotAvailable", "lppe.rssiNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_rtdNotAvailable,
-      { "rtdNotAvailable", "lppe.rtdNotAvailable",
+      { "rtdNotAvailable", "lppe.rtdNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_multipleSetsNotAvailable,
-      { "multipleSetsNotAvailable", "lppe.multipleSetsNotAvailable",
+      { "multipleSetsNotAvailable", "lppe.multipleSetsNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_srnDataVersion,
@@ -20023,7 +20023,7 @@ void proto_register_lppe(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M300_500", HFILL }},
     { &hf_lppe_srnAntennaInfo,
-      { "srnAntennaInfo", "lppe.srnAntennaInfo",
+      { "srnAntennaInfo", "lppe.srnAntennaInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_switchingPatternID,
@@ -20031,11 +20031,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_65535", HFILL }},
     { &hf_lppe_srnTechnologyType,
-      { "srnTechnologyType", "lppe.srnTechnologyType",
+      { "srnTechnologyType", "lppe.srnTechnologyType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_Technologies", HFILL }},
     { &hf_lppe_srnVendorInformation,
-      { "srnVendorInformation", "lppe.srnVendorInformation",
+      { "srnVendorInformation", "lppe.srnVendorInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_vendor,
@@ -20055,7 +20055,7 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_48", HFILL }},
     { &hf_lppe_nfc,
-      { "nfc", "lppe.nfc",
+      { "nfc", "lppe.nfc_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_manufacturer,
@@ -20067,7 +20067,7 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_48", HFILL }},
     { &hf_lppe_mobileCode,
-      { "mobileCode", "lppe.mobileCode",
+      { "mobileCode", "lppe.mobileCode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_registryID,
diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c
index 32a0a915c2..91377a14d8 100644
--- a/epan/dissectors/packet-lte-rrc.c
+++ b/epan/dissectors/packet-lte-rrc.c
@@ -34029,107 +34029,107 @@ void proto_register_lte_rrc(void) {
 /*--- Included file: packet-lte-rrc-hfarr.c ---*/
 #line 1 "../../asn1/lte-rrc/packet-lte-rrc-hfarr.c"
     { &hf_lte_rrc_BCCH_BCH_Message_PDU,
-      { "BCCH-BCH-Message", "lte-rrc.BCCH_BCH_Message",
+      { "BCCH-BCH-Message", "lte-rrc.BCCH_BCH_Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_BCCH_DL_SCH_Message_PDU,
-      { "BCCH-DL-SCH-Message", "lte-rrc.BCCH_DL_SCH_Message",
+      { "BCCH-DL-SCH-Message", "lte-rrc.BCCH_DL_SCH_Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_MCCH_Message_PDU,
-      { "MCCH-Message", "lte-rrc.MCCH_Message",
+      { "MCCH-Message", "lte-rrc.MCCH_Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_PCCH_Message_PDU,
-      { "PCCH-Message", "lte-rrc.PCCH_Message",
+      { "PCCH-Message", "lte-rrc.PCCH_Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_DL_CCCH_Message_PDU,
-      { "DL-CCCH-Message", "lte-rrc.DL_CCCH_Message",
+      { "DL-CCCH-Message", "lte-rrc.DL_CCCH_Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_DL_DCCH_Message_PDU,
-      { "DL-DCCH-Message", "lte-rrc.DL_DCCH_Message",
+      { "DL-DCCH-Message", "lte-rrc.DL_DCCH_Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_UL_CCCH_Message_PDU,
-      { "UL-CCCH-Message", "lte-rrc.UL_CCCH_Message",
+      { "UL-CCCH-Message", "lte-rrc.UL_CCCH_Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_UL_DCCH_Message_PDU,
-      { "UL-DCCH-Message", "lte-rrc.UL_DCCH_Message",
+      { "UL-DCCH-Message", "lte-rrc.UL_DCCH_Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_UECapabilityInformation_PDU,
-      { "UECapabilityInformation", "lte-rrc.UECapabilityInformation",
+      { "UECapabilityInformation", "lte-rrc.UECapabilityInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_lte_rrc_UE_EUTRA_Capability_PDU,
-      { "UE-EUTRA-Capability", "lte-rrc.UE_EUTRA_Capability",
+      { "UE-EUTRA-Capability", "lte-rrc.UE_EUTRA_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_lte_rrc_HandoverCommand_PDU,
-      { "HandoverCommand", "lte-rrc.HandoverCommand",
+      { "HandoverCommand", "lte-rrc.HandoverCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_lte_rrc_HandoverPreparationInformation_PDU,
-      { "HandoverPreparationInformation", "lte-rrc.HandoverPreparationInformation",
+      { "HandoverPreparationInformation", "lte-rrc.HandoverPreparationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_lte_rrc_UERadioAccessCapabilityInformation_PDU,
-      { "UERadioAccessCapabilityInformation", "lte-rrc.UERadioAccessCapabilityInformation",
+      { "UERadioAccessCapabilityInformation", "lte-rrc.UERadioAccessCapabilityInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_SystemInformationBlockType1_PDU,
-      { "SystemInformationBlockType1", "lte-rrc.SystemInformationBlockType1",
+      { "SystemInformationBlockType1", "lte-rrc.SystemInformationBlockType1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_RRCConnectionRelease_v9e0_IEs_PDU,
-      { "RRCConnectionRelease-v9e0-IEs", "lte-rrc.RRCConnectionRelease_v9e0_IEs",
+      { "RRCConnectionRelease-v9e0-IEs", "lte-rrc.RRCConnectionRelease_v9e0_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_SystemInformationBlockType1_v8h0_IEs_PDU,
-      { "SystemInformationBlockType1-v8h0-IEs", "lte-rrc.SystemInformationBlockType1_v8h0_IEs",
+      { "SystemInformationBlockType1-v8h0-IEs", "lte-rrc.SystemInformationBlockType1_v8h0_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_UEInformationResponse_v9e0_IEs_PDU,
-      { "UEInformationResponse-v9e0-IEs", "lte-rrc.UEInformationResponse_v9e0_IEs",
+      { "UEInformationResponse-v9e0-IEs", "lte-rrc.UEInformationResponse_v9e0_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_SystemInformationBlockType2_v8h0_IEs_PDU,
-      { "SystemInformationBlockType2-v8h0-IEs", "lte-rrc.SystemInformationBlockType2_v8h0_IEs",
+      { "SystemInformationBlockType2-v8h0-IEs", "lte-rrc.SystemInformationBlockType2_v8h0_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_SystemInformationBlockType5_v8h0_IEs_PDU,
-      { "SystemInformationBlockType5-v8h0-IEs", "lte-rrc.SystemInformationBlockType5_v8h0_IEs",
+      { "SystemInformationBlockType5-v8h0-IEs", "lte-rrc.SystemInformationBlockType5_v8h0_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_SystemInformationBlockType6_v8h0_IEs_PDU,
-      { "SystemInformationBlockType6-v8h0-IEs", "lte-rrc.SystemInformationBlockType6_v8h0_IEs",
+      { "SystemInformationBlockType6-v8h0-IEs", "lte-rrc.SystemInformationBlockType6_v8h0_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_UE_EUTRA_Capability_v9a0_IEs_PDU,
-      { "UE-EUTRA-Capability-v9a0-IEs", "lte-rrc.UE_EUTRA_Capability_v9a0_IEs",
+      { "UE-EUTRA-Capability-v9a0-IEs", "lte-rrc.UE_EUTRA_Capability_v9a0_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_SystemInformationBlockType1_v890_IEs_PDU,
-      { "SystemInformationBlockType1-v890-IEs", "lte-rrc.SystemInformationBlockType1_v890_IEs",
+      { "SystemInformationBlockType1-v890-IEs", "lte-rrc.SystemInformationBlockType1_v890_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_InDeviceCoexIndication_r11_PDU,
-      { "InDeviceCoexIndication-r11", "lte-rrc.InDeviceCoexIndication_r11",
+      { "InDeviceCoexIndication-r11", "lte-rrc.InDeviceCoexIndication_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_MBMSInterestIndication_r11_PDU,
-      { "MBMSInterestIndication-r11", "lte-rrc.MBMSInterestIndication_r11",
+      { "MBMSInterestIndication-r11", "lte-rrc.MBMSInterestIndication_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_UEAssistanceInformation_r11_PDU,
-      { "UEAssistanceInformation-r11", "lte-rrc.UEAssistanceInformation_r11",
+      { "UEAssistanceInformation-r11", "lte-rrc.UEAssistanceInformation_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_message,
-      { "message", "lte-rrc.message",
+      { "message", "lte-rrc.message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "BCCH_BCH_MessageType", HFILL }},
     { &hf_lte_rrc_message_01,
@@ -34141,15 +34141,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_systemInformation,
-      { "systemInformation", "lte-rrc.systemInformation",
+      { "systemInformation", "lte-rrc.systemInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_systemInformationBlockType1,
-      { "systemInformationBlockType1", "lte-rrc.systemInformationBlockType1",
+      { "systemInformationBlockType1", "lte-rrc.systemInformationBlockType1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_messageClassExtension,
-      { "messageClassExtension", "lte-rrc.messageClassExtension",
+      { "messageClassExtension", "lte-rrc.messageClassExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_message_02,
@@ -34161,7 +34161,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_01_vals), 0,
         "T_c1_01", HFILL }},
     { &hf_lte_rrc_mbsfnAreaConfiguration_r9,
-      { "mbsfnAreaConfiguration-r9", "lte-rrc.mbsfnAreaConfiguration_r9",
+      { "mbsfnAreaConfiguration-r9", "lte-rrc.mbsfnAreaConfiguration_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_later,
@@ -34173,11 +34173,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c2_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_mbmsCountingRequest_r10,
-      { "mbmsCountingRequest-r10", "lte-rrc.mbmsCountingRequest_r10",
+      { "mbmsCountingRequest-r10", "lte-rrc.mbmsCountingRequest_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_messageClassExtension_01,
-      { "messageClassExtension", "lte-rrc.messageClassExtension",
+      { "messageClassExtension", "lte-rrc.messageClassExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_messageClassExtension_01", HFILL }},
     { &hf_lte_rrc_message_03,
@@ -34189,11 +34189,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_02_vals), 0,
         "T_c1_02", HFILL }},
     { &hf_lte_rrc_paging,
-      { "paging", "lte-rrc.paging",
+      { "paging", "lte-rrc.paging_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_messageClassExtension_02,
-      { "messageClassExtension", "lte-rrc.messageClassExtension",
+      { "messageClassExtension", "lte-rrc.messageClassExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_messageClassExtension_02", HFILL }},
     { &hf_lte_rrc_message_04,
@@ -34205,23 +34205,23 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_03_vals), 0,
         "T_c1_03", HFILL }},
     { &hf_lte_rrc_rrcConnectionReestablishment,
-      { "rrcConnectionReestablishment", "lte-rrc.rrcConnectionReestablishment",
+      { "rrcConnectionReestablishment", "lte-rrc.rrcConnectionReestablishment_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rrcConnectionReestablishmentReject,
-      { "rrcConnectionReestablishmentReject", "lte-rrc.rrcConnectionReestablishmentReject",
+      { "rrcConnectionReestablishmentReject", "lte-rrc.rrcConnectionReestablishmentReject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rrcConnectionReject,
-      { "rrcConnectionReject", "lte-rrc.rrcConnectionReject",
+      { "rrcConnectionReject", "lte-rrc.rrcConnectionReject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rrcConnectionSetup,
-      { "rrcConnectionSetup", "lte-rrc.rrcConnectionSetup",
+      { "rrcConnectionSetup", "lte-rrc.rrcConnectionSetup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_messageClassExtension_03,
-      { "messageClassExtension", "lte-rrc.messageClassExtension",
+      { "messageClassExtension", "lte-rrc.messageClassExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_messageClassExtension_03", HFILL }},
     { &hf_lte_rrc_message_05,
@@ -34233,71 +34233,71 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_04_vals), 0,
         "T_c1_04", HFILL }},
     { &hf_lte_rrc_csfbParametersResponseCDMA2000,
-      { "csfbParametersResponseCDMA2000", "lte-rrc.csfbParametersResponseCDMA2000",
+      { "csfbParametersResponseCDMA2000", "lte-rrc.csfbParametersResponseCDMA2000_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_dlInformationTransfer,
-      { "dlInformationTransfer", "lte-rrc.dlInformationTransfer",
+      { "dlInformationTransfer", "lte-rrc.dlInformationTransfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_handoverFromEUTRAPreparationRequest,
-      { "handoverFromEUTRAPreparationRequest", "lte-rrc.handoverFromEUTRAPreparationRequest",
+      { "handoverFromEUTRAPreparationRequest", "lte-rrc.handoverFromEUTRAPreparationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_mobilityFromEUTRACommand,
-      { "mobilityFromEUTRACommand", "lte-rrc.mobilityFromEUTRACommand",
+      { "mobilityFromEUTRACommand", "lte-rrc.mobilityFromEUTRACommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rrcConnectionReconfiguration,
-      { "rrcConnectionReconfiguration", "lte-rrc.rrcConnectionReconfiguration",
+      { "rrcConnectionReconfiguration", "lte-rrc.rrcConnectionReconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rrcConnectionRelease,
-      { "rrcConnectionRelease", "lte-rrc.rrcConnectionRelease",
+      { "rrcConnectionRelease", "lte-rrc.rrcConnectionRelease_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_securityModeCommand,
-      { "securityModeCommand", "lte-rrc.securityModeCommand",
+      { "securityModeCommand", "lte-rrc.securityModeCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_ueCapabilityEnquiry,
-      { "ueCapabilityEnquiry", "lte-rrc.ueCapabilityEnquiry",
+      { "ueCapabilityEnquiry", "lte-rrc.ueCapabilityEnquiry_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_counterCheck,
-      { "counterCheck", "lte-rrc.counterCheck",
+      { "counterCheck", "lte-rrc.counterCheck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_ueInformationRequest_r9,
-      { "ueInformationRequest-r9", "lte-rrc.ueInformationRequest_r9",
+      { "ueInformationRequest-r9", "lte-rrc.ueInformationRequest_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_loggedMeasurementConfiguration_r10,
-      { "loggedMeasurementConfiguration-r10", "lte-rrc.loggedMeasurementConfiguration_r10",
+      { "loggedMeasurementConfiguration-r10", "lte-rrc.loggedMeasurementConfiguration_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rnReconfiguration_r10,
-      { "rnReconfiguration-r10", "lte-rrc.rnReconfiguration_r10",
+      { "rnReconfiguration-r10", "lte-rrc.rnReconfiguration_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_spare4,
-      { "spare4", "lte-rrc.spare4",
+      { "spare4", "lte-rrc.spare4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_spare3,
-      { "spare3", "lte-rrc.spare3",
+      { "spare3", "lte-rrc.spare3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_spare2,
-      { "spare2", "lte-rrc.spare2",
+      { "spare2", "lte-rrc.spare2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_spare1,
-      { "spare1", "lte-rrc.spare1",
+      { "spare1", "lte-rrc.spare1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_messageClassExtension_04,
-      { "messageClassExtension", "lte-rrc.messageClassExtension",
+      { "messageClassExtension", "lte-rrc.messageClassExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_messageClassExtension_04", HFILL }},
     { &hf_lte_rrc_message_06,
@@ -34309,15 +34309,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_05_vals), 0,
         "T_c1_05", HFILL }},
     { &hf_lte_rrc_rrcConnectionReestablishmentRequest,
-      { "rrcConnectionReestablishmentRequest", "lte-rrc.rrcConnectionReestablishmentRequest",
+      { "rrcConnectionReestablishmentRequest", "lte-rrc.rrcConnectionReestablishmentRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rrcConnectionRequest,
-      { "rrcConnectionRequest", "lte-rrc.rrcConnectionRequest",
+      { "rrcConnectionRequest", "lte-rrc.rrcConnectionRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_messageClassExtension_05,
-      { "messageClassExtension", "lte-rrc.messageClassExtension",
+      { "messageClassExtension", "lte-rrc.messageClassExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_messageClassExtension_05", HFILL }},
     { &hf_lte_rrc_message_07,
@@ -34329,67 +34329,67 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_06_vals), 0,
         "T_c1_06", HFILL }},
     { &hf_lte_rrc_csfbParametersRequestCDMA2000,
-      { "csfbParametersRequestCDMA2000", "lte-rrc.csfbParametersRequestCDMA2000",
+      { "csfbParametersRequestCDMA2000", "lte-rrc.csfbParametersRequestCDMA2000_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_measurementReport,
-      { "measurementReport", "lte-rrc.measurementReport",
+      { "measurementReport", "lte-rrc.measurementReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rrcConnectionReconfigurationComplete,
-      { "rrcConnectionReconfigurationComplete", "lte-rrc.rrcConnectionReconfigurationComplete",
+      { "rrcConnectionReconfigurationComplete", "lte-rrc.rrcConnectionReconfigurationComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rrcConnectionReestablishmentComplete,
-      { "rrcConnectionReestablishmentComplete", "lte-rrc.rrcConnectionReestablishmentComplete",
+      { "rrcConnectionReestablishmentComplete", "lte-rrc.rrcConnectionReestablishmentComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rrcConnectionSetupComplete,
-      { "rrcConnectionSetupComplete", "lte-rrc.rrcConnectionSetupComplete",
+      { "rrcConnectionSetupComplete", "lte-rrc.rrcConnectionSetupComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_securityModeComplete,
-      { "securityModeComplete", "lte-rrc.securityModeComplete",
+      { "securityModeComplete", "lte-rrc.securityModeComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_securityModeFailure,
-      { "securityModeFailure", "lte-rrc.securityModeFailure",
+      { "securityModeFailure", "lte-rrc.securityModeFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_ueCapabilityInformation,
-      { "ueCapabilityInformation", "lte-rrc.ueCapabilityInformation",
+      { "ueCapabilityInformation", "lte-rrc.ueCapabilityInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_ulHandoverPreparationTransfer,
-      { "ulHandoverPreparationTransfer", "lte-rrc.ulHandoverPreparationTransfer",
+      { "ulHandoverPreparationTransfer", "lte-rrc.ulHandoverPreparationTransfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_ulInformationTransfer,
-      { "ulInformationTransfer", "lte-rrc.ulInformationTransfer",
+      { "ulInformationTransfer", "lte-rrc.ulInformationTransfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_counterCheckResponse,
-      { "counterCheckResponse", "lte-rrc.counterCheckResponse",
+      { "counterCheckResponse", "lte-rrc.counterCheckResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_ueInformationResponse_r9,
-      { "ueInformationResponse-r9", "lte-rrc.ueInformationResponse_r9",
+      { "ueInformationResponse-r9", "lte-rrc.ueInformationResponse_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_proximityIndication_r9,
-      { "proximityIndication-r9", "lte-rrc.proximityIndication_r9",
+      { "proximityIndication-r9", "lte-rrc.proximityIndication_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rnReconfigurationComplete_r10,
-      { "rnReconfigurationComplete-r10", "lte-rrc.rnReconfigurationComplete_r10",
+      { "rnReconfigurationComplete-r10", "lte-rrc.rnReconfigurationComplete_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_mbmsCountingResponse_r10,
-      { "mbmsCountingResponse-r10", "lte-rrc.mbmsCountingResponse_r10",
+      { "mbmsCountingResponse-r10", "lte-rrc.mbmsCountingResponse_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_interFreqRSTDMeasurementIndication_r10,
-      { "interFreqRSTDMeasurementIndication-r10", "lte-rrc.interFreqRSTDMeasurementIndication_r10",
+      { "interFreqRSTDMeasurementIndication-r10", "lte-rrc.interFreqRSTDMeasurementIndication_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_messageClassExtension_06,
@@ -34401,55 +34401,55 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c2_01_vals), 0,
         "T_c2_01", HFILL }},
     { &hf_lte_rrc_ueAssistanceInformation_r11,
-      { "ueAssistanceInformation-r11", "lte-rrc.ueAssistanceInformation_r11",
+      { "ueAssistanceInformation-r11", "lte-rrc.ueAssistanceInformation_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_inDeviceCoexIndication_r11,
-      { "inDeviceCoexIndication-r11", "lte-rrc.inDeviceCoexIndication_r11",
+      { "inDeviceCoexIndication-r11", "lte-rrc.inDeviceCoexIndication_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_mbmsInterestIndication_r11,
-      { "mbmsInterestIndication-r11", "lte-rrc.mbmsInterestIndication_r11",
+      { "mbmsInterestIndication-r11", "lte-rrc.mbmsInterestIndication_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_spare13,
-      { "spare13", "lte-rrc.spare13",
+      { "spare13", "lte-rrc.spare13_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_spare12,
-      { "spare12", "lte-rrc.spare12",
+      { "spare12", "lte-rrc.spare12_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_spare11,
-      { "spare11", "lte-rrc.spare11",
+      { "spare11", "lte-rrc.spare11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_spare10,
-      { "spare10", "lte-rrc.spare10",
+      { "spare10", "lte-rrc.spare10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_spare9,
-      { "spare9", "lte-rrc.spare9",
+      { "spare9", "lte-rrc.spare9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_spare8,
-      { "spare8", "lte-rrc.spare8",
+      { "spare8", "lte-rrc.spare8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_spare7,
-      { "spare7", "lte-rrc.spare7",
+      { "spare7", "lte-rrc.spare7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_spare6,
-      { "spare6", "lte-rrc.spare6",
+      { "spare6", "lte-rrc.spare6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_spare5,
-      { "spare5", "lte-rrc.spare5",
+      { "spare5", "lte-rrc.spare5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_messageClassExtensionFuture_r11,
-      { "messageClassExtensionFuture-r11", "lte-rrc.messageClassExtensionFuture_r11",
+      { "messageClassExtensionFuture-r11", "lte-rrc.messageClassExtensionFuture_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rrc_TransactionIdentifier,
@@ -34465,11 +34465,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_07_vals), 0,
         "T_c1_07", HFILL }},
     { &hf_lte_rrc_counterCheck_r8,
-      { "counterCheck-r8", "lte-rrc.counterCheck_r8",
+      { "counterCheck-r8", "lte-rrc.counterCheck_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CounterCheck_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_drb_CountMSB_InfoList,
@@ -34477,7 +34477,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CounterCheck_v8a0_IEs", HFILL }},
     { &hf_lte_rrc_lateNonCriticalExtension,
@@ -34485,11 +34485,11 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_01,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_DRB_CountMSB_InfoList_item,
-      { "DRB-CountMSB-Info", "lte-rrc.DRB_CountMSB_Info",
+      { "DRB-CountMSB-Info", "lte-rrc.DRB_CountMSB_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_drb_Identity,
@@ -34509,11 +34509,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_criticalExtensions_01_vals), 0,
         "T_criticalExtensions_01", HFILL }},
     { &hf_lte_rrc_counterCheckResponse_r8,
-      { "counterCheckResponse-r8", "lte-rrc.counterCheckResponse_r8",
+      { "counterCheckResponse-r8", "lte-rrc.counterCheckResponse_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CounterCheckResponse_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_01,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_01", HFILL }},
     { &hf_lte_rrc_drb_CountInfoList,
@@ -34521,15 +34521,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_02,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CounterCheckResponse_v8a0_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_03,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_01", HFILL }},
     { &hf_lte_rrc_DRB_CountInfoList_item,
-      { "DRB-CountInfo", "lte-rrc.DRB_CountInfo",
+      { "DRB-CountInfo", "lte-rrc.DRB_CountInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_count_Uplink,
@@ -34545,19 +34545,19 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_criticalExtensions_02_vals), 0,
         "T_criticalExtensions_02", HFILL }},
     { &hf_lte_rrc_csfbParametersRequestCDMA2000_r8,
-      { "csfbParametersRequestCDMA2000-r8", "lte-rrc.csfbParametersRequestCDMA2000_r8",
+      { "csfbParametersRequestCDMA2000-r8", "lte-rrc.csfbParametersRequestCDMA2000_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CSFBParametersRequestCDMA2000_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_02,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_02", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_04,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CSFBParametersRequestCDMA2000_v8a0_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_05,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_02", HFILL }},
     { &hf_lte_rrc_criticalExtensions_03,
@@ -34565,11 +34565,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_criticalExtensions_03_vals), 0,
         "T_criticalExtensions_03", HFILL }},
     { &hf_lte_rrc_csfbParametersResponseCDMA2000_r8,
-      { "csfbParametersResponseCDMA2000-r8", "lte-rrc.csfbParametersResponseCDMA2000_r8",
+      { "csfbParametersResponseCDMA2000-r8", "lte-rrc.csfbParametersResponseCDMA2000_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CSFBParametersResponseCDMA2000_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_03,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_03", HFILL }},
     { &hf_lte_rrc_rand,
@@ -34581,11 +34581,11 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "MobilityParametersCDMA2000", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_06,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CSFBParametersResponseCDMA2000_v8a0_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_07,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_03", HFILL }},
     { &hf_lte_rrc_criticalExtensions_04,
@@ -34597,11 +34597,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_08_vals), 0,
         "T_c1_08", HFILL }},
     { &hf_lte_rrc_dlInformationTransfer_r8,
-      { "dlInformationTransfer-r8", "lte-rrc.dlInformationTransfer_r8",
+      { "dlInformationTransfer-r8", "lte-rrc.dlInformationTransfer_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DLInformationTransfer_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_04,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_04", HFILL }},
     { &hf_lte_rrc_dedicatedInfoType,
@@ -34621,11 +34621,11 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "DedicatedInfoCDMA2000", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_08,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DLInformationTransfer_v8a0_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_09,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_04", HFILL }},
     { &hf_lte_rrc_criticalExtensions_05,
@@ -34637,11 +34637,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_09_vals), 0,
         "T_c1_09", HFILL }},
     { &hf_lte_rrc_handoverFromEUTRAPreparationRequest_r8,
-      { "handoverFromEUTRAPreparationRequest-r8", "lte-rrc.handoverFromEUTRAPreparationRequest_r8",
+      { "handoverFromEUTRAPreparationRequest-r8", "lte-rrc.handoverFromEUTRAPreparationRequest_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverFromEUTRAPreparationRequest_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_05,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_05", HFILL }},
     { &hf_lte_rrc_cdma2000_Type,
@@ -34649,11 +34649,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_CDMA2000_Type_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_10,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverFromEUTRAPreparationRequest_v890_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_11,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverFromEUTRAPreparationRequest_v920_IEs", HFILL }},
     { &hf_lte_rrc_concurrPrepCDMA2000_HRPD_r9,
@@ -34661,7 +34661,7 @@ void proto_register_lte_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_12,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverFromEUTRAPreparationRequest_v1020_IEs", HFILL }},
     { &hf_lte_rrc_dualRxTxRedirectIndicator_r10,
@@ -34669,11 +34669,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_dualRxTxRedirectIndicator_r10_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_redirectCarrierCDMA2000_1XRTT_r10,
-      { "redirectCarrierCDMA2000-1XRTT-r10", "lte-rrc.redirectCarrierCDMA2000_1XRTT_r10",
+      { "redirectCarrierCDMA2000-1XRTT-r10", "lte-rrc.redirectCarrierCDMA2000_1XRTT_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CarrierFreqCDMA2000", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_13,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_05", HFILL }},
     { &hf_lte_rrc_criticalExtensions_06,
@@ -34685,11 +34685,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_10_vals), 0,
         "T_c1_10", HFILL }},
     { &hf_lte_rrc_inDeviceCoexIndication_r11_01,
-      { "inDeviceCoexIndication-r11", "lte-rrc.inDeviceCoexIndication_r11",
+      { "inDeviceCoexIndication-r11", "lte-rrc.inDeviceCoexIndication_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InDeviceCoexIndication_r11_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_06,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_06", HFILL }},
     { &hf_lte_rrc_affectedCarrierFreqList_r11,
@@ -34701,11 +34701,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_TDM_AssistanceInfo_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_14,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_06", HFILL }},
     { &hf_lte_rrc_AffectedCarrierFreqList_r11_item,
-      { "AffectedCarrierFreq-r11", "lte-rrc.AffectedCarrierFreq_r11",
+      { "AffectedCarrierFreq-r11", "lte-rrc.AffectedCarrierFreq_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_carrierFreq_r11,
@@ -34717,7 +34717,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_interferenceDirection_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_drx_AssistanceInfo_r11,
-      { "drx-AssistanceInfo-r11", "lte-rrc.drx_AssistanceInfo_r11",
+      { "drx-AssistanceInfo-r11", "lte-rrc.drx_AssistanceInfo_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_drx_CycleLength_r11,
@@ -34769,11 +34769,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_11_vals), 0,
         "T_c1_11", HFILL }},
     { &hf_lte_rrc_interFreqRSTDMeasurementIndication_r10_01,
-      { "interFreqRSTDMeasurementIndication-r10", "lte-rrc.interFreqRSTDMeasurementIndication_r10",
+      { "interFreqRSTDMeasurementIndication-r10", "lte-rrc.interFreqRSTDMeasurementIndication_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqRSTDMeasurementIndication_r10_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_07,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_07", HFILL }},
     { &hf_lte_rrc_rstd_InterFreqIndication_r10,
@@ -34781,7 +34781,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_rstd_InterFreqIndication_r10_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_start,
-      { "start", "lte-rrc.start",
+      { "start", "lte-rrc.start_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rstd_InterFreqInfoList_r10,
@@ -34789,15 +34789,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_stop,
-      { "stop", "lte-rrc.stop",
+      { "stop", "lte-rrc.stop_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_15,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_07", HFILL }},
     { &hf_lte_rrc_RSTD_InterFreqInfoList_r10_item,
-      { "RSTD-InterFreqInfo-r10", "lte-rrc.RSTD_InterFreqInfo_r10",
+      { "RSTD-InterFreqInfo-r10", "lte-rrc.RSTD_InterFreqInfo_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_carrierFreq_r10,
@@ -34821,15 +34821,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_12_vals), 0,
         "T_c1_12", HFILL }},
     { &hf_lte_rrc_loggedMeasurementConfiguration_r10_01,
-      { "loggedMeasurementConfiguration-r10", "lte-rrc.loggedMeasurementConfiguration_r10",
+      { "loggedMeasurementConfiguration-r10", "lte-rrc.loggedMeasurementConfiguration_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LoggedMeasurementConfiguration_r10_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_08,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_08", HFILL }},
     { &hf_lte_rrc_traceReference_r10,
-      { "traceReference-r10", "lte-rrc.traceReference_r10",
+      { "traceReference-r10", "lte-rrc.traceReference_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_traceRecordingSessionRef_r10,
@@ -34857,7 +34857,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_LoggingInterval_r10_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_16,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LoggedMeasurementConfiguration_v1080_IEs", HFILL }},
     { &hf_lte_rrc_lateNonCriticalExtension_r10,
@@ -34865,7 +34865,7 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_17,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LoggedMeasurementConfiguration_v1130_IEs", HFILL }},
     { &hf_lte_rrc_plmn_IdentityList_r11,
@@ -34873,11 +34873,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PLMN_IdentityList3_r11", HFILL }},
     { &hf_lte_rrc_areaConfiguration_v1130,
-      { "areaConfiguration-v1130", "lte-rrc.areaConfiguration_v1130",
+      { "areaConfiguration-v1130", "lte-rrc.areaConfiguration_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_18,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_08", HFILL }},
     { &hf_lte_rrc_dl_Bandwidth,
@@ -34885,7 +34885,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_dl_Bandwidth_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_phich_Config,
-      { "phich-Config", "lte-rrc.phich_Config",
+      { "phich-Config", "lte-rrc.phich_Config_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_systemFrameNumber,
@@ -34901,15 +34901,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_19,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_09", HFILL }},
     { &hf_lte_rrc_CountingRequestList_r10_item,
-      { "CountingRequestInfo-r10", "lte-rrc.CountingRequestInfo_r10",
+      { "CountingRequestInfo-r10", "lte-rrc.CountingRequestInfo_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_tmgi_r10,
-      { "tmgi-r10", "lte-rrc.tmgi_r10",
+      { "tmgi-r10", "lte-rrc.tmgi_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TMGI_r9", HFILL }},
     { &hf_lte_rrc_criticalExtensions_09,
@@ -34921,11 +34921,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_13_vals), 0,
         "T_c1_13", HFILL }},
     { &hf_lte_rrc_countingResponse_r10,
-      { "countingResponse-r10", "lte-rrc.countingResponse_r10",
+      { "countingResponse-r10", "lte-rrc.countingResponse_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMSCountingResponse_r10_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_09,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_09", HFILL }},
     { &hf_lte_rrc_mbsfn_AreaIndex_r10,
@@ -34937,11 +34937,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_20,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_10", HFILL }},
     { &hf_lte_rrc_CountingResponseList_r10_item,
-      { "CountingResponseInfo-r10", "lte-rrc.CountingResponseInfo_r10",
+      { "CountingResponseInfo-r10", "lte-rrc.CountingResponseInfo_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_countingResponseService_r10,
@@ -34957,11 +34957,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_14_vals), 0,
         "T_c1_14", HFILL }},
     { &hf_lte_rrc_interestIndication_r11,
-      { "interestIndication-r11", "lte-rrc.interestIndication_r11",
+      { "interestIndication-r11", "lte-rrc.interestIndication_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMSInterestIndication_r11_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_10,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_10", HFILL }},
     { &hf_lte_rrc_mbms_FreqList_r11,
@@ -34973,7 +34973,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_mbms_Priority_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_21,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_11", HFILL }},
     { &hf_lte_rrc_commonSF_Alloc_r9,
@@ -34989,15 +34989,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_22,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBSFNAreaConfiguration_v930_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_23,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_12", HFILL }},
     { &hf_lte_rrc_CommonSF_AllocPatternList_r9_item,
-      { "MBSFN-SubframeConfig", "lte-rrc.MBSFN_SubframeConfig",
+      { "MBSFN-SubframeConfig", "lte-rrc.MBSFN_SubframeConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_criticalExtensions_11,
@@ -35009,23 +35009,23 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_15_vals), 0,
         "T_c1_15", HFILL }},
     { &hf_lte_rrc_measurementReport_r8,
-      { "measurementReport-r8", "lte-rrc.measurementReport_r8",
+      { "measurementReport-r8", "lte-rrc.measurementReport_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementReport_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_11,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_11", HFILL }},
     { &hf_lte_rrc_measResults,
-      { "measResults", "lte-rrc.measResults",
+      { "measResults", "lte-rrc.measResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_24,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementReport_v8a0_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_25,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_13", HFILL }},
     { &hf_lte_rrc_criticalExtensions_12,
@@ -35037,15 +35037,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_16_vals), 0,
         "T_c1_16", HFILL }},
     { &hf_lte_rrc_mobilityFromEUTRACommand_r8,
-      { "mobilityFromEUTRACommand-r8", "lte-rrc.mobilityFromEUTRACommand_r8",
+      { "mobilityFromEUTRACommand-r8", "lte-rrc.mobilityFromEUTRACommand_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MobilityFromEUTRACommand_r8_IEs", HFILL }},
     { &hf_lte_rrc_mobilityFromEUTRACommand_r9,
-      { "mobilityFromEUTRACommand-r9", "lte-rrc.mobilityFromEUTRACommand_r9",
+      { "mobilityFromEUTRACommand-r9", "lte-rrc.mobilityFromEUTRACommand_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MobilityFromEUTRACommand_r9_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_12,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_12", HFILL }},
     { &hf_lte_rrc_cs_FallbackIndicator,
@@ -35057,19 +35057,19 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_purpose_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_handover,
-      { "handover", "lte-rrc.handover",
+      { "handover", "lte-rrc.handover_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cellChangeOrder,
-      { "cellChangeOrder", "lte-rrc.cellChangeOrder",
+      { "cellChangeOrder", "lte-rrc.cellChangeOrder_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_26,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MobilityFromEUTRACommand_v8a0_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_27,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MobilityFromEUTRACommand_v8d0_IEs", HFILL }},
     { &hf_lte_rrc_bandIndicator,
@@ -35077,7 +35077,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_BandIndicatorGERAN_vals), 0,
         "BandIndicatorGERAN", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_28,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_14", HFILL }},
     { &hf_lte_rrc_purpose_01,
@@ -35085,19 +35085,19 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_purpose_01_vals), 0,
         "T_purpose_01", HFILL }},
     { &hf_lte_rrc_e_CSFB_r9,
-      { "e-CSFB-r9", "lte-rrc.e_CSFB_r9",
+      { "e-CSFB-r9", "lte-rrc.e_CSFB_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_29,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MobilityFromEUTRACommand_v930_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_30,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MobilityFromEUTRACommand_v960_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_31,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_15", HFILL }},
     { &hf_lte_rrc_targetRAT_Type,
@@ -35125,15 +35125,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_targetRAT_Type_01_vals), 0,
         "T_targetRAT_Type_01", HFILL }},
     { &hf_lte_rrc_geran,
-      { "geran", "lte-rrc.geran",
+      { "geran", "lte-rrc.geran_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_physCellId,
-      { "physCellId", "lte-rrc.physCellId",
+      { "physCellId", "lte-rrc.physCellId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysCellIdGERAN", HFILL }},
     { &hf_lte_rrc_carrierFreq,
-      { "carrierFreq", "lte-rrc.carrierFreq",
+      { "carrierFreq", "lte-rrc.carrierFreq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CarrierFreqGERAN", HFILL }},
     { &hf_lte_rrc_networkControlOrder,
@@ -35161,7 +35161,7 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_lte_rrc_redirectCarrierCDMA2000_HRPD_r9,
-      { "redirectCarrierCDMA2000-HRPD-r9", "lte-rrc.redirectCarrierCDMA2000_HRPD_r9",
+      { "redirectCarrierCDMA2000-HRPD-r9", "lte-rrc.redirectCarrierCDMA2000_HRPD_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CarrierFreqCDMA2000", HFILL }},
     { &hf_lte_rrc_pagingRecordList,
@@ -35177,11 +35177,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_etws_Indication_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_32,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Paging_v890_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_33,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Paging_v920_IEs", HFILL }},
     { &hf_lte_rrc_cmas_Indication_r9,
@@ -35189,7 +35189,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_cmas_Indication_r9_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_34,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Paging_v1130_IEs", HFILL }},
     { &hf_lte_rrc_eab_ParamModification_r11,
@@ -35197,11 +35197,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_eab_ParamModification_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_35,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_16", HFILL }},
     { &hf_lte_rrc_PagingRecordList_item,
-      { "PagingRecord", "lte-rrc.PagingRecord",
+      { "PagingRecord", "lte-rrc.PagingRecord_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_ue_Identity,
@@ -35213,7 +35213,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_cn_Domain_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_s_TMSI,
-      { "s-TMSI", "lte-rrc.s_TMSI",
+      { "s-TMSI", "lte-rrc.s_TMSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_imsi,
@@ -35233,11 +35233,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_17_vals), 0,
         "T_c1_17", HFILL }},
     { &hf_lte_rrc_proximityIndication_r9_01,
-      { "proximityIndication-r9", "lte-rrc.proximityIndication_r9",
+      { "proximityIndication-r9", "lte-rrc.proximityIndication_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProximityIndication_r9_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_13,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_13", HFILL }},
     { &hf_lte_rrc_type_r9,
@@ -35261,11 +35261,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ARFCN_ValueEUTRA_v9e0", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_36,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProximityIndication_v930_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_37,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_17", HFILL }},
     { &hf_lte_rrc_criticalExtensions_14,
@@ -35277,23 +35277,23 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_18_vals), 0,
         "T_c1_18", HFILL }},
     { &hf_lte_rrc_rnReconfiguration_r10_01,
-      { "rnReconfiguration-r10", "lte-rrc.rnReconfiguration_r10",
+      { "rnReconfiguration-r10", "lte-rrc.rnReconfiguration_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RNReconfiguration_r10_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_14,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_14", HFILL }},
     { &hf_lte_rrc_rn_SystemInfo_r10,
-      { "rn-SystemInfo-r10", "lte-rrc.rn_SystemInfo_r10",
+      { "rn-SystemInfo-r10", "lte-rrc.rn_SystemInfo_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rn_SubframeConfig_r10,
-      { "rn-SubframeConfig-r10", "lte-rrc.rn_SubframeConfig_r10",
+      { "rn-SubframeConfig-r10", "lte-rrc.rn_SubframeConfig_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_38,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_18", HFILL }},
     { &hf_lte_rrc_systemInformationBlockType1_r10,
@@ -35301,7 +35301,7 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_systemInformationBlockType2_r10,
-      { "systemInformationBlockType2-r10", "lte-rrc.systemInformationBlockType2_r10",
+      { "systemInformationBlockType2-r10", "lte-rrc.systemInformationBlockType2_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformationBlockType2", HFILL }},
     { &hf_lte_rrc_criticalExtensions_15,
@@ -35313,15 +35313,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_19_vals), 0,
         "T_c1_19", HFILL }},
     { &hf_lte_rrc_rnReconfigurationComplete_r10_01,
-      { "rnReconfigurationComplete-r10", "lte-rrc.rnReconfigurationComplete_r10",
+      { "rnReconfigurationComplete-r10", "lte-rrc.rnReconfigurationComplete_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RNReconfigurationComplete_r10_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_15,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_15", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_39,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_19", HFILL }},
     { &hf_lte_rrc_criticalExtensions_16,
@@ -35333,19 +35333,19 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_20_vals), 0,
         "T_c1_20", HFILL }},
     { &hf_lte_rrc_rrcConnectionReconfiguration_r8,
-      { "rrcConnectionReconfiguration-r8", "lte-rrc.rrcConnectionReconfiguration_r8",
+      { "rrcConnectionReconfiguration-r8", "lte-rrc.rrcConnectionReconfiguration_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReconfiguration_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_16,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_16", HFILL }},
     { &hf_lte_rrc_measConfig,
-      { "measConfig", "lte-rrc.measConfig",
+      { "measConfig", "lte-rrc.measConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_mobilityControlInfo,
-      { "mobilityControlInfo", "lte-rrc.mobilityControlInfo",
+      { "mobilityControlInfo", "lte-rrc.mobilityControlInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_dedicatedInfoNASList,
@@ -35357,23 +35357,23 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_radioResourceConfigDedicated,
-      { "radioResourceConfigDedicated", "lte-rrc.radioResourceConfigDedicated",
+      { "radioResourceConfigDedicated", "lte-rrc.radioResourceConfigDedicated_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_securityConfigHO,
-      { "securityConfigHO", "lte-rrc.securityConfigHO",
+      { "securityConfigHO", "lte-rrc.securityConfigHO_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_40,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReconfiguration_v890_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_41,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReconfiguration_v920_IEs", HFILL }},
     { &hf_lte_rrc_otherConfig_r9,
-      { "otherConfig-r9", "lte-rrc.otherConfig_r9",
+      { "otherConfig-r9", "lte-rrc.otherConfig_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_fullConfig_r9,
@@ -35381,7 +35381,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_fullConfig_r9_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_42,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReconfiguration_v1020_IEs", HFILL }},
     { &hf_lte_rrc_sCellToReleaseList_r10,
@@ -35393,7 +35393,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_43,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReconfiguration_v1130_IEs", HFILL }},
     { &hf_lte_rrc_systemInfomationBlockType1Dedicated_r11,
@@ -35401,11 +35401,11 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_44,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_20", HFILL }},
     { &hf_lte_rrc_SCellToAddModList_r10_item,
-      { "SCellToAddMod-r10", "lte-rrc.SCellToAddMod_r10",
+      { "SCellToAddMod-r10", "lte-rrc.SCellToAddMod_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_sCellIndex_r10,
@@ -35413,7 +35413,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cellIdentification_r10,
-      { "cellIdentification-r10", "lte-rrc.cellIdentification_r10",
+      { "cellIdentification-r10", "lte-rrc.cellIdentification_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_physCellId_r10,
@@ -35425,11 +35425,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ARFCN_ValueEUTRA", HFILL }},
     { &hf_lte_rrc_radioResourceConfigCommonSCell_r10,
-      { "radioResourceConfigCommonSCell-r10", "lte-rrc.radioResourceConfigCommonSCell_r10",
+      { "radioResourceConfigCommonSCell-r10", "lte-rrc.radioResourceConfigCommonSCell_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_radioResourceConfigDedicatedSCell_r10,
-      { "radioResourceConfigDedicatedSCell-r10", "lte-rrc.radioResourceConfigDedicatedSCell_r10",
+      { "radioResourceConfigDedicatedSCell-r10", "lte-rrc.radioResourceConfigDedicatedSCell_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_dl_CarrierFreq_v1090,
@@ -35445,11 +35445,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_handoverType_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_intraLTE,
-      { "intraLTE", "lte-rrc.intraLTE",
+      { "intraLTE", "lte-rrc.intraLTE_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_securityAlgorithmConfig,
-      { "securityAlgorithmConfig", "lte-rrc.securityAlgorithmConfig",
+      { "securityAlgorithmConfig", "lte-rrc.securityAlgorithmConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_keyChangeIndicator,
@@ -35461,7 +35461,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_interRAT,
-      { "interRAT", "lte-rrc.interRAT",
+      { "interRAT", "lte-rrc.interRAT_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nas_SecurityParamToEUTRA,
@@ -35473,19 +35473,19 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_criticalExtensions_17_vals), 0,
         "T_criticalExtensions_17", HFILL }},
     { &hf_lte_rrc_rrcConnectionReconfigurationComplete_r8,
-      { "rrcConnectionReconfigurationComplete-r8", "lte-rrc.rrcConnectionReconfigurationComplete_r8",
+      { "rrcConnectionReconfigurationComplete-r8", "lte-rrc.rrcConnectionReconfigurationComplete_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReconfigurationComplete_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_17,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_17", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_45,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReconfigurationComplete_v8a0_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_46,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReconfigurationComplete_v1020_IEs", HFILL }},
     { &hf_lte_rrc_rlf_InfoAvailable_r10,
@@ -35497,7 +35497,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_logMeasAvailable_r10_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_47,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReconfigurationComplete_v1130_IEs", HFILL }},
     { &hf_lte_rrc_connEstFailInfoAvailable_r11,
@@ -35505,7 +35505,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_connEstFailInfoAvailable_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_48,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_21", HFILL }},
     { &hf_lte_rrc_criticalExtensions_18,
@@ -35517,19 +35517,19 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_21_vals), 0,
         "T_c1_21", HFILL }},
     { &hf_lte_rrc_rrcConnectionReestablishment_r8,
-      { "rrcConnectionReestablishment-r8", "lte-rrc.rrcConnectionReestablishment_r8",
+      { "rrcConnectionReestablishment-r8", "lte-rrc.rrcConnectionReestablishment_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReestablishment_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_18,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_18", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_49,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReestablishment_v8a0_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_50,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_22", HFILL }},
     { &hf_lte_rrc_criticalExtensions_19,
@@ -35537,15 +35537,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_criticalExtensions_19_vals), 0,
         "T_criticalExtensions_19", HFILL }},
     { &hf_lte_rrc_rrcConnectionReestablishmentComplete_r8,
-      { "rrcConnectionReestablishmentComplete-r8", "lte-rrc.rrcConnectionReestablishmentComplete_r8",
+      { "rrcConnectionReestablishmentComplete-r8", "lte-rrc.rrcConnectionReestablishmentComplete_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReestablishmentComplete_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_19,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_19", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_51,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReestablishmentComplete_v920_IEs", HFILL }},
     { &hf_lte_rrc_rlf_InfoAvailable_r9,
@@ -35553,11 +35553,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_rlf_InfoAvailable_r9_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_52,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReestablishmentComplete_v8a0_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_53,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReestablishmentComplete_v1020_IEs", HFILL }},
     { &hf_lte_rrc_logMeasAvailable_r10_01,
@@ -35565,7 +35565,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_logMeasAvailable_r10_01_vals), 0,
         "T_logMeasAvailable_r10_01", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_54,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReestablishmentComplete_v1130_IEs", HFILL }},
     { &hf_lte_rrc_connEstFailInfoAvailable_r11_01,
@@ -35573,7 +35573,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_connEstFailInfoAvailable_r11_01_vals), 0,
         "T_connEstFailInfoAvailable_r11_01", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_55,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_23", HFILL }},
     { &hf_lte_rrc_criticalExtensions_20,
@@ -35581,19 +35581,19 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_criticalExtensions_20_vals), 0,
         "T_criticalExtensions_20", HFILL }},
     { &hf_lte_rrc_rrcConnectionReestablishmentReject_r8,
-      { "rrcConnectionReestablishmentReject-r8", "lte-rrc.rrcConnectionReestablishmentReject_r8",
+      { "rrcConnectionReestablishmentReject-r8", "lte-rrc.rrcConnectionReestablishmentReject_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReestablishmentReject_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_20,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_20", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_56,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReestablishmentReject_v8a0_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_57,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_24", HFILL }},
     { &hf_lte_rrc_criticalExtensions_21,
@@ -35601,15 +35601,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_criticalExtensions_21_vals), 0,
         "T_criticalExtensions_21", HFILL }},
     { &hf_lte_rrc_rrcConnectionReestablishmentRequest_r8,
-      { "rrcConnectionReestablishmentRequest-r8", "lte-rrc.rrcConnectionReestablishmentRequest_r8",
+      { "rrcConnectionReestablishmentRequest-r8", "lte-rrc.rrcConnectionReestablishmentRequest_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReestablishmentRequest_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_21,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_21", HFILL }},
     { &hf_lte_rrc_ue_Identity_01,
-      { "ue-Identity", "lte-rrc.ue_Identity",
+      { "ue-Identity", "lte-rrc.ue_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReestabUE_Identity", HFILL }},
     { &hf_lte_rrc_reestablishmentCause,
@@ -35641,11 +35641,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_22_vals), 0,
         "T_c1_22", HFILL }},
     { &hf_lte_rrc_rrcConnectionReject_r8,
-      { "rrcConnectionReject-r8", "lte-rrc.rrcConnectionReject_r8",
+      { "rrcConnectionReject-r8", "lte-rrc.rrcConnectionReject_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReject_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_22,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_22", HFILL }},
     { &hf_lte_rrc_waitTime,
@@ -35653,11 +35653,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_58,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReject_v8a0_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_59,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReject_v1020_IEs", HFILL }},
     { &hf_lte_rrc_extendedWaitTime_r10,
@@ -35665,11 +35665,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_60,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReject_v1130_IEs", HFILL }},
     { &hf_lte_rrc_deprioritisationReq_r11,
-      { "deprioritisationReq-r11", "lte-rrc.deprioritisationReq_r11",
+      { "deprioritisationReq-r11", "lte-rrc.deprioritisationReq_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_deprioritisationType_r11,
@@ -35681,7 +35681,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_deprioritisationTimer_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_61,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_25", HFILL }},
     { &hf_lte_rrc_criticalExtensions_23,
@@ -35693,11 +35693,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_23_vals), 0,
         "T_c1_23", HFILL }},
     { &hf_lte_rrc_rrcConnectionRelease_r8,
-      { "rrcConnectionRelease-r8", "lte-rrc.rrcConnectionRelease_r8",
+      { "rrcConnectionRelease-r8", "lte-rrc.rrcConnectionRelease_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRelease_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_23,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_23", HFILL }},
     { &hf_lte_rrc_releaseCause,
@@ -35709,11 +35709,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_RedirectedCarrierInfo_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_idleModeMobilityControlInfo,
-      { "idleModeMobilityControlInfo", "lte-rrc.idleModeMobilityControlInfo",
+      { "idleModeMobilityControlInfo", "lte-rrc.idleModeMobilityControlInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_62,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRelease_v890_IEs", HFILL }},
     { &hf_lte_rrc_lateNonCriticalExtension_01,
@@ -35721,19 +35721,19 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_63,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRelease_v920_IEs", HFILL }},
     { &hf_lte_rrc_redirectedCarrierInfo_v9e0,
-      { "redirectedCarrierInfo-v9e0", "lte-rrc.redirectedCarrierInfo_v9e0",
+      { "redirectedCarrierInfo-v9e0", "lte-rrc.redirectedCarrierInfo_v9e0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_idleModeMobilityControlInfo_v9e0,
-      { "idleModeMobilityControlInfo-v9e0", "lte-rrc.idleModeMobilityControlInfo_v9e0",
+      { "idleModeMobilityControlInfo-v9e0", "lte-rrc.idleModeMobilityControlInfo_v9e0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_64,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_26", HFILL }},
     { &hf_lte_rrc_cellInfoList_r9,
@@ -35757,7 +35757,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CellInfoListUTRA_TDD_r10", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_65,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRelease_v1020_IEs", HFILL }},
     { &hf_lte_rrc_extendedWaitTime_r10_01,
@@ -35765,7 +35765,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_extendedWaitTime_r10_01", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_66,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_27", HFILL }},
     { &hf_lte_rrc_eutra,
@@ -35773,7 +35773,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ARFCN_ValueEUTRA", HFILL }},
     { &hf_lte_rrc_geran_01,
-      { "geran", "lte-rrc.geran",
+      { "geran", "lte-rrc.geran_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CarrierFreqsGERAN", HFILL }},
     { &hf_lte_rrc_utra_FDD,
@@ -35785,11 +35785,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ARFCN_ValueUTRA", HFILL }},
     { &hf_lte_rrc_cdma2000_HRPD,
-      { "cdma2000-HRPD", "lte-rrc.cdma2000_HRPD",
+      { "cdma2000-HRPD", "lte-rrc.cdma2000_HRPD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CarrierFreqCDMA2000", HFILL }},
     { &hf_lte_rrc_cdma2000_1xRTT,
-      { "cdma2000-1xRTT", "lte-rrc.cdma2000_1xRTT",
+      { "cdma2000-1xRTT", "lte-rrc.cdma2000_1xRTT_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CarrierFreqCDMA2000", HFILL }},
     { &hf_lte_rrc_utra_TDD_r10_01,
@@ -35837,11 +35837,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxFreq_OF_FreqPriorityEUTRA_v9e0", HFILL }},
     { &hf_lte_rrc_freqPriorityListEUTRA_v9e0_item,
-      { "FreqPriorityEUTRA-v9e0", "lte-rrc.FreqPriorityEUTRA_v9e0",
+      { "FreqPriorityEUTRA-v9e0", "lte-rrc.FreqPriorityEUTRA_v9e0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_FreqPriorityListEUTRA_item,
-      { "FreqPriorityEUTRA", "lte-rrc.FreqPriorityEUTRA",
+      { "FreqPriorityEUTRA", "lte-rrc.FreqPriorityEUTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_carrierFreq_01,
@@ -35857,15 +35857,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ARFCN_ValueEUTRA_v9e0", HFILL }},
     { &hf_lte_rrc_FreqsPriorityListGERAN_item,
-      { "FreqsPriorityGERAN", "lte-rrc.FreqsPriorityGERAN",
+      { "FreqsPriorityGERAN", "lte-rrc.FreqsPriorityGERAN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_carrierFreqs,
-      { "carrierFreqs", "lte-rrc.carrierFreqs",
+      { "carrierFreqs", "lte-rrc.carrierFreqs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CarrierFreqsGERAN", HFILL }},
     { &hf_lte_rrc_FreqPriorityListUTRA_FDD_item,
-      { "FreqPriorityUTRA-FDD", "lte-rrc.FreqPriorityUTRA_FDD",
+      { "FreqPriorityUTRA-FDD", "lte-rrc.FreqPriorityUTRA_FDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_carrierFreq_02,
@@ -35873,11 +35873,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ARFCN_ValueUTRA", HFILL }},
     { &hf_lte_rrc_FreqPriorityListUTRA_TDD_item,
-      { "FreqPriorityUTRA-TDD", "lte-rrc.FreqPriorityUTRA_TDD",
+      { "FreqPriorityUTRA-TDD", "lte-rrc.FreqPriorityUTRA_TDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_BandClassPriorityListHRPD_item,
-      { "BandClassPriorityHRPD", "lte-rrc.BandClassPriorityHRPD",
+      { "BandClassPriorityHRPD", "lte-rrc.BandClassPriorityHRPD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_bandClass,
@@ -35885,19 +35885,19 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &lte_rrc_BandclassCDMA2000_vals_ext, 0,
         "BandclassCDMA2000", HFILL }},
     { &hf_lte_rrc_BandClassPriorityList1XRTT_item,
-      { "BandClassPriority1XRTT", "lte-rrc.BandClassPriority1XRTT",
+      { "BandClassPriority1XRTT", "lte-rrc.BandClassPriority1XRTT_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_CellInfoListGERAN_r9_item,
-      { "CellInfoGERAN-r9", "lte-rrc.CellInfoGERAN_r9",
+      { "CellInfoGERAN-r9", "lte-rrc.CellInfoGERAN_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_physCellId_r9,
-      { "physCellId-r9", "lte-rrc.physCellId_r9",
+      { "physCellId-r9", "lte-rrc.physCellId_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysCellIdGERAN", HFILL }},
     { &hf_lte_rrc_carrierFreq_r9_01,
-      { "carrierFreq-r9", "lte-rrc.carrierFreq_r9",
+      { "carrierFreq-r9", "lte-rrc.carrierFreq_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CarrierFreqGERAN", HFILL }},
     { &hf_lte_rrc_systemInformation_r9,
@@ -35905,7 +35905,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SystemInfoListGERAN", HFILL }},
     { &hf_lte_rrc_CellInfoListUTRA_FDD_r9_item,
-      { "CellInfoUTRA-FDD-r9", "lte-rrc.CellInfoUTRA_FDD_r9",
+      { "CellInfoUTRA-FDD-r9", "lte-rrc.CellInfoUTRA_FDD_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_physCellId_r9_01,
@@ -35917,7 +35917,7 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_CellInfoListUTRA_TDD_r9_item,
-      { "CellInfoUTRA-TDD-r9", "lte-rrc.CellInfoUTRA_TDD_r9",
+      { "CellInfoUTRA-TDD-r9", "lte-rrc.CellInfoUTRA_TDD_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_physCellId_r9_02,
@@ -35929,7 +35929,7 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "T_utra_BCCH_Container_r9_01", HFILL }},
     { &hf_lte_rrc_CellInfoListUTRA_TDD_r10_item,
-      { "CellInfoUTRA-TDD-r10", "lte-rrc.CellInfoUTRA_TDD_r10",
+      { "CellInfoUTRA-TDD-r10", "lte-rrc.CellInfoUTRA_TDD_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_physCellId_r10_01,
@@ -35949,11 +35949,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_criticalExtensions_24_vals), 0,
         "T_criticalExtensions_24", HFILL }},
     { &hf_lte_rrc_rrcConnectionRequest_r8,
-      { "rrcConnectionRequest-r8", "lte-rrc.rrcConnectionRequest_r8",
+      { "rrcConnectionRequest-r8", "lte-rrc.rrcConnectionRequest_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRequest_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_24,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_24", HFILL }},
     { &hf_lte_rrc_ue_Identity_02,
@@ -35981,19 +35981,19 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_24_vals), 0,
         "T_c1_24", HFILL }},
     { &hf_lte_rrc_rrcConnectionSetup_r8,
-      { "rrcConnectionSetup-r8", "lte-rrc.rrcConnectionSetup_r8",
+      { "rrcConnectionSetup-r8", "lte-rrc.rrcConnectionSetup_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetup_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_25,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_25", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_67,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetup_v8a0_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_68,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_28", HFILL }},
     { &hf_lte_rrc_criticalExtensions_26,
@@ -36005,11 +36005,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_25_vals), 0,
         "T_c1_25", HFILL }},
     { &hf_lte_rrc_rrcConnectionSetupComplete_r8,
-      { "rrcConnectionSetupComplete-r8", "lte-rrc.rrcConnectionSetupComplete_r8",
+      { "rrcConnectionSetupComplete-r8", "lte-rrc.rrcConnectionSetupComplete_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetupComplete_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_26,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_26", HFILL }},
     { &hf_lte_rrc_selectedPLMN_Identity,
@@ -36017,15 +36017,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_maxPLMN_r11", HFILL }},
     { &hf_lte_rrc_registeredMME,
-      { "registeredMME", "lte-rrc.registeredMME",
+      { "registeredMME", "lte-rrc.registeredMME_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_69,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetupComplete_v8a0_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_70,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetupComplete_v1020_IEs", HFILL }},
     { &hf_lte_rrc_gummei_Type_r10,
@@ -36045,7 +36045,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_rn_SubframeConfigReq_r10_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_71,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetupComplete_v1130_IEs", HFILL }},
     { &hf_lte_rrc_connEstFailInfoAvailable_r11_02,
@@ -36053,11 +36053,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_connEstFailInfoAvailable_r11_02_vals), 0,
         "T_connEstFailInfoAvailable_r11_02", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_72,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_29", HFILL }},
     { &hf_lte_rrc_plmn_Identity,
-      { "plmn-Identity", "lte-rrc.plmn_Identity",
+      { "plmn-Identity", "lte-rrc.plmn_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_mmegi,
@@ -36077,23 +36077,23 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_26_vals), 0,
         "T_c1_26", HFILL }},
     { &hf_lte_rrc_securityModeCommand_r8,
-      { "securityModeCommand-r8", "lte-rrc.securityModeCommand_r8",
+      { "securityModeCommand-r8", "lte-rrc.securityModeCommand_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecurityModeCommand_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_27,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_27", HFILL }},
     { &hf_lte_rrc_securityConfigSMC,
-      { "securityConfigSMC", "lte-rrc.securityConfigSMC",
+      { "securityConfigSMC", "lte-rrc.securityConfigSMC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_73,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecurityModeCommand_v8a0_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_74,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_30", HFILL }},
     { &hf_lte_rrc_criticalExtensions_28,
@@ -36101,19 +36101,19 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_criticalExtensions_28_vals), 0,
         "T_criticalExtensions_28", HFILL }},
     { &hf_lte_rrc_securityModeComplete_r8,
-      { "securityModeComplete-r8", "lte-rrc.securityModeComplete_r8",
+      { "securityModeComplete-r8", "lte-rrc.securityModeComplete_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecurityModeComplete_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_28,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_28", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_75,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecurityModeComplete_v8a0_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_76,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_31", HFILL }},
     { &hf_lte_rrc_criticalExtensions_29,
@@ -36121,19 +36121,19 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_criticalExtensions_29_vals), 0,
         "T_criticalExtensions_29", HFILL }},
     { &hf_lte_rrc_securityModeFailure_r8,
-      { "securityModeFailure-r8", "lte-rrc.securityModeFailure_r8",
+      { "securityModeFailure-r8", "lte-rrc.securityModeFailure_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecurityModeFailure_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_29,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_29", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_77,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecurityModeFailure_v8a0_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_78,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_32", HFILL }},
     { &hf_lte_rrc_criticalExtensions_30,
@@ -36141,11 +36141,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_criticalExtensions_30_vals), 0,
         "T_criticalExtensions_30", HFILL }},
     { &hf_lte_rrc_systemInformation_r8,
-      { "systemInformation-r8", "lte-rrc.systemInformation_r8",
+      { "systemInformation-r8", "lte-rrc.systemInformation_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformation_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_30,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_30", HFILL }},
     { &hf_lte_rrc_sib_TypeAndInfo,
@@ -36157,75 +36157,75 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_sib_TypeAndInfo_item_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_sib2,
-      { "sib2", "lte-rrc.sib2",
+      { "sib2", "lte-rrc.sib2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformationBlockType2", HFILL }},
     { &hf_lte_rrc_sib3,
-      { "sib3", "lte-rrc.sib3",
+      { "sib3", "lte-rrc.sib3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformationBlockType3", HFILL }},
     { &hf_lte_rrc_sib4,
-      { "sib4", "lte-rrc.sib4",
+      { "sib4", "lte-rrc.sib4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformationBlockType4", HFILL }},
     { &hf_lte_rrc_sib5,
-      { "sib5", "lte-rrc.sib5",
+      { "sib5", "lte-rrc.sib5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformationBlockType5", HFILL }},
     { &hf_lte_rrc_sib6,
-      { "sib6", "lte-rrc.sib6",
+      { "sib6", "lte-rrc.sib6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformationBlockType6", HFILL }},
     { &hf_lte_rrc_sib7,
-      { "sib7", "lte-rrc.sib7",
+      { "sib7", "lte-rrc.sib7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformationBlockType7", HFILL }},
     { &hf_lte_rrc_sib8,
-      { "sib8", "lte-rrc.sib8",
+      { "sib8", "lte-rrc.sib8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformationBlockType8", HFILL }},
     { &hf_lte_rrc_sib9,
-      { "sib9", "lte-rrc.sib9",
+      { "sib9", "lte-rrc.sib9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformationBlockType9", HFILL }},
     { &hf_lte_rrc_sib10,
-      { "sib10", "lte-rrc.sib10",
+      { "sib10", "lte-rrc.sib10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformationBlockType10", HFILL }},
     { &hf_lte_rrc_sib11,
-      { "sib11", "lte-rrc.sib11",
+      { "sib11", "lte-rrc.sib11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformationBlockType11", HFILL }},
     { &hf_lte_rrc_sib12_v920,
-      { "sib12-v920", "lte-rrc.sib12_v920",
+      { "sib12-v920", "lte-rrc.sib12_v920_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformationBlockType12_r9", HFILL }},
     { &hf_lte_rrc_sib13_v920,
-      { "sib13-v920", "lte-rrc.sib13_v920",
+      { "sib13-v920", "lte-rrc.sib13_v920_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformationBlockType13_r9", HFILL }},
     { &hf_lte_rrc_sib14_v1130,
-      { "sib14-v1130", "lte-rrc.sib14_v1130",
+      { "sib14-v1130", "lte-rrc.sib14_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformationBlockType14_r11", HFILL }},
     { &hf_lte_rrc_sib15_v1130,
-      { "sib15-v1130", "lte-rrc.sib15_v1130",
+      { "sib15-v1130", "lte-rrc.sib15_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformationBlockType15_r11", HFILL }},
     { &hf_lte_rrc_sib16_v1130,
-      { "sib16-v1130", "lte-rrc.sib16_v1130",
+      { "sib16-v1130", "lte-rrc.sib16_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformationBlockType16_r11", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_79,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformation_v8a0_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_80,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_33", HFILL }},
     { &hf_lte_rrc_cellAccessRelatedInfo,
-      { "cellAccessRelatedInfo", "lte-rrc.cellAccessRelatedInfo",
+      { "cellAccessRelatedInfo", "lte-rrc.cellAccessRelatedInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_plmn_IdentityList,
@@ -36257,7 +36257,7 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cellSelectionInfo,
-      { "cellSelectionInfo", "lte-rrc.cellSelectionInfo",
+      { "cellSelectionInfo", "lte-rrc.cellSelectionInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_q_RxLevMin,
@@ -36281,7 +36281,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_tdd_Config,
-      { "tdd-Config", "lte-rrc.tdd_Config",
+      { "tdd-Config", "lte-rrc.tdd_Config_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_si_WindowLength,
@@ -36293,7 +36293,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_31", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_81,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformationBlockType1_v890_IEs", HFILL }},
     { &hf_lte_rrc_lateNonCriticalExtension_02,
@@ -36301,7 +36301,7 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "T_lateNonCriticalExtension_01", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_82,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformationBlockType1_v920_IEs", HFILL }},
     { &hf_lte_rrc_multiBandInfoList,
@@ -36309,7 +36309,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_83,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformationBlockType1_v9e0_IEs", HFILL }},
     { &hf_lte_rrc_freqBandIndicator_v9e0,
@@ -36321,7 +36321,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_84,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_34", HFILL }},
     { &hf_lte_rrc_ims_EmergencySupport_r9,
@@ -36329,27 +36329,27 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_ims_EmergencySupport_r9_vals), 0,
         "T_ims_EmergencySupport_r9", HFILL }},
     { &hf_lte_rrc_cellSelectionInfo_v920,
-      { "cellSelectionInfo-v920", "lte-rrc.cellSelectionInfo_v920",
+      { "cellSelectionInfo-v920", "lte-rrc.cellSelectionInfo_v920_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_85,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformationBlockType1_v1130_IEs", HFILL }},
     { &hf_lte_rrc_tdd_Config_v1130,
-      { "tdd-Config-v1130", "lte-rrc.tdd_Config_v1130",
+      { "tdd-Config-v1130", "lte-rrc.tdd_Config_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cellSelectionInfo_v1130,
-      { "cellSelectionInfo-v1130", "lte-rrc.cellSelectionInfo_v1130",
+      { "cellSelectionInfo-v1130", "lte-rrc.cellSelectionInfo_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_86,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_35", HFILL }},
     { &hf_lte_rrc_PLMN_IdentityList_item,
-      { "PLMN-IdentityInfo", "lte-rrc.PLMN_IdentityInfo",
+      { "PLMN-IdentityInfo", "lte-rrc.PLMN_IdentityInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cellReservedForOperatorUse,
@@ -36357,7 +36357,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_cellReservedForOperatorUse_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_SchedulingInfoList_item,
-      { "SchedulingInfo", "lte-rrc.SchedulingInfo",
+      { "SchedulingInfo", "lte-rrc.SchedulingInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_si_Periodicity,
@@ -36393,11 +36393,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_27_vals), 0,
         "T_c1_27", HFILL }},
     { &hf_lte_rrc_ueAssistanceInformation_r11_01,
-      { "ueAssistanceInformation-r11", "lte-rrc.ueAssistanceInformation_r11",
+      { "ueAssistanceInformation-r11", "lte-rrc.ueAssistanceInformation_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UEAssistanceInformation_r11_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_31,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_31", HFILL }},
     { &hf_lte_rrc_powerPrefIndication_r11,
@@ -36405,7 +36405,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_powerPrefIndication_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_87,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_36", HFILL }},
     { &hf_lte_rrc_criticalExtensions_32,
@@ -36417,11 +36417,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_28_vals), 0,
         "T_c1_28", HFILL }},
     { &hf_lte_rrc_ueCapabilityEnquiry_r8,
-      { "ueCapabilityEnquiry-r8", "lte-rrc.ueCapabilityEnquiry_r8",
+      { "ueCapabilityEnquiry-r8", "lte-rrc.ueCapabilityEnquiry_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UECapabilityEnquiry_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_32,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_32", HFILL }},
     { &hf_lte_rrc_ue_CapabilityRequest,
@@ -36429,11 +36429,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_88,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UECapabilityEnquiry_v8a0_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_89,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_37", HFILL }},
     { &hf_lte_rrc_UE_CapabilityRequest_item,
@@ -36449,11 +36449,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_29_vals), 0,
         "T_c1_29", HFILL }},
     { &hf_lte_rrc_ueCapabilityInformation_r8,
-      { "ueCapabilityInformation-r8", "lte-rrc.ueCapabilityInformation_r8",
+      { "ueCapabilityInformation-r8", "lte-rrc.ueCapabilityInformation_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UECapabilityInformation_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_33,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_33", HFILL }},
     { &hf_lte_rrc_ue_CapabilityRAT_ContainerList,
@@ -36461,11 +36461,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_90,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UECapabilityInformation_v8a0_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_91,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_38", HFILL }},
     { &hf_lte_rrc_criticalExtensions_34,
@@ -36477,11 +36477,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_30_vals), 0,
         "T_c1_30", HFILL }},
     { &hf_lte_rrc_ueInformationRequest_r9_01,
-      { "ueInformationRequest-r9", "lte-rrc.ueInformationRequest_r9",
+      { "ueInformationRequest-r9", "lte-rrc.ueInformationRequest_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UEInformationRequest_r9_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_34,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_34", HFILL }},
     { &hf_lte_rrc_rach_ReportReq_r9,
@@ -36493,11 +36493,11 @@ void proto_register_lte_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_92,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UEInformationRequest_v930_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_93,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UEInformationRequest_v1020_IEs", HFILL }},
     { &hf_lte_rrc_logMeasReportReq_r10,
@@ -36505,7 +36505,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_logMeasReportReq_r10_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_94,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UEInformationRequest_v1130_IEs", HFILL }},
     { &hf_lte_rrc_connEstFailReportReq_r11,
@@ -36513,7 +36513,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_connEstFailReportReq_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_95,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_39", HFILL }},
     { &hf_lte_rrc_criticalExtensions_35,
@@ -36525,15 +36525,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_31_vals), 0,
         "T_c1_31", HFILL }},
     { &hf_lte_rrc_ueInformationResponse_r9_01,
-      { "ueInformationResponse-r9", "lte-rrc.ueInformationResponse_r9",
+      { "ueInformationResponse-r9", "lte-rrc.ueInformationResponse_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UEInformationResponse_r9_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_35,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_35", HFILL }},
     { &hf_lte_rrc_rach_Report_r9,
-      { "rach-Report-r9", "lte-rrc.rach_Report_r9",
+      { "rach-Report-r9", "lte-rrc.rach_Report_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_rach_Report_r9", HFILL }},
     { &hf_lte_rrc_numberOfPreamblesSent_r9,
@@ -36545,19 +36545,19 @@ void proto_register_lte_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lte_rrc_rlf_Report_r9,
-      { "rlf-Report-r9", "lte-rrc.rlf_Report_r9",
+      { "rlf-Report-r9", "lte-rrc.rlf_Report_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_96,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UEInformationResponse_v930_IEs", HFILL }},
     { &hf_lte_rrc_rlf_Report_v9e0,
-      { "rlf-Report-v9e0", "lte-rrc.rlf_Report_v9e0",
+      { "rlf-Report-v9e0", "lte-rrc.rlf_Report_v9e0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_97,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_40", HFILL }},
     { &hf_lte_rrc_lateNonCriticalExtension_03,
@@ -36565,27 +36565,27 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "T_lateNonCriticalExtension_02", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_98,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UEInformationResponse_v1020_IEs", HFILL }},
     { &hf_lte_rrc_logMeasReport_r10,
-      { "logMeasReport-r10", "lte-rrc.logMeasReport_r10",
+      { "logMeasReport-r10", "lte-rrc.logMeasReport_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_99,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UEInformationResponse_v1130_IEs", HFILL }},
     { &hf_lte_rrc_connEstFailReport_r11,
-      { "connEstFailReport-r11", "lte-rrc.connEstFailReport_r11",
+      { "connEstFailReport-r11", "lte-rrc.connEstFailReport_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_100,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_41", HFILL }},
     { &hf_lte_rrc_measResultLastServCell_r9,
-      { "measResultLastServCell-r9", "lte-rrc.measResultLastServCell_r9",
+      { "measResultLastServCell-r9", "lte-rrc.measResultLastServCell_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rsrpResult_r9,
@@ -36597,7 +36597,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &lte_rrc_RSRQ_Range_vals_ext, 0,
         "RSRQ_Range", HFILL }},
     { &hf_lte_rrc_measResultNeighCells_r9,
-      { "measResultNeighCells-r9", "lte-rrc.measResultNeighCells_r9",
+      { "measResultNeighCells-r9", "lte-rrc.measResultNeighCells_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_measResultListEUTRA_r9,
@@ -36617,7 +36617,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MeasResultList2CDMA2000_r9", HFILL }},
     { &hf_lte_rrc_locationInfo_r10,
-      { "locationInfo-r10", "lte-rrc.locationInfo_r10",
+      { "locationInfo-r10", "lte-rrc.locationInfo_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_failedPCellId_r10,
@@ -36625,15 +36625,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_failedPCellId_r10_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cellGlobalId_r10,
-      { "cellGlobalId-r10", "lte-rrc.cellGlobalId_r10",
+      { "cellGlobalId-r10", "lte-rrc.cellGlobalId_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellGlobalIdEUTRA", HFILL }},
     { &hf_lte_rrc_pci_arfcn_r10,
-      { "pci-arfcn-r10", "lte-rrc.pci_arfcn_r10",
+      { "pci-arfcn-r10", "lte-rrc.pci_arfcn_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_reestablishmentCellId_r10,
-      { "reestablishmentCellId-r10", "lte-rrc.reestablishmentCellId_r10",
+      { "reestablishmentCellId-r10", "lte-rrc.reestablishmentCellId_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellGlobalIdEUTRA", HFILL }},
     { &hf_lte_rrc_timeConnFailure_r10,
@@ -36645,15 +36645,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_connectionFailureType_r10_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_previousPCellId_r10,
-      { "previousPCellId-r10", "lte-rrc.previousPCellId_r10",
+      { "previousPCellId-r10", "lte-rrc.previousPCellId_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellGlobalIdEUTRA", HFILL }},
     { &hf_lte_rrc_failedPCellId_v1090,
-      { "failedPCellId-v1090", "lte-rrc.failedPCellId_v1090",
+      { "failedPCellId-v1090", "lte-rrc.failedPCellId_v1090_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_basicFields_r11,
-      { "basicFields-r11", "lte-rrc.basicFields_r11",
+      { "basicFields-r11", "lte-rrc.basicFields_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_c_RNTI_r11,
@@ -36669,7 +36669,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_previousUTRA_CellId_r11,
-      { "previousUTRA-CellId-r11", "lte-rrc.previousUTRA_CellId_r11",
+      { "previousUTRA-CellId-r11", "lte-rrc.previousUTRA_CellId_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_carrierFreq_r11_01,
@@ -36689,11 +36689,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PhysCellIdUTRA_TDD", HFILL }},
     { &hf_lte_rrc_cellGlobalId_r11,
-      { "cellGlobalId-r11", "lte-rrc.cellGlobalId_r11",
+      { "cellGlobalId-r11", "lte-rrc.cellGlobalId_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellGlobalIdUTRA", HFILL }},
     { &hf_lte_rrc_selectedUTRA_CellId_r11,
-      { "selectedUTRA-CellId-r11", "lte-rrc.selectedUTRA_CellId_r11",
+      { "selectedUTRA-CellId-r11", "lte-rrc.selectedUTRA_CellId_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_physCellId_r11_01,
@@ -36705,11 +36705,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MeasResultList2EUTRA_v9e0", HFILL }},
     { &hf_lte_rrc_MeasResultList2EUTRA_r9_item,
-      { "MeasResult2EUTRA-r9", "lte-rrc.MeasResult2EUTRA_r9",
+      { "MeasResult2EUTRA-r9", "lte-rrc.MeasResult2EUTRA_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_MeasResultList2EUTRA_v9e0_item,
-      { "MeasResult2EUTRA-v9e0", "lte-rrc.MeasResult2EUTRA_v9e0",
+      { "MeasResult2EUTRA-v9e0", "lte-rrc.MeasResult2EUTRA_v9e0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_carrierFreq_r9_02,
@@ -36721,7 +36721,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MeasResultListEUTRA", HFILL }},
     { &hf_lte_rrc_MeasResultList2UTRA_r9_item,
-      { "MeasResult2UTRA-r9", "lte-rrc.MeasResult2UTRA_r9",
+      { "MeasResult2UTRA-r9", "lte-rrc.MeasResult2UTRA_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_carrierFreq_r9_03,
@@ -36733,15 +36733,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MeasResultListUTRA", HFILL }},
     { &hf_lte_rrc_MeasResultList2CDMA2000_r9_item,
-      { "MeasResult2CDMA2000-r9", "lte-rrc.MeasResult2CDMA2000_r9",
+      { "MeasResult2CDMA2000-r9", "lte-rrc.MeasResult2CDMA2000_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_carrierFreq_r9_04,
-      { "carrierFreq-r9", "lte-rrc.carrierFreq_r9",
+      { "carrierFreq-r9", "lte-rrc.carrierFreq_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CarrierFreqCDMA2000", HFILL }},
     { &hf_lte_rrc_measResultList_r9_02,
-      { "measResultList-r9", "lte-rrc.measResultList_r9",
+      { "measResultList-r9", "lte-rrc.measResultList_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasResultsCDMA2000", HFILL }},
     { &hf_lte_rrc_absoluteTimeStamp_r10,
@@ -36757,7 +36757,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_logMeasAvailable_r10_03_vals), 0,
         "T_logMeasAvailable_r10_03", HFILL }},
     { &hf_lte_rrc_LogMeasInfoList_r10_item,
-      { "LogMeasInfo-r10", "lte-rrc.LogMeasInfo_r10",
+      { "LogMeasInfo-r10", "lte-rrc.LogMeasInfo_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_relativeTimeStamp_r10,
@@ -36765,11 +36765,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_servCellIdentity_r10,
-      { "servCellIdentity-r10", "lte-rrc.servCellIdentity_r10",
+      { "servCellIdentity-r10", "lte-rrc.servCellIdentity_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellGlobalIdEUTRA", HFILL }},
     { &hf_lte_rrc_measResultServCell_r10,
-      { "measResultServCell-r10", "lte-rrc.measResultServCell_r10",
+      { "measResultServCell-r10", "lte-rrc.measResultServCell_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rsrpResult_r10,
@@ -36781,7 +36781,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &lte_rrc_RSRQ_Range_vals_ext, 0,
         "RSRQ_Range", HFILL }},
     { &hf_lte_rrc_measResultNeighCells_r10,
-      { "measResultNeighCells-r10", "lte-rrc.measResultNeighCells_r10",
+      { "measResultNeighCells-r10", "lte-rrc.measResultNeighCells_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_measResultListEUTRA_r10,
@@ -36809,15 +36809,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_failedCellId_r11,
-      { "failedCellId-r11", "lte-rrc.failedCellId_r11",
+      { "failedCellId-r11", "lte-rrc.failedCellId_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellGlobalIdEUTRA", HFILL }},
     { &hf_lte_rrc_locationInfo_r11,
-      { "locationInfo-r11", "lte-rrc.locationInfo_r11",
+      { "locationInfo-r11", "lte-rrc.locationInfo_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LocationInfo_r10", HFILL }},
     { &hf_lte_rrc_measResultFailedCell_r11,
-      { "measResultFailedCell-r11", "lte-rrc.measResultFailedCell_r11",
+      { "measResultFailedCell-r11", "lte-rrc.measResultFailedCell_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rsrpResult_r11,
@@ -36829,7 +36829,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &lte_rrc_RSRQ_Range_vals_ext, 0,
         "RSRQ_Range", HFILL }},
     { &hf_lte_rrc_measResultNeighCells_r11,
-      { "measResultNeighCells-r11", "lte-rrc.measResultNeighCells_r11",
+      { "measResultNeighCells-r11", "lte-rrc.measResultNeighCells_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_measResultListEUTRA_r11,
@@ -36873,11 +36873,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_32_vals), 0,
         "T_c1_32", HFILL }},
     { &hf_lte_rrc_ulHandoverPreparationTransfer_r8,
-      { "ulHandoverPreparationTransfer-r8", "lte-rrc.ulHandoverPreparationTransfer_r8",
+      { "ulHandoverPreparationTransfer-r8", "lte-rrc.ulHandoverPreparationTransfer_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ULHandoverPreparationTransfer_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_36,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_36", HFILL }},
     { &hf_lte_rrc_meid,
@@ -36889,11 +36889,11 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "DedicatedInfoCDMA2000", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_101,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ULHandoverPreparationTransfer_v8a0_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_102,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_42", HFILL }},
     { &hf_lte_rrc_criticalExtensions_37,
@@ -36905,11 +36905,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_33_vals), 0,
         "T_c1_33", HFILL }},
     { &hf_lte_rrc_ulInformationTransfer_r8,
-      { "ulInformationTransfer-r8", "lte-rrc.ulInformationTransfer_r8",
+      { "ulInformationTransfer-r8", "lte-rrc.ulInformationTransfer_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ULInformationTransfer_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_37,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_37", HFILL }},
     { &hf_lte_rrc_dedicatedInfoType_01,
@@ -36917,15 +36917,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_dedicatedInfoType_01_vals), 0,
         "T_dedicatedInfoType_01", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_103,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ULInformationTransfer_v8a0_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_104,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_43", HFILL }},
     { &hf_lte_rrc_ac_BarringInfo,
-      { "ac-BarringInfo", "lte-rrc.ac_BarringInfo",
+      { "ac-BarringInfo", "lte-rrc.ac_BarringInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_ac_BarringForEmergency,
@@ -36933,23 +36933,23 @@ void proto_register_lte_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lte_rrc_ac_BarringForMO_Signalling,
-      { "ac-BarringForMO-Signalling", "lte-rrc.ac_BarringForMO_Signalling",
+      { "ac-BarringForMO-Signalling", "lte-rrc.ac_BarringForMO_Signalling_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AC_BarringConfig", HFILL }},
     { &hf_lte_rrc_ac_BarringForMO_Data,
-      { "ac-BarringForMO-Data", "lte-rrc.ac_BarringForMO_Data",
+      { "ac-BarringForMO-Data", "lte-rrc.ac_BarringForMO_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AC_BarringConfig", HFILL }},
     { &hf_lte_rrc_radioResourceConfigCommon,
-      { "radioResourceConfigCommon", "lte-rrc.radioResourceConfigCommon",
+      { "radioResourceConfigCommon", "lte-rrc.radioResourceConfigCommon_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioResourceConfigCommonSIB", HFILL }},
     { &hf_lte_rrc_ue_TimersAndConstants,
-      { "ue-TimersAndConstants", "lte-rrc.ue_TimersAndConstants",
+      { "ue-TimersAndConstants", "lte-rrc.ue_TimersAndConstants_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_freqInfo,
-      { "freqInfo", "lte-rrc.freqInfo",
+      { "freqInfo", "lte-rrc.freqInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_ul_CarrierFreq,
@@ -36977,15 +36977,15 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "T_lateNonCriticalExtension_03", HFILL }},
     { &hf_lte_rrc_ssac_BarringForMMTEL_Voice_r9,
-      { "ssac-BarringForMMTEL-Voice-r9", "lte-rrc.ssac_BarringForMMTEL_Voice_r9",
+      { "ssac-BarringForMMTEL-Voice-r9", "lte-rrc.ssac_BarringForMMTEL_Voice_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AC_BarringConfig", HFILL }},
     { &hf_lte_rrc_ssac_BarringForMMTEL_Video_r9,
-      { "ssac-BarringForMMTEL-Video-r9", "lte-rrc.ssac_BarringForMMTEL_Video_r9",
+      { "ssac-BarringForMMTEL-Video-r9", "lte-rrc.ssac_BarringForMMTEL_Video_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AC_BarringConfig", HFILL }},
     { &hf_lte_rrc_ac_BarringForCSFB_r10,
-      { "ac-BarringForCSFB-r10", "lte-rrc.ac_BarringForCSFB_r10",
+      { "ac-BarringForCSFB-r10", "lte-rrc.ac_BarringForCSFB_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AC_BarringConfig", HFILL }},
     { &hf_lte_rrc_multiBandInfoList_01,
@@ -36997,7 +36997,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_105,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformationBlockType2_v9e0_IEs", HFILL }},
     { &hf_lte_rrc_ul_CarrierFreq_v9e0,
@@ -37005,7 +37005,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ARFCN_ValueEUTRA_v9e0", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_106,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_44", HFILL }},
     { &hf_lte_rrc_ac_BarringFactor,
@@ -37021,11 +37021,11 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_5", HFILL }},
     { &hf_lte_rrc_MBSFN_SubframeConfigList_item,
-      { "MBSFN-SubframeConfig", "lte-rrc.MBSFN_SubframeConfig",
+      { "MBSFN-SubframeConfig", "lte-rrc.MBSFN_SubframeConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cellReselectionInfoCommon,
-      { "cellReselectionInfoCommon", "lte-rrc.cellReselectionInfoCommon",
+      { "cellReselectionInfoCommon", "lte-rrc.cellReselectionInfoCommon_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_q_Hyst,
@@ -37033,15 +37033,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_q_Hyst_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_speedStateReselectionPars,
-      { "speedStateReselectionPars", "lte-rrc.speedStateReselectionPars",
+      { "speedStateReselectionPars", "lte-rrc.speedStateReselectionPars_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_mobilityStateParameters,
-      { "mobilityStateParameters", "lte-rrc.mobilityStateParameters",
+      { "mobilityStateParameters", "lte-rrc.mobilityStateParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_q_HystSF,
-      { "q-HystSF", "lte-rrc.q_HystSF",
+      { "q-HystSF", "lte-rrc.q_HystSF_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_sf_Medium,
@@ -37053,7 +37053,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_sf_High_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cellReselectionServingFreqInfo,
-      { "cellReselectionServingFreqInfo", "lte-rrc.cellReselectionServingFreqInfo",
+      { "cellReselectionServingFreqInfo", "lte-rrc.cellReselectionServingFreqInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_s_NonIntraSearch,
@@ -37065,7 +37065,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &lte_rrc_ReselectionThreshold_vals_ext, 0,
         "ReselectionThreshold", HFILL }},
     { &hf_lte_rrc_intraFreqCellReselectionInfo,
-      { "intraFreqCellReselectionInfo", "lte-rrc.intraFreqCellReselectionInfo",
+      { "intraFreqCellReselectionInfo", "lte-rrc.intraFreqCellReselectionInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_s_IntraSearch,
@@ -37089,11 +37089,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_Reselection", HFILL }},
     { &hf_lte_rrc_t_ReselectionEUTRA_SF,
-      { "t-ReselectionEUTRA-SF", "lte-rrc.t_ReselectionEUTRA_SF",
+      { "t-ReselectionEUTRA-SF", "lte-rrc.t_ReselectionEUTRA_SF_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SpeedStateScaleFactors", HFILL }},
     { &hf_lte_rrc_s_IntraSearch_v920,
-      { "s-IntraSearch-v920", "lte-rrc.s_IntraSearch_v920",
+      { "s-IntraSearch-v920", "lte-rrc.s_IntraSearch_v920_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_s_IntraSearchP_r9,
@@ -37105,7 +37105,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ReselectionThresholdQ_r9", HFILL }},
     { &hf_lte_rrc_s_NonIntraSearch_v920,
-      { "s-NonIntraSearch-v920", "lte-rrc.s_NonIntraSearch_v920",
+      { "s-NonIntraSearch-v920", "lte-rrc.s_NonIntraSearch_v920_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_s_NonIntraSearchP_r9,
@@ -37129,11 +37129,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_csg_PhysCellIdRange,
-      { "csg-PhysCellIdRange", "lte-rrc.csg_PhysCellIdRange",
+      { "csg-PhysCellIdRange", "lte-rrc.csg_PhysCellIdRange_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysCellIdRange", HFILL }},
     { &hf_lte_rrc_IntraFreqNeighCellList_item,
-      { "IntraFreqNeighCellInfo", "lte-rrc.IntraFreqNeighCellInfo",
+      { "IntraFreqNeighCellInfo", "lte-rrc.IntraFreqNeighCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_q_OffsetCell,
@@ -37141,7 +37141,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &lte_rrc_Q_OffsetRange_vals_ext, 0,
         "Q_OffsetRange", HFILL }},
     { &hf_lte_rrc_IntraFreqBlackCellList_item,
-      { "PhysCellIdRange", "lte-rrc.PhysCellIdRange",
+      { "PhysCellIdRange", "lte-rrc.PhysCellIdRange_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_interFreqCarrierFreqList,
@@ -37157,11 +37157,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxFreq_OF_InterFreqCarrierFreqInfo_v8h0", HFILL }},
     { &hf_lte_rrc_interFreqCarrierFreqList_v8h0_item,
-      { "InterFreqCarrierFreqInfo-v8h0", "lte-rrc.InterFreqCarrierFreqInfo_v8h0",
+      { "InterFreqCarrierFreqInfo-v8h0", "lte-rrc.InterFreqCarrierFreqInfo_v8h0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_107,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformationBlockType5_v9e0_IEs", HFILL }},
     { &hf_lte_rrc_interFreqCarrierFreqList_v9e0,
@@ -37169,15 +37169,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxFreq_OF_InterFreqCarrierFreqInfo_v9e0", HFILL }},
     { &hf_lte_rrc_interFreqCarrierFreqList_v9e0_item,
-      { "InterFreqCarrierFreqInfo-v9e0", "lte-rrc.InterFreqCarrierFreqInfo_v9e0",
+      { "InterFreqCarrierFreqInfo-v9e0", "lte-rrc.InterFreqCarrierFreqInfo_v9e0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_108,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_45", HFILL }},
     { &hf_lte_rrc_InterFreqCarrierFreqList_item,
-      { "InterFreqCarrierFreqInfo", "lte-rrc.InterFreqCarrierFreqInfo",
+      { "InterFreqCarrierFreqInfo", "lte-rrc.InterFreqCarrierFreqInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_dl_CarrierFreq,
@@ -37205,7 +37205,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_threshX_Q_r9,
-      { "threshX-Q-r9", "lte-rrc.threshX_Q_r9",
+      { "threshX-Q-r9", "lte-rrc.threshX_Q_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_threshX_HighQ_r9,
@@ -37221,11 +37221,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ARFCN_ValueEUTRA_v9e0", HFILL }},
     { &hf_lte_rrc_InterFreqNeighCellList_item,
-      { "InterFreqNeighCellInfo", "lte-rrc.InterFreqNeighCellInfo",
+      { "InterFreqNeighCellInfo", "lte-rrc.InterFreqNeighCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_InterFreqBlackCellList_item,
-      { "PhysCellIdRange", "lte-rrc.PhysCellIdRange",
+      { "PhysCellIdRange", "lte-rrc.PhysCellIdRange_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_carrierFreqListUTRA_FDD,
@@ -37241,7 +37241,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_Reselection", HFILL }},
     { &hf_lte_rrc_t_ReselectionUTRA_SF,
-      { "t-ReselectionUTRA-SF", "lte-rrc.t_ReselectionUTRA_SF",
+      { "t-ReselectionUTRA-SF", "lte-rrc.t_ReselectionUTRA_SF_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SpeedStateScaleFactors", HFILL }},
     { &hf_lte_rrc_lateNonCriticalExtension_06,
@@ -37253,15 +37253,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxUTRA_FDD_Carrier_OF_CarrierFreqInfoUTRA_FDD_v8h0", HFILL }},
     { &hf_lte_rrc_carrierFreqListUTRA_FDD_v8h0_item,
-      { "CarrierFreqInfoUTRA-FDD-v8h0", "lte-rrc.CarrierFreqInfoUTRA_FDD_v8h0",
+      { "CarrierFreqInfoUTRA-FDD-v8h0", "lte-rrc.CarrierFreqInfoUTRA_FDD_v8h0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_109,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_46", HFILL }},
     { &hf_lte_rrc_CarrierFreqListUTRA_FDD_item,
-      { "CarrierFreqUTRA-FDD", "lte-rrc.CarrierFreqUTRA_FDD",
+      { "CarrierFreqUTRA-FDD", "lte-rrc.CarrierFreqUTRA_FDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_q_RxLevMin_01,
@@ -37277,7 +37277,7 @@ void proto_register_lte_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_threshX_Q_r9_01,
-      { "threshX-Q-r9", "lte-rrc.threshX_Q_r9",
+      { "threshX-Q-r9", "lte-rrc.threshX_Q_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_threshX_Q_r9_01", HFILL }},
     { &hf_lte_rrc_multiBandInfoList_02,
@@ -37289,7 +37289,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_CarrierFreqListUTRA_TDD_item,
-      { "CarrierFreqUTRA-TDD", "lte-rrc.CarrierFreqUTRA_TDD",
+      { "CarrierFreqUTRA-TDD", "lte-rrc.CarrierFreqUTRA_TDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_p_MaxUTRA_01,
@@ -37301,7 +37301,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_Reselection", HFILL }},
     { &hf_lte_rrc_t_ReselectionGERAN_SF,
-      { "t-ReselectionGERAN-SF", "lte-rrc.t_ReselectionGERAN_SF",
+      { "t-ReselectionGERAN-SF", "lte-rrc.t_ReselectionGERAN_SF_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SpeedStateScaleFactors", HFILL }},
     { &hf_lte_rrc_carrierFreqsInfoList,
@@ -37309,11 +37309,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CarrierFreqsInfoListGERAN", HFILL }},
     { &hf_lte_rrc_CarrierFreqsInfoListGERAN_item,
-      { "CarrierFreqsInfoGERAN", "lte-rrc.CarrierFreqsInfoGERAN",
+      { "CarrierFreqsInfoGERAN", "lte-rrc.CarrierFreqsInfoGERAN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_commonInfo,
-      { "commonInfo", "lte-rrc.commonInfo",
+      { "commonInfo", "lte-rrc.commonInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_ncc_Permitted,
@@ -37329,7 +37329,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_systemTimeInfo,
-      { "systemTimeInfo", "lte-rrc.systemTimeInfo",
+      { "systemTimeInfo", "lte-rrc.systemTimeInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemTimeInfoCDMA2000", HFILL }},
     { &hf_lte_rrc_searchWindowSize,
@@ -37337,23 +37337,23 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_15", HFILL }},
     { &hf_lte_rrc_parametersHRPD,
-      { "parametersHRPD", "lte-rrc.parametersHRPD",
+      { "parametersHRPD", "lte-rrc.parametersHRPD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_preRegistrationInfoHRPD,
-      { "preRegistrationInfoHRPD", "lte-rrc.preRegistrationInfoHRPD",
+      { "preRegistrationInfoHRPD", "lte-rrc.preRegistrationInfoHRPD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cellReselectionParametersHRPD,
-      { "cellReselectionParametersHRPD", "lte-rrc.cellReselectionParametersHRPD",
+      { "cellReselectionParametersHRPD", "lte-rrc.cellReselectionParametersHRPD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellReselectionParametersCDMA2000", HFILL }},
     { &hf_lte_rrc_parameters1XRTT,
-      { "parameters1XRTT", "lte-rrc.parameters1XRTT",
+      { "parameters1XRTT", "lte-rrc.parameters1XRTT_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_csfb_RegistrationParam1XRTT,
-      { "csfb-RegistrationParam1XRTT", "lte-rrc.csfb_RegistrationParam1XRTT",
+      { "csfb-RegistrationParam1XRTT", "lte-rrc.csfb_RegistrationParam1XRTT_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_longCodeState1XRTT,
@@ -37361,7 +37361,7 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_42", HFILL }},
     { &hf_lte_rrc_cellReselectionParameters1XRTT,
-      { "cellReselectionParameters1XRTT", "lte-rrc.cellReselectionParameters1XRTT",
+      { "cellReselectionParameters1XRTT", "lte-rrc.cellReselectionParameters1XRTT_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellReselectionParametersCDMA2000", HFILL }},
     { &hf_lte_rrc_csfb_SupportForDualRxUEs_r9,
@@ -37369,19 +37369,19 @@ void proto_register_lte_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lte_rrc_cellReselectionParametersHRPD_v920,
-      { "cellReselectionParametersHRPD-v920", "lte-rrc.cellReselectionParametersHRPD_v920",
+      { "cellReselectionParametersHRPD-v920", "lte-rrc.cellReselectionParametersHRPD_v920_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellReselectionParametersCDMA2000_v920", HFILL }},
     { &hf_lte_rrc_cellReselectionParameters1XRTT_v920,
-      { "cellReselectionParameters1XRTT-v920", "lte-rrc.cellReselectionParameters1XRTT_v920",
+      { "cellReselectionParameters1XRTT-v920", "lte-rrc.cellReselectionParameters1XRTT_v920_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellReselectionParametersCDMA2000_v920", HFILL }},
     { &hf_lte_rrc_csfb_RegistrationParam1XRTT_v920,
-      { "csfb-RegistrationParam1XRTT-v920", "lte-rrc.csfb_RegistrationParam1XRTT_v920",
+      { "csfb-RegistrationParam1XRTT-v920", "lte-rrc.csfb_RegistrationParam1XRTT_v920_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_ac_BarringConfig1XRTT_r9,
-      { "ac-BarringConfig1XRTT-r9", "lte-rrc.ac_BarringConfig1XRTT_r9",
+      { "ac-BarringConfig1XRTT-r9", "lte-rrc.ac_BarringConfig1XRTT_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_csfb_DualRxTxSupport_r10,
@@ -37405,7 +37405,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_Reselection", HFILL }},
     { &hf_lte_rrc_t_ReselectionCDMA2000_SF,
-      { "t-ReselectionCDMA2000-SF", "lte-rrc.t_ReselectionCDMA2000_SF",
+      { "t-ReselectionCDMA2000-SF", "lte-rrc.t_ReselectionCDMA2000_SF_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SpeedStateScaleFactors", HFILL }},
     { &hf_lte_rrc_neighCellList_r11,
@@ -37413,7 +37413,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_16_OF_NeighCellCDMA2000_r11", HFILL }},
     { &hf_lte_rrc_neighCellList_r11_item,
-      { "NeighCellCDMA2000-r11", "lte-rrc.NeighCellCDMA2000_r11",
+      { "NeighCellCDMA2000-r11", "lte-rrc.NeighCellCDMA2000_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_neighCellList_v920,
@@ -37421,7 +37421,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "NeighCellListCDMA2000_v920", HFILL }},
     { &hf_lte_rrc_NeighCellListCDMA2000_item,
-      { "NeighCellCDMA2000", "lte-rrc.NeighCellCDMA2000",
+      { "NeighCellCDMA2000", "lte-rrc.NeighCellCDMA2000_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_neighCellsPerFreqList,
@@ -37433,11 +37433,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_16_OF_NeighCellsPerBandclassCDMA2000_r11", HFILL }},
     { &hf_lte_rrc_neighFreqInfoList_r11_item,
-      { "NeighCellsPerBandclassCDMA2000-r11", "lte-rrc.NeighCellsPerBandclassCDMA2000_r11",
+      { "NeighCellsPerBandclassCDMA2000-r11", "lte-rrc.NeighCellsPerBandclassCDMA2000_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_NeighCellsPerBandclassListCDMA2000_item,
-      { "NeighCellsPerBandclassCDMA2000", "lte-rrc.NeighCellsPerBandclassCDMA2000",
+      { "NeighCellsPerBandclassCDMA2000", "lte-rrc.NeighCellsPerBandclassCDMA2000_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_arfcn,
@@ -37457,7 +37457,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_NeighCellListCDMA2000_v920_item,
-      { "NeighCellCDMA2000-v920", "lte-rrc.NeighCellCDMA2000_v920",
+      { "NeighCellCDMA2000-v920", "lte-rrc.NeighCellCDMA2000_v920_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_neighCellsPerFreqList_v920,
@@ -37465,7 +37465,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "NeighCellsPerBandclassListCDMA2000_v920", HFILL }},
     { &hf_lte_rrc_NeighCellsPerBandclassListCDMA2000_v920_item,
-      { "NeighCellsPerBandclassCDMA2000-v920", "lte-rrc.NeighCellsPerBandclassCDMA2000_v920",
+      { "NeighCellsPerBandclassCDMA2000-v920", "lte-rrc.NeighCellsPerBandclassCDMA2000_v920_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_physCellIdList_v920,
@@ -37481,7 +37481,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_BandClassListCDMA2000_item,
-      { "BandClassInfoCDMA2000", "lte-rrc.BandClassInfoCDMA2000",
+      { "BandClassInfoCDMA2000", "lte-rrc.BandClassInfoCDMA2000_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_threshX_High_01,
@@ -37533,7 +37533,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_7", HFILL }},
     { &hf_lte_rrc_SIB8_PerPLMN_List_r11_item,
-      { "SIB8-PerPLMN-r11", "lte-rrc.SIB8_PerPLMN_r11",
+      { "SIB8-PerPLMN-r11", "lte-rrc.SIB8_PerPLMN_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_plmn_Identity_r11,
@@ -37545,11 +37545,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_parametersCDMA2000_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_explicitValue,
-      { "explicitValue", "lte-rrc.explicitValue",
+      { "explicitValue", "lte-rrc.explicitValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ParametersCDMA2000_r11", HFILL }},
     { &hf_lte_rrc_defaultValue,
-      { "defaultValue", "lte-rrc.defaultValue",
+      { "defaultValue", "lte-rrc.defaultValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_systemTimeInfo_r11,
@@ -37557,7 +37557,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_systemTimeInfo_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_explicitValue_01,
-      { "explicitValue", "lte-rrc.explicitValue",
+      { "explicitValue", "lte-rrc.explicitValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemTimeInfoCDMA2000", HFILL }},
     { &hf_lte_rrc_searchWindowSize_r11,
@@ -37565,27 +37565,27 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_15", HFILL }},
     { &hf_lte_rrc_parametersHRPD_r11,
-      { "parametersHRPD-r11", "lte-rrc.parametersHRPD_r11",
+      { "parametersHRPD-r11", "lte-rrc.parametersHRPD_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_preRegistrationInfoHRPD_r11,
-      { "preRegistrationInfoHRPD-r11", "lte-rrc.preRegistrationInfoHRPD_r11",
+      { "preRegistrationInfoHRPD-r11", "lte-rrc.preRegistrationInfoHRPD_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PreRegistrationInfoHRPD", HFILL }},
     { &hf_lte_rrc_cellReselectionParametersHRPD_r11,
-      { "cellReselectionParametersHRPD-r11", "lte-rrc.cellReselectionParametersHRPD_r11",
+      { "cellReselectionParametersHRPD-r11", "lte-rrc.cellReselectionParametersHRPD_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellReselectionParametersCDMA2000_r11", HFILL }},
     { &hf_lte_rrc_parameters1XRTT_r11,
-      { "parameters1XRTT-r11", "lte-rrc.parameters1XRTT_r11",
+      { "parameters1XRTT-r11", "lte-rrc.parameters1XRTT_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_parameters1XRTT_r11", HFILL }},
     { &hf_lte_rrc_csfb_RegistrationParam1XRTT_r11,
-      { "csfb-RegistrationParam1XRTT-r11", "lte-rrc.csfb_RegistrationParam1XRTT_r11",
+      { "csfb-RegistrationParam1XRTT-r11", "lte-rrc.csfb_RegistrationParam1XRTT_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CSFB_RegistrationParam1XRTT", HFILL }},
     { &hf_lte_rrc_csfb_RegistrationParam1XRTT_Ext_r11,
-      { "csfb-RegistrationParam1XRTT-Ext-r11", "lte-rrc.csfb_RegistrationParam1XRTT_Ext_r11",
+      { "csfb-RegistrationParam1XRTT-Ext-r11", "lte-rrc.csfb_RegistrationParam1XRTT_Ext_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CSFB_RegistrationParam1XRTT_v920", HFILL }},
     { &hf_lte_rrc_longCodeState1XRTT_r11,
@@ -37593,11 +37593,11 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_42", HFILL }},
     { &hf_lte_rrc_cellReselectionParameters1XRTT_r11,
-      { "cellReselectionParameters1XRTT-r11", "lte-rrc.cellReselectionParameters1XRTT_r11",
+      { "cellReselectionParameters1XRTT-r11", "lte-rrc.cellReselectionParameters1XRTT_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellReselectionParametersCDMA2000_r11", HFILL }},
     { &hf_lte_rrc_ac_BarringConfig1XRTT_r11,
-      { "ac-BarringConfig1XRTT-r11", "lte-rrc.ac_BarringConfig1XRTT_r11",
+      { "ac-BarringConfig1XRTT-r11", "lte-rrc.ac_BarringConfig1XRTT_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AC_BarringConfig1XRTT_r9", HFILL }},
     { &hf_lte_rrc_csfb_SupportForDualRxUEs_r11,
@@ -37681,7 +37681,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_notificationConfig_r9,
-      { "notificationConfig-r9", "lte-rrc.notificationConfig_r9",
+      { "notificationConfig-r9", "lte-rrc.notificationConfig_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMS_NotificationConfig_r9", HFILL }},
     { &hf_lte_rrc_eab_Param_r11,
@@ -37689,7 +37689,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_eab_Param_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_eab_Common_r11,
-      { "eab-Common-r11", "lte-rrc.eab_Common_r11",
+      { "eab-Common-r11", "lte-rrc.eab_Common_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EAB_Config_r11", HFILL }},
     { &hf_lte_rrc_eab_PerPLMN_List_r11,
@@ -37697,11 +37697,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxPLMN_r11_OF_EAB_ConfigPLMN_r11", HFILL }},
     { &hf_lte_rrc_eab_PerPLMN_List_r11_item,
-      { "EAB-ConfigPLMN-r11", "lte-rrc.EAB_ConfigPLMN_r11",
+      { "EAB-ConfigPLMN-r11", "lte-rrc.EAB_ConfigPLMN_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_eab_Config_r11,
-      { "eab-Config-r11", "lte-rrc.eab_Config_r11",
+      { "eab-Config-r11", "lte-rrc.eab_Config_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_eab_Category_r11,
@@ -37725,7 +37725,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_MBMS_SAI_InterFreqList_r11_item,
-      { "MBMS-SAI-InterFreq-r11", "lte-rrc.MBMS_SAI_InterFreq_r11",
+      { "MBMS-SAI-InterFreq-r11", "lte-rrc.MBMS_SAI_InterFreq_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_dl_CarrierFreq_r11,
@@ -37737,7 +37737,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_timeInfo_r11,
-      { "timeInfo-r11", "lte-rrc.timeInfo_r11",
+      { "timeInfo-r11", "lte-rrc.timeInfo_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_timeInfoUTC_r11,
@@ -37805,7 +37805,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_ue_TransmitAntennaSelection_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_release,
-      { "release", "lte-rrc.release",
+      { "release", "lte-rrc.release_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup,
@@ -37885,7 +37885,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_csi_SubframePatternConfig_r10_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_02,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_02", HFILL }},
     { &hf_lte_rrc_csi_MeasSubframeSet1_r10,
@@ -37897,11 +37897,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_MeasSubframePattern_r10_vals), 0,
         "MeasSubframePattern_r10", HFILL }},
     { &hf_lte_rrc_cqi_ReportPeriodic_v1130,
-      { "cqi-ReportPeriodic-v1130", "lte-rrc.cqi_ReportPeriodic_v1130",
+      { "cqi-ReportPeriodic-v1130", "lte-rrc.cqi_ReportPeriodic_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cqi_ReportBoth_r11,
-      { "cqi-ReportBoth-r11", "lte-rrc.cqi_ReportBoth_r11",
+      { "cqi-ReportBoth-r11", "lte-rrc.cqi_ReportBoth_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cqi_ReportModeAperiodic_r10,
@@ -37921,7 +37921,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_pmi_RI_Report_r10_vals), 0,
         "T_pmi_RI_Report_r10", HFILL }},
     { &hf_lte_rrc_setup_03,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_03", HFILL }},
     { &hf_lte_rrc_cqi_PUCCH_ResourceIndex,
@@ -37937,11 +37937,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_cqi_FormatIndicatorPeriodic_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_widebandCQI,
-      { "widebandCQI", "lte-rrc.widebandCQI",
+      { "widebandCQI", "lte-rrc.widebandCQI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_subbandCQI,
-      { "subbandCQI", "lte-rrc.subbandCQI",
+      { "subbandCQI", "lte-rrc.subbandCQI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_k,
@@ -37957,7 +37957,7 @@ void proto_register_lte_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lte_rrc_setup_04,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_04", HFILL }},
     { &hf_lte_rrc_cqi_PUCCH_ResourceIndex_r10,
@@ -37973,7 +37973,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_cqi_FormatIndicatorPeriodic_r10_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_widebandCQI_r10,
-      { "widebandCQI-r10", "lte-rrc.widebandCQI_r10",
+      { "widebandCQI-r10", "lte-rrc.widebandCQI_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_csi_ReportMode_r10,
@@ -37981,7 +37981,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_csi_ReportMode_r10_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_subbandCQI_r10,
-      { "subbandCQI-r10", "lte-rrc.subbandCQI_r10",
+      { "subbandCQI-r10", "lte-rrc.subbandCQI_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_periodicityFactor_r10,
@@ -37997,7 +37997,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_csi_ConfigIndex_r10_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_05,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_05", HFILL }},
     { &hf_lte_rrc_cqi_pmi_ConfigIndex2_r10,
@@ -38021,7 +38021,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_CQI_ReportPeriodicProcExtToAddModList_r11_item,
-      { "CQI-ReportPeriodicProcExt-r11", "lte-rrc.CQI_ReportPeriodicProcExt_r11",
+      { "CQI-ReportPeriodicProcExt-r11", "lte-rrc.CQI_ReportPeriodicProcExt_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_CQI_ReportPeriodicProcExtToReleaseList_r11_item,
@@ -38041,7 +38041,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_cqi_FormatIndicatorPeriodic_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_widebandCQI_r11,
-      { "widebandCQI-r11", "lte-rrc.widebandCQI_r11",
+      { "widebandCQI-r11", "lte-rrc.widebandCQI_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_csi_ReportMode_r11,
@@ -38049,7 +38049,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_csi_ReportMode_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_subbandCQI_r11,
-      { "subbandCQI-r11", "lte-rrc.subbandCQI_r11",
+      { "subbandCQI-r11", "lte-rrc.subbandCQI_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_periodicityFactor_r11,
@@ -38065,7 +38065,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_csi_ConfigIndex_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_06,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_06", HFILL }},
     { &hf_lte_rrc_cqi_pmi_ConfigIndex2_r11,
@@ -38077,11 +38077,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_1023", HFILL }},
     { &hf_lte_rrc_setup_07,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_07", HFILL }},
     { &hf_lte_rrc_aperiodicCSI_Trigger_r10,
-      { "aperiodicCSI-Trigger-r10", "lte-rrc.aperiodicCSI_Trigger_r10",
+      { "aperiodicCSI-Trigger-r10", "lte-rrc.aperiodicCSI_Trigger_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_trigger1_r10,
@@ -38125,7 +38125,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_CSI_IM_ConfigToAddModList_r11_item,
-      { "CSI-IM-Config-r11", "lte-rrc.CSI_IM_Config_r11",
+      { "CSI-IM-Config-r11", "lte-rrc.CSI_IM_Config_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_CSI_IM_ConfigToReleaseList_r11_item,
@@ -38133,7 +38133,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_CSI_ProcessToAddModList_r11_item,
-      { "CSI-Process-r11", "lte-rrc.CSI_Process_r11",
+      { "CSI-Process-r11", "lte-rrc.CSI_Process_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_CSI_ProcessToReleaseList_r11_item,
@@ -38153,7 +38153,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_schedulingCellInfo_r10_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_own_r10,
-      { "own-r10", "lte-rrc.own_r10",
+      { "own-r10", "lte-rrc.own_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cif_Presence_r10,
@@ -38161,7 +38161,7 @@ void proto_register_lte_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lte_rrc_other_r10,
-      { "other-r10", "lte-rrc.other_r10",
+      { "other-r10", "lte-rrc.other_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_schedulingCellId_r10,
@@ -38197,11 +38197,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_2_OF_P_C_AndCBSR_r11", HFILL }},
     { &hf_lte_rrc_p_C_AndCBSRList_r11_item,
-      { "P-C-AndCBSR-r11", "lte-rrc.P_C_AndCBSR_r11",
+      { "P-C-AndCBSR-r11", "lte-rrc.P_C_AndCBSR_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cqi_ReportBothProc_r11,
-      { "cqi-ReportBothProc-r11", "lte-rrc.cqi_ReportBothProc_r11",
+      { "cqi-ReportBothProc-r11", "lte-rrc.cqi_ReportBothProc_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cqi_ReportPeriodicProcId_r11,
@@ -38209,7 +38209,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_maxCQI_ProcExt_r11", HFILL }},
     { &hf_lte_rrc_cqi_ReportAperiodicProc_r11,
-      { "cqi-ReportAperiodicProc-r11", "lte-rrc.cqi_ReportAperiodicProc_r11",
+      { "cqi-ReportAperiodicProc-r11", "lte-rrc.cqi_ReportAperiodicProc_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_p_C_r11,
@@ -38225,7 +38225,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_csi_RS_r10_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_08,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_08", HFILL }},
     { &hf_lte_rrc_antennaPortsCount_r10,
@@ -38249,7 +38249,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_zeroTxPowerCSI_RS_r10_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_09,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_09", HFILL }},
     { &hf_lte_rrc_zeroTxPowerResourceConfigList_r10,
@@ -38269,7 +38269,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_503", HFILL }},
     { &hf_lte_rrc_qcl_CRS_Info_r11,
-      { "qcl-CRS-Info-r11", "lte-rrc.qcl_CRS_Info_r11",
+      { "qcl-CRS-Info-r11", "lte-rrc.qcl_CRS_Info_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_qcl_ScramblingIdentity_r11,
@@ -38285,7 +38285,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_mbsfn_SubframeConfigList_r11_vals), 0,
         "T_mbsfn_SubframeConfigList_r11", HFILL }},
     { &hf_lte_rrc_setup_10,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_10", HFILL }},
     { &hf_lte_rrc_subframeConfigList,
@@ -38301,7 +38301,7 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_16", HFILL }},
     { &hf_lte_rrc_setup_11,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_11", HFILL }},
     { &hf_lte_rrc_scramblingIdentity2_r11,
@@ -38313,7 +38313,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_config_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_12,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_12", HFILL }},
     { &hf_lte_rrc_subframePatternConfig_r11,
@@ -38321,7 +38321,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_subframePatternConfig_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_13,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_13", HFILL }},
     { &hf_lte_rrc_subframePattern_r11,
@@ -38341,7 +38341,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "EPDCCH_SetConfigToAddModList_r11", HFILL }},
     { &hf_lte_rrc_EPDCCH_SetConfigToAddModList_r11_item,
-      { "EPDCCH-SetConfig-r11", "lte-rrc.EPDCCH_SetConfig_r11",
+      { "EPDCCH-SetConfig-r11", "lte-rrc.EPDCCH_SetConfig_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_EPDCCH_SetConfigToReleaseList_r11_item,
@@ -38357,7 +38357,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_transmissionType_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_resourceBlockAssignment_r11,
-      { "resourceBlockAssignment-r11", "lte-rrc.resourceBlockAssignment_r11",
+      { "resourceBlockAssignment-r11", "lte-rrc.resourceBlockAssignment_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_resourceBlockAssignment_r11", HFILL }},
     { &hf_lte_rrc_numberPRB_Pairs_r11,
@@ -38381,7 +38381,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PDSCH_RE_MappingQCL_ConfigId_r11", HFILL }},
     { &hf_lte_rrc_ul_SpecificParameters,
-      { "ul-SpecificParameters", "lte-rrc.ul_SpecificParameters",
+      { "ul-SpecificParameters", "lte-rrc.ul_SpecificParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_priority,
@@ -38405,7 +38405,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_logicalChannelSR_Mask_r9_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_ul_SCH_Config,
-      { "ul-SCH-Config", "lte-rrc.ul_SCH_Config",
+      { "ul-SCH-Config", "lte-rrc.ul_SCH_Config_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_maxHARQ_Tx,
@@ -38437,7 +38437,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_phr_Config_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_14,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_14", HFILL }},
     { &hf_lte_rrc_periodicPHR_Timer,
@@ -38457,7 +38457,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_mac_MainConfig_v1020,
-      { "mac-MainConfig-v1020", "lte-rrc.mac_MainConfig_v1020",
+      { "mac-MainConfig-v1020", "lte-rrc.mac_MainConfig_v1020_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_sCellDeactivationTimer_r10,
@@ -38481,7 +38481,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_drx_Config_v1130,
-      { "drx-Config-v1130", "lte-rrc.drx_Config_v1130",
+      { "drx-Config-v1130", "lte-rrc.drx_Config_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_stag_Id_r11,
@@ -38489,7 +38489,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_15,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_15", HFILL }},
     { &hf_lte_rrc_onDurationTimer,
@@ -38573,7 +38573,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_2559", HFILL }},
     { &hf_lte_rrc_shortDRX,
-      { "shortDRX", "lte-rrc.shortDRX",
+      { "shortDRX", "lte-rrc.shortDRX_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_shortDRX_Cycle,
@@ -38609,7 +38609,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_STAG_ToAddModList_r11_item,
-      { "STAG-ToAddMod-r11", "lte-rrc.STAG_ToAddMod_r11",
+      { "STAG-ToAddMod-r11", "lte-rrc.STAG_ToAddMod_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_timeAlignmentTimerSTAG_r11,
@@ -38621,7 +38621,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_discardTimer_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rlc_AM,
-      { "rlc-AM", "lte-rrc.rlc_AM",
+      { "rlc-AM", "lte-rrc.rlc_AM_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_statusReportRequired,
@@ -38629,7 +38629,7 @@ void proto_register_lte_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lte_rrc_rlc_UM,
-      { "rlc-UM", "lte-rrc.rlc_UM",
+      { "rlc-UM", "lte-rrc.rlc_UM_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_pdcp_SN_Size,
@@ -38641,11 +38641,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_headerCompression_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_notUsed,
-      { "notUsed", "lte-rrc.notUsed",
+      { "notUsed", "lte-rrc.notUsed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rohc,
-      { "rohc", "lte-rrc.rohc",
+      { "rohc", "lte-rrc.rohc_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_maxCID,
@@ -38653,7 +38653,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_16383", HFILL }},
     { &hf_lte_rrc_profiles,
-      { "profiles", "lte-rrc.profiles",
+      { "profiles", "lte-rrc.profiles_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_profile0x0001,
@@ -38729,7 +38729,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_RE_MappingQCLConfigToAddModList_r11_item,
-      { "PDSCH-RE-MappingQCL-Config-r11", "lte-rrc.PDSCH_RE_MappingQCL_Config_r11",
+      { "PDSCH-RE-MappingQCL-Config-r11", "lte-rrc.PDSCH_RE_MappingQCL_Config_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_RE_MappingQCLConfigToReleaseList_r11_item,
@@ -38741,7 +38741,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_optionalSetOfFields_r11,
-      { "optionalSetOfFields-r11", "lte-rrc.optionalSetOfFields_r11",
+      { "optionalSetOfFields-r11", "lte-rrc.optionalSetOfFields_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_crs_PortsCount_r11_01,
@@ -38757,7 +38757,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_mbsfn_SubframeConfigList_r11_01_vals), 0,
         "T_mbsfn_SubframeConfigList_r11_01", HFILL }},
     { &hf_lte_rrc_setup_16,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_16", HFILL }},
     { &hf_lte_rrc_pdsch_Start_r11,
@@ -38777,19 +38777,19 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_phich_Resource_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_pdsch_ConfigDedicated,
-      { "pdsch-ConfigDedicated", "lte-rrc.pdsch_ConfigDedicated",
+      { "pdsch-ConfigDedicated", "lte-rrc.pdsch_ConfigDedicated_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_pucch_ConfigDedicated,
-      { "pucch-ConfigDedicated", "lte-rrc.pucch_ConfigDedicated",
+      { "pucch-ConfigDedicated", "lte-rrc.pucch_ConfigDedicated_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_pusch_ConfigDedicated,
-      { "pusch-ConfigDedicated", "lte-rrc.pusch_ConfigDedicated",
+      { "pusch-ConfigDedicated", "lte-rrc.pusch_ConfigDedicated_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_uplinkPowerControlDedicated,
-      { "uplinkPowerControlDedicated", "lte-rrc.uplinkPowerControlDedicated",
+      { "uplinkPowerControlDedicated", "lte-rrc.uplinkPowerControlDedicated_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_tpc_PDCCH_ConfigPUCCH,
@@ -38801,7 +38801,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_TPC_PDCCH_Config_vals), 0,
         "TPC_PDCCH_Config", HFILL }},
     { &hf_lte_rrc_cqi_ReportConfig,
-      { "cqi-ReportConfig", "lte-rrc.cqi_ReportConfig",
+      { "cqi-ReportConfig", "lte-rrc.cqi_ReportConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_soundingRS_UL_ConfigDedicated,
@@ -38813,7 +38813,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_antennaInfo_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_explicitValue_02,
-      { "explicitValue", "lte-rrc.explicitValue",
+      { "explicitValue", "lte-rrc.explicitValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AntennaInfoDedicated", HFILL }},
     { &hf_lte_rrc_schedulingRequestConfig,
@@ -38821,11 +38821,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_SchedulingRequestConfig_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cqi_ReportConfig_v920,
-      { "cqi-ReportConfig-v920", "lte-rrc.cqi_ReportConfig_v920",
+      { "cqi-ReportConfig-v920", "lte-rrc.cqi_ReportConfig_v920_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_antennaInfo_v920,
-      { "antennaInfo-v920", "lte-rrc.antennaInfo_v920",
+      { "antennaInfo-v920", "lte-rrc.antennaInfo_v920_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AntennaInfoDedicated_v920", HFILL }},
     { &hf_lte_rrc_antennaInfo_r10,
@@ -38833,35 +38833,35 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_antennaInfo_r10_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_explicitValue_r10,
-      { "explicitValue-r10", "lte-rrc.explicitValue_r10",
+      { "explicitValue-r10", "lte-rrc.explicitValue_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AntennaInfoDedicated_r10", HFILL }},
     { &hf_lte_rrc_antennaInfoUL_r10,
-      { "antennaInfoUL-r10", "lte-rrc.antennaInfoUL_r10",
+      { "antennaInfoUL-r10", "lte-rrc.antennaInfoUL_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cqi_ReportConfig_r10,
-      { "cqi-ReportConfig-r10", "lte-rrc.cqi_ReportConfig_r10",
+      { "cqi-ReportConfig-r10", "lte-rrc.cqi_ReportConfig_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_csi_RS_Config_r10,
-      { "csi-RS-Config-r10", "lte-rrc.csi_RS_Config_r10",
+      { "csi-RS-Config-r10", "lte-rrc.csi_RS_Config_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_pucch_ConfigDedicated_v1020,
-      { "pucch-ConfigDedicated-v1020", "lte-rrc.pucch_ConfigDedicated_v1020",
+      { "pucch-ConfigDedicated-v1020", "lte-rrc.pucch_ConfigDedicated_v1020_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_pusch_ConfigDedicated_v1020,
-      { "pusch-ConfigDedicated-v1020", "lte-rrc.pusch_ConfigDedicated_v1020",
+      { "pusch-ConfigDedicated-v1020", "lte-rrc.pusch_ConfigDedicated_v1020_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_schedulingRequestConfig_v1020,
-      { "schedulingRequestConfig-v1020", "lte-rrc.schedulingRequestConfig_v1020",
+      { "schedulingRequestConfig-v1020", "lte-rrc.schedulingRequestConfig_v1020_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_soundingRS_UL_ConfigDedicated_v1020,
-      { "soundingRS-UL-ConfigDedicated-v1020", "lte-rrc.soundingRS_UL_ConfigDedicated_v1020",
+      { "soundingRS-UL-ConfigDedicated-v1020", "lte-rrc.soundingRS_UL_ConfigDedicated_v1020_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_soundingRS_UL_ConfigDedicatedAperiodic_r10,
@@ -38869,7 +38869,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_SoundingRS_UL_ConfigDedicatedAperiodic_r10_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_uplinkPowerControlDedicated_v1020,
-      { "uplinkPowerControlDedicated-v1020", "lte-rrc.uplinkPowerControlDedicated_v1020",
+      { "uplinkPowerControlDedicated-v1020", "lte-rrc.uplinkPowerControlDedicated_v1020_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_additionalSpectrumEmissionCA_r10,
@@ -38877,7 +38877,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_additionalSpectrumEmissionCA_r10_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_17,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_17", HFILL }},
     { &hf_lte_rrc_additionalSpectrumEmissionPCell_r10,
@@ -38901,59 +38901,59 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_epdcch_Config_r11,
-      { "epdcch-Config-r11", "lte-rrc.epdcch_Config_r11",
+      { "epdcch-Config-r11", "lte-rrc.epdcch_Config_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_pdsch_ConfigDedicated_v1130,
-      { "pdsch-ConfigDedicated-v1130", "lte-rrc.pdsch_ConfigDedicated_v1130",
+      { "pdsch-ConfigDedicated-v1130", "lte-rrc.pdsch_ConfigDedicated_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cqi_ReportConfig_v1130,
-      { "cqi-ReportConfig-v1130", "lte-rrc.cqi_ReportConfig_v1130",
+      { "cqi-ReportConfig-v1130", "lte-rrc.cqi_ReportConfig_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_pucch_ConfigDedicated_v1130,
-      { "pucch-ConfigDedicated-v1130", "lte-rrc.pucch_ConfigDedicated_v1130",
+      { "pucch-ConfigDedicated-v1130", "lte-rrc.pucch_ConfigDedicated_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_pusch_ConfigDedicated_v1130,
-      { "pusch-ConfigDedicated-v1130", "lte-rrc.pusch_ConfigDedicated_v1130",
+      { "pusch-ConfigDedicated-v1130", "lte-rrc.pusch_ConfigDedicated_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_uplinkPowerControlDedicated_v1130,
-      { "uplinkPowerControlDedicated-v1130", "lte-rrc.uplinkPowerControlDedicated_v1130",
+      { "uplinkPowerControlDedicated-v1130", "lte-rrc.uplinkPowerControlDedicated_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonUL_Configuration_r10,
-      { "nonUL-Configuration-r10", "lte-rrc.nonUL_Configuration_r10",
+      { "nonUL-Configuration-r10", "lte-rrc.nonUL_Configuration_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_antennaInfo_r10_01,
-      { "antennaInfo-r10", "lte-rrc.antennaInfo_r10",
+      { "antennaInfo-r10", "lte-rrc.antennaInfo_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AntennaInfoDedicated_r10", HFILL }},
     { &hf_lte_rrc_crossCarrierSchedulingConfig_r10,
-      { "crossCarrierSchedulingConfig-r10", "lte-rrc.crossCarrierSchedulingConfig_r10",
+      { "crossCarrierSchedulingConfig-r10", "lte-rrc.crossCarrierSchedulingConfig_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_pdsch_ConfigDedicated_r10,
-      { "pdsch-ConfigDedicated-r10", "lte-rrc.pdsch_ConfigDedicated_r10",
+      { "pdsch-ConfigDedicated-r10", "lte-rrc.pdsch_ConfigDedicated_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PDSCH_ConfigDedicated", HFILL }},
     { &hf_lte_rrc_ul_Configuration_r10,
-      { "ul-Configuration-r10", "lte-rrc.ul_Configuration_r10",
+      { "ul-Configuration-r10", "lte-rrc.ul_Configuration_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_pusch_ConfigDedicatedSCell_r10,
-      { "pusch-ConfigDedicatedSCell-r10", "lte-rrc.pusch_ConfigDedicatedSCell_r10",
+      { "pusch-ConfigDedicatedSCell-r10", "lte-rrc.pusch_ConfigDedicatedSCell_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_uplinkPowerControlDedicatedSCell_r10,
-      { "uplinkPowerControlDedicatedSCell-r10", "lte-rrc.uplinkPowerControlDedicatedSCell_r10",
+      { "uplinkPowerControlDedicatedSCell-r10", "lte-rrc.uplinkPowerControlDedicatedSCell_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cqi_ReportConfigSCell_r10,
-      { "cqi-ReportConfigSCell-r10", "lte-rrc.cqi_ReportConfigSCell_r10",
+      { "cqi-ReportConfigSCell-r10", "lte-rrc.cqi_ReportConfigSCell_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_soundingRS_UL_ConfigDedicated_r10,
@@ -38961,11 +38961,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_SoundingRS_UL_ConfigDedicated_vals), 0,
         "SoundingRS_UL_ConfigDedicated", HFILL }},
     { &hf_lte_rrc_uplinkPowerControlDedicatedSCell_v1130,
-      { "uplinkPowerControlDedicatedSCell-v1130", "lte-rrc.uplinkPowerControlDedicatedSCell_v1130",
+      { "uplinkPowerControlDedicatedSCell-v1130", "lte-rrc.uplinkPowerControlDedicatedSCell_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UplinkPowerControlDedicated_v1130", HFILL }},
     { &hf_lte_rrc_CSI_RS_ConfigNZPToAddModList_r11_item,
-      { "CSI-RS-ConfigNZP-r11", "lte-rrc.CSI_RS_ConfigNZP_r11",
+      { "CSI-RS-ConfigNZP-r11", "lte-rrc.CSI_RS_ConfigNZP_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_CSI_RS_ConfigNZPToReleaseList_r11_item,
@@ -38973,7 +38973,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_CSI_RS_ConfigZPToAddModList_r11_item,
-      { "CSI-RS-ConfigZP-r11", "lte-rrc.CSI_RS_ConfigZP_r11",
+      { "CSI-RS-ConfigZP-r11", "lte-rrc.CSI_RS_ConfigZP_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_CSI_RS_ConfigZPToReleaseList_r11_item,
@@ -38985,7 +38985,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_837", HFILL }},
     { &hf_lte_rrc_prach_ConfigInfo,
-      { "prach-ConfigInfo", "lte-rrc.prach_ConfigInfo",
+      { "prach-ConfigInfo", "lte-rrc.prach_ConfigInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_prach_ConfigIndex_r10,
@@ -39029,7 +39029,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_ackNackRepetition_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_18,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_18", HFILL }},
     { &hf_lte_rrc_repetitionFactor,
@@ -39049,7 +39049,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_pucch_Format_r10_vals), 0,
         "T_pucch_Format_r10", HFILL }},
     { &hf_lte_rrc_format3_r10,
-      { "format3-r10", "lte-rrc.format3_r10",
+      { "format3-r10", "lte-rrc.format3_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_n3PUCCH_AN_List_r10,
@@ -39065,7 +39065,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_twoAntennaPortActivatedPUCCH_Format3_r10_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_19,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_19", HFILL }},
     { &hf_lte_rrc_n3PUCCH_AN_ListP1_r10,
@@ -39077,7 +39077,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_549", HFILL }},
     { &hf_lte_rrc_channelSelection_r10,
-      { "channelSelection-r10", "lte-rrc.channelSelection_r10",
+      { "channelSelection-r10", "lte-rrc.channelSelection_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_n1PUCCH_AN_CS_r10,
@@ -39085,7 +39085,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_n1PUCCH_AN_CS_r10_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_20,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_20", HFILL }},
     { &hf_lte_rrc_n1PUCCH_AN_CS_List_r10,
@@ -39113,7 +39113,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_n1PUCCH_AN_CS_v1130_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_21,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_21", HFILL }},
     { &hf_lte_rrc_n1PUCCH_AN_CS_ListP1_r11,
@@ -39129,7 +39129,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_nPUCCH_Param_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_22,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_22", HFILL }},
     { &hf_lte_rrc_nPUCCH_Identity_r11,
@@ -39145,7 +39145,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_2047", HFILL }},
     { &hf_lte_rrc_pusch_ConfigBasic,
-      { "pusch-ConfigBasic", "lte-rrc.pusch_ConfigBasic",
+      { "pusch-ConfigBasic", "lte-rrc.pusch_ConfigBasic_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_n_SB,
@@ -39165,7 +39165,7 @@ void proto_register_lte_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lte_rrc_ul_ReferenceSignalsPUSCH,
-      { "ul-ReferenceSignalsPUSCH", "lte-rrc.ul_ReferenceSignalsPUSCH",
+      { "ul-ReferenceSignalsPUSCH", "lte-rrc.ul_ReferenceSignalsPUSCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_betaOffset_ACK_Index,
@@ -39181,7 +39181,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_15", HFILL }},
     { &hf_lte_rrc_betaOffsetMC_r10,
-      { "betaOffsetMC-r10", "lte-rrc.betaOffsetMC_r10",
+      { "betaOffsetMC-r10", "lte-rrc.betaOffsetMC_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_betaOffset_ACK_Index_MC_r10,
@@ -39209,7 +39209,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_pusch_DMRS_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_23,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_23", HFILL }},
     { &hf_lte_rrc_nPUSCH_Identity_r11,
@@ -39245,7 +39245,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_7", HFILL }},
     { &hf_lte_rrc_preambleInfo,
-      { "preambleInfo", "lte-rrc.preambleInfo",
+      { "preambleInfo", "lte-rrc.preambleInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_numberOfRA_Preambles,
@@ -39253,7 +39253,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_numberOfRA_Preambles_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_preamblesGroupAConfig,
-      { "preamblesGroupAConfig", "lte-rrc.preamblesGroupAConfig",
+      { "preamblesGroupAConfig", "lte-rrc.preamblesGroupAConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_sizeOfRA_PreamblesGroupA,
@@ -39269,11 +39269,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_messagePowerOffsetGroupB_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_powerRampingParameters,
-      { "powerRampingParameters", "lte-rrc.powerRampingParameters",
+      { "powerRampingParameters", "lte-rrc.powerRampingParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_ra_SupervisionInfo,
-      { "ra-SupervisionInfo", "lte-rrc.ra_SupervisionInfo",
+      { "ra-SupervisionInfo", "lte-rrc.ra_SupervisionInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_preambleTransMax,
@@ -39293,11 +39293,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_8", HFILL }},
     { &hf_lte_rrc_powerRampingParameters_r11,
-      { "powerRampingParameters-r11", "lte-rrc.powerRampingParameters_r11",
+      { "powerRampingParameters-r11", "lte-rrc.powerRampingParameters_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PowerRampingParameters", HFILL }},
     { &hf_lte_rrc_ra_SupervisionInfo_r11,
-      { "ra-SupervisionInfo-r11", "lte-rrc.ra_SupervisionInfo_r11",
+      { "ra-SupervisionInfo-r11", "lte-rrc.ra_SupervisionInfo_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_preambleTransMax_r11,
@@ -39321,31 +39321,31 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_15", HFILL }},
     { &hf_lte_rrc_rach_ConfigCommon,
-      { "rach-ConfigCommon", "lte-rrc.rach_ConfigCommon",
+      { "rach-ConfigCommon", "lte-rrc.rach_ConfigCommon_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_bcch_Config,
-      { "bcch-Config", "lte-rrc.bcch_Config",
+      { "bcch-Config", "lte-rrc.bcch_Config_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_pcch_Config,
-      { "pcch-Config", "lte-rrc.pcch_Config",
+      { "pcch-Config", "lte-rrc.pcch_Config_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_prach_Config,
-      { "prach-Config", "lte-rrc.prach_Config",
+      { "prach-Config", "lte-rrc.prach_Config_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PRACH_ConfigSIB", HFILL }},
     { &hf_lte_rrc_pdsch_ConfigCommon,
-      { "pdsch-ConfigCommon", "lte-rrc.pdsch_ConfigCommon",
+      { "pdsch-ConfigCommon", "lte-rrc.pdsch_ConfigCommon_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_pusch_ConfigCommon,
-      { "pusch-ConfigCommon", "lte-rrc.pusch_ConfigCommon",
+      { "pusch-ConfigCommon", "lte-rrc.pusch_ConfigCommon_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_pucch_ConfigCommon,
-      { "pucch-ConfigCommon", "lte-rrc.pucch_ConfigCommon",
+      { "pucch-ConfigCommon", "lte-rrc.pucch_ConfigCommon_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_soundingRS_UL_ConfigCommon,
@@ -39353,7 +39353,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_SoundingRS_UL_ConfigCommon_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_uplinkPowerControlCommon,
-      { "uplinkPowerControlCommon", "lte-rrc.uplinkPowerControlCommon",
+      { "uplinkPowerControlCommon", "lte-rrc.uplinkPowerControlCommon_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_ul_CyclicPrefixLength,
@@ -39361,19 +39361,19 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_UL_CyclicPrefixLength_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_uplinkPowerControlCommon_v1020,
-      { "uplinkPowerControlCommon-v1020", "lte-rrc.uplinkPowerControlCommon_v1020",
+      { "uplinkPowerControlCommon-v1020", "lte-rrc.uplinkPowerControlCommon_v1020_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_prach_Config_01,
-      { "prach-Config", "lte-rrc.prach_Config",
+      { "prach-Config", "lte-rrc.prach_Config_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_antennaInfoCommon,
-      { "antennaInfoCommon", "lte-rrc.antennaInfoCommon",
+      { "antennaInfoCommon", "lte-rrc.antennaInfoCommon_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonUL_Configuration_r10_01,
-      { "nonUL-Configuration-r10", "lte-rrc.nonUL_Configuration_r10",
+      { "nonUL-Configuration-r10", "lte-rrc.nonUL_Configuration_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonUL_Configuration_r10_01", HFILL }},
     { &hf_lte_rrc_dl_Bandwidth_r10,
@@ -39381,7 +39381,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_dl_Bandwidth_r10_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_antennaInfoCommon_r10,
-      { "antennaInfoCommon-r10", "lte-rrc.antennaInfoCommon_r10",
+      { "antennaInfoCommon-r10", "lte-rrc.antennaInfoCommon_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AntennaInfoCommon", HFILL }},
     { &hf_lte_rrc_mbsfn_SubframeConfigList_r10,
@@ -39389,23 +39389,23 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MBSFN_SubframeConfigList", HFILL }},
     { &hf_lte_rrc_phich_Config_r10,
-      { "phich-Config-r10", "lte-rrc.phich_Config_r10",
+      { "phich-Config-r10", "lte-rrc.phich_Config_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PHICH_Config", HFILL }},
     { &hf_lte_rrc_pdsch_ConfigCommon_r10,
-      { "pdsch-ConfigCommon-r10", "lte-rrc.pdsch_ConfigCommon_r10",
+      { "pdsch-ConfigCommon-r10", "lte-rrc.pdsch_ConfigCommon_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PDSCH_ConfigCommon", HFILL }},
     { &hf_lte_rrc_tdd_Config_r10,
-      { "tdd-Config-r10", "lte-rrc.tdd_Config_r10",
+      { "tdd-Config-r10", "lte-rrc.tdd_Config_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TDD_Config", HFILL }},
     { &hf_lte_rrc_ul_Configuration_r10_01,
-      { "ul-Configuration-r10", "lte-rrc.ul_Configuration_r10",
+      { "ul-Configuration-r10", "lte-rrc.ul_Configuration_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ul_Configuration_r10_01", HFILL }},
     { &hf_lte_rrc_ul_FreqInfo_r10,
-      { "ul-FreqInfo-r10", "lte-rrc.ul_FreqInfo_r10",
+      { "ul-FreqInfo-r10", "lte-rrc.ul_FreqInfo_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_ul_CarrierFreq_r10,
@@ -39425,7 +39425,7 @@ void proto_register_lte_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "P_Max", HFILL }},
     { &hf_lte_rrc_uplinkPowerControlCommonSCell_r10,
-      { "uplinkPowerControlCommonSCell-r10", "lte-rrc.uplinkPowerControlCommonSCell_r10",
+      { "uplinkPowerControlCommonSCell-r10", "lte-rrc.uplinkPowerControlCommonSCell_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_soundingRS_UL_ConfigCommon_r10,
@@ -39437,11 +39437,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_UL_CyclicPrefixLength_vals), 0,
         "UL_CyclicPrefixLength", HFILL }},
     { &hf_lte_rrc_prach_ConfigSCell_r10,
-      { "prach-ConfigSCell-r10", "lte-rrc.prach_ConfigSCell_r10",
+      { "prach-ConfigSCell-r10", "lte-rrc.prach_ConfigSCell_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_pusch_ConfigCommon_r10,
-      { "pusch-ConfigCommon-r10", "lte-rrc.pusch_ConfigCommon_r10",
+      { "pusch-ConfigCommon-r10", "lte-rrc.pusch_ConfigCommon_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PUSCH_ConfigCommon", HFILL }},
     { &hf_lte_rrc_ul_CarrierFreq_v1090,
@@ -39449,15 +39449,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ARFCN_ValueEUTRA_v9e0", HFILL }},
     { &hf_lte_rrc_rach_ConfigCommonSCell_r11,
-      { "rach-ConfigCommonSCell-r11", "lte-rrc.rach_ConfigCommonSCell_r11",
+      { "rach-ConfigCommonSCell-r11", "lte-rrc.rach_ConfigCommonSCell_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_prach_ConfigSCell_r11,
-      { "prach-ConfigSCell-r11", "lte-rrc.prach_ConfigSCell_r11",
+      { "prach-ConfigSCell-r11", "lte-rrc.prach_ConfigSCell_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PRACH_Config", HFILL }},
     { &hf_lte_rrc_uplinkPowerControlCommonSCell_v1130,
-      { "uplinkPowerControlCommonSCell-v1130", "lte-rrc.uplinkPowerControlCommonSCell_v1130",
+      { "uplinkPowerControlCommonSCell-v1130", "lte-rrc.uplinkPowerControlCommonSCell_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_modificationPeriodCoeff,
@@ -39489,15 +39489,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_mac_MainConfig_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_explicitValue_03,
-      { "explicitValue", "lte-rrc.explicitValue",
+      { "explicitValue", "lte-rrc.explicitValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MAC_MainConfig", HFILL }},
     { &hf_lte_rrc_sps_Config,
-      { "sps-Config", "lte-rrc.sps_Config",
+      { "sps-Config", "lte-rrc.sps_Config_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_physicalConfigDedicated,
-      { "physicalConfigDedicated", "lte-rrc.physicalConfigDedicated",
+      { "physicalConfigDedicated", "lte-rrc.physicalConfigDedicated_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rlf_TimersAndConstants_r9,
@@ -39513,15 +39513,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_NeighCellsCRS_Info_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_physicalConfigDedicatedSCell_r10,
-      { "physicalConfigDedicatedSCell-r10", "lte-rrc.physicalConfigDedicatedSCell_r10",
+      { "physicalConfigDedicatedSCell-r10", "lte-rrc.physicalConfigDedicatedSCell_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_mac_MainConfigSCell_r11,
-      { "mac-MainConfigSCell-r11", "lte-rrc.mac_MainConfigSCell_r11",
+      { "mac-MainConfigSCell-r11", "lte-rrc.mac_MainConfigSCell_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_SRB_ToAddModList_item,
-      { "SRB-ToAddMod", "lte-rrc.SRB_ToAddMod",
+      { "SRB-ToAddMod", "lte-rrc.SRB_ToAddMod_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_srb_Identity,
@@ -39541,11 +39541,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_logicalChannelConfig_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_explicitValue_05,
-      { "explicitValue", "lte-rrc.explicitValue",
+      { "explicitValue", "lte-rrc.explicitValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LogicalChannelConfig", HFILL }},
     { &hf_lte_rrc_DRB_ToAddModList_item,
-      { "DRB-ToAddMod", "lte-rrc.DRB_ToAddMod",
+      { "DRB-ToAddMod", "lte-rrc.DRB_ToAddMod_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_eps_BearerIdentity,
@@ -39553,7 +39553,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_15", HFILL }},
     { &hf_lte_rrc_pdcp_Config,
-      { "pdcp-Config", "lte-rrc.pdcp_Config",
+      { "pdcp-Config", "lte-rrc.pdcp_Config_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rlc_Config_01,
@@ -39565,7 +39565,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_3_10", HFILL }},
     { &hf_lte_rrc_logicalChannelConfig_01,
-      { "logicalChannelConfig", "lte-rrc.logicalChannelConfig",
+      { "logicalChannelConfig", "lte-rrc.logicalChannelConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_DRB_ToReleaseList_item,
@@ -39581,7 +39581,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CRS_AssistanceInfoList_r11", HFILL }},
     { &hf_lte_rrc_CRS_AssistanceInfoList_r11_item,
-      { "CRS-AssistanceInfo-r11", "lte-rrc.CRS_AssistanceInfo_r11",
+      { "CRS-AssistanceInfo-r11", "lte-rrc.CRS_AssistanceInfo_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_physCellId_r11_02,
@@ -39597,35 +39597,35 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MBSFN_SubframeConfigList", HFILL }},
     { &hf_lte_rrc_am,
-      { "am", "lte-rrc.am",
+      { "am", "lte-rrc.am_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_ul_AM_RLC,
-      { "ul-AM-RLC", "lte-rrc.ul_AM_RLC",
+      { "ul-AM-RLC", "lte-rrc.ul_AM_RLC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_dl_AM_RLC,
-      { "dl-AM-RLC", "lte-rrc.dl_AM_RLC",
+      { "dl-AM-RLC", "lte-rrc.dl_AM_RLC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_um_Bi_Directional,
-      { "um-Bi-Directional", "lte-rrc.um_Bi_Directional",
+      { "um-Bi-Directional", "lte-rrc.um_Bi_Directional_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_ul_UM_RLC,
-      { "ul-UM-RLC", "lte-rrc.ul_UM_RLC",
+      { "ul-UM-RLC", "lte-rrc.ul_UM_RLC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_dl_UM_RLC,
-      { "dl-UM-RLC", "lte-rrc.dl_UM_RLC",
+      { "dl-UM-RLC", "lte-rrc.dl_UM_RLC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_um_Uni_Directional_UL,
-      { "um-Uni-Directional-UL", "lte-rrc.um_Uni_Directional_UL",
+      { "um-Uni-Directional-UL", "lte-rrc.um_Uni_Directional_UL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_um_Uni_Directional_DL,
-      { "um-Uni-Directional-DL", "lte-rrc.um_Uni_Directional_DL",
+      { "um-Uni-Directional-DL", "lte-rrc.um_Uni_Directional_DL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_t_PollRetransmit,
@@ -39657,7 +39657,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_SN_FieldLength_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_26,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_24", HFILL }},
     { &hf_lte_rrc_t301_r9,
@@ -39693,7 +39693,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_31", HFILL }},
     { &hf_lte_rrc_rpdcch_Config_r10,
-      { "rpdcch-Config-r10", "lte-rrc.rpdcch_Config_r10",
+      { "rpdcch-Config-r10", "lte-rrc.rpdcch_Config_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_resourceAllocationType_r10,
@@ -39785,7 +39785,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_tdd_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_channelSelectionMultiplexingBundling,
-      { "channelSelectionMultiplexingBundling", "lte-rrc.channelSelectionMultiplexingBundling",
+      { "channelSelectionMultiplexingBundling", "lte-rrc.channelSelectionMultiplexingBundling_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_n1PUCCH_AN_List_r10,
@@ -39797,7 +39797,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_2047", HFILL }},
     { &hf_lte_rrc_fallbackForFormat3,
-      { "fallbackForFormat3", "lte-rrc.fallbackForFormat3",
+      { "fallbackForFormat3", "lte-rrc.fallbackForFormat3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_n1PUCCH_AN_P0_r10,
@@ -39809,11 +39809,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_2047", HFILL }},
     { &hf_lte_rrc_fdd,
-      { "fdd", "lte-rrc.fdd",
+      { "fdd", "lte-rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_27,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_25", HFILL }},
     { &hf_lte_rrc_sr_PUCCH_ResourceIndex,
@@ -39833,7 +39833,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_2047", HFILL }},
     { &hf_lte_rrc_setup_28,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_26", HFILL }},
     { &hf_lte_rrc_srs_BandwidthConfig,
@@ -39853,7 +39853,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_srs_MaxUpPts_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_29,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_27", HFILL }},
     { &hf_lte_rrc_srs_Bandwidth,
@@ -39889,7 +39889,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_SRS_AntennaPort_vals), 0,
         "SRS_AntennaPort", HFILL }},
     { &hf_lte_rrc_setup_30,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_28", HFILL }},
     { &hf_lte_rrc_srs_ConfigIndexAp_r10,
@@ -39901,7 +39901,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_3_OF_SRS_ConfigAp_r10", HFILL }},
     { &hf_lte_rrc_srs_ConfigApDCI_Format4_r10_item,
-      { "SRS-ConfigAp-r10", "lte-rrc.SRS_ConfigAp_r10",
+      { "SRS-ConfigAp-r10", "lte-rrc.SRS_ConfigAp_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_srs_ActivateAp_r10,
@@ -39909,15 +39909,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_srs_ActivateAp_r10_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_31,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_29", HFILL }},
     { &hf_lte_rrc_srs_ConfigApDCI_Format0_r10,
-      { "srs-ConfigApDCI-Format0-r10", "lte-rrc.srs_ConfigApDCI_Format0_r10",
+      { "srs-ConfigApDCI-Format0-r10", "lte-rrc.srs_ConfigApDCI_Format0_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRS_ConfigAp_r10", HFILL }},
     { &hf_lte_rrc_srs_ConfigApDCI_Format1a2b2c_r10,
-      { "srs-ConfigApDCI-Format1a2b2c-r10", "lte-rrc.srs_ConfigApDCI_Format1a2b2c_r10",
+      { "srs-ConfigApDCI-Format1a2b2c-r10", "lte-rrc.srs_ConfigApDCI_Format1a2b2c_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRS_ConfigAp_r10", HFILL }},
     { &hf_lte_rrc_srs_AntennaPortAp_r10,
@@ -39953,7 +39953,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_SPS_ConfigUL_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_32,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_30", HFILL }},
     { &hf_lte_rrc_semiPersistSchedIntervalDL,
@@ -39973,7 +39973,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_twoAntennaPortActivated_r10_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_33,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_31", HFILL }},
     { &hf_lte_rrc_n1PUCCH_AN_PersistentListP1_r10,
@@ -39981,7 +39981,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "N1PUCCH_AN_PersistentList", HFILL }},
     { &hf_lte_rrc_setup_34,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_32", HFILL }},
     { &hf_lte_rrc_semiPersistSchedIntervalUL,
@@ -39993,7 +39993,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_implicitReleaseAfter_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_p0_Persistent,
-      { "p0-Persistent", "lte-rrc.p0_Persistent",
+      { "p0-Persistent", "lte-rrc.p0_Persistent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_p0_NominalPUSCH_Persistent,
@@ -40025,7 +40025,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_specialSubframePatterns_v1130_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_35,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_33", HFILL }},
     { &hf_lte_rrc_tpc_RNTI,
@@ -40057,7 +40057,7 @@ void proto_register_lte_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_deltaFList_PUCCH,
-      { "deltaFList-PUCCH", "lte-rrc.deltaFList_PUCCH",
+      { "deltaFList-PUCCH", "lte-rrc.deltaFList_PUCCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_deltaPreambleMsg3,
@@ -40109,7 +40109,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_FilterCoefficient_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_deltaTxD_OffsetListPUCCH_r10,
-      { "deltaTxD-OffsetListPUCCH-r10", "lte-rrc.deltaTxD_OffsetListPUCCH_r10",
+      { "deltaTxD-OffsetListPUCCH-r10", "lte-rrc.deltaTxD_OffsetListPUCCH_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_pSRS_OffsetAp_r10,
@@ -40125,7 +40125,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_16_31", HFILL }},
     { &hf_lte_rrc_deltaTxD_OffsetListPUCCH_v1130,
-      { "deltaTxD-OffsetListPUCCH-v1130", "lte-rrc.deltaTxD_OffsetListPUCCH_v1130",
+      { "deltaTxD-OffsetListPUCCH-v1130", "lte-rrc.deltaTxD_OffsetListPUCCH_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_p0_UE_PUSCH_r10,
@@ -40217,7 +40217,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_equallySpacedARFCNs,
-      { "equallySpacedARFCNs", "lte-rrc.equallySpacedARFCNs",
+      { "equallySpacedARFCNs", "lte-rrc.equallySpacedARFCNs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_arfcn_Spacing,
@@ -40325,11 +40325,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PhysCellId", HFILL }},
     { &hf_lte_rrc_carrierFreq_03,
-      { "carrierFreq", "lte-rrc.carrierFreq",
+      { "carrierFreq", "lte-rrc.carrierFreq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CarrierFreqEUTRA", HFILL }},
     { &hf_lte_rrc_carrierBandwidth,
-      { "carrierBandwidth", "lte-rrc.carrierBandwidth",
+      { "carrierBandwidth", "lte-rrc.carrierBandwidth_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CarrierBandwidthEUTRA", HFILL }},
     { &hf_lte_rrc_t304_01,
@@ -40341,15 +40341,15 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "C_RNTI", HFILL }},
     { &hf_lte_rrc_radioResourceConfigCommon_01,
-      { "radioResourceConfigCommon", "lte-rrc.radioResourceConfigCommon",
+      { "radioResourceConfigCommon", "lte-rrc.radioResourceConfigCommon_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rach_ConfigDedicated,
-      { "rach-ConfigDedicated", "lte-rrc.rach_ConfigDedicated",
+      { "rach-ConfigDedicated", "lte-rrc.rach_ConfigDedicated_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_carrierFreq_v9e0_01,
-      { "carrierFreq-v9e0", "lte-rrc.carrierFreq_v9e0",
+      { "carrierFreq-v9e0", "lte-rrc.carrierFreq_v9e0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CarrierFreqEUTRA_v9e0", HFILL }},
     { &hf_lte_rrc_drb_ContinueROHC_r11,
@@ -40393,7 +40393,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_MultiBandInfoList_v9e0_item,
-      { "MultiBandInfo-v9e0", "lte-rrc.MultiBandInfo_v9e0",
+      { "MultiBandInfo-v9e0", "lte-rrc.MultiBandInfo_v9e0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_start_01,
@@ -40405,7 +40405,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_range_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_PhysCellIdRangeUTRA_FDDList_r9_item,
-      { "PhysCellIdRangeUTRA-FDD-r9", "lte-rrc.PhysCellIdRangeUTRA_FDD_r9",
+      { "PhysCellIdRangeUTRA-FDD-r9", "lte-rrc.PhysCellIdRangeUTRA_FDD_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_start_r9,
@@ -40441,7 +40441,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_PLMN_IdentityList3_r11_item,
-      { "PLMN-Identity", "lte-rrc.PLMN_Identity",
+      { "PLMN-Identity", "lte-rrc.PLMN_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_preRegistrationAllowed,
@@ -40553,7 +40553,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_quantityConfig,
-      { "quantityConfig", "lte-rrc.quantityConfig",
+      { "quantityConfig", "lte-rrc.quantityConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_measGapConfig,
@@ -40569,11 +40569,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_speedStatePars_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_36,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_34", HFILL }},
     { &hf_lte_rrc_timeToTrigger_SF,
-      { "timeToTrigger-SF", "lte-rrc.timeToTrigger_SF",
+      { "timeToTrigger-SF", "lte-rrc.timeToTrigger_SF_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SpeedStateScaleFactors", HFILL }},
     { &hf_lte_rrc_measObjectToAddModList_v9e0,
@@ -40593,7 +40593,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_37,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_35", HFILL }},
     { &hf_lte_rrc_gapOffset,
@@ -40609,7 +40609,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_79", HFILL }},
     { &hf_lte_rrc_MeasIdToAddModList_item,
-      { "MeasIdToAddMod", "lte-rrc.MeasIdToAddMod",
+      { "MeasIdToAddMod", "lte-rrc.MeasIdToAddMod_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_measId,
@@ -40625,7 +40625,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_carrierFreq_04,
-      { "carrierFreq", "lte-rrc.carrierFreq",
+      { "carrierFreq", "lte-rrc.carrierFreq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CarrierFreqCDMA2000", HFILL }},
     { &hf_lte_rrc_offsetFreq,
@@ -40645,7 +40645,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PhysCellIdCDMA2000", HFILL }},
     { &hf_lte_rrc_CellsToAddModListCDMA2000_item,
-      { "CellsToAddModCDMA2000", "lte-rrc.CellsToAddModCDMA2000",
+      { "CellsToAddModCDMA2000", "lte-rrc.CellsToAddModCDMA2000_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cellIndex,
@@ -40689,7 +40689,7 @@ void proto_register_lte_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lte_rrc_CellsToAddModList_item,
-      { "CellsToAddMod", "lte-rrc.CellsToAddMod",
+      { "CellsToAddMod", "lte-rrc.CellsToAddMod_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cellIndividualOffset,
@@ -40697,15 +40697,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &lte_rrc_Q_OffsetRange_vals_ext, 0,
         "Q_OffsetRange", HFILL }},
     { &hf_lte_rrc_BlackCellsToAddModList_item,
-      { "BlackCellsToAddMod", "lte-rrc.BlackCellsToAddMod",
+      { "BlackCellsToAddMod", "lte-rrc.BlackCellsToAddMod_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_physCellIdRange,
-      { "physCellIdRange", "lte-rrc.physCellIdRange",
+      { "physCellIdRange", "lte-rrc.physCellIdRange_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_38,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_36", HFILL }},
     { &hf_lte_rrc_measSubframePatternNeigh_r10,
@@ -40717,19 +40717,19 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_MeasSubframeCellList_r10_item,
-      { "PhysCellIdRange", "lte-rrc.PhysCellIdRange",
+      { "PhysCellIdRange", "lte-rrc.PhysCellIdRange_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cellForWhichToReportCGI_02,
-      { "cellForWhichToReportCGI", "lte-rrc.cellForWhichToReportCGI",
+      { "cellForWhichToReportCGI", "lte-rrc.cellForWhichToReportCGI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysCellIdGERAN", HFILL }},
     { &hf_lte_rrc_MeasObjectToAddModList_item,
-      { "MeasObjectToAddMod", "lte-rrc.MeasObjectToAddMod",
+      { "MeasObjectToAddMod", "lte-rrc.MeasObjectToAddMod_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_MeasObjectToAddModList_v9e0_item,
-      { "MeasObjectToAddMod-v9e0", "lte-rrc.MeasObjectToAddMod_v9e0",
+      { "MeasObjectToAddMod-v9e0", "lte-rrc.MeasObjectToAddMod_v9e0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_measObject,
@@ -40737,23 +40737,23 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_measObject_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_measObjectEUTRA,
-      { "measObjectEUTRA", "lte-rrc.measObjectEUTRA",
+      { "measObjectEUTRA", "lte-rrc.measObjectEUTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_measObjectUTRA,
-      { "measObjectUTRA", "lte-rrc.measObjectUTRA",
+      { "measObjectUTRA", "lte-rrc.measObjectUTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_measObjectGERAN,
-      { "measObjectGERAN", "lte-rrc.measObjectGERAN",
+      { "measObjectGERAN", "lte-rrc.measObjectGERAN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_measObjectCDMA2000,
-      { "measObjectCDMA2000", "lte-rrc.measObjectCDMA2000",
+      { "measObjectCDMA2000", "lte-rrc.measObjectCDMA2000_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_measObjectEUTRA_v9e0,
-      { "measObjectEUTRA-v9e0", "lte-rrc.measObjectEUTRA_v9e0",
+      { "measObjectEUTRA-v9e0", "lte-rrc.measObjectEUTRA_v9e0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cellsToAddModList_02,
@@ -40781,11 +40781,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PhysCellIdUTRA_TDD", HFILL }},
     { &hf_lte_rrc_csg_allowedReportingCells_v930,
-      { "csg-allowedReportingCells-v930", "lte-rrc.csg_allowedReportingCells_v930",
+      { "csg-allowedReportingCells-v930", "lte-rrc.csg_allowedReportingCells_v930_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CSG_AllowedReportingCells_r9", HFILL }},
     { &hf_lte_rrc_CellsToAddModListUTRA_FDD_item,
-      { "CellsToAddModUTRA-FDD", "lte-rrc.CellsToAddModUTRA_FDD",
+      { "CellsToAddModUTRA-FDD", "lte-rrc.CellsToAddModUTRA_FDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_physCellId_03,
@@ -40793,7 +40793,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PhysCellIdUTRA_FDD", HFILL }},
     { &hf_lte_rrc_CellsToAddModListUTRA_TDD_item,
-      { "CellsToAddModUTRA-TDD", "lte-rrc.CellsToAddModUTRA_TDD",
+      { "CellsToAddModUTRA-TDD", "lte-rrc.CellsToAddModUTRA_TDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_physCellId_04,
@@ -40805,7 +40805,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_measResultPCell,
-      { "measResultPCell", "lte-rrc.measResultPCell",
+      { "measResultPCell", "lte-rrc.measResultPCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rsrpResult,
@@ -40833,11 +40833,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_measResultsCDMA2000,
-      { "measResultsCDMA2000", "lte-rrc.measResultsCDMA2000",
+      { "measResultsCDMA2000", "lte-rrc.measResultsCDMA2000_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_measResultForECID_r9,
-      { "measResultForECID-r9", "lte-rrc.measResultForECID_r9",
+      { "measResultForECID-r9", "lte-rrc.measResultForECID_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_measResultServFreqList_r10,
@@ -40845,15 +40845,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_MeasResultListEUTRA_item,
-      { "MeasResultEUTRA", "lte-rrc.MeasResultEUTRA",
+      { "MeasResultEUTRA", "lte-rrc.MeasResultEUTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cgi_Info,
-      { "cgi-Info", "lte-rrc.cgi_Info",
+      { "cgi-Info", "lte-rrc.cgi_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cellGlobalId,
-      { "cellGlobalId", "lte-rrc.cellGlobalId",
+      { "cellGlobalId", "lte-rrc.cellGlobalId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellGlobalIdEUTRA", HFILL }},
     { &hf_lte_rrc_plmn_IdentityList_01,
@@ -40861,15 +40861,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PLMN_IdentityList2", HFILL }},
     { &hf_lte_rrc_measResult,
-      { "measResult", "lte-rrc.measResult",
+      { "measResult", "lte-rrc.measResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_additionalSI_Info_r9,
-      { "additionalSI-Info-r9", "lte-rrc.additionalSI_Info_r9",
+      { "additionalSI-Info-r9", "lte-rrc.additionalSI_Info_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_MeasResultServFreqList_r10_item,
-      { "MeasResultServFreq-r10", "lte-rrc.MeasResultServFreq_r10",
+      { "MeasResultServFreq-r10", "lte-rrc.MeasResultServFreq_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_servFreqId_r10,
@@ -40877,7 +40877,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ServCellIndex_r10", HFILL }},
     { &hf_lte_rrc_measResultSCell_r10,
-      { "measResultSCell-r10", "lte-rrc.measResultSCell_r10",
+      { "measResultSCell-r10", "lte-rrc.measResultSCell_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rsrpResultSCell_r10,
@@ -40889,7 +40889,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &lte_rrc_RSRQ_Range_vals_ext, 0,
         "RSRQ_Range", HFILL }},
     { &hf_lte_rrc_measResultBestNeighCell_r10,
-      { "measResultBestNeighCell-r10", "lte-rrc.measResultBestNeighCell_r10",
+      { "measResultBestNeighCell-r10", "lte-rrc.measResultBestNeighCell_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rsrpResultNCell_r10,
@@ -40901,7 +40901,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &lte_rrc_RSRQ_Range_vals_ext, 0,
         "RSRQ_Range", HFILL }},
     { &hf_lte_rrc_MeasResultListUTRA_item,
-      { "MeasResultUTRA", "lte-rrc.MeasResultUTRA",
+      { "MeasResultUTRA", "lte-rrc.MeasResultUTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_physCellId_05,
@@ -40917,11 +40917,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PhysCellIdUTRA_TDD", HFILL }},
     { &hf_lte_rrc_cgi_Info_01,
-      { "cgi-Info", "lte-rrc.cgi_Info",
+      { "cgi-Info", "lte-rrc.cgi_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_cgi_Info_01", HFILL }},
     { &hf_lte_rrc_cellGlobalId_01,
-      { "cellGlobalId", "lte-rrc.cellGlobalId",
+      { "cellGlobalId", "lte-rrc.cellGlobalId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellGlobalIdUTRA", HFILL }},
     { &hf_lte_rrc_routingAreaCode,
@@ -40929,7 +40929,7 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_8", HFILL }},
     { &hf_lte_rrc_measResult_01,
-      { "measResult", "lte-rrc.measResult",
+      { "measResult", "lte-rrc.measResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_measResult_01", HFILL }},
     { &hf_lte_rrc_utra_RSCP,
@@ -40941,19 +40941,19 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &lte_rrc_utra_EcN0_vals_ext, 0,
         "INTEGER_0_49", HFILL }},
     { &hf_lte_rrc_MeasResultListGERAN_item,
-      { "MeasResultGERAN", "lte-rrc.MeasResultGERAN",
+      { "MeasResultGERAN", "lte-rrc.MeasResultGERAN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cgi_Info_02,
-      { "cgi-Info", "lte-rrc.cgi_Info",
+      { "cgi-Info", "lte-rrc.cgi_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_cgi_Info_02", HFILL }},
     { &hf_lte_rrc_cellGlobalId_02,
-      { "cellGlobalId", "lte-rrc.cellGlobalId",
+      { "cellGlobalId", "lte-rrc.cellGlobalId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellGlobalIdGERAN", HFILL }},
     { &hf_lte_rrc_measResult_02,
-      { "measResult", "lte-rrc.measResult",
+      { "measResult", "lte-rrc.measResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_measResult_02", HFILL }},
     { &hf_lte_rrc_rssi,
@@ -40969,7 +40969,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_MeasResultListCDMA2000_item,
-      { "MeasResultCDMA2000", "lte-rrc.MeasResultCDMA2000",
+      { "MeasResultCDMA2000", "lte-rrc.MeasResultCDMA2000_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cgi_Info_03,
@@ -40977,7 +40977,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_CellGlobalIdCDMA2000_vals), 0,
         "CellGlobalIdCDMA2000", HFILL }},
     { &hf_lte_rrc_measResult_03,
-      { "measResult", "lte-rrc.measResult",
+      { "measResult", "lte-rrc.measResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_measResult_03", HFILL }},
     { &hf_lte_rrc_pilotPnPhase,
@@ -40997,7 +40997,7 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_10", HFILL }},
     { &hf_lte_rrc_PLMN_IdentityList2_item,
-      { "PLMN-Identity", "lte-rrc.PLMN_Identity",
+      { "PLMN-Identity", "lte-rrc.PLMN_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_csg_MemberStatus_r9,
@@ -41009,23 +41009,23 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "CSG_Identity", HFILL }},
     { &hf_lte_rrc_quantityConfigEUTRA,
-      { "quantityConfigEUTRA", "lte-rrc.quantityConfigEUTRA",
+      { "quantityConfigEUTRA", "lte-rrc.quantityConfigEUTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_quantityConfigUTRA,
-      { "quantityConfigUTRA", "lte-rrc.quantityConfigUTRA",
+      { "quantityConfigUTRA", "lte-rrc.quantityConfigUTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_quantityConfigGERAN,
-      { "quantityConfigGERAN", "lte-rrc.quantityConfigGERAN",
+      { "quantityConfigGERAN", "lte-rrc.quantityConfigGERAN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_quantityConfigCDMA2000,
-      { "quantityConfigCDMA2000", "lte-rrc.quantityConfigCDMA2000",
+      { "quantityConfigCDMA2000", "lte-rrc.quantityConfigCDMA2000_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_quantityConfigUTRA_v1020,
-      { "quantityConfigUTRA-v1020", "lte-rrc.quantityConfigUTRA_v1020",
+      { "quantityConfigUTRA-v1020", "lte-rrc.quantityConfigUTRA_v1020_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_filterCoefficientRSRP,
@@ -41061,7 +41061,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_triggerType_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_event,
-      { "event", "lte-rrc.event",
+      { "event", "lte-rrc.event_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_eventId,
@@ -41069,7 +41069,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_eventId_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_eventA1,
-      { "eventA1", "lte-rrc.eventA1",
+      { "eventA1", "lte-rrc.eventA1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_a1_Threshold,
@@ -41077,7 +41077,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_ThresholdEUTRA_vals), 0,
         "ThresholdEUTRA", HFILL }},
     { &hf_lte_rrc_eventA2,
-      { "eventA2", "lte-rrc.eventA2",
+      { "eventA2", "lte-rrc.eventA2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_a2_Threshold,
@@ -41085,7 +41085,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_ThresholdEUTRA_vals), 0,
         "ThresholdEUTRA", HFILL }},
     { &hf_lte_rrc_eventA3,
-      { "eventA3", "lte-rrc.eventA3",
+      { "eventA3", "lte-rrc.eventA3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_a3_Offset,
@@ -41097,7 +41097,7 @@ void proto_register_lte_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lte_rrc_eventA4,
-      { "eventA4", "lte-rrc.eventA4",
+      { "eventA4", "lte-rrc.eventA4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_a4_Threshold,
@@ -41105,7 +41105,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_ThresholdEUTRA_vals), 0,
         "ThresholdEUTRA", HFILL }},
     { &hf_lte_rrc_eventA5,
-      { "eventA5", "lte-rrc.eventA5",
+      { "eventA5", "lte-rrc.eventA5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_a5_Threshold1,
@@ -41117,7 +41117,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_ThresholdEUTRA_vals), 0,
         "ThresholdEUTRA", HFILL }},
     { &hf_lte_rrc_eventA6_r10,
-      { "eventA6-r10", "lte-rrc.eventA6_r10",
+      { "eventA6-r10", "lte-rrc.eventA6_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_a6_Offset_r10,
@@ -41137,7 +41137,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_TimeToTrigger_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_periodical,
-      { "periodical", "lte-rrc.periodical",
+      { "periodical", "lte-rrc.periodical_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_purpose_02,
@@ -41193,7 +41193,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_triggerType_01_vals), 0,
         "T_triggerType_01", HFILL }},
     { &hf_lte_rrc_event_01,
-      { "event", "lte-rrc.event",
+      { "event", "lte-rrc.event_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_event_01", HFILL }},
     { &hf_lte_rrc_eventId_01,
@@ -41201,7 +41201,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_eventId_01_vals), 0,
         "T_eventId_01", HFILL }},
     { &hf_lte_rrc_eventB1,
-      { "eventB1", "lte-rrc.eventB1",
+      { "eventB1", "lte-rrc.eventB1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_b1_Threshold,
@@ -41221,7 +41221,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ThresholdCDMA2000", HFILL }},
     { &hf_lte_rrc_eventB2,
-      { "eventB2", "lte-rrc.eventB2",
+      { "eventB2", "lte-rrc.eventB2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_b2_Threshold1,
@@ -41245,7 +41245,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ThresholdCDMA2000", HFILL }},
     { &hf_lte_rrc_periodical_01,
-      { "periodical", "lte-rrc.periodical",
+      { "periodical", "lte-rrc.periodical_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_periodical_01", HFILL }},
     { &hf_lte_rrc_purpose_03,
@@ -41277,7 +41277,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &lte_rrc_thresholdUTRA_EcN0_vals_ext, 0,
         "Threshold_utra_EcN0", HFILL }},
     { &hf_lte_rrc_ReportConfigToAddModList_item,
-      { "ReportConfigToAddMod", "lte-rrc.ReportConfigToAddMod",
+      { "ReportConfigToAddMod", "lte-rrc.ReportConfigToAddMod_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_reportConfig,
@@ -41285,11 +41285,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_reportConfig_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_reportConfigEUTRA,
-      { "reportConfigEUTRA", "lte-rrc.reportConfigEUTRA",
+      { "reportConfigEUTRA", "lte-rrc.reportConfigEUTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_reportConfigInterRAT,
-      { "reportConfigInterRAT", "lte-rrc.reportConfigInterRAT",
+      { "reportConfigInterRAT", "lte-rrc.reportConfigInterRAT_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_cellGlobalIdList_r10,
@@ -41301,11 +41301,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_trackingAreaCodeList_v1130,
-      { "trackingAreaCodeList-v1130", "lte-rrc.trackingAreaCodeList_v1130",
+      { "trackingAreaCodeList-v1130", "lte-rrc.trackingAreaCodeList_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_CellGlobalIdList_r10_item,
-      { "CellGlobalIdEUTRA", "lte-rrc.CellGlobalIdEUTRA",
+      { "CellGlobalIdEUTRA", "lte-rrc.CellGlobalIdEUTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_TrackingAreaCodeList_r10_item,
@@ -41317,7 +41317,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_8_OF_PLMN_Identity", HFILL }},
     { &hf_lte_rrc_plmn_Identity_perTAC_List_r11_item,
-      { "PLMN-Identity", "lte-rrc.PLMN_Identity",
+      { "PLMN-Identity", "lte-rrc.PLMN_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_subframePatternFDD_r10,
@@ -41341,11 +41341,11 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_60", HFILL }},
     { &hf_lte_rrc_reportProximityConfig_r9,
-      { "reportProximityConfig-r9", "lte-rrc.reportProximityConfig_r9",
+      { "reportProximityConfig-r9", "lte-rrc.reportProximityConfig_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_idc_Config_r11,
-      { "idc-Config-r11", "lte-rrc.idc_Config_r11",
+      { "idc-Config-r11", "lte-rrc.idc_Config_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_powerPrefIndicationConfig_r11,
@@ -41353,7 +41353,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_PowerPrefIndicationConfig_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_obtainLocationConfig_r11,
-      { "obtainLocationConfig-r11", "lte-rrc.obtainLocationConfig_r11",
+      { "obtainLocationConfig-r11", "lte-rrc.obtainLocationConfig_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_idc_Indication_r11,
@@ -41361,7 +41361,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_idc_Indication_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_autonomousDenialParameters_r11,
-      { "autonomousDenialParameters-r11", "lte-rrc.autonomousDenialParameters_r11",
+      { "autonomousDenialParameters-r11", "lte-rrc.autonomousDenialParameters_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_autonomousDenialSubframes_r11,
@@ -41377,7 +41377,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_obtainLocation_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_setup_39,
-      { "setup", "lte-rrc.setup",
+      { "setup", "lte-rrc.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_setup_37", HFILL }},
     { &hf_lte_rrc_powerPrefIndicationTimer_r11,
@@ -41397,7 +41397,7 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_32", HFILL }},
     { &hf_lte_rrc_plmn_Identity_r10,
-      { "plmn-Identity-r10", "lte-rrc.plmn_Identity_r10",
+      { "plmn-Identity-r10", "lte-rrc.plmn_Identity_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PLMN_Identity", HFILL }},
     { &hf_lte_rrc_traceId_r10,
@@ -41405,7 +41405,7 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_3", HFILL }},
     { &hf_lte_rrc_UE_CapabilityRAT_ContainerList_item,
-      { "UE-CapabilityRAT-Container", "lte-rrc.UE_CapabilityRAT_Container",
+      { "UE-CapabilityRAT-Container", "lte-rrc.UE_CapabilityRAT_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rat_Type,
@@ -41425,19 +41425,19 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_5", HFILL }},
     { &hf_lte_rrc_pdcp_Parameters,
-      { "pdcp-Parameters", "lte-rrc.pdcp_Parameters",
+      { "pdcp-Parameters", "lte-rrc.pdcp_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_phyLayerParameters,
-      { "phyLayerParameters", "lte-rrc.phyLayerParameters",
+      { "phyLayerParameters", "lte-rrc.phyLayerParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rf_Parameters,
-      { "rf-Parameters", "lte-rrc.rf_Parameters",
+      { "rf-Parameters", "lte-rrc.rf_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_measParameters,
-      { "measParameters", "lte-rrc.measParameters",
+      { "measParameters", "lte-rrc.measParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_featureGroupIndicators,
@@ -41445,39 +41445,39 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_interRAT_Parameters,
-      { "interRAT-Parameters", "lte-rrc.interRAT_Parameters",
+      { "interRAT-Parameters", "lte-rrc.interRAT_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_interRAT_Parameters", HFILL }},
     { &hf_lte_rrc_utraFDD,
-      { "utraFDD", "lte-rrc.utraFDD",
+      { "utraFDD", "lte-rrc.utraFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IRAT_ParametersUTRA_FDD", HFILL }},
     { &hf_lte_rrc_utraTDD128,
-      { "utraTDD128", "lte-rrc.utraTDD128",
+      { "utraTDD128", "lte-rrc.utraTDD128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IRAT_ParametersUTRA_TDD128", HFILL }},
     { &hf_lte_rrc_utraTDD384,
-      { "utraTDD384", "lte-rrc.utraTDD384",
+      { "utraTDD384", "lte-rrc.utraTDD384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IRAT_ParametersUTRA_TDD384", HFILL }},
     { &hf_lte_rrc_utraTDD768,
-      { "utraTDD768", "lte-rrc.utraTDD768",
+      { "utraTDD768", "lte-rrc.utraTDD768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IRAT_ParametersUTRA_TDD768", HFILL }},
     { &hf_lte_rrc_geran_02,
-      { "geran", "lte-rrc.geran",
+      { "geran", "lte-rrc.geran_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IRAT_ParametersGERAN", HFILL }},
     { &hf_lte_rrc_cdma2000_HRPD_01,
-      { "cdma2000-HRPD", "lte-rrc.cdma2000_HRPD",
+      { "cdma2000-HRPD", "lte-rrc.cdma2000_HRPD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IRAT_ParametersCDMA2000_HRPD", HFILL }},
     { &hf_lte_rrc_cdma2000_1xRTT_01,
-      { "cdma2000-1xRTT", "lte-rrc.cdma2000_1xRTT",
+      { "cdma2000-1xRTT", "lte-rrc.cdma2000_1xRTT_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IRAT_ParametersCDMA2000_1XRTT", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_110,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_EUTRA_Capability_v920_IEs", HFILL }},
     { &hf_lte_rrc_featureGroupIndRel9Add_r9,
@@ -41485,55 +41485,55 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_fdd_Add_UE_EUTRA_Capabilities_r9,
-      { "fdd-Add-UE-EUTRA-Capabilities-r9", "lte-rrc.fdd_Add_UE_EUTRA_Capabilities_r9",
+      { "fdd-Add-UE-EUTRA-Capabilities-r9", "lte-rrc.fdd_Add_UE_EUTRA_Capabilities_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_EUTRA_CapabilityAddXDD_Mode_r9", HFILL }},
     { &hf_lte_rrc_tdd_Add_UE_EUTRA_Capabilities_r9,
-      { "tdd-Add-UE-EUTRA-Capabilities-r9", "lte-rrc.tdd_Add_UE_EUTRA_Capabilities_r9",
+      { "tdd-Add-UE-EUTRA-Capabilities-r9", "lte-rrc.tdd_Add_UE_EUTRA_Capabilities_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_EUTRA_CapabilityAddXDD_Mode_r9", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_111,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_EUTRA_Capability_v9c0_IEs", HFILL }},
     { &hf_lte_rrc_interRAT_ParametersUTRA_v9c0,
-      { "interRAT-ParametersUTRA-v9c0", "lte-rrc.interRAT_ParametersUTRA_v9c0",
+      { "interRAT-ParametersUTRA-v9c0", "lte-rrc.interRAT_ParametersUTRA_v9c0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IRAT_ParametersUTRA_v9c0", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_112,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_EUTRA_Capability_v9d0_IEs", HFILL }},
     { &hf_lte_rrc_phyLayerParameters_v9d0,
-      { "phyLayerParameters-v9d0", "lte-rrc.phyLayerParameters_v9d0",
+      { "phyLayerParameters-v9d0", "lte-rrc.phyLayerParameters_v9d0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_113,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_EUTRA_Capability_v9e0_IEs", HFILL }},
     { &hf_lte_rrc_rf_Parameters_v9e0,
-      { "rf-Parameters-v9e0", "lte-rrc.rf_Parameters_v9e0",
+      { "rf-Parameters-v9e0", "lte-rrc.rf_Parameters_v9e0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_114,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_47", HFILL }},
     { &hf_lte_rrc_phyLayerParameters_v920,
-      { "phyLayerParameters-v920", "lte-rrc.phyLayerParameters_v920",
+      { "phyLayerParameters-v920", "lte-rrc.phyLayerParameters_v920_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_interRAT_ParametersGERAN_v920,
-      { "interRAT-ParametersGERAN-v920", "lte-rrc.interRAT_ParametersGERAN_v920",
+      { "interRAT-ParametersGERAN-v920", "lte-rrc.interRAT_ParametersGERAN_v920_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IRAT_ParametersGERAN_v920", HFILL }},
     { &hf_lte_rrc_interRAT_ParametersUTRA_v920,
-      { "interRAT-ParametersUTRA-v920", "lte-rrc.interRAT_ParametersUTRA_v920",
+      { "interRAT-ParametersUTRA-v920", "lte-rrc.interRAT_ParametersUTRA_v920_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IRAT_ParametersUTRA_v920", HFILL }},
     { &hf_lte_rrc_interRAT_ParametersCDMA2000_v920,
-      { "interRAT-ParametersCDMA2000-v920", "lte-rrc.interRAT_ParametersCDMA2000_v920",
+      { "interRAT-ParametersCDMA2000-v920", "lte-rrc.interRAT_ParametersCDMA2000_v920_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IRAT_ParametersCDMA2000_1XRTT_v920", HFILL }},
     { &hf_lte_rrc_deviceType_r9,
@@ -41541,19 +41541,19 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_deviceType_r9_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_csg_ProximityIndicationParameters_r9,
-      { "csg-ProximityIndicationParameters-r9", "lte-rrc.csg_ProximityIndicationParameters_r9",
+      { "csg-ProximityIndicationParameters-r9", "lte-rrc.csg_ProximityIndicationParameters_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_neighCellSI_AcquisitionParameters_r9,
-      { "neighCellSI-AcquisitionParameters-r9", "lte-rrc.neighCellSI_AcquisitionParameters_r9",
+      { "neighCellSI-AcquisitionParameters-r9", "lte-rrc.neighCellSI_AcquisitionParameters_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_son_Parameters_r9,
-      { "son-Parameters-r9", "lte-rrc.son_Parameters_r9",
+      { "son-Parameters-r9", "lte-rrc.son_Parameters_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_115,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_EUTRA_Capability_v940_IEs", HFILL }},
     { &hf_lte_rrc_lateNonCriticalExtension_07,
@@ -41561,7 +41561,7 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "T_lateNonCriticalExtension_06", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_116,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_EUTRA_Capability_v1020_IEs", HFILL }},
     { &hf_lte_rrc_ue_Category_v1020,
@@ -41569,15 +41569,15 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_6_8", HFILL }},
     { &hf_lte_rrc_phyLayerParameters_v1020,
-      { "phyLayerParameters-v1020", "lte-rrc.phyLayerParameters_v1020",
+      { "phyLayerParameters-v1020", "lte-rrc.phyLayerParameters_v1020_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rf_Parameters_v1020,
-      { "rf-Parameters-v1020", "lte-rrc.rf_Parameters_v1020",
+      { "rf-Parameters-v1020", "lte-rrc.rf_Parameters_v1020_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_measParameters_v1020,
-      { "measParameters-v1020", "lte-rrc.measParameters_v1020",
+      { "measParameters-v1020", "lte-rrc.measParameters_v1020_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_featureGroupIndRel10_r10,
@@ -41585,83 +41585,83 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_interRAT_ParametersCDMA2000_v1020,
-      { "interRAT-ParametersCDMA2000-v1020", "lte-rrc.interRAT_ParametersCDMA2000_v1020",
+      { "interRAT-ParametersCDMA2000-v1020", "lte-rrc.interRAT_ParametersCDMA2000_v1020_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IRAT_ParametersCDMA2000_1XRTT_v1020", HFILL }},
     { &hf_lte_rrc_ue_BasedNetwPerfMeasParameters_r10,
-      { "ue-BasedNetwPerfMeasParameters-r10", "lte-rrc.ue_BasedNetwPerfMeasParameters_r10",
+      { "ue-BasedNetwPerfMeasParameters-r10", "lte-rrc.ue_BasedNetwPerfMeasParameters_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_interRAT_ParametersUTRA_TDD_v1020,
-      { "interRAT-ParametersUTRA-TDD-v1020", "lte-rrc.interRAT_ParametersUTRA_TDD_v1020",
+      { "interRAT-ParametersUTRA-TDD-v1020", "lte-rrc.interRAT_ParametersUTRA_TDD_v1020_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IRAT_ParametersUTRA_TDD_v1020", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_117,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_EUTRA_Capability_v1060_IEs", HFILL }},
     { &hf_lte_rrc_fdd_Add_UE_EUTRA_Capabilities_v1060,
-      { "fdd-Add-UE-EUTRA-Capabilities-v1060", "lte-rrc.fdd_Add_UE_EUTRA_Capabilities_v1060",
+      { "fdd-Add-UE-EUTRA-Capabilities-v1060", "lte-rrc.fdd_Add_UE_EUTRA_Capabilities_v1060_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_EUTRA_CapabilityAddXDD_Mode_v1060", HFILL }},
     { &hf_lte_rrc_tdd_Add_UE_EUTRA_Capabilities_v1060,
-      { "tdd-Add-UE-EUTRA-Capabilities-v1060", "lte-rrc.tdd_Add_UE_EUTRA_Capabilities_v1060",
+      { "tdd-Add-UE-EUTRA-Capabilities-v1060", "lte-rrc.tdd_Add_UE_EUTRA_Capabilities_v1060_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_EUTRA_CapabilityAddXDD_Mode_v1060", HFILL }},
     { &hf_lte_rrc_rf_Parameters_v1060,
-      { "rf-Parameters-v1060", "lte-rrc.rf_Parameters_v1060",
+      { "rf-Parameters-v1060", "lte-rrc.rf_Parameters_v1060_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_118,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_EUTRA_Capability_v1090_IEs", HFILL }},
     { &hf_lte_rrc_rf_Parameters_v1090,
-      { "rf-Parameters-v1090", "lte-rrc.rf_Parameters_v1090",
+      { "rf-Parameters-v1090", "lte-rrc.rf_Parameters_v1090_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_119,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_EUTRA_Capability_v1130_IEs", HFILL }},
     { &hf_lte_rrc_pdcp_Parameters_v1130,
-      { "pdcp-Parameters-v1130", "lte-rrc.pdcp_Parameters_v1130",
+      { "pdcp-Parameters-v1130", "lte-rrc.pdcp_Parameters_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_phyLayerParameters_v1130,
-      { "phyLayerParameters-v1130", "lte-rrc.phyLayerParameters_v1130",
+      { "phyLayerParameters-v1130", "lte-rrc.phyLayerParameters_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rf_Parameters_v1130,
-      { "rf-Parameters-v1130", "lte-rrc.rf_Parameters_v1130",
+      { "rf-Parameters-v1130", "lte-rrc.rf_Parameters_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_measParameters_v1130,
-      { "measParameters-v1130", "lte-rrc.measParameters_v1130",
+      { "measParameters-v1130", "lte-rrc.measParameters_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_interRAT_ParametersCDMA2000_v1130,
-      { "interRAT-ParametersCDMA2000-v1130", "lte-rrc.interRAT_ParametersCDMA2000_v1130",
+      { "interRAT-ParametersCDMA2000-v1130", "lte-rrc.interRAT_ParametersCDMA2000_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IRAT_ParametersCDMA2000_v1130", HFILL }},
     { &hf_lte_rrc_otherParameters_r11,
-      { "otherParameters-r11", "lte-rrc.otherParameters_r11",
+      { "otherParameters-r11", "lte-rrc.otherParameters_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Other_Parameters_r11", HFILL }},
     { &hf_lte_rrc_fdd_Add_UE_EUTRA_Capabilities_v1130,
-      { "fdd-Add-UE-EUTRA-Capabilities-v1130", "lte-rrc.fdd_Add_UE_EUTRA_Capabilities_v1130",
+      { "fdd-Add-UE-EUTRA-Capabilities-v1130", "lte-rrc.fdd_Add_UE_EUTRA_Capabilities_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_EUTRA_CapabilityAddXDD_Mode_v1130", HFILL }},
     { &hf_lte_rrc_tdd_Add_UE_EUTRA_Capabilities_v1130,
-      { "tdd-Add-UE-EUTRA-Capabilities-v1130", "lte-rrc.tdd_Add_UE_EUTRA_Capabilities_v1130",
+      { "tdd-Add-UE-EUTRA-Capabilities-v1130", "lte-rrc.tdd_Add_UE_EUTRA_Capabilities_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_EUTRA_CapabilityAddXDD_Mode_v1130", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_120,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_48", HFILL }},
     { &hf_lte_rrc_phyLayerParameters_r9,
-      { "phyLayerParameters-r9", "lte-rrc.phyLayerParameters_r9",
+      { "phyLayerParameters-r9", "lte-rrc.phyLayerParameters_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhyLayerParameters", HFILL }},
     { &hf_lte_rrc_featureGroupIndicators_r9,
@@ -41673,19 +41673,19 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "T_featureGroupIndRel9Add_r9_01", HFILL }},
     { &hf_lte_rrc_interRAT_ParametersGERAN_r9,
-      { "interRAT-ParametersGERAN-r9", "lte-rrc.interRAT_ParametersGERAN_r9",
+      { "interRAT-ParametersGERAN-r9", "lte-rrc.interRAT_ParametersGERAN_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IRAT_ParametersGERAN", HFILL }},
     { &hf_lte_rrc_interRAT_ParametersUTRA_r9,
-      { "interRAT-ParametersUTRA-r9", "lte-rrc.interRAT_ParametersUTRA_r9",
+      { "interRAT-ParametersUTRA-r9", "lte-rrc.interRAT_ParametersUTRA_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IRAT_ParametersUTRA_v920", HFILL }},
     { &hf_lte_rrc_interRAT_ParametersCDMA2000_r9,
-      { "interRAT-ParametersCDMA2000-r9", "lte-rrc.interRAT_ParametersCDMA2000_r9",
+      { "interRAT-ParametersCDMA2000-r9", "lte-rrc.interRAT_ParametersCDMA2000_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IRAT_ParametersCDMA2000_1XRTT_v920", HFILL }},
     { &hf_lte_rrc_phyLayerParameters_v1060,
-      { "phyLayerParameters-v1060", "lte-rrc.phyLayerParameters_v1060",
+      { "phyLayerParameters-v1060", "lte-rrc.phyLayerParameters_v1060_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhyLayerParameters_v1020", HFILL }},
     { &hf_lte_rrc_featureGroupIndRel10_v1060,
@@ -41693,15 +41693,15 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_interRAT_ParametersCDMA2000_v1060,
-      { "interRAT-ParametersCDMA2000-v1060", "lte-rrc.interRAT_ParametersCDMA2000_v1060",
+      { "interRAT-ParametersCDMA2000-v1060", "lte-rrc.interRAT_ParametersCDMA2000_v1060_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IRAT_ParametersCDMA2000_1XRTT_v1020", HFILL }},
     { &hf_lte_rrc_interRAT_ParametersUTRA_TDD_v1060,
-      { "interRAT-ParametersUTRA-TDD-v1060", "lte-rrc.interRAT_ParametersUTRA_TDD_v1060",
+      { "interRAT-ParametersUTRA-TDD-v1060", "lte-rrc.interRAT_ParametersUTRA_TDD_v1060_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IRAT_ParametersUTRA_TDD_v1020", HFILL }},
     { &hf_lte_rrc_supportedROHC_Profiles,
-      { "supportedROHC-Profiles", "lte-rrc.supportedROHC_Profiles",
+      { "supportedROHC-Profiles", "lte-rrc.supportedROHC_Profiles_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_maxNumberROHC_ContextSessions,
@@ -41797,7 +41797,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_ul_CoMP_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_NonContiguousUL_RA_WithinCC_List_r10_item,
-      { "NonContiguousUL-RA-WithinCC-r10", "lte-rrc.NonContiguousUL_RA_WithinCC_r10",
+      { "NonContiguousUL-RA-WithinCC-r10", "lte-rrc.NonContiguousUL_RA_WithinCC_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonContiguousUL_RA_WithinCC_Info_r10,
@@ -41833,7 +41833,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_SupportedBandCombinationExt_r10_item,
-      { "BandCombinationParametersExt-r10", "lte-rrc.BandCombinationParametersExt_r10",
+      { "BandCombinationParametersExt-r10", "lte-rrc.BandCombinationParametersExt_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_SupportedBandCombination_v1090_item,
@@ -41841,11 +41841,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_SupportedBandCombination_v1130_item,
-      { "BandCombinationParameters-v1130", "lte-rrc.BandCombinationParameters_v1130",
+      { "BandCombinationParameters-v1130", "lte-rrc.BandCombinationParameters_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_BandCombinationParameters_r10_item,
-      { "BandParameters-r10", "lte-rrc.BandParameters_r10",
+      { "BandParameters-r10", "lte-rrc.BandParameters_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_supportedBandwidthCombinationSet_r10,
@@ -41853,7 +41853,7 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_BandCombinationParameters_v1090_item,
-      { "BandParameters-v1090", "lte-rrc.BandParameters_v1090",
+      { "BandParameters-v1090", "lte-rrc.BandParameters_v1090_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_multipleTimingAdvance_r11,
@@ -41869,7 +41869,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxSimultaneousBands_r10_OF_BandParameters_v1130", HFILL }},
     { &hf_lte_rrc_bandParameterList_r11_item,
-      { "BandParameters-v1130", "lte-rrc.BandParameters_v1130",
+      { "BandParameters-v1130", "lte-rrc.BandParameters_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_bandEUTRA_r10,
@@ -41893,7 +41893,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_supportedCSI_Proc_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_BandParametersUL_r10_item,
-      { "CA-MIMO-ParametersUL-r10", "lte-rrc.CA_MIMO_ParametersUL_r10",
+      { "CA-MIMO-ParametersUL-r10", "lte-rrc.CA_MIMO_ParametersUL_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_ca_BandwidthClassUL_r10,
@@ -41905,7 +41905,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_MIMO_CapabilityUL_r10_vals), 0,
         "MIMO_CapabilityUL_r10", HFILL }},
     { &hf_lte_rrc_BandParametersDL_r10_item,
-      { "CA-MIMO-ParametersDL-r10", "lte-rrc.CA_MIMO_ParametersDL_r10",
+      { "CA-MIMO-ParametersDL-r10", "lte-rrc.CA_MIMO_ParametersDL_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_ca_BandwidthClassDL_r10,
@@ -41917,11 +41917,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_MIMO_CapabilityDL_r10_vals), 0,
         "MIMO_CapabilityDL_r10", HFILL }},
     { &hf_lte_rrc_SupportedBandListEUTRA_item,
-      { "SupportedBandEUTRA", "lte-rrc.SupportedBandEUTRA",
+      { "SupportedBandEUTRA", "lte-rrc.SupportedBandEUTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_SupportedBandListEUTRA_v9e0_item,
-      { "SupportedBandEUTRA-v9e0", "lte-rrc.SupportedBandEUTRA_v9e0",
+      { "SupportedBandEUTRA-v9e0", "lte-rrc.SupportedBandEUTRA_v9e0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_bandEUTRA,
@@ -41949,11 +41949,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_rsrqMeasWideband_r11_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_BandListEUTRA_item,
-      { "BandInfoEUTRA", "lte-rrc.BandInfoEUTRA",
+      { "BandInfoEUTRA", "lte-rrc.BandInfoEUTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_BandCombinationListEUTRA_r10_item,
-      { "BandInfoEUTRA", "lte-rrc.BandInfoEUTRA",
+      { "BandInfoEUTRA", "lte-rrc.BandInfoEUTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_interFreqBandList,
@@ -41965,7 +41965,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_InterFreqBandList_item,
-      { "InterFreqBandInfo", "lte-rrc.InterFreqBandInfo",
+      { "InterFreqBandInfo", "lte-rrc.InterFreqBandInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_interFreqNeedForGaps,
@@ -41973,7 +41973,7 @@ void proto_register_lte_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lte_rrc_InterRAT_BandList_item,
-      { "InterRAT-BandInfo", "lte-rrc.InterRAT_BandInfo",
+      { "InterRAT-BandInfo", "lte-rrc.InterRAT_BandInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_interRAT_NeedForGaps,
@@ -42197,7 +42197,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_6", HFILL }},
     { &hf_lte_rrc_MBSFN_AreaInfoList_r9_item,
-      { "MBSFN-AreaInfo-r9", "lte-rrc.MBSFN_AreaInfo_r9",
+      { "MBSFN-AreaInfo-r9", "lte-rrc.MBSFN_AreaInfo_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_mbsfn_AreaId_r9,
@@ -42213,7 +42213,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_7", HFILL }},
     { &hf_lte_rrc_mcch_Config_r9,
-      { "mcch-Config-r9", "lte-rrc.mcch_Config_r9",
+      { "mcch-Config-r9", "lte-rrc.mcch_Config_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_mcch_RepetitionPeriod_r9,
@@ -42257,11 +42257,11 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_24", HFILL }},
     { &hf_lte_rrc_PMCH_InfoList_r9_item,
-      { "PMCH-Info-r9", "lte-rrc.PMCH_Info_r9",
+      { "PMCH-Info-r9", "lte-rrc.PMCH_Info_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_pmch_Config_r9,
-      { "pmch-Config-r9", "lte-rrc.pmch_Config_r9",
+      { "pmch-Config-r9", "lte-rrc.pmch_Config_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_mbms_SessionInfoList_r9,
@@ -42269,11 +42269,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_MBMS_SessionInfoList_r9_item,
-      { "MBMS-SessionInfo-r9", "lte-rrc.MBMS_SessionInfo_r9",
+      { "MBMS-SessionInfo-r9", "lte-rrc.MBMS_SessionInfo_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_tmgi_r9,
-      { "tmgi-r9", "lte-rrc.tmgi_r9",
+      { "tmgi-r9", "lte-rrc.tmgi_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_sessionId_r9,
@@ -42305,7 +42305,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_maxPLMN_r11", HFILL }},
     { &hf_lte_rrc_explicitValue_r9,
-      { "explicitValue-r9", "lte-rrc.explicitValue_r9",
+      { "explicitValue-r9", "lte-rrc.explicitValue_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PLMN_Identity", HFILL }},
     { &hf_lte_rrc_serviceId_r9,
@@ -42321,11 +42321,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_34_vals), 0,
         "T_c1_34", HFILL }},
     { &hf_lte_rrc_handoverCommand_r8,
-      { "handoverCommand-r8", "lte-rrc.handoverCommand_r8",
+      { "handoverCommand-r8", "lte-rrc.handoverCommand_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverCommand_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_38,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_38", HFILL }},
     { &hf_lte_rrc_handoverCommandMessage,
@@ -42333,7 +42333,7 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_121,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_49", HFILL }},
     { &hf_lte_rrc_criticalExtensions_39,
@@ -42345,11 +42345,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_35_vals), 0,
         "T_c1_35", HFILL }},
     { &hf_lte_rrc_handoverPreparationInformation_r8,
-      { "handoverPreparationInformation-r8", "lte-rrc.handoverPreparationInformation_r8",
+      { "handoverPreparationInformation-r8", "lte-rrc.handoverPreparationInformation_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverPreparationInformation_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_39,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_39", HFILL }},
     { &hf_lte_rrc_ue_RadioAccessCapabilityInfo,
@@ -42357,19 +42357,19 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "UE_CapabilityRAT_ContainerList", HFILL }},
     { &hf_lte_rrc_as_Config,
-      { "as-Config", "lte-rrc.as_Config",
+      { "as-Config", "lte-rrc.as_Config_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_rrm_Config,
-      { "rrm-Config", "lte-rrc.rrm_Config",
+      { "rrm-Config", "lte-rrc.rrm_Config_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_as_Context,
-      { "as-Context", "lte-rrc.as_Context",
+      { "as-Context", "lte-rrc.as_Context_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_122,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverPreparationInformation_v920_IEs", HFILL }},
     { &hf_lte_rrc_ue_ConfigRelease_r9,
@@ -42377,27 +42377,27 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_ue_ConfigRelease_r9_vals), 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_123,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverPreparationInformation_v9d0_IEs", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_124,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverPreparationInformation_v9e0_IEs", HFILL }},
     { &hf_lte_rrc_as_Config_v9e0,
-      { "as-Config-v9e0", "lte-rrc.as_Config_v9e0",
+      { "as-Config-v9e0", "lte-rrc.as_Config_v9e0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_125,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverPreparationInformation_v1130_IEs", HFILL }},
     { &hf_lte_rrc_as_Context_v1130,
-      { "as-Context-v1130", "lte-rrc.as_Context_v1130",
+      { "as-Context-v1130", "lte-rrc.as_Context_v1130_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_126,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_50", HFILL }},
     { &hf_lte_rrc_criticalExtensions_40,
@@ -42409,11 +42409,11 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(lte_rrc_T_c1_36_vals), 0,
         "T_c1_36", HFILL }},
     { &hf_lte_rrc_ueRadioAccessCapabilityInformation_r8,
-      { "ueRadioAccessCapabilityInformation-r8", "lte-rrc.ueRadioAccessCapabilityInformation_r8",
+      { "ueRadioAccessCapabilityInformation-r8", "lte-rrc.ueRadioAccessCapabilityInformation_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UERadioAccessCapabilityInformation_r8_IEs", HFILL }},
     { &hf_lte_rrc_criticalExtensionsFuture_40,
-      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture",
+      { "criticalExtensionsFuture", "lte-rrc.criticalExtensionsFuture_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensionsFuture_40", HFILL }},
     { &hf_lte_rrc_ue_RadioAccessCapabilityInfo_01,
@@ -42421,19 +42421,19 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_127,
-      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtension_51", HFILL }},
     { &hf_lte_rrc_sourceMeasConfig,
-      { "sourceMeasConfig", "lte-rrc.sourceMeasConfig",
+      { "sourceMeasConfig", "lte-rrc.sourceMeasConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasConfig", HFILL }},
     { &hf_lte_rrc_sourceRadioResourceConfig,
-      { "sourceRadioResourceConfig", "lte-rrc.sourceRadioResourceConfig",
+      { "sourceRadioResourceConfig", "lte-rrc.sourceRadioResourceConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioResourceConfigDedicated", HFILL }},
     { &hf_lte_rrc_sourceSecurityAlgorithmConfig,
-      { "sourceSecurityAlgorithmConfig", "lte-rrc.sourceSecurityAlgorithmConfig",
+      { "sourceSecurityAlgorithmConfig", "lte-rrc.sourceSecurityAlgorithmConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecurityAlgorithmConfig", HFILL }},
     { &hf_lte_rrc_sourceUE_Identity,
@@ -42441,15 +42441,15 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "C_RNTI", HFILL }},
     { &hf_lte_rrc_sourceMasterInformationBlock,
-      { "sourceMasterInformationBlock", "lte-rrc.sourceMasterInformationBlock",
+      { "sourceMasterInformationBlock", "lte-rrc.sourceMasterInformationBlock_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MasterInformationBlock", HFILL }},
     { &hf_lte_rrc_sourceSystemInformationBlockType1,
-      { "sourceSystemInformationBlockType1", "lte-rrc.sourceSystemInformationBlockType1",
+      { "sourceSystemInformationBlockType1", "lte-rrc.sourceSystemInformationBlockType1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformationBlockType1", HFILL }},
     { &hf_lte_rrc_sourceSystemInformationBlockType2,
-      { "sourceSystemInformationBlockType2", "lte-rrc.sourceSystemInformationBlockType2",
+      { "sourceSystemInformationBlockType2", "lte-rrc.sourceSystemInformationBlockType2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformationBlockType2", HFILL }},
     { &hf_lte_rrc_sourceDl_CarrierFreq,
@@ -42461,7 +42461,7 @@ void proto_register_lte_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_sourceOtherConfig_r9,
-      { "sourceOtherConfig-r9", "lte-rrc.sourceOtherConfig_r9",
+      { "sourceOtherConfig-r9", "lte-rrc.sourceOtherConfig_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OtherConfig_r9", HFILL }},
     { &hf_lte_rrc_sourceSCellConfigList_r10,
@@ -42473,7 +42473,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ARFCN_ValueEUTRA_v9e0", HFILL }},
     { &hf_lte_rrc_reestablishmentInfo,
-      { "reestablishmentInfo", "lte-rrc.reestablishmentInfo",
+      { "reestablishmentInfo", "lte-rrc.reestablishmentInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_idc_Indication_r11_01,
@@ -42501,7 +42501,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_AdditionalReestabInfoList_item,
-      { "AdditionalReestabInfo", "lte-rrc.AdditionalReestabInfo",
+      { "AdditionalReestabInfo", "lte-rrc.AdditionalReestabInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_key_eNodeB_Star,
@@ -42517,7 +42517,7 @@ void proto_register_lte_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_lte_rrc_CandidateCellInfoList_r10_item,
-      { "CandidateCellInfo-r10", "lte-rrc.CandidateCellInfo_r10",
+      { "CandidateCellInfo-r10", "lte-rrc.CandidateCellInfo_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-m3ap.c b/epan/dissectors/packet-m3ap.c
index 7ef6299df2..3d4d54cb60 100644
--- a/epan/dissectors/packet-m3ap.c
+++ b/epan/dissectors/packet-m3ap.c
@@ -2097,7 +2097,7 @@ void proto_register_m3ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_AllocationAndRetentionPriority_PDU,
-      { "AllocationAndRetentionPriority", "m3ap.AllocationAndRetentionPriority",
+      { "AllocationAndRetentionPriority", "m3ap.AllocationAndRetentionPriority_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_Cause_PDU,
@@ -2105,19 +2105,19 @@ void proto_register_m3ap(void) {
         FT_UINT32, BASE_DEC, VALS(m3ap_Cause_vals), 0,
         NULL, HFILL }},
     { &hf_m3ap_CriticalityDiagnostics_PDU,
-      { "CriticalityDiagnostics", "m3ap.CriticalityDiagnostics",
+      { "CriticalityDiagnostics", "m3ap.CriticalityDiagnostics_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_Global_MCE_ID_PDU,
-      { "Global-MCE-ID", "m3ap.Global_MCE_ID",
+      { "Global-MCE-ID", "m3ap.Global_MCE_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_MBMS_E_RAB_QoS_Parameters_PDU,
-      { "MBMS-E-RAB-QoS-Parameters", "m3ap.MBMS_E_RAB_QoS_Parameters",
+      { "MBMS-E-RAB-QoS-Parameters", "m3ap.MBMS_E_RAB_QoS_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_MBMS_Service_associatedLogicalM3_ConnectionItem_PDU,
-      { "MBMS-Service-associatedLogicalM3-ConnectionItem", "m3ap.MBMS_Service_associatedLogicalM3_ConnectionItem",
+      { "MBMS-Service-associatedLogicalM3-ConnectionItem", "m3ap.MBMS_Service_associatedLogicalM3_ConnectionItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_MBMS_Service_Area_PDU,
@@ -2153,51 +2153,51 @@ void proto_register_m3ap(void) {
         FT_UINT32, BASE_DEC, VALS(m3ap_TimeToWait_vals), 0,
         NULL, HFILL }},
     { &hf_m3ap_TMGI_PDU,
-      { "TMGI", "m3ap.TMGI",
+      { "TMGI", "m3ap.TMGI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_TNL_Information_PDU,
-      { "TNL-Information", "m3ap.TNL_Information",
+      { "TNL-Information", "m3ap.TNL_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_MBMSSessionStartRequest_PDU,
-      { "MBMSSessionStartRequest", "m3ap.MBMSSessionStartRequest",
+      { "MBMSSessionStartRequest", "m3ap.MBMSSessionStartRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_MBMSSessionStartResponse_PDU,
-      { "MBMSSessionStartResponse", "m3ap.MBMSSessionStartResponse",
+      { "MBMSSessionStartResponse", "m3ap.MBMSSessionStartResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_MBMSSessionStartFailure_PDU,
-      { "MBMSSessionStartFailure", "m3ap.MBMSSessionStartFailure",
+      { "MBMSSessionStartFailure", "m3ap.MBMSSessionStartFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_MBMSSessionStopRequest_PDU,
-      { "MBMSSessionStopRequest", "m3ap.MBMSSessionStopRequest",
+      { "MBMSSessionStopRequest", "m3ap.MBMSSessionStopRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_MBMSSessionStopResponse_PDU,
-      { "MBMSSessionStopResponse", "m3ap.MBMSSessionStopResponse",
+      { "MBMSSessionStopResponse", "m3ap.MBMSSessionStopResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_MBMSSessionUpdateRequest_PDU,
-      { "MBMSSessionUpdateRequest", "m3ap.MBMSSessionUpdateRequest",
+      { "MBMSSessionUpdateRequest", "m3ap.MBMSSessionUpdateRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_MBMSSessionUpdateResponse_PDU,
-      { "MBMSSessionUpdateResponse", "m3ap.MBMSSessionUpdateResponse",
+      { "MBMSSessionUpdateResponse", "m3ap.MBMSSessionUpdateResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_MBMSSessionUpdateFailure_PDU,
-      { "MBMSSessionUpdateFailure", "m3ap.MBMSSessionUpdateFailure",
+      { "MBMSSessionUpdateFailure", "m3ap.MBMSSessionUpdateFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_ErrorIndication_PDU,
-      { "ErrorIndication", "m3ap.ErrorIndication",
+      { "ErrorIndication", "m3ap.ErrorIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_Reset_PDU,
-      { "Reset", "m3ap.Reset",
+      { "Reset", "m3ap.Reset_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_ResetType_PDU,
@@ -2205,7 +2205,7 @@ void proto_register_m3ap(void) {
         FT_UINT32, BASE_DEC, VALS(m3ap_ResetType_vals), 0,
         NULL, HFILL }},
     { &hf_m3ap_ResetAcknowledge_PDU,
-      { "ResetAcknowledge", "m3ap.ResetAcknowledge",
+      { "ResetAcknowledge", "m3ap.ResetAcknowledge_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_MBMS_Service_associatedLogicalM3_ConnectionListResAck_PDU,
@@ -2213,11 +2213,11 @@ void proto_register_m3ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_PrivateMessage_PDU,
-      { "PrivateMessage", "m3ap.PrivateMessage",
+      { "PrivateMessage", "m3ap.PrivateMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_M3SetupRequest_PDU,
-      { "M3SetupRequest", "m3ap.M3SetupRequest",
+      { "M3SetupRequest", "m3ap.M3SetupRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_MBMSServiceAreaListItem_PDU,
@@ -2225,23 +2225,23 @@ void proto_register_m3ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_M3SetupResponse_PDU,
-      { "M3SetupResponse", "m3ap.M3SetupResponse",
+      { "M3SetupResponse", "m3ap.M3SetupResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_M3SetupFailure_PDU,
-      { "M3SetupFailure", "m3ap.M3SetupFailure",
+      { "M3SetupFailure", "m3ap.M3SetupFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_MCEConfigurationUpdate_PDU,
-      { "MCEConfigurationUpdate", "m3ap.MCEConfigurationUpdate",
+      { "MCEConfigurationUpdate", "m3ap.MCEConfigurationUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_MCEConfigurationUpdateAcknowledge_PDU,
-      { "MCEConfigurationUpdateAcknowledge", "m3ap.MCEConfigurationUpdateAcknowledge",
+      { "MCEConfigurationUpdateAcknowledge", "m3ap.MCEConfigurationUpdateAcknowledge_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_MCEConfigurationUpdateFailure_PDU,
-      { "MCEConfigurationUpdateFailure", "m3ap.MCEConfigurationUpdateFailure",
+      { "MCEConfigurationUpdateFailure", "m3ap.MCEConfigurationUpdateFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_M3AP_PDU_PDU,
@@ -2257,7 +2257,7 @@ void proto_register_m3ap(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_m3ap_ProtocolIE_Container_item,
-      { "ProtocolIE-Field", "m3ap.ProtocolIE_Field",
+      { "ProtocolIE-Field", "m3ap.ProtocolIE_Field_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_id,
@@ -2269,7 +2269,7 @@ void proto_register_m3ap(void) {
         FT_UINT32, BASE_DEC, VALS(m3ap_Criticality_vals), 0,
         NULL, HFILL }},
     { &hf_m3ap_ie_field_value,
-      { "value", "m3ap.value",
+      { "value", "m3ap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ie_field_value", HFILL }},
     { &hf_m3ap_ProtocolIE_ContainerList_item,
@@ -2277,7 +2277,7 @@ void proto_register_m3ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_ProtocolExtensionContainer_item,
-      { "ProtocolExtensionField", "m3ap.ProtocolExtensionField",
+      { "ProtocolExtensionField", "m3ap.ProtocolExtensionField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_ext_id,
@@ -2285,11 +2285,11 @@ void proto_register_m3ap(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &m3ap_ProtocolIE_ID_vals_ext, 0,
         "ProtocolIE_ID", HFILL }},
     { &hf_m3ap_extensionValue,
-      { "extensionValue", "m3ap.extensionValue",
+      { "extensionValue", "m3ap.extensionValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_PrivateIE_Container_item,
-      { "PrivateIE-Field", "m3ap.PrivateIE_Field",
+      { "PrivateIE-Field", "m3ap.PrivateIE_Field_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_private_id,
@@ -2297,7 +2297,7 @@ void proto_register_m3ap(void) {
         FT_UINT32, BASE_DEC, VALS(m3ap_PrivateIE_ID_vals), 0,
         "PrivateIE_ID", HFILL }},
     { &hf_m3ap_private_value,
-      { "value", "m3ap.value",
+      { "value", "m3ap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_private_value", HFILL }},
     { &hf_m3ap_priorityLevel,
@@ -2353,7 +2353,7 @@ void proto_register_m3ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CriticalityDiagnostics_IE_List", HFILL }},
     { &hf_m3ap_CriticalityDiagnostics_IE_List_item,
-      { "CriticalityDiagnostics-IE-List item", "m3ap.CriticalityDiagnostics_IE_List_item",
+      { "CriticalityDiagnostics-IE-List item", "m3ap.CriticalityDiagnostics_IE_List_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_iECriticality,
@@ -2393,7 +2393,7 @@ void proto_register_m3ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_gbrQosInformation,
-      { "gbrQosInformation", "m3ap.gbrQosInformation",
+      { "gbrQosInformation", "m3ap.gbrQosInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GBR_QosInformation", HFILL }},
     { &hf_m3ap_mME_MBMS_M3AP_ID,
@@ -2437,11 +2437,11 @@ void proto_register_m3ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MBMS_Service_associatedLogicalM3_ConnectionListRes", HFILL }},
     { &hf_m3ap_MBMS_Service_associatedLogicalM3_ConnectionListRes_item,
-      { "ProtocolIE-Single-Container", "m3ap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "m3ap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_MBMS_Service_associatedLogicalM3_ConnectionListResAck_item,
-      { "ProtocolIE-Single-Container", "m3ap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "m3ap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_privateIEs,
@@ -2453,27 +2453,27 @@ void proto_register_m3ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_initiatingMessage,
-      { "initiatingMessage", "m3ap.initiatingMessage",
+      { "initiatingMessage", "m3ap.initiatingMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_successfulOutcome,
-      { "successfulOutcome", "m3ap.successfulOutcome",
+      { "successfulOutcome", "m3ap.successfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_unsuccessfulOutcome,
-      { "unsuccessfulOutcome", "m3ap.unsuccessfulOutcome",
+      { "unsuccessfulOutcome", "m3ap.unsuccessfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_m3ap_initiatingMessagevalue,
-      { "value", "m3ap.value",
+      { "value", "m3ap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InitiatingMessage_value", HFILL }},
     { &hf_m3ap_successfulOutcome_value,
-      { "value", "m3ap.value",
+      { "value", "m3ap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SuccessfulOutcome_value", HFILL }},
     { &hf_m3ap_unsuccessfulOutcome_value,
-      { "value", "m3ap.value",
+      { "value", "m3ap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UnsuccessfulOutcome_value", HFILL }},
 
diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c
index 18a0a25d36..78e24c6b48 100644
--- a/epan/dissectors/packet-mms.c
+++ b/epan/dissectors/packet-mms.c
@@ -7095,23 +7095,23 @@ void proto_register_mms(void) {
 /*--- Included file: packet-mms-hfarr.c ---*/
 #line 1 "../../asn1/mms/packet-mms-hfarr.c"
     { &hf_mms_confirmed_RequestPDU,
-      { "confirmed-RequestPDU", "mms.confirmed_RequestPDU",
+      { "confirmed-RequestPDU", "mms.confirmed_RequestPDU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_confirmed_ResponsePDU,
-      { "confirmed-ResponsePDU", "mms.confirmed_ResponsePDU",
+      { "confirmed-ResponsePDU", "mms.confirmed_ResponsePDU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_confirmed_ErrorPDU,
-      { "confirmed-ErrorPDU", "mms.confirmed_ErrorPDU",
+      { "confirmed-ErrorPDU", "mms.confirmed_ErrorPDU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_unconfirmed_PDU,
-      { "unconfirmed-PDU", "mms.unconfirmed_PDU",
+      { "unconfirmed-PDU", "mms.unconfirmed_PDU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_rejectPDU,
-      { "rejectPDU", "mms.rejectPDU",
+      { "rejectPDU", "mms.rejectPDU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_cancel_RequestPDU,
@@ -7123,31 +7123,31 @@ void proto_register_mms(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_cancel_ErrorPDU,
-      { "cancel-ErrorPDU", "mms.cancel_ErrorPDU",
+      { "cancel-ErrorPDU", "mms.cancel_ErrorPDU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_initiate_RequestPDU,
-      { "initiate-RequestPDU", "mms.initiate_RequestPDU",
+      { "initiate-RequestPDU", "mms.initiate_RequestPDU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_initiate_ResponsePDU,
-      { "initiate-ResponsePDU", "mms.initiate_ResponsePDU",
+      { "initiate-ResponsePDU", "mms.initiate_ResponsePDU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_initiate_ErrorPDU,
-      { "initiate-ErrorPDU", "mms.initiate_ErrorPDU",
+      { "initiate-ErrorPDU", "mms.initiate_ErrorPDU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_conclude_RequestPDU,
-      { "conclude-RequestPDU", "mms.conclude_RequestPDU",
+      { "conclude-RequestPDU", "mms.conclude_RequestPDU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_conclude_ResponsePDU,
-      { "conclude-ResponsePDU", "mms.conclude_ResponsePDU",
+      { "conclude-ResponsePDU", "mms.conclude_ResponsePDU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_conclude_ErrorPDU,
-      { "conclude-ErrorPDU", "mms.conclude_ErrorPDU",
+      { "conclude-ErrorPDU", "mms.conclude_ErrorPDU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_invokeID,
@@ -7183,27 +7183,27 @@ void proto_register_mms(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "Unsigned32", HFILL }},
     { &hf_mms_serviceError,
-      { "serviceError", "mms.serviceError",
+      { "serviceError", "mms.serviceError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_informationReport,
-      { "informationReport", "mms.informationReport",
+      { "informationReport", "mms.informationReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_unsolicitedStatus,
-      { "unsolicitedStatus", "mms.unsolicitedStatus",
+      { "unsolicitedStatus", "mms.unsolicitedStatus_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_eventNotification,
-      { "eventNotification", "mms.eventNotification",
+      { "eventNotification", "mms.eventNotification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_attach_To_Event_Condition,
-      { "attach-To-Event-Condition", "mms.attach_To_Event_Condition",
+      { "attach-To-Event-Condition", "mms.attach_To_Event_Condition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttachToEventCondition", HFILL }},
     { &hf_mms_attach_To_Semaphore,
-      { "attach-To-Semaphore", "mms.attach_To_Semaphore",
+      { "attach-To-Semaphore", "mms.attach_To_Semaphore_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttachToSemaphore", HFILL }},
     { &hf_mms_status,
@@ -7211,23 +7211,23 @@ void proto_register_mms(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "Status_Request", HFILL }},
     { &hf_mms_getNameList,
-      { "getNameList", "mms.getNameList",
+      { "getNameList", "mms.getNameList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetNameList_Request", HFILL }},
     { &hf_mms_identify,
-      { "identify", "mms.identify",
+      { "identify", "mms.identify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Identify_Request", HFILL }},
     { &hf_mms_rename,
-      { "rename", "mms.rename",
+      { "rename", "mms.rename_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Rename_Request", HFILL }},
     { &hf_mms_read,
-      { "read", "mms.read",
+      { "read", "mms.read_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Read_Request", HFILL }},
     { &hf_mms_write,
-      { "write", "mms.write",
+      { "write", "mms.write_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Write_Request", HFILL }},
     { &hf_mms_getVariableAccessAttributes,
@@ -7235,11 +7235,11 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, VALS(mms_GetVariableAccessAttributes_Request_vals), 0,
         "GetVariableAccessAttributes_Request", HFILL }},
     { &hf_mms_defineNamedVariable,
-      { "defineNamedVariable", "mms.defineNamedVariable",
+      { "defineNamedVariable", "mms.defineNamedVariable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DefineNamedVariable_Request", HFILL }},
     { &hf_mms_defineScatteredAccess,
-      { "defineScatteredAccess", "mms.defineScatteredAccess",
+      { "defineScatteredAccess", "mms.defineScatteredAccess_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DefineScatteredAccess_Request", HFILL }},
     { &hf_mms_getScatteredAccessAttributes,
@@ -7247,11 +7247,11 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, VALS(mms_ObjectName_vals), 0,
         "GetScatteredAccessAttributes_Request", HFILL }},
     { &hf_mms_deleteVariableAccess,
-      { "deleteVariableAccess", "mms.deleteVariableAccess",
+      { "deleteVariableAccess", "mms.deleteVariableAccess_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeleteVariableAccess_Request", HFILL }},
     { &hf_mms_defineNamedVariableList,
-      { "defineNamedVariableList", "mms.defineNamedVariableList",
+      { "defineNamedVariableList", "mms.defineNamedVariableList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DefineNamedVariableList_Request", HFILL }},
     { &hf_mms_getNamedVariableListAttributes,
@@ -7259,11 +7259,11 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, VALS(mms_ObjectName_vals), 0,
         "GetNamedVariableListAttributes_Request", HFILL }},
     { &hf_mms_deleteNamedVariableList,
-      { "deleteNamedVariableList", "mms.deleteNamedVariableList",
+      { "deleteNamedVariableList", "mms.deleteNamedVariableList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeleteNamedVariableList_Request", HFILL }},
     { &hf_mms_defineNamedType,
-      { "defineNamedType", "mms.defineNamedType",
+      { "defineNamedType", "mms.defineNamedType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DefineNamedType_Request", HFILL }},
     { &hf_mms_getNamedTypeAttributes,
@@ -7271,27 +7271,27 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, VALS(mms_ObjectName_vals), 0,
         "GetNamedTypeAttributes_Request", HFILL }},
     { &hf_mms_deleteNamedType,
-      { "deleteNamedType", "mms.deleteNamedType",
+      { "deleteNamedType", "mms.deleteNamedType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeleteNamedType_Request", HFILL }},
     { &hf_mms_input,
-      { "input", "mms.input",
+      { "input", "mms.input_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Input_Request", HFILL }},
     { &hf_mms_output,
-      { "output", "mms.output",
+      { "output", "mms.output_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Output_Request", HFILL }},
     { &hf_mms_takeControl,
-      { "takeControl", "mms.takeControl",
+      { "takeControl", "mms.takeControl_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TakeControl_Request", HFILL }},
     { &hf_mms_relinquishControl,
-      { "relinquishControl", "mms.relinquishControl",
+      { "relinquishControl", "mms.relinquishControl_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RelinquishControl_Request", HFILL }},
     { &hf_mms_defineSemaphore,
-      { "defineSemaphore", "mms.defineSemaphore",
+      { "defineSemaphore", "mms.defineSemaphore_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DefineSemaphore_Request", HFILL }},
     { &hf_mms_deleteSemaphore,
@@ -7303,15 +7303,15 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, VALS(mms_ObjectName_vals), 0,
         "ReportSemaphoreStatus_Request", HFILL }},
     { &hf_mms_reportPoolSemaphoreStatus,
-      { "reportPoolSemaphoreStatus", "mms.reportPoolSemaphoreStatus",
+      { "reportPoolSemaphoreStatus", "mms.reportPoolSemaphoreStatus_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReportPoolSemaphoreStatus_Request", HFILL }},
     { &hf_mms_reportSemaphoreEntryStatus,
-      { "reportSemaphoreEntryStatus", "mms.reportSemaphoreEntryStatus",
+      { "reportSemaphoreEntryStatus", "mms.reportSemaphoreEntryStatus_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReportSemaphoreEntryStatus_Request", HFILL }},
     { &hf_mms_initiateDownloadSequence,
-      { "initiateDownloadSequence", "mms.initiateDownloadSequence",
+      { "initiateDownloadSequence", "mms.initiateDownloadSequence_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InitiateDownloadSequence_Request", HFILL }},
     { &hf_mms_downloadSegment,
@@ -7319,7 +7319,7 @@ void proto_register_mms(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "DownloadSegment_Request", HFILL }},
     { &hf_mms_terminateDownloadSequence,
-      { "terminateDownloadSequence", "mms.terminateDownloadSequence",
+      { "terminateDownloadSequence", "mms.terminateDownloadSequence_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminateDownloadSequence_Request", HFILL }},
     { &hf_mms_initiateUploadSequence,
@@ -7335,19 +7335,19 @@ void proto_register_mms(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "TerminateUploadSequence_Request", HFILL }},
     { &hf_mms_requestDomainDownload,
-      { "requestDomainDownload", "mms.requestDomainDownload",
+      { "requestDomainDownload", "mms.requestDomainDownload_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RequestDomainDownload_Request", HFILL }},
     { &hf_mms_requestDomainUpload,
-      { "requestDomainUpload", "mms.requestDomainUpload",
+      { "requestDomainUpload", "mms.requestDomainUpload_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RequestDomainUpload_Request", HFILL }},
     { &hf_mms_loadDomainContent,
-      { "loadDomainContent", "mms.loadDomainContent",
+      { "loadDomainContent", "mms.loadDomainContent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LoadDomainContent_Request", HFILL }},
     { &hf_mms_storeDomainContent,
-      { "storeDomainContent", "mms.storeDomainContent",
+      { "storeDomainContent", "mms.storeDomainContent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "StoreDomainContent_Request", HFILL }},
     { &hf_mms_deleteDomain,
@@ -7359,7 +7359,7 @@ void proto_register_mms(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "GetDomainAttributes_Request", HFILL }},
     { &hf_mms_createProgramInvocation,
-      { "createProgramInvocation", "mms.createProgramInvocation",
+      { "createProgramInvocation", "mms.createProgramInvocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CreateProgramInvocation_Request", HFILL }},
     { &hf_mms_deleteProgramInvocation,
@@ -7367,23 +7367,23 @@ void proto_register_mms(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "DeleteProgramInvocation_Request", HFILL }},
     { &hf_mms_start,
-      { "start", "mms.start",
+      { "start", "mms.start_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Start_Request", HFILL }},
     { &hf_mms_stop,
-      { "stop", "mms.stop",
+      { "stop", "mms.stop_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Stop_Request", HFILL }},
     { &hf_mms_resume,
-      { "resume", "mms.resume",
+      { "resume", "mms.resume_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Resume_Request", HFILL }},
     { &hf_mms_reset,
-      { "reset", "mms.reset",
+      { "reset", "mms.reset_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Reset_Request", HFILL }},
     { &hf_mms_kill,
-      { "kill", "mms.kill",
+      { "kill", "mms.kill_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Kill_Request", HFILL }},
     { &hf_mms_getProgramInvocationAttributes,
@@ -7391,11 +7391,11 @@ void proto_register_mms(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "GetProgramInvocationAttributes_Request", HFILL }},
     { &hf_mms_obtainFile,
-      { "obtainFile", "mms.obtainFile",
+      { "obtainFile", "mms.obtainFile_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ObtainFile_Request", HFILL }},
     { &hf_mms_defineEventCondition,
-      { "defineEventCondition", "mms.defineEventCondition",
+      { "defineEventCondition", "mms.defineEventCondition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DefineEventCondition_Request", HFILL }},
     { &hf_mms_deleteEventCondition,
@@ -7411,15 +7411,15 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, VALS(mms_ObjectName_vals), 0,
         "ReportEventConditionStatus_Request", HFILL }},
     { &hf_mms_alterEventConditionMonitoring,
-      { "alterEventConditionMonitoring", "mms.alterEventConditionMonitoring",
+      { "alterEventConditionMonitoring", "mms.alterEventConditionMonitoring_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlterEventConditionMonitoring_Request", HFILL }},
     { &hf_mms_triggerEvent,
-      { "triggerEvent", "mms.triggerEvent",
+      { "triggerEvent", "mms.triggerEvent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TriggerEvent_Request", HFILL }},
     { &hf_mms_defineEventAction,
-      { "defineEventAction", "mms.defineEventAction",
+      { "defineEventAction", "mms.defineEventAction_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DefineEventAction_Request", HFILL }},
     { &hf_mms_deleteEventAction,
@@ -7435,7 +7435,7 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, VALS(mms_ObjectName_vals), 0,
         "ReportEventActionStatus_Request", HFILL }},
     { &hf_mms_defineEventEnrollment,
-      { "defineEventEnrollment", "mms.defineEventEnrollment",
+      { "defineEventEnrollment", "mms.defineEventEnrollment_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DefineEventEnrollment_Request", HFILL }},
     { &hf_mms_deleteEventEnrollment,
@@ -7443,7 +7443,7 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, VALS(mms_DeleteEventEnrollment_Request_vals), 0,
         "DeleteEventEnrollment_Request", HFILL }},
     { &hf_mms_alterEventEnrollment,
-      { "alterEventEnrollment", "mms.alterEventEnrollment",
+      { "alterEventEnrollment", "mms.alterEventEnrollment_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlterEventEnrollment_Request", HFILL }},
     { &hf_mms_reportEventEnrollmentStatus,
@@ -7451,31 +7451,31 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, VALS(mms_ObjectName_vals), 0,
         "ReportEventEnrollmentStatus_Request", HFILL }},
     { &hf_mms_getEventEnrollmentAttributes,
-      { "getEventEnrollmentAttributes", "mms.getEventEnrollmentAttributes",
+      { "getEventEnrollmentAttributes", "mms.getEventEnrollmentAttributes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetEventEnrollmentAttributes_Request", HFILL }},
     { &hf_mms_acknowledgeEventNotification,
-      { "acknowledgeEventNotification", "mms.acknowledgeEventNotification",
+      { "acknowledgeEventNotification", "mms.acknowledgeEventNotification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AcknowledgeEventNotification_Request", HFILL }},
     { &hf_mms_getAlarmSummary,
-      { "getAlarmSummary", "mms.getAlarmSummary",
+      { "getAlarmSummary", "mms.getAlarmSummary_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetAlarmSummary_Request", HFILL }},
     { &hf_mms_getAlarmEnrollmentSummary,
-      { "getAlarmEnrollmentSummary", "mms.getAlarmEnrollmentSummary",
+      { "getAlarmEnrollmentSummary", "mms.getAlarmEnrollmentSummary_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetAlarmEnrollmentSummary_Request", HFILL }},
     { &hf_mms_readJournal,
-      { "readJournal", "mms.readJournal",
+      { "readJournal", "mms.readJournal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReadJournal_Request", HFILL }},
     { &hf_mms_writeJournal,
-      { "writeJournal", "mms.writeJournal",
+      { "writeJournal", "mms.writeJournal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "WriteJournal_Request", HFILL }},
     { &hf_mms_initializeJournal,
-      { "initializeJournal", "mms.initializeJournal",
+      { "initializeJournal", "mms.initializeJournal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InitializeJournal_Request", HFILL }},
     { &hf_mms_reportJournalStatus,
@@ -7483,19 +7483,19 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, VALS(mms_ObjectName_vals), 0,
         "ReportJournalStatus_Request", HFILL }},
     { &hf_mms_createJournal,
-      { "createJournal", "mms.createJournal",
+      { "createJournal", "mms.createJournal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CreateJournal_Request", HFILL }},
     { &hf_mms_deleteJournal,
-      { "deleteJournal", "mms.deleteJournal",
+      { "deleteJournal", "mms.deleteJournal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeleteJournal_Request", HFILL }},
     { &hf_mms_getCapabilityList,
-      { "getCapabilityList", "mms.getCapabilityList",
+      { "getCapabilityList", "mms.getCapabilityList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetCapabilityList_Request", HFILL }},
     { &hf_mms_fileOpen,
-      { "fileOpen", "mms.fileOpen",
+      { "fileOpen", "mms.fileOpen_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FileOpen_Request", HFILL }},
     { &hf_mms_fileRead,
@@ -7507,7 +7507,7 @@ void proto_register_mms(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "FileClose_Request", HFILL }},
     { &hf_mms_fileRename,
-      { "fileRename", "mms.fileRename",
+      { "fileRename", "mms.fileRename_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FileRename_Request", HFILL }},
     { &hf_mms_fileDelete,
@@ -7515,7 +7515,7 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "FileDelete_Request", HFILL }},
     { &hf_mms_fileDirectory,
-      { "fileDirectory", "mms.fileDirectory",
+      { "fileDirectory", "mms.fileDirectory_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FileDirectory_Request", HFILL }},
     { &hf_mms_foo,
@@ -7523,23 +7523,23 @@ void proto_register_mms(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_mms_status_01,
-      { "status", "mms.status",
+      { "status", "mms.status_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Status_Response", HFILL }},
     { &hf_mms_getNameList_01,
-      { "getNameList", "mms.getNameList",
+      { "getNameList", "mms.getNameList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetNameList_Response", HFILL }},
     { &hf_mms_identify_01,
-      { "identify", "mms.identify",
+      { "identify", "mms.identify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Identify_Response", HFILL }},
     { &hf_mms_rename_01,
-      { "rename", "mms.rename",
+      { "rename", "mms.rename_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Rename_Response", HFILL }},
     { &hf_mms_read_01,
-      { "read", "mms.read",
+      { "read", "mms.read_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Read_Response", HFILL }},
     { &hf_mms_write_01,
@@ -7547,47 +7547,47 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Write_Response", HFILL }},
     { &hf_mms_getVariableAccessAttributes_01,
-      { "getVariableAccessAttributes", "mms.getVariableAccessAttributes",
+      { "getVariableAccessAttributes", "mms.getVariableAccessAttributes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetVariableAccessAttributes_Response", HFILL }},
     { &hf_mms_defineNamedVariable_01,
-      { "defineNamedVariable", "mms.defineNamedVariable",
+      { "defineNamedVariable", "mms.defineNamedVariable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DefineNamedVariable_Response", HFILL }},
     { &hf_mms_defineScatteredAccess_01,
-      { "defineScatteredAccess", "mms.defineScatteredAccess",
+      { "defineScatteredAccess", "mms.defineScatteredAccess_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DefineScatteredAccess_Response", HFILL }},
     { &hf_mms_getScatteredAccessAttributes_01,
-      { "getScatteredAccessAttributes", "mms.getScatteredAccessAttributes",
+      { "getScatteredAccessAttributes", "mms.getScatteredAccessAttributes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetScatteredAccessAttributes_Response", HFILL }},
     { &hf_mms_deleteVariableAccess_01,
-      { "deleteVariableAccess", "mms.deleteVariableAccess",
+      { "deleteVariableAccess", "mms.deleteVariableAccess_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeleteVariableAccess_Response", HFILL }},
     { &hf_mms_defineNamedVariableList_01,
-      { "defineNamedVariableList", "mms.defineNamedVariableList",
+      { "defineNamedVariableList", "mms.defineNamedVariableList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DefineNamedVariableList_Response", HFILL }},
     { &hf_mms_getNamedVariableListAttributes_01,
-      { "getNamedVariableListAttributes", "mms.getNamedVariableListAttributes",
+      { "getNamedVariableListAttributes", "mms.getNamedVariableListAttributes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetNamedVariableListAttributes_Response", HFILL }},
     { &hf_mms_deleteNamedVariableList_01,
-      { "deleteNamedVariableList", "mms.deleteNamedVariableList",
+      { "deleteNamedVariableList", "mms.deleteNamedVariableList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeleteNamedVariableList_Response", HFILL }},
     { &hf_mms_defineNamedType_01,
-      { "defineNamedType", "mms.defineNamedType",
+      { "defineNamedType", "mms.defineNamedType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DefineNamedType_Response", HFILL }},
     { &hf_mms_getNamedTypeAttributes_01,
-      { "getNamedTypeAttributes", "mms.getNamedTypeAttributes",
+      { "getNamedTypeAttributes", "mms.getNamedTypeAttributes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetNamedTypeAttributes_Response", HFILL }},
     { &hf_mms_deleteNamedType_01,
-      { "deleteNamedType", "mms.deleteNamedType",
+      { "deleteNamedType", "mms.deleteNamedType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeleteNamedType_Response", HFILL }},
     { &hf_mms_input_01,
@@ -7595,7 +7595,7 @@ void proto_register_mms(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "Input_Response", HFILL }},
     { &hf_mms_output_01,
-      { "output", "mms.output",
+      { "output", "mms.output_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Output_Response", HFILL }},
     { &hf_mms_takeControl_01,
@@ -7603,119 +7603,119 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, VALS(mms_TakeControl_Response_vals), 0,
         "TakeControl_Response", HFILL }},
     { &hf_mms_relinquishControl_01,
-      { "relinquishControl", "mms.relinquishControl",
+      { "relinquishControl", "mms.relinquishControl_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RelinquishControl_Response", HFILL }},
     { &hf_mms_defineSemaphore_01,
-      { "defineSemaphore", "mms.defineSemaphore",
+      { "defineSemaphore", "mms.defineSemaphore_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DefineSemaphore_Response", HFILL }},
     { &hf_mms_deleteSemaphore_01,
-      { "deleteSemaphore", "mms.deleteSemaphore",
+      { "deleteSemaphore", "mms.deleteSemaphore_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeleteSemaphore_Response", HFILL }},
     { &hf_mms_reportSemaphoreStatus_01,
-      { "reportSemaphoreStatus", "mms.reportSemaphoreStatus",
+      { "reportSemaphoreStatus", "mms.reportSemaphoreStatus_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReportSemaphoreStatus_Response", HFILL }},
     { &hf_mms_reportPoolSemaphoreStatus_01,
-      { "reportPoolSemaphoreStatus", "mms.reportPoolSemaphoreStatus",
+      { "reportPoolSemaphoreStatus", "mms.reportPoolSemaphoreStatus_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReportPoolSemaphoreStatus_Response", HFILL }},
     { &hf_mms_reportSemaphoreEntryStatus_01,
-      { "reportSemaphoreEntryStatus", "mms.reportSemaphoreEntryStatus",
+      { "reportSemaphoreEntryStatus", "mms.reportSemaphoreEntryStatus_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReportSemaphoreEntryStatus_Response", HFILL }},
     { &hf_mms_initiateDownloadSequence_01,
-      { "initiateDownloadSequence", "mms.initiateDownloadSequence",
+      { "initiateDownloadSequence", "mms.initiateDownloadSequence_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InitiateDownloadSequence_Response", HFILL }},
     { &hf_mms_downloadSegment_01,
-      { "downloadSegment", "mms.downloadSegment",
+      { "downloadSegment", "mms.downloadSegment_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DownloadSegment_Response", HFILL }},
     { &hf_mms_terminateDownloadSequence_01,
-      { "terminateDownloadSequence", "mms.terminateDownloadSequence",
+      { "terminateDownloadSequence", "mms.terminateDownloadSequence_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminateDownloadSequence_Response", HFILL }},
     { &hf_mms_initiateUploadSequence_01,
-      { "initiateUploadSequence", "mms.initiateUploadSequence",
+      { "initiateUploadSequence", "mms.initiateUploadSequence_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InitiateUploadSequence_Response", HFILL }},
     { &hf_mms_uploadSegment_01,
-      { "uploadSegment", "mms.uploadSegment",
+      { "uploadSegment", "mms.uploadSegment_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UploadSegment_Response", HFILL }},
     { &hf_mms_terminateUploadSequence_01,
-      { "terminateUploadSequence", "mms.terminateUploadSequence",
+      { "terminateUploadSequence", "mms.terminateUploadSequence_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TerminateUploadSequence_Response", HFILL }},
     { &hf_mms_requestDomainDownLoad,
-      { "requestDomainDownLoad", "mms.requestDomainDownLoad",
+      { "requestDomainDownLoad", "mms.requestDomainDownLoad_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RequestDomainDownload_Response", HFILL }},
     { &hf_mms_requestDomainUpload_01,
-      { "requestDomainUpload", "mms.requestDomainUpload",
+      { "requestDomainUpload", "mms.requestDomainUpload_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RequestDomainUpload_Response", HFILL }},
     { &hf_mms_loadDomainContent_01,
-      { "loadDomainContent", "mms.loadDomainContent",
+      { "loadDomainContent", "mms.loadDomainContent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LoadDomainContent_Response", HFILL }},
     { &hf_mms_storeDomainContent_01,
-      { "storeDomainContent", "mms.storeDomainContent",
+      { "storeDomainContent", "mms.storeDomainContent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "StoreDomainContent_Response", HFILL }},
     { &hf_mms_deleteDomain_01,
-      { "deleteDomain", "mms.deleteDomain",
+      { "deleteDomain", "mms.deleteDomain_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeleteDomain_Response", HFILL }},
     { &hf_mms_getDomainAttributes_01,
-      { "getDomainAttributes", "mms.getDomainAttributes",
+      { "getDomainAttributes", "mms.getDomainAttributes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetDomainAttributes_Response", HFILL }},
     { &hf_mms_createProgramInvocation_01,
-      { "createProgramInvocation", "mms.createProgramInvocation",
+      { "createProgramInvocation", "mms.createProgramInvocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CreateProgramInvocation_Response", HFILL }},
     { &hf_mms_deleteProgramInvocation_01,
-      { "deleteProgramInvocation", "mms.deleteProgramInvocation",
+      { "deleteProgramInvocation", "mms.deleteProgramInvocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeleteProgramInvocation_Response", HFILL }},
     { &hf_mms_start_01,
-      { "start", "mms.start",
+      { "start", "mms.start_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Start_Response", HFILL }},
     { &hf_mms_stop_01,
-      { "stop", "mms.stop",
+      { "stop", "mms.stop_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Stop_Response", HFILL }},
     { &hf_mms_resume_01,
-      { "resume", "mms.resume",
+      { "resume", "mms.resume_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Resume_Response", HFILL }},
     { &hf_mms_reset_01,
-      { "reset", "mms.reset",
+      { "reset", "mms.reset_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Reset_Response", HFILL }},
     { &hf_mms_kill_01,
-      { "kill", "mms.kill",
+      { "kill", "mms.kill_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Kill_Response", HFILL }},
     { &hf_mms_getProgramInvocationAttributes_01,
-      { "getProgramInvocationAttributes", "mms.getProgramInvocationAttributes",
+      { "getProgramInvocationAttributes", "mms.getProgramInvocationAttributes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetProgramInvocationAttributes_Response", HFILL }},
     { &hf_mms_obtainFile_01,
-      { "obtainFile", "mms.obtainFile",
+      { "obtainFile", "mms.obtainFile_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ObtainFile_Response", HFILL }},
     { &hf_mms_fileOpen_01,
-      { "fileOpen", "mms.fileOpen",
+      { "fileOpen", "mms.fileOpen_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FileOpen_Response", HFILL }},
     { &hf_mms_defineEventCondition_01,
-      { "defineEventCondition", "mms.defineEventCondition",
+      { "defineEventCondition", "mms.defineEventCondition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DefineEventCondition_Response", HFILL }},
     { &hf_mms_deleteEventCondition_01,
@@ -7723,23 +7723,23 @@ void proto_register_mms(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "DeleteEventCondition_Response", HFILL }},
     { &hf_mms_getEventConditionAttributes_01,
-      { "getEventConditionAttributes", "mms.getEventConditionAttributes",
+      { "getEventConditionAttributes", "mms.getEventConditionAttributes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetEventConditionAttributes_Response", HFILL }},
     { &hf_mms_reportEventConditionStatus_01,
-      { "reportEventConditionStatus", "mms.reportEventConditionStatus",
+      { "reportEventConditionStatus", "mms.reportEventConditionStatus_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReportEventConditionStatus_Response", HFILL }},
     { &hf_mms_alterEventConditionMonitoring_01,
-      { "alterEventConditionMonitoring", "mms.alterEventConditionMonitoring",
+      { "alterEventConditionMonitoring", "mms.alterEventConditionMonitoring_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlterEventConditionMonitoring_Response", HFILL }},
     { &hf_mms_triggerEvent_01,
-      { "triggerEvent", "mms.triggerEvent",
+      { "triggerEvent", "mms.triggerEvent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TriggerEvent_Response", HFILL }},
     { &hf_mms_defineEventAction_01,
-      { "defineEventAction", "mms.defineEventAction",
+      { "defineEventAction", "mms.defineEventAction_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DefineEventAction_Response", HFILL }},
     { &hf_mms_deleteEventAction_01,
@@ -7747,7 +7747,7 @@ void proto_register_mms(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "DeleteEventAction_Response", HFILL }},
     { &hf_mms_getEventActionAttributes_01,
-      { "getEventActionAttributes", "mms.getEventActionAttributes",
+      { "getEventActionAttributes", "mms.getEventActionAttributes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetEventActionAttributes_Response", HFILL }},
     { &hf_mms_reportActionStatus,
@@ -7755,7 +7755,7 @@ void proto_register_mms(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "ReportEventActionStatus_Response", HFILL }},
     { &hf_mms_defineEventEnrollment_01,
-      { "defineEventEnrollment", "mms.defineEventEnrollment",
+      { "defineEventEnrollment", "mms.defineEventEnrollment_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DefineEventEnrollment_Response", HFILL }},
     { &hf_mms_deleteEventEnrollment_01,
@@ -7763,35 +7763,35 @@ void proto_register_mms(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "DeleteEventEnrollment_Response", HFILL }},
     { &hf_mms_alterEventEnrollment_01,
-      { "alterEventEnrollment", "mms.alterEventEnrollment",
+      { "alterEventEnrollment", "mms.alterEventEnrollment_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlterEventEnrollment_Response", HFILL }},
     { &hf_mms_reportEventEnrollmentStatus_01,
-      { "reportEventEnrollmentStatus", "mms.reportEventEnrollmentStatus",
+      { "reportEventEnrollmentStatus", "mms.reportEventEnrollmentStatus_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReportEventEnrollmentStatus_Response", HFILL }},
     { &hf_mms_getEventEnrollmentAttributes_01,
-      { "getEventEnrollmentAttributes", "mms.getEventEnrollmentAttributes",
+      { "getEventEnrollmentAttributes", "mms.getEventEnrollmentAttributes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetEventEnrollmentAttributes_Response", HFILL }},
     { &hf_mms_acknowledgeEventNotification_01,
-      { "acknowledgeEventNotification", "mms.acknowledgeEventNotification",
+      { "acknowledgeEventNotification", "mms.acknowledgeEventNotification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AcknowledgeEventNotification_Response", HFILL }},
     { &hf_mms_getAlarmSummary_01,
-      { "getAlarmSummary", "mms.getAlarmSummary",
+      { "getAlarmSummary", "mms.getAlarmSummary_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetAlarmSummary_Response", HFILL }},
     { &hf_mms_getAlarmEnrollmentSummary_01,
-      { "getAlarmEnrollmentSummary", "mms.getAlarmEnrollmentSummary",
+      { "getAlarmEnrollmentSummary", "mms.getAlarmEnrollmentSummary_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetAlarmEnrollmentSummary_Response", HFILL }},
     { &hf_mms_readJournal_01,
-      { "readJournal", "mms.readJournal",
+      { "readJournal", "mms.readJournal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReadJournal_Response", HFILL }},
     { &hf_mms_writeJournal_01,
-      { "writeJournal", "mms.writeJournal",
+      { "writeJournal", "mms.writeJournal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "WriteJournal_Response", HFILL }},
     { &hf_mms_initializeJournal_01,
@@ -7799,39 +7799,39 @@ void proto_register_mms(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "InitializeJournal_Response", HFILL }},
     { &hf_mms_reportJournalStatus_01,
-      { "reportJournalStatus", "mms.reportJournalStatus",
+      { "reportJournalStatus", "mms.reportJournalStatus_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReportJournalStatus_Response", HFILL }},
     { &hf_mms_createJournal_01,
-      { "createJournal", "mms.createJournal",
+      { "createJournal", "mms.createJournal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CreateJournal_Response", HFILL }},
     { &hf_mms_deleteJournal_01,
-      { "deleteJournal", "mms.deleteJournal",
+      { "deleteJournal", "mms.deleteJournal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeleteJournal_Response", HFILL }},
     { &hf_mms_getCapabilityList_01,
-      { "getCapabilityList", "mms.getCapabilityList",
+      { "getCapabilityList", "mms.getCapabilityList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetCapabilityList_Response", HFILL }},
     { &hf_mms_fileRead_01,
-      { "fileRead", "mms.fileRead",
+      { "fileRead", "mms.fileRead_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FileRead_Response", HFILL }},
     { &hf_mms_fileClose_01,
-      { "fileClose", "mms.fileClose",
+      { "fileClose", "mms.fileClose_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FileClose_Response", HFILL }},
     { &hf_mms_fileRename_01,
-      { "fileRename", "mms.fileRename",
+      { "fileRename", "mms.fileRename_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FileRename_Response", HFILL }},
     { &hf_mms_fileDelete_01,
-      { "fileDelete", "mms.fileDelete",
+      { "fileDelete", "mms.fileDelete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FileDelete_Response", HFILL }},
     { &hf_mms_fileDirectory_01,
-      { "fileDirectory", "mms.fileDirectory",
+      { "fileDirectory", "mms.fileDirectory_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FileDirectory_Response", HFILL }},
     { &hf_mms_FileName_item,
@@ -7843,7 +7843,7 @@ void proto_register_mms(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "Identifier", HFILL }},
     { &hf_mms_domain_specific,
-      { "domain-specific", "mms.domain_specific",
+      { "domain-specific", "mms.domain_specific_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_domainId,
@@ -7891,7 +7891,7 @@ void proto_register_mms(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "Integer8", HFILL }},
     { &hf_mms_mmsInitRequestDetail,
-      { "mmsInitRequestDetail", "mms.mmsInitRequestDetail",
+      { "mmsInitRequestDetail", "mms.mmsInitRequestDetail_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InitRequestDetail", HFILL }},
     { &hf_mms_proposedVersionNumber,
@@ -7923,7 +7923,7 @@ void proto_register_mms(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "Integer8", HFILL }},
     { &hf_mms_mmsInitResponseDetail,
-      { "mmsInitResponseDetail", "mms.mmsInitResponseDetail",
+      { "mmsInitResponseDetail", "mms.mmsInitResponseDetail_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InitResponseDetail", HFILL }},
     { &hf_mms_negociatedVersionNumber,
@@ -8123,7 +8123,7 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, VALS(mms_T_objectScope_vals), 0,
         NULL, HFILL }},
     { &hf_mms_vmdSpecific,
-      { "vmdSpecific", "mms.vmdSpecific",
+      { "vmdSpecific", "mms.vmdSpecific_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_domainSpecific,
@@ -8131,7 +8131,7 @@ void proto_register_mms(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "Identifier", HFILL }},
     { &hf_mms_aaSpecific,
-      { "aaSpecific", "mms.aaSpecific",
+      { "aaSpecific", "mms.aaSpecific_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_continueAfter,
@@ -8219,11 +8219,11 @@ void proto_register_mms(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_mms_coded,
-      { "coded", "mms.coded",
+      { "coded", "mms.coded_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EXTERNALt", HFILL }},
     { &hf_mms_discard,
-      { "discard", "mms.discard",
+      { "discard", "mms.discard_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ServiceError", HFILL }},
     { &hf_mms_ulsmID,
@@ -8251,7 +8251,7 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_listOfCapabilities_04", HFILL }},
     { &hf_mms_thirdParty,
-      { "thirdParty", "mms.thirdParty",
+      { "thirdParty", "mms.thirdParty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ApplicationReference", HFILL }},
     { &hf_mms_filenName,
@@ -8311,7 +8311,7 @@ void proto_register_mms(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "VisibleString", HFILL }},
     { &hf_mms_encodedString,
-      { "encodedString", "mms.encodedString",
+      { "encodedString", "mms.encodedString_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EXTERNALt", HFILL }},
     { &hf_mms_executionArgument_01,
@@ -8347,7 +8347,7 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, VALS(mms_ObjectName_vals), 0,
         "ObjectName", HFILL }},
     { &hf_mms_array,
-      { "array", "mms.array",
+      { "array", "mms.array_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_packed,
@@ -8363,7 +8363,7 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, VALS(mms_TypeSpecification_vals), 0,
         "TypeSpecification", HFILL }},
     { &hf_mms_structure,
-      { "structure", "mms.structure",
+      { "structure", "mms.structure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_components,
@@ -8371,7 +8371,7 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_components_item,
-      { "components item", "mms.components_item",
+      { "components item", "mms.components_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_componentName,
@@ -8383,7 +8383,7 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, VALS(mms_TypeSpecification_vals), 0,
         "TypeSpecification", HFILL }},
     { &hf_mms_boolean,
-      { "boolean", "mms.boolean",
+      { "boolean", "mms.boolean_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_bit_string,
@@ -8407,7 +8407,7 @@ void proto_register_mms(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "Integer32", HFILL }},
     { &hf_mms_generalized_time,
-      { "generalized-time", "mms.generalized_time",
+      { "generalized-time", "mms.generalized_time_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_binary_time,
@@ -8419,7 +8419,7 @@ void proto_register_mms(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "Unsigned8", HFILL }},
     { &hf_mms_objId,
-      { "objId", "mms.objId",
+      { "objId", "mms.objId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_AlternateAccess_item,
@@ -8431,7 +8431,7 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, VALS(mms_AlternateAccessSelection_vals), 0,
         "AlternateAccessSelection", HFILL }},
     { &hf_mms_named,
-      { "named", "mms.named",
+      { "named", "mms.named_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_accesst,
@@ -8439,7 +8439,7 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, VALS(mms_AlternateAccessSelection_vals), 0,
         "AlternateAccessSelection", HFILL }},
     { &hf_mms_selectAlternateAccess,
-      { "selectAlternateAccess", "mms.selectAlternateAccess",
+      { "selectAlternateAccess", "mms.selectAlternateAccess_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_accessSelection,
@@ -8455,7 +8455,7 @@ void proto_register_mms(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "Unsigned32", HFILL }},
     { &hf_mms_indexRange,
-      { "indexRange", "mms.indexRange",
+      { "indexRange", "mms.indexRange_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_lowIndex,
@@ -8463,7 +8463,7 @@ void proto_register_mms(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "Unsigned32", HFILL }},
     { &hf_mms_allElements,
-      { "allElements", "mms.allElements",
+      { "allElements", "mms.allElements_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_alternateAccess,
@@ -8475,7 +8475,7 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, VALS(mms_T_selectAccess_vals), 0,
         NULL, HFILL }},
     { &hf_mms_indexRange_01,
-      { "indexRange", "mms.indexRange",
+      { "indexRange", "mms.indexRange_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_indexRange_01", HFILL }},
     { &hf_mms_nmberOfElements,
@@ -8515,7 +8515,7 @@ void proto_register_mms(void) {
         FT_INT32, BASE_DEC, VALS(mms_DataAccessError_vals), 0,
         "DataAccessError", HFILL }},
     { &hf_mms_success,
-      { "success", "mms.success",
+      { "success", "mms.success_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_variableAccessSpecification,
@@ -8575,7 +8575,7 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_listOfVariable_item,
-      { "listOfVariable item", "mms.listOfVariable_item",
+      { "listOfVariable item", "mms.listOfVariable_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_variableSpecification,
@@ -8587,7 +8587,7 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_listOfVariable_01", HFILL }},
     { &hf_mms_listOfVariable_item_01,
-      { "listOfVariable item", "mms.listOfVariable_item",
+      { "listOfVariable item", "mms.listOfVariable_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_listOfVariable_item_01", HFILL }},
     { &hf_mms_scopeOfDelete_01,
@@ -8691,19 +8691,19 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_listOfVariable_02", HFILL }},
     { &hf_mms_listOfVariable_item_02,
-      { "listOfVariable item", "mms.listOfVariable_item",
+      { "listOfVariable item", "mms.listOfVariable_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_listOfVariable_item_02", HFILL }},
     { &hf_mms_ScatteredAccessDescription_item,
-      { "ScatteredAccessDescription item", "mms.ScatteredAccessDescription_item",
+      { "ScatteredAccessDescription item", "mms.ScatteredAccessDescription_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_variableDescription,
-      { "variableDescription", "mms.variableDescription",
+      { "variableDescription", "mms.variableDescription_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_invalidated,
-      { "invalidated", "mms.invalidated",
+      { "invalidated", "mms.invalidated_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_numericAddress,
@@ -8747,11 +8747,11 @@ void proto_register_mms(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_mms_applicationToPreempt,
-      { "applicationToPreempt", "mms.applicationToPreempt",
+      { "applicationToPreempt", "mms.applicationToPreempt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ApplicationReference", HFILL }},
     { &hf_mms_noResult,
-      { "noResult", "mms.noResult",
+      { "noResult", "mms.noResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_numbersOfTokens,
@@ -8811,7 +8811,7 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_SemaphoreEntry", HFILL }},
     { &hf_mms_listOfSemaphoreEntry_item,
-      { "SemaphoreEntry", "mms.SemaphoreEntry",
+      { "SemaphoreEntry", "mms.SemaphoreEntry_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_entryId,
@@ -8823,7 +8823,7 @@ void proto_register_mms(void) {
         FT_INT32, BASE_DEC, VALS(mms_T_entryClass_vals), 0,
         NULL, HFILL }},
     { &hf_mms_applicationReference,
-      { "applicationReference", "mms.applicationReference",
+      { "applicationReference", "mms.applicationReference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_remainingTimeOut,
@@ -8895,7 +8895,7 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, VALS(mms_ObjectName_vals), 0,
         NULL, HFILL }},
     { &hf_mms_aa_specific_01,
-      { "aa-specific", "mms.aa_specific",
+      { "aa-specific", "mms.aa_specific_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_domain,
@@ -8903,7 +8903,7 @@ void proto_register_mms(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "Identifier", HFILL }},
     { &hf_mms_vmd,
-      { "vmd", "mms.vmd",
+      { "vmd", "mms.vmd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_monitoredVariable_01,
@@ -8915,7 +8915,7 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, VALS(mms_VariableSpecification_vals), 0,
         "VariableSpecification", HFILL }},
     { &hf_mms_undefined,
-      { "undefined", "mms.undefined",
+      { "undefined", "mms.undefined_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_currentState,
@@ -8955,7 +8955,7 @@ void proto_register_mms(void) {
         FT_INT32, BASE_DEC, VALS(mms_AlarmAckRule_vals), 0,
         "AlarmAckRule", HFILL }},
     { &hf_mms_clientApplication,
-      { "clientApplication", "mms.clientApplication",
+      { "clientApplication", "mms.clientApplication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ApplicationReference", HFILL }},
     { &hf_mms_ec,
@@ -9015,7 +9015,7 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_EventEnrollment", HFILL }},
     { &hf_mms_listOfEventEnrollment_item,
-      { "EventEnrollment", "mms.EventEnrollment",
+      { "EventEnrollment", "mms.EventEnrollment_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_eventConditionTransitions,
@@ -9067,7 +9067,7 @@ void proto_register_mms(void) {
         FT_INT32, BASE_DEC, VALS(mms_T_acknowledgmentFilter_vals), 0,
         NULL, HFILL }},
     { &hf_mms_severityFilter,
-      { "severityFilter", "mms.severityFilter",
+      { "severityFilter", "mms.severityFilter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_mostSevere,
@@ -9083,7 +9083,7 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_AlarmSummary", HFILL }},
     { &hf_mms_listOfAlarmSummary_item,
-      { "AlarmSummary", "mms.AlarmSummary",
+      { "AlarmSummary", "mms.AlarmSummary_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_unacknowledgedState,
@@ -9095,7 +9095,7 @@ void proto_register_mms(void) {
         FT_INT32, BASE_DEC, VALS(mms_T_acknowledgmentFilter_01_vals), 0,
         "T_acknowledgmentFilter_01", HFILL }},
     { &hf_mms_severityFilter_01,
-      { "severityFilter", "mms.severityFilter",
+      { "severityFilter", "mms.severityFilter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_severityFilter_01", HFILL }},
     { &hf_mms_listOfAlarmEnrollmentSummary,
@@ -9103,7 +9103,7 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_AlarmEnrollmentSummary", HFILL }},
     { &hf_mms_listOfAlarmEnrollmentSummary_item,
-      { "AlarmEnrollmentSummary", "mms.AlarmEnrollmentSummary",
+      { "AlarmEnrollmentSummary", "mms.AlarmEnrollmentSummary_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_enrollementState,
@@ -9123,7 +9123,7 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, VALS(mms_T_eventConditionName_01_vals), 0,
         "T_eventConditionName_01", HFILL }},
     { &hf_mms_actionResult,
-      { "actionResult", "mms.actionResult",
+      { "actionResult", "mms.actionResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_eventActioName,
@@ -9139,7 +9139,7 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, VALS(mms_ConfirmedServiceResponse_vals), 0,
         "ConfirmedServiceResponse", HFILL }},
     { &hf_mms_failure_01,
-      { "failure", "mms.failure",
+      { "failure", "mms.failure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ServiceError", HFILL }},
     { &hf_mms_causingTransitions,
@@ -9191,7 +9191,7 @@ void proto_register_mms(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "VisibleString", HFILL }},
     { &hf_mms_entryToStartAfter,
-      { "entryToStartAfter", "mms.entryToStartAfter",
+      { "entryToStartAfter", "mms.entryToStartAfter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_timeSpecification,
@@ -9207,7 +9207,7 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_JournalEntry", HFILL }},
     { &hf_mms_listOfJournalEntry_item,
-      { "JournalEntry", "mms.JournalEntry",
+      { "JournalEntry", "mms.JournalEntry_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_entryIdentifier,
@@ -9215,11 +9215,11 @@ void proto_register_mms(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_mms_originatingApplication,
-      { "originatingApplication", "mms.originatingApplication",
+      { "originatingApplication", "mms.originatingApplication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ApplicationReference", HFILL }},
     { &hf_mms_entryContent,
-      { "entryContent", "mms.entryContent",
+      { "entryContent", "mms.entryContent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_listOfJournalEntry_01,
@@ -9227,11 +9227,11 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_EntryContent", HFILL }},
     { &hf_mms_listOfJournalEntry_item_01,
-      { "EntryContent", "mms.EntryContent",
+      { "EntryContent", "mms.EntryContent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_limitSpecification,
-      { "limitSpecification", "mms.limitSpecification",
+      { "limitSpecification", "mms.limitSpecification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_limitingTime,
@@ -9251,7 +9251,7 @@ void proto_register_mms(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "TimeOfDay", HFILL }},
     { &hf_mms_additionalDetail,
-      { "additionalDetail", "mms.additionalDetail",
+      { "additionalDetail", "mms.additionalDetail_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "JOU_Additional_Detail", HFILL }},
     { &hf_mms_entryForm,
@@ -9259,11 +9259,11 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, VALS(mms_T_entryForm_vals), 0,
         NULL, HFILL }},
     { &hf_mms_data,
-      { "data", "mms.data",
+      { "data", "mms.data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_event,
-      { "event", "mms.event",
+      { "event", "mms.event_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_listOfVariables_01,
@@ -9271,7 +9271,7 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_listOfVariables_01", HFILL }},
     { &hf_mms_listOfVariables_item_01,
-      { "listOfVariables item", "mms.listOfVariables_item",
+      { "listOfVariables item", "mms.listOfVariables_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_variableTag,
@@ -9287,7 +9287,7 @@ void proto_register_mms(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "VisibleString", HFILL }},
     { &hf_mms_sourceFileServer,
-      { "sourceFileServer", "mms.sourceFileServer",
+      { "sourceFileServer", "mms.sourceFileServer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ApplicationReference", HFILL }},
     { &hf_mms_sourceFile,
@@ -9307,7 +9307,7 @@ void proto_register_mms(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "Integer32", HFILL }},
     { &hf_mms_fileAttributes,
-      { "fileAttributes", "mms.fileAttributes",
+      { "fileAttributes", "mms.fileAttributes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_fileData,
@@ -9335,7 +9335,7 @@ void proto_register_mms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_DirectoryEntry", HFILL }},
     { &hf_mms_listOfDirectoryEntry_item,
-      { "DirectoryEntry", "mms.DirectoryEntry",
+      { "DirectoryEntry", "mms.DirectoryEntry_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_mms_filename,
diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c
index 088cbff2c1..2ca7bfabf9 100644
--- a/epan/dissectors/packet-nbap.c
+++ b/epan/dissectors/packet-nbap.c
@@ -55332,7 +55332,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_EDCH_Setup_Info_PDU,
-      { "Additional-EDCH-Setup-Info", "nbap.Additional_EDCH_Setup_Info",
+      { "Additional-EDCH-Setup-Info", "nbap.Additional_EDCH_Setup_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_EDCH_Cell_Information_Response_List_PDU,
@@ -55356,7 +55356,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Active_Pattern_Sequence_Information_PDU,
-      { "Active-Pattern-Sequence-Information", "nbap.Active_Pattern_Sequence_Information",
+      { "Active-Pattern-Sequence-Information", "nbap.Active_Pattern_Sequence_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_AlternativeFormatReportingIndicator_PDU,
@@ -55364,7 +55364,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_AlternativeFormatReportingIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_Angle_Of_Arrival_Value_LCR_PDU,
-      { "Angle-Of-Arrival-Value-LCR", "nbap.Angle_Of_Arrival_Value_LCR",
+      { "Angle-Of-Arrival-Value-LCR", "nbap.Angle_Of_Arrival_Value_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_BCCH_ModificationTime_PDU,
@@ -55388,7 +55388,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_BlockingPriorityIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_BroadcastCommonTransportBearerIndication_PDU,
-      { "BroadcastCommonTransportBearerIndication", "nbap.BroadcastCommonTransportBearerIndication",
+      { "BroadcastCommonTransportBearerIndication", "nbap.BroadcastCommonTransportBearerIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_BroadcastReference_PDU,
@@ -55440,11 +55440,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_Common_E_DCH_HSDPCCH_Capability_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_Common_EDCH_System_InformationFDD_PDU,
-      { "Common-EDCH-System-InformationFDD", "nbap.Common_EDCH_System_InformationFDD",
+      { "Common-EDCH-System-InformationFDD", "nbap.Common_EDCH_System_InformationFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Common_EDCH_System_Information_ResponseFDD_PDU,
-      { "Common-EDCH-System-Information-ResponseFDD", "nbap.Common_EDCH_System_Information_ResponseFDD",
+      { "Common-EDCH-System-Information-ResponseFDD", "nbap.Common_EDCH_System_Information_ResponseFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_RNTI_List_PDU,
@@ -55472,19 +55472,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Common_PhysicalChannel_Status_Information_PDU,
-      { "Common-PhysicalChannel-Status-Information", "nbap.Common_PhysicalChannel_Status_Information",
+      { "Common-PhysicalChannel-Status-Information", "nbap.Common_PhysicalChannel_Status_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Common_PhysicalChannel_Status_Information768_PDU,
-      { "Common-PhysicalChannel-Status-Information768", "nbap.Common_PhysicalChannel_Status_Information768",
+      { "Common-PhysicalChannel-Status-Information768", "nbap.Common_PhysicalChannel_Status_Information768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonTransportChannel_InformationResponse_PDU,
-      { "CommonTransportChannel-InformationResponse", "nbap.CommonTransportChannel_InformationResponse",
+      { "CommonTransportChannel-InformationResponse", "nbap.CommonTransportChannel_InformationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Common_TransportChannel_Status_Information_PDU,
-      { "Common-TransportChannel-Status-Information", "nbap.Common_TransportChannel_Status_Information",
+      { "Common-TransportChannel-Status-Information", "nbap.Common_TransportChannel_Status_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommunicationControlPortID_PDU,
@@ -55508,7 +55508,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_ContinuousPacketConnectivityDTX_DRX_Capability_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_ContinuousPacketConnectivityDTX_DRX_Information_PDU,
-      { "ContinuousPacketConnectivityDTX-DRX-Information", "nbap.ContinuousPacketConnectivityDTX_DRX_Information",
+      { "ContinuousPacketConnectivityDTX-DRX-Information", "nbap.ContinuousPacketConnectivityDTX_DRX_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ContinuousPacketConnectivityHS_SCCH_less_Capability_PDU,
@@ -55520,7 +55520,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ContinuousPacketConnectivityHS_SCCH_less_Information_Response_PDU,
-      { "ContinuousPacketConnectivityHS-SCCH-less-Information-Response", "nbap.ContinuousPacketConnectivityHS_SCCH_less_Information_Response",
+      { "ContinuousPacketConnectivityHS-SCCH-less-Information-Response", "nbap.ContinuousPacketConnectivityHS_SCCH_less_Information_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ControlGAP_PDU,
@@ -55528,15 +55528,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CPC_Information_PDU,
-      { "CPC-Information", "nbap.CPC_Information",
+      { "CPC-Information", "nbap.CPC_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ContinuousPacketConnectivityHS_SCCH_less_Deactivate_Indicator_PDU,
-      { "ContinuousPacketConnectivityHS-SCCH-less-Deactivate-Indicator", "nbap.ContinuousPacketConnectivityHS_SCCH_less_Deactivate_Indicator",
+      { "ContinuousPacketConnectivityHS-SCCH-less-Deactivate-Indicator", "nbap.ContinuousPacketConnectivityHS_SCCH_less_Deactivate_Indicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CriticalityDiagnostics_PDU,
-      { "CriticalityDiagnostics", "nbap.CriticalityDiagnostics",
+      { "CriticalityDiagnostics", "nbap.CriticalityDiagnostics_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CRNC_CommunicationContextID_PDU,
@@ -55552,11 +55552,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Common_EDCH_System_InformationLCR_PDU,
-      { "Common-EDCH-System-InformationLCR", "nbap.Common_EDCH_System_InformationLCR",
+      { "Common-EDCH-System-InformationLCR", "nbap.Common_EDCH_System_InformationLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Common_EDCH_System_Information_ResponseLCR_PDU,
-      { "Common-EDCH-System-Information-ResponseLCR", "nbap.Common_EDCH_System_Information_ResponseLCR",
+      { "Common-EDCH-System-Information-ResponseLCR", "nbap.Common_EDCH_System_Information_ResponseLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Ul_common_E_DCH_MACflow_Specific_InfoResponseListLCR_Ext_PDU,
@@ -55568,7 +55568,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CPC_InformationLCR_PDU,
-      { "CPC-InformationLCR", "nbap.CPC_InformationLCR",
+      { "CPC-InformationLCR", "nbap.CPC_InformationLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ContinuousPacketConnectivity_DRX_CapabilityLCR_PDU,
@@ -55576,7 +55576,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_ContinuousPacketConnectivity_DRX_CapabilityLCR_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_ContinuousPacketConnectivity_DRX_InformationLCR_PDU,
-      { "ContinuousPacketConnectivity-DRX-InformationLCR", "nbap.ContinuousPacketConnectivity_DRX_InformationLCR",
+      { "ContinuousPacketConnectivity-DRX-InformationLCR", "nbap.ContinuousPacketConnectivity_DRX_InformationLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_AGCH_UE_Inactivity_Monitor_Threshold_PDU,
@@ -55584,7 +55584,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &nbap_E_AGCH_UE_Inactivity_Monitor_Threshold_vals_ext, 0,
         NULL, HFILL }},
     { &hf_nbap_ContinuousPacketConnectivity_DRX_Information_ResponseLCR_PDU,
-      { "ContinuousPacketConnectivity-DRX-Information-ResponseLCR", "nbap.ContinuousPacketConnectivity_DRX_Information_ResponseLCR",
+      { "ContinuousPacketConnectivity-DRX-Information-ResponseLCR", "nbap.ContinuousPacketConnectivity_DRX_Information_ResponseLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DCH_FDD_Information_PDU,
@@ -55624,11 +55624,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_DelayedActivation_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_DGANSS_Corrections_Req_PDU,
-      { "DGANSS-Corrections-Req", "nbap.DGANSS_Corrections_Req",
+      { "DGANSS-Corrections-Req", "nbap.DGANSS_Corrections_Req_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DGNSS_ValidityPeriod_PDU,
-      { "DGNSS-ValidityPeriod", "nbap.DGNSS_ValidityPeriod",
+      { "DGNSS-ValidityPeriod", "nbap.DGNSS_ValidityPeriod_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DiversityMode_PDU,
@@ -55644,7 +55644,7 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_PowerBalancing_Information_PDU,
-      { "DL-PowerBalancing-Information", "nbap.DL_PowerBalancing_Information",
+      { "DL-PowerBalancing-Information", "nbap.DL_PowerBalancing_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_PowerBalancing_ActivationIndicator_PDU,
@@ -55696,7 +55696,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Dual_Band_Capability_Info_PDU,
-      { "Dual-Band-Capability-Info", "nbap.Dual_Band_Capability_Info",
+      { "Dual-Band-Capability-Info", "nbap.Dual_Band_Capability_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DwPCH_Power_PDU,
@@ -55720,11 +55720,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_E_DCH_Capability_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCHCapacityConsumptionLaw_PDU,
-      { "E-DCHCapacityConsumptionLaw", "nbap.E_DCHCapacityConsumptionLaw",
+      { "E-DCHCapacityConsumptionLaw", "nbap.E_DCHCapacityConsumptionLaw_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_TDD_CapacityConsumptionLaw_PDU,
-      { "E-DCH-TDD-CapacityConsumptionLaw", "nbap.E_DCH_TDD_CapacityConsumptionLaw",
+      { "E-DCH-TDD-CapacityConsumptionLaw", "nbap.E_DCH_TDD_CapacityConsumptionLaw_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_TTI2ms_Capability_PDU,
@@ -55740,23 +55740,23 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_E_DCH_HARQ_Combining_Capability_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_FDD_DL_Control_Channel_Information_PDU,
-      { "E-DCH-FDD-DL-Control-Channel-Information", "nbap.E_DCH_FDD_DL_Control_Channel_Information",
+      { "E-DCH-FDD-DL-Control-Channel-Information", "nbap.E_DCH_FDD_DL_Control_Channel_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_FDD_Information_PDU,
-      { "E-DCH-FDD-Information", "nbap.E_DCH_FDD_Information",
+      { "E-DCH-FDD-Information", "nbap.E_DCH_FDD_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_FDD_Information_Response_PDU,
-      { "E-DCH-FDD-Information-Response", "nbap.E_DCH_FDD_Information_Response",
+      { "E-DCH-FDD-Information-Response", "nbap.E_DCH_FDD_Information_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_FDD_Information_to_Modify_PDU,
-      { "E-DCH-FDD-Information-to-Modify", "nbap.E_DCH_FDD_Information_to_Modify",
+      { "E-DCH-FDD-Information-to-Modify", "nbap.E_DCH_FDD_Information_to_Modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_FDD_Update_Information_PDU,
-      { "E-DCH-FDD-Update-Information", "nbap.E_DCH_FDD_Update_Information",
+      { "E-DCH-FDD-Update-Information", "nbap.E_DCH_FDD_Update_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_DL_Control_Channel_Change_Information_PDU,
@@ -55780,7 +55780,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_E_DCH_MACdPDUSizeFormat_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_MACdFlows_Information_PDU,
-      { "E-DCH-MACdFlows-Information", "nbap.E_DCH_MACdFlows_Information",
+      { "E-DCH-MACdFlows-Information", "nbap.E_DCH_MACdFlows_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_MACdFlows_to_Delete_PDU,
@@ -55804,7 +55804,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_E_DCH_RL_Indication_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_Serving_Cell_Change_Info_Response_PDU,
-      { "E-DCH-Serving-Cell-Change-Info-Response", "nbap.E_DCH_Serving_Cell_Change_Info_Response",
+      { "E-DCH-Serving-Cell-Change-Info-Response", "nbap.E_DCH_Serving_Cell_Change_Info_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_EDCH_RACH_Report_Value_PDU,
@@ -55820,7 +55820,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Enhanced_UE_DRX_InformationLCR_PDU,
-      { "Enhanced-UE-DRX-InformationLCR", "nbap.Enhanced_UE_DRX_InformationLCR",
+      { "Enhanced-UE-DRX-InformationLCR", "nbap.Enhanced_UE_DRX_InformationLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_End_Of_Audit_Sequence_Indicator_PDU,
@@ -55836,7 +55836,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_TFCI_Boost_Information_PDU,
-      { "E-TFCI-Boost-Information", "nbap.E_TFCI_Boost_Information",
+      { "E-TFCI-Boost-Information", "nbap.E_TFCI_Boost_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCHProvidedBitRate_PDU,
@@ -55856,7 +55856,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_Information_PDU,
-      { "E-DCH-Information", "nbap.E_DCH_Information",
+      { "E-DCH-Information", "nbap.E_DCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_MACdFlow_Retransmission_Timer_PDU,
@@ -55864,11 +55864,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &nbap_E_DCH_MACdFlow_Retransmission_Timer_vals_ext, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_Information_Response_PDU,
-      { "E-DCH-Information-Response", "nbap.E_DCH_Information_Response",
+      { "E-DCH-Information-Response", "nbap.E_DCH_Information_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_Information_Reconfig_PDU,
-      { "E-DCH-Information-Reconfig", "nbap.E_DCH_Information_Reconfig",
+      { "E-DCH-Information-Reconfig", "nbap.E_DCH_Information_Reconfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Maximum_Generated_ReceivedTotalWideBandPowerInOtherCells_PDU,
@@ -55876,19 +55876,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_768_Information_PDU,
-      { "E-DCH-768-Information", "nbap.E_DCH_768_Information",
+      { "E-DCH-768-Information", "nbap.E_DCH_768_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_768_Information_Reconfig_PDU,
-      { "E-DCH-768-Information-Reconfig", "nbap.E_DCH_768_Information_Reconfig",
+      { "E-DCH-768-Information-Reconfig", "nbap.E_DCH_768_Information_Reconfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_LCR_Information_PDU,
-      { "E-DCH-LCR-Information", "nbap.E_DCH_LCR_Information",
+      { "E-DCH-LCR-Information", "nbap.E_DCH_LCR_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_LCR_Information_Reconfig_PDU,
-      { "E-DCH-LCR-Information-Reconfig", "nbap.E_DCH_LCR_Information_Reconfig",
+      { "E-DCH-LCR-Information-Reconfig", "nbap.E_DCH_LCR_Information_Reconfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DormantModeIndicator_PDU,
@@ -55912,7 +55912,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_Enhanced_UE_DRX_Capability_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_Enhanced_UE_DRX_InformationFDD_PDU,
-      { "Enhanced-UE-DRX-InformationFDD", "nbap.Enhanced_UE_DRX_InformationFDD",
+      { "Enhanced-UE-DRX-InformationFDD", "nbap.Enhanced_UE_DRX_InformationFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Extended_E_DCH_LCRTDD_PhysicalLayerCategory_PDU,
@@ -55952,11 +55952,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_Semi_PersistentScheduling_Information_LCR_PDU,
-      { "E-DCH-Semi-PersistentScheduling-Information-LCR", "nbap.E_DCH_Semi_PersistentScheduling_Information_LCR",
+      { "E-DCH-Semi-PersistentScheduling-Information-LCR", "nbap.E_DCH_Semi_PersistentScheduling_Information_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_Semi_PersistentScheduling_Information_ResponseLCR_PDU,
-      { "E-DCH-Semi-PersistentScheduling-Information-ResponseLCR", "nbap.E_DCH_Semi_PersistentScheduling_Information_ResponseLCR",
+      { "E-DCH-Semi-PersistentScheduling-Information-ResponseLCR", "nbap.E_DCH_Semi_PersistentScheduling_Information_ResponseLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Fast_Reconfiguration_Mode_PDU,
@@ -56000,11 +56000,11 @@ void proto_register_nbap(void)
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_GANSS_Additional_Ionospheric_Model_PDU,
-      { "GANSS-Additional-Ionospheric-Model", "nbap.GANSS_Additional_Ionospheric_Model",
+      { "GANSS-Additional-Ionospheric-Model", "nbap.GANSS_Additional_Ionospheric_Model_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_GANSS_Additional_Navigation_Models_PDU,
-      { "GANSS-Additional-Navigation-Models", "nbap.GANSS_Additional_Navigation_Models",
+      { "GANSS-Additional-Navigation-Models", "nbap.GANSS_Additional_Navigation_Models_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_GANSS_Additional_Time_Models_PDU,
@@ -56016,23 +56016,23 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_GANSS_Additional_UTC_Models_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_GANSS_ALM_ECEFsbasAlmanacSet_PDU,
-      { "GANSS-ALM-ECEFsbasAlmanacSet", "nbap.GANSS_ALM_ECEFsbasAlmanacSet",
+      { "GANSS-ALM-ECEFsbasAlmanacSet", "nbap.GANSS_ALM_ECEFsbasAlmanacSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_GANSS_ALM_GlonassAlmanacSet_PDU,
-      { "GANSS-ALM-GlonassAlmanacSet", "nbap.GANSS_ALM_GlonassAlmanacSet",
+      { "GANSS-ALM-GlonassAlmanacSet", "nbap.GANSS_ALM_GlonassAlmanacSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_GANSS_ALM_MidiAlmanacSet_PDU,
-      { "GANSS-ALM-MidiAlmanacSet", "nbap.GANSS_ALM_MidiAlmanacSet",
+      { "GANSS-ALM-MidiAlmanacSet", "nbap.GANSS_ALM_MidiAlmanacSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_GANSS_ALM_NAVKeplerianSet_PDU,
-      { "GANSS-ALM-NAVKeplerianSet", "nbap.GANSS_ALM_NAVKeplerianSet",
+      { "GANSS-ALM-NAVKeplerianSet", "nbap.GANSS_ALM_NAVKeplerianSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_GANSS_ALM_ReducedKeplerianSet_PDU,
-      { "GANSS-ALM-ReducedKeplerianSet", "nbap.GANSS_ALM_ReducedKeplerianSet",
+      { "GANSS-ALM-ReducedKeplerianSet", "nbap.GANSS_ALM_ReducedKeplerianSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_GANSS_Auxiliary_Information_PDU,
@@ -56044,11 +56044,11 @@ void proto_register_nbap(void)
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_GANSS_Common_Data_PDU,
-      { "GANSS-Common-Data", "nbap.GANSS_Common_Data",
+      { "GANSS-Common-Data", "nbap.GANSS_Common_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_GANSS_Earth_Orientation_Parameters_PDU,
-      { "GANSS-Earth-Orientation-Parameters", "nbap.GANSS_Earth_Orientation_Parameters",
+      { "GANSS-Earth-Orientation-Parameters", "nbap.GANSS_Earth_Orientation_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_GANSS_EarthOrientParaReq_PDU,
@@ -56064,7 +56064,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_GANSS_Information_PDU,
-      { "GANSS-Information", "nbap.GANSS_Information",
+      { "GANSS-Information", "nbap.GANSS_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_GANSS_SBAS_ID_PDU,
@@ -56120,23 +56120,23 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSDSCH_Common_System_InformationFDD_PDU,
-      { "HSDSCH-Common-System-InformationFDD", "nbap.HSDSCH_Common_System_InformationFDD",
+      { "HSDSCH-Common-System-InformationFDD", "nbap.HSDSCH_Common_System_InformationFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSDSCH_Common_System_Information_ResponseFDD_PDU,
-      { "HSDSCH-Common-System-Information-ResponseFDD", "nbap.HSDSCH_Common_System_Information_ResponseFDD",
+      { "HSDSCH-Common-System-Information-ResponseFDD", "nbap.HSDSCH_Common_System_Information_ResponseFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSDSCH_FDD_Information_PDU,
-      { "HSDSCH-FDD-Information", "nbap.HSDSCH_FDD_Information",
+      { "HSDSCH-FDD-Information", "nbap.HSDSCH_FDD_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSDSCH_TDD_Information_PDU,
-      { "HSDSCH-TDD-Information", "nbap.HSDSCH_TDD_Information",
+      { "HSDSCH-TDD-Information", "nbap.HSDSCH_TDD_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSDSCH_Information_to_Modify_PDU,
-      { "HSDSCH-Information-to-Modify", "nbap.HSDSCH_Information_to_Modify",
+      { "HSDSCH-Information-to-Modify", "nbap.HSDSCH_Information_to_Modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSDSCH_MACdPDUSizeFormat_PDU,
@@ -56148,15 +56148,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_HSDSCH_MACdPDU_SizeCapability_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_HSDSCH_Information_to_Modify_Unsynchronised_PDU,
-      { "HSDSCH-Information-to-Modify-Unsynchronised", "nbap.HSDSCH_Information_to_Modify_Unsynchronised",
+      { "HSDSCH-Information-to-Modify-Unsynchronised", "nbap.HSDSCH_Information_to_Modify_Unsynchronised_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSDSCH_FDD_Information_Response_PDU,
-      { "HSDSCH-FDD-Information-Response", "nbap.HSDSCH_FDD_Information_Response",
+      { "HSDSCH-FDD-Information-Response", "nbap.HSDSCH_FDD_Information_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSDSCH_Paging_System_InformationFDD_PDU,
-      { "HSDSCH-Paging-System-InformationFDD", "nbap.HSDSCH_Paging_System_InformationFDD",
+      { "HSDSCH-Paging-System-InformationFDD", "nbap.HSDSCH_Paging_System_InformationFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSDSCH_Paging_System_Information_ResponseFDD_PDU,
@@ -56164,11 +56164,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSDSCH_TDD_Information_Response_PDU,
-      { "HSDSCH-TDD-Information-Response", "nbap.HSDSCH_TDD_Information_Response",
+      { "HSDSCH-TDD-Information-Response", "nbap.HSDSCH_TDD_Information_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSDSCH_MACdFlows_Information_PDU,
-      { "HSDSCH-MACdFlows-Information", "nbap.HSDSCH_MACdFlows_Information",
+      { "HSDSCH-MACdFlows-Information", "nbap.HSDSCH_MACdFlows_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSDSCH_MACdFlows_to_Delete_PDU,
@@ -56180,7 +56180,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_HSDSCH_TBSizeTableIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_HSDSCH_PreconfigurationInfo_PDU,
-      { "HSDSCH-PreconfigurationInfo", "nbap.HSDSCH_PreconfigurationInfo",
+      { "HSDSCH-PreconfigurationInfo", "nbap.HSDSCH_PreconfigurationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_EDCH_Preconfiguration_Information_PDU,
@@ -56188,7 +56188,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSDSCH_PreconfigurationSetup_PDU,
-      { "HSDSCH-PreconfigurationSetup", "nbap.HSDSCH_PreconfigurationSetup",
+      { "HSDSCH-PreconfigurationSetup", "nbap.HSDSCH_PreconfigurationSetup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSSCCH_Specific_InformationRespListTDD768_PDU,
@@ -56196,7 +56196,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HS_SICH_Reception_Quality_Value_PDU,
-      { "HS-SICH-Reception-Quality-Value", "nbap.HS_SICH_Reception_Quality_Value",
+      { "HS-SICH-Reception-Quality-Value", "nbap.HS_SICH_Reception_Quality_Value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HS_SICH_failed_PDU,
@@ -56220,7 +56220,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HS_PDSCH_FDD_Code_Information_PDU,
-      { "HS-PDSCH-FDD-Code-Information", "nbap.HS_PDSCH_FDD_Code_Information",
+      { "HS-PDSCH-FDD-Code-Information", "nbap.HS_PDSCH_FDD_Code_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HS_SICH_ID_PDU,
@@ -56244,31 +56244,31 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_HSDSCH_Configured_Indicator_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_HS_DSCH_Serving_Cell_Change_Info_PDU,
-      { "HS-DSCH-Serving-Cell-Change-Info", "nbap.HS_DSCH_Serving_Cell_Change_Info",
+      { "HS-DSCH-Serving-Cell-Change-Info", "nbap.HS_DSCH_Serving_Cell_Change_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HS_DSCH_Serving_Cell_Change_Info_Response_PDU,
-      { "HS-DSCH-Serving-Cell-Change-Info-Response", "nbap.HS_DSCH_Serving_Cell_Change_Info_Response",
+      { "HS-DSCH-Serving-Cell-Change-Info-Response", "nbap.HS_DSCH_Serving_Cell_Change_Info_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSDSCH_FDD_Update_Information_PDU,
-      { "HSDSCH-FDD-Update-Information", "nbap.HSDSCH_FDD_Update_Information",
+      { "HSDSCH-FDD-Update-Information", "nbap.HSDSCH_FDD_Update_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSDSCH_TDD_Update_Information_PDU,
-      { "HSDSCH-TDD-Update-Information", "nbap.HSDSCH_TDD_Update_Information",
+      { "HSDSCH-TDD-Update-Information", "nbap.HSDSCH_TDD_Update_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSDSCH_Common_System_InformationLCR_PDU,
-      { "HSDSCH-Common-System-InformationLCR", "nbap.HSDSCH_Common_System_InformationLCR",
+      { "HSDSCH-Common-System-InformationLCR", "nbap.HSDSCH_Common_System_InformationLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSDSCH_Common_System_Information_ResponseLCR_PDU,
-      { "HSDSCH-Common-System-Information-ResponseLCR", "nbap.HSDSCH_Common_System_Information_ResponseLCR",
+      { "HSDSCH-Common-System-Information-ResponseLCR", "nbap.HSDSCH_Common_System_Information_ResponseLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSDSCH_Paging_System_InformationLCR_PDU,
-      { "HSDSCH-Paging-System-InformationLCR", "nbap.HSDSCH_Paging_System_InformationLCR",
+      { "HSDSCH-Paging-System-InformationLCR", "nbap.HSDSCH_Paging_System_InformationLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSDSCH_Paging_System_Information_ResponseLCR_PDU,
@@ -56276,7 +56276,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HS_DSCH_Semi_PersistentScheduling_Information_LCR_PDU,
-      { "HS-DSCH-Semi-PersistentScheduling-Information-LCR", "nbap.HS_DSCH_Semi_PersistentScheduling_Information_LCR",
+      { "HS-DSCH-Semi-PersistentScheduling-Information-LCR", "nbap.HS_DSCH_Semi_PersistentScheduling_Information_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RepetitionPeriodIndex_PDU,
@@ -56292,11 +56292,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_HS_DSCH_SPS_Operation_Indicator_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_HS_DSCH_Semi_PersistentScheduling_Information_ResponseLCR_PDU,
-      { "HS-DSCH-Semi-PersistentScheduling-Information-ResponseLCR", "nbap.HS_DSCH_Semi_PersistentScheduling_Information_ResponseLCR",
+      { "HS-DSCH-Semi-PersistentScheduling-Information-ResponseLCR", "nbap.HS_DSCH_Semi_PersistentScheduling_Information_ResponseLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Add_To_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst_PDU,
-      { "Add-To-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst", "nbap.Add_To_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst",
+      { "Add-To-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst", "nbap.Add_To_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Non_HS_SCCH_Associated_HS_SICH_InformationList_Ext_PDU,
@@ -56304,7 +56304,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Modify_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst_PDU,
-      { "Modify-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst", "nbap.Modify_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst",
+      { "Modify-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst", "nbap.Modify_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Modify_Non_HS_SCCH_Associated_HS_SICH_InformationList_Ext_PDU,
@@ -56324,15 +56324,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSSICH_ReferenceSignal_InformationLCR_PDU,
-      { "HSSICH-ReferenceSignal-InformationLCR", "nbap.HSSICH_ReferenceSignal_InformationLCR",
+      { "HSSICH-ReferenceSignal-InformationLCR", "nbap.HSSICH_ReferenceSignal_InformationLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSSICH_ReferenceSignal_InformationModifyLCR_PDU,
-      { "HSSICH-ReferenceSignal-InformationModifyLCR", "nbap.HSSICH_ReferenceSignal_InformationModifyLCR",
+      { "HSSICH-ReferenceSignal-InformationModifyLCR", "nbap.HSSICH_ReferenceSignal_InformationModifyLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_IMB_Parameters_PDU,
-      { "IMB-Parameters", "nbap.IMB_Parameters",
+      { "IMB-Parameters", "nbap.IMB_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_InformationReportCharacteristics_PDU,
@@ -56344,7 +56344,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_InformationType_PDU,
-      { "InformationType", "nbap.InformationType",
+      { "InformationType", "nbap.InformationType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Initial_DL_DPCH_TimingAdjustment_Allowed_PDU,
@@ -56356,7 +56356,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_InnerLoopDLPCStatus_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_IPMulticastIndication_PDU,
-      { "IPMulticastIndication", "nbap.IPMulticastIndication",
+      { "IPMulticastIndication", "nbap.IPMulticastIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_IPMulticastDataBearerIndication_PDU,
@@ -56364,7 +56364,7 @@ void proto_register_nbap(void)
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_IdleIntervalInformation_PDU,
-      { "IdleIntervalInformation", "nbap.IdleIntervalInformation",
+      { "IdleIntervalInformation", "nbap.IdleIntervalInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Local_Cell_ID_PDU,
@@ -56372,7 +56372,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_LCRTDD_Uplink_Physical_Channel_Capability_PDU,
-      { "LCRTDD-Uplink-Physical-Channel-Capability", "nbap.LCRTDD_Uplink_Physical_Channel_Capability",
+      { "LCRTDD-Uplink-Physical-Channel-Capability", "nbap.LCRTDD_Uplink_Physical_Channel_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MAC_PDU_SizeExtended_PDU,
@@ -56412,15 +56412,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MeasurementRecoveryBehavior_PDU,
-      { "MeasurementRecoveryBehavior", "nbap.MeasurementRecoveryBehavior",
+      { "MeasurementRecoveryBehavior", "nbap.MeasurementRecoveryBehavior_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MeasurementRecoveryReportingIndicator_PDU,
-      { "MeasurementRecoveryReportingIndicator", "nbap.MeasurementRecoveryReportingIndicator",
+      { "MeasurementRecoveryReportingIndicator", "nbap.MeasurementRecoveryReportingIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MeasurementRecoverySupportIndicator_PDU,
-      { "MeasurementRecoverySupportIndicator", "nbap.MeasurementRecoverySupportIndicator",
+      { "MeasurementRecoverySupportIndicator", "nbap.MeasurementRecoverySupportIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MessageStructure_PDU,
@@ -56432,11 +56432,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MidambleShiftLCR_PDU,
-      { "MidambleShiftLCR", "nbap.MidambleShiftLCR",
+      { "MidambleShiftLCR", "nbap.MidambleShiftLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MIMO_ActivationIndicator_PDU,
-      { "MIMO-ActivationIndicator", "nbap.MIMO_ActivationIndicator",
+      { "MIMO-ActivationIndicator", "nbap.MIMO_ActivationIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MIMO_Capability_PDU,
@@ -56504,15 +56504,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Multi_Cell_Capability_Info_PDU,
-      { "Multi-Cell-Capability-Info", "nbap.Multi_Cell_Capability_Info",
+      { "Multi-Cell-Capability-Info", "nbap.Multi_Cell_Capability_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Multicell_EDCH_InformationItemIEs_PDU,
-      { "Multicell-EDCH-InformationItemIEs", "nbap.Multicell_EDCH_InformationItemIEs",
+      { "Multicell-EDCH-InformationItemIEs", "nbap.Multicell_EDCH_InformationItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Multicell_EDCH_RL_Specific_InformationItemIEs_PDU,
-      { "Multicell-EDCH-RL-Specific-InformationItemIEs", "nbap.Multicell_EDCH_RL_Specific_InformationItemIEs",
+      { "Multicell-EDCH-RL-Specific-InformationItemIEs", "nbap.Multicell_EDCH_RL_Specific_InformationItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MIMO_SFMode_For_HSPDSCHDualStream_PDU,
@@ -56532,11 +56532,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_NeighbouringTDDCellMeasurementInformationLCR_PDU,
-      { "NeighbouringTDDCellMeasurementInformationLCR", "nbap.NeighbouringTDDCellMeasurementInformationLCR",
+      { "NeighbouringTDDCellMeasurementInformationLCR", "nbap.NeighbouringTDDCellMeasurementInformationLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_NeighbouringTDDCellMeasurementInformation768_PDU,
-      { "NeighbouringTDDCellMeasurementInformation768", "nbap.NeighbouringTDDCellMeasurementInformation768",
+      { "NeighbouringTDDCellMeasurementInformation768", "nbap.NeighbouringTDDCellMeasurementInformation768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_NonCellSpecificTxDiversity_PDU,
@@ -56584,7 +56584,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_PhysicalChannelID_for_CommonERNTI_RequestedIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_PLCCHinformation_PDU,
-      { "PLCCHinformation", "nbap.PLCCHinformation",
+      { "PLCCHinformation", "nbap.PLCCHinformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PowerAdjustmentType_PDU,
@@ -56624,7 +56624,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_Specific_E_DCH_Info_PDU,
-      { "RL-Specific-E-DCH-Info", "nbap.RL_Specific_E_DCH_Info",
+      { "RL-Specific-E-DCH-Info", "nbap.RL_Specific_E_DCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Reference_ReceivedTotalWideBandPower_PDU,
@@ -56652,15 +56652,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_ReportCharacteristics_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_ReportCharacteristicsType_OnModification_PDU,
-      { "ReportCharacteristicsType-OnModification", "nbap.ReportCharacteristicsType_OnModification",
+      { "ReportCharacteristicsType-OnModification", "nbap.ReportCharacteristicsType_OnModification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_EDCH_RACH_Report_IncrDecrThres_PDU,
-      { "EDCH-RACH-Report-IncrDecrThres", "nbap.EDCH_RACH_Report_IncrDecrThres",
+      { "EDCH-RACH-Report-IncrDecrThres", "nbap.EDCH_RACH_Report_IncrDecrThres_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_EDCH_RACH_Report_ThresholdInformation_PDU,
-      { "EDCH-RACH-Report-ThresholdInformation", "nbap.EDCH_RACH_Report_ThresholdInformation",
+      { "EDCH-RACH-Report-ThresholdInformation", "nbap.EDCH_RACH_Report_ThresholdInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_ID_PDU,
@@ -56692,7 +56692,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Received_Scheduled_EDCH_Power_Share_Value_PDU,
-      { "Received-Scheduled-EDCH-Power-Share-Value", "nbap.Received_Scheduled_EDCH_Power_Share_Value",
+      { "Received-Scheduled-EDCH-Power-Share-Value", "nbap.Received_Scheduled_EDCH_Power_Share_Value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RSEPS_Value_IncrDecrThres_PDU,
@@ -56760,11 +56760,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SFNSFNMeasurementThresholdInformation_PDU,
-      { "SFNSFNMeasurementThresholdInformation", "nbap.SFNSFNMeasurementThresholdInformation",
+      { "SFNSFNMeasurementThresholdInformation", "nbap.SFNSFNMeasurementThresholdInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SFNSFNMeasurementValueInformation_PDU,
-      { "SFNSFNMeasurementValueInformation", "nbap.SFNSFNMeasurementValueInformation",
+      { "SFNSFNMeasurementValueInformation", "nbap.SFNSFNMeasurementValueInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ShutdownTimer_PDU,
@@ -56772,7 +56772,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Single_Stream_MIMO_ActivationIndicator_PDU,
-      { "Single-Stream-MIMO-ActivationIndicator", "nbap.Single_Stream_MIMO_ActivationIndicator",
+      { "Single-Stream-MIMO-ActivationIndicator", "nbap.Single_Stream_MIMO_ActivationIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Single_Stream_MIMO_Capability_PDU,
@@ -56820,7 +56820,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SynchronisationReportCharacteristics_PDU,
-      { "SynchronisationReportCharacteristics", "nbap.SynchronisationReportCharacteristics",
+      { "SynchronisationReportCharacteristics", "nbap.SynchronisationReportCharacteristics_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SyncDLCodeIdThreInfoLCR_PDU,
@@ -56960,19 +56960,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_TSN_Length_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_TUTRANGANSSMeasurementThresholdInformation_PDU,
-      { "TUTRANGANSSMeasurementThresholdInformation", "nbap.TUTRANGANSSMeasurementThresholdInformation",
+      { "TUTRANGANSSMeasurementThresholdInformation", "nbap.TUTRANGANSSMeasurementThresholdInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_TUTRANGANSSMeasurementValueInformation_PDU,
-      { "TUTRANGANSSMeasurementValueInformation", "nbap.TUTRANGANSSMeasurementValueInformation",
+      { "TUTRANGANSSMeasurementValueInformation", "nbap.TUTRANGANSSMeasurementValueInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_TUTRANGPSMeasurementThresholdInformation_PDU,
-      { "TUTRANGPSMeasurementThresholdInformation", "nbap.TUTRANGPSMeasurementThresholdInformation",
+      { "TUTRANGPSMeasurementThresholdInformation", "nbap.TUTRANGPSMeasurementThresholdInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_TUTRANGPSMeasurementValueInformation_PDU,
-      { "TUTRANGPSMeasurementValueInformation", "nbap.TUTRANGPSMeasurementValueInformation",
+      { "TUTRANGPSMeasurementValueInformation", "nbap.TUTRANGPSMeasurementValueInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_TxDiversityOnDLControlChannelsByMIMOUECapability_PDU,
@@ -56988,15 +56988,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UE_AggregateMaximumBitRate_PDU,
-      { "UE-AggregateMaximumBitRate", "nbap.UE_AggregateMaximumBitRate",
+      { "UE-AggregateMaximumBitRate", "nbap.UE_AggregateMaximumBitRate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UE_AggregateMaximumBitRate_Enforcement_Indicator_PDU,
-      { "UE-AggregateMaximumBitRate-Enforcement-Indicator", "nbap.UE_AggregateMaximumBitRate_Enforcement_Indicator",
+      { "UE-AggregateMaximumBitRate-Enforcement-Indicator", "nbap.UE_AggregateMaximumBitRate_Enforcement_Indicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UE_Capability_Information_PDU,
-      { "UE-Capability-Information", "nbap.UE_Capability_Information",
+      { "UE-Capability-Information", "nbap.UE_Capability_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UE_TS0_CapabilityLCR_PDU,
@@ -57020,7 +57020,7 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_Synchronisation_Parameters_LCR_PDU,
-      { "UL-Synchronisation-Parameters-LCR", "nbap.UL_Synchronisation_Parameters_LCR",
+      { "UL-Synchronisation-Parameters-LCR", "nbap.UL_Synchronisation_Parameters_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UPPCHPositionLCR_PDU,
@@ -57056,7 +57056,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonTransportChannelSetupRequestFDD_PDU,
-      { "CommonTransportChannelSetupRequestFDD", "nbap.CommonTransportChannelSetupRequestFDD",
+      { "CommonTransportChannelSetupRequestFDD", "nbap.CommonTransportChannelSetupRequestFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonPhysicalChannelType_CTCH_SetupRqstFDD_PDU,
@@ -57068,19 +57068,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PCH_ParametersItem_CTCH_SetupRqstFDD_PDU,
-      { "PCH-ParametersItem-CTCH-SetupRqstFDD", "nbap.PCH_ParametersItem_CTCH_SetupRqstFDD",
+      { "PCH-ParametersItem-CTCH-SetupRqstFDD", "nbap.PCH_ParametersItem_CTCH_SetupRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MICH_Parameters_CTCH_SetupRqstFDD_PDU,
-      { "MICH-Parameters-CTCH-SetupRqstFDD", "nbap.MICH_Parameters_CTCH_SetupRqstFDD",
+      { "MICH-Parameters-CTCH-SetupRqstFDD", "nbap.MICH_Parameters_CTCH_SetupRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RACH_ParametersItem_CTCH_SetupRqstFDD_PDU,
-      { "RACH-ParametersItem-CTCH-SetupRqstFDD", "nbap.RACH_ParametersItem_CTCH_SetupRqstFDD",
+      { "RACH-ParametersItem-CTCH-SetupRqstFDD", "nbap.RACH_ParametersItem_CTCH_SetupRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonTransportChannelSetupRequestTDD_PDU,
-      { "CommonTransportChannelSetupRequestTDD", "nbap.CommonTransportChannelSetupRequestTDD",
+      { "CommonTransportChannelSetupRequestTDD", "nbap.CommonTransportChannelSetupRequestTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonPhysicalChannelType_CTCH_SetupRqstTDD_PDU,
@@ -57104,23 +57104,23 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PCH_ParametersItem_CTCH_SetupRqstTDD_PDU,
-      { "PCH-ParametersItem-CTCH-SetupRqstTDD", "nbap.PCH_ParametersItem_CTCH_SetupRqstTDD",
+      { "PCH-ParametersItem-CTCH-SetupRqstTDD", "nbap.PCH_ParametersItem_CTCH_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PICH_ParametersItem_CTCH_SetupRqstTDD_PDU,
-      { "PICH-ParametersItem-CTCH-SetupRqstTDD", "nbap.PICH_ParametersItem_CTCH_SetupRqstTDD",
+      { "PICH-ParametersItem-CTCH-SetupRqstTDD", "nbap.PICH_ParametersItem_CTCH_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PICH_LCR_Parameters_CTCH_SetupRqstTDD_PDU,
-      { "PICH-LCR-Parameters-CTCH-SetupRqstTDD", "nbap.PICH_LCR_Parameters_CTCH_SetupRqstTDD",
+      { "PICH-LCR-Parameters-CTCH-SetupRqstTDD", "nbap.PICH_LCR_Parameters_CTCH_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PICH_768_ParametersItem_CTCH_SetupRqstTDD_PDU,
-      { "PICH-768-ParametersItem-CTCH-SetupRqstTDD", "nbap.PICH_768_ParametersItem_CTCH_SetupRqstTDD",
+      { "PICH-768-ParametersItem-CTCH-SetupRqstTDD", "nbap.PICH_768_ParametersItem_CTCH_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MICH_Parameters_CTCH_SetupRqstTDD_PDU,
-      { "MICH-Parameters-CTCH-SetupRqstTDD", "nbap.MICH_Parameters_CTCH_SetupRqstTDD",
+      { "MICH-Parameters-CTCH-SetupRqstTDD", "nbap.MICH_Parameters_CTCH_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_TimeSlotConfigurationList_LCR_CTCH_SetupRqstTDD_PDU,
@@ -57136,11 +57136,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PRACH_ParametersItem_CTCH_SetupRqstTDD_PDU,
-      { "PRACH-ParametersItem-CTCH-SetupRqstTDD", "nbap.PRACH_ParametersItem_CTCH_SetupRqstTDD",
+      { "PRACH-ParametersItem-CTCH-SetupRqstTDD", "nbap.PRACH_ParametersItem_CTCH_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RACH_ParameterItem_CTCH_SetupRqstTDD_PDU,
-      { "RACH-ParameterItem-CTCH-SetupRqstTDD", "nbap.RACH_ParameterItem_CTCH_SetupRqstTDD",
+      { "RACH-ParameterItem-CTCH-SetupRqstTDD", "nbap.RACH_ParameterItem_CTCH_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PRACH_LCR_ParametersList_CTCH_SetupRqstTDD_PDU,
@@ -57148,27 +57148,27 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PRACH_768_ParametersItem_CTCH_SetupRqstTDD_PDU,
-      { "PRACH-768-ParametersItem-CTCH-SetupRqstTDD", "nbap.PRACH_768_ParametersItem_CTCH_SetupRqstTDD",
+      { "PRACH-768-ParametersItem-CTCH-SetupRqstTDD", "nbap.PRACH_768_ParametersItem_CTCH_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_FPACH_LCR_Parameters_CTCH_SetupRqstTDD_PDU,
-      { "FPACH-LCR-Parameters-CTCH-SetupRqstTDD", "nbap.FPACH_LCR_Parameters_CTCH_SetupRqstTDD",
+      { "FPACH-LCR-Parameters-CTCH-SetupRqstTDD", "nbap.FPACH_LCR_Parameters_CTCH_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PLCCH_parameters_PDU,
-      { "PLCCH-parameters", "nbap.PLCCH_parameters",
+      { "PLCCH-parameters", "nbap.PLCCH_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_RUCCH_parameters_PDU,
-      { "E-RUCCH-parameters", "nbap.E_RUCCH_parameters",
+      { "E-RUCCH-parameters", "nbap.E_RUCCH_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_RUCCH_768_parameters_PDU,
-      { "E-RUCCH-768-parameters", "nbap.E_RUCCH_768_parameters",
+      { "E-RUCCH-768-parameters", "nbap.E_RUCCH_768_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonTransportChannelSetupResponse_PDU,
-      { "CommonTransportChannelSetupResponse", "nbap.CommonTransportChannelSetupResponse",
+      { "CommonTransportChannelSetupResponse", "nbap.CommonTransportChannelSetupResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_FACH_CommonTransportChannel_InformationResponse_PDU,
@@ -57176,11 +57176,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonTransportChannelSetupFailure_PDU,
-      { "CommonTransportChannelSetupFailure", "nbap.CommonTransportChannelSetupFailure",
+      { "CommonTransportChannelSetupFailure", "nbap.CommonTransportChannelSetupFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonTransportChannelReconfigurationRequestFDD_PDU,
-      { "CommonTransportChannelReconfigurationRequestFDD", "nbap.CommonTransportChannelReconfigurationRequestFDD",
+      { "CommonTransportChannelReconfigurationRequestFDD", "nbap.CommonTransportChannelReconfigurationRequestFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonPhysicalChannelType_CTCH_ReconfRqstFDD_PDU,
@@ -57192,15 +57192,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PCH_ParametersItem_CTCH_ReconfRqstFDD_PDU,
-      { "PCH-ParametersItem-CTCH-ReconfRqstFDD", "nbap.PCH_ParametersItem_CTCH_ReconfRqstFDD",
+      { "PCH-ParametersItem-CTCH-ReconfRqstFDD", "nbap.PCH_ParametersItem_CTCH_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PICH_ParametersItem_CTCH_ReconfRqstFDD_PDU,
-      { "PICH-ParametersItem-CTCH-ReconfRqstFDD", "nbap.PICH_ParametersItem_CTCH_ReconfRqstFDD",
+      { "PICH-ParametersItem-CTCH-ReconfRqstFDD", "nbap.PICH_ParametersItem_CTCH_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MICH_Parameters_CTCH_ReconfRqstFDD_PDU,
-      { "MICH-Parameters-CTCH-ReconfRqstFDD", "nbap.MICH_Parameters_CTCH_ReconfRqstFDD",
+      { "MICH-Parameters-CTCH-ReconfRqstFDD", "nbap.MICH_Parameters_CTCH_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PRACH_ParametersListIE_CTCH_ReconfRqstFDD_PDU,
@@ -57212,11 +57212,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonTransportChannelReconfigurationRequestTDD_PDU,
-      { "CommonTransportChannelReconfigurationRequestTDD", "nbap.CommonTransportChannelReconfigurationRequestTDD",
+      { "CommonTransportChannelReconfigurationRequestTDD", "nbap.CommonTransportChannelReconfigurationRequestTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Secondary_CCPCH_Parameters_CTCH_ReconfRqstTDD_PDU,
-      { "Secondary-CCPCH-Parameters-CTCH-ReconfRqstTDD", "nbap.Secondary_CCPCH_Parameters_CTCH_ReconfRqstTDD",
+      { "Secondary-CCPCH-Parameters-CTCH-ReconfRqstTDD", "nbap.Secondary_CCPCH_Parameters_CTCH_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Secondary_CCPCHListIE_CTCH_ReconfRqstTDD_PDU,
@@ -57232,7 +57232,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PICH_Parameters_CTCH_ReconfRqstTDD_PDU,
-      { "PICH-Parameters-CTCH-ReconfRqstTDD", "nbap.PICH_Parameters_CTCH_ReconfRqstTDD",
+      { "PICH-Parameters-CTCH-ReconfRqstTDD", "nbap.PICH_Parameters_CTCH_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_FACH_ParametersList_CTCH_ReconfRqstTDD_PDU,
@@ -57240,79 +57240,79 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PCH_Parameters_CTCH_ReconfRqstTDD_PDU,
-      { "PCH-Parameters-CTCH-ReconfRqstTDD", "nbap.PCH_Parameters_CTCH_ReconfRqstTDD",
+      { "PCH-Parameters-CTCH-ReconfRqstTDD", "nbap.PCH_Parameters_CTCH_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_FPACH_LCR_Parameters_CTCH_ReconfRqstTDD_PDU,
-      { "FPACH-LCR-Parameters-CTCH-ReconfRqstTDD", "nbap.FPACH_LCR_Parameters_CTCH_ReconfRqstTDD",
+      { "FPACH-LCR-Parameters-CTCH-ReconfRqstTDD", "nbap.FPACH_LCR_Parameters_CTCH_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MICH_Parameters_CTCH_ReconfRqstTDD_PDU,
-      { "MICH-Parameters-CTCH-ReconfRqstTDD", "nbap.MICH_Parameters_CTCH_ReconfRqstTDD",
+      { "MICH-Parameters-CTCH-ReconfRqstTDD", "nbap.MICH_Parameters_CTCH_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PLCCH_Parameters_CTCH_ReconfRqstTDD_PDU,
-      { "PLCCH-Parameters-CTCH-ReconfRqstTDD", "nbap.PLCCH_Parameters_CTCH_ReconfRqstTDD",
+      { "PLCCH-Parameters-CTCH-ReconfRqstTDD", "nbap.PLCCH_Parameters_CTCH_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Secondary_CCPCH_768_Parameters_CTCH_ReconfRqstTDD_PDU,
-      { "Secondary-CCPCH-768-Parameters-CTCH-ReconfRqstTDD", "nbap.Secondary_CCPCH_768_Parameters_CTCH_ReconfRqstTDD",
+      { "Secondary-CCPCH-768-Parameters-CTCH-ReconfRqstTDD", "nbap.Secondary_CCPCH_768_Parameters_CTCH_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PICH_768_Parameters_CTCH_ReconfRqstTDD_PDU,
-      { "PICH-768-Parameters-CTCH-ReconfRqstTDD", "nbap.PICH_768_Parameters_CTCH_ReconfRqstTDD",
+      { "PICH-768-Parameters-CTCH-ReconfRqstTDD", "nbap.PICH_768_Parameters_CTCH_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MICH_768_Parameters_CTCH_ReconfRqstTDD_PDU,
-      { "MICH-768-Parameters-CTCH-ReconfRqstTDD", "nbap.MICH_768_Parameters_CTCH_ReconfRqstTDD",
+      { "MICH-768-Parameters-CTCH-ReconfRqstTDD", "nbap.MICH_768_Parameters_CTCH_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UPPCH_LCR_Parameters_CTCH_ReconfRqstTDD_PDU,
-      { "UPPCH-LCR-Parameters-CTCH-ReconfRqstTDD", "nbap.UPPCH_LCR_Parameters_CTCH_ReconfRqstTDD",
+      { "UPPCH-LCR-Parameters-CTCH-ReconfRqstTDD", "nbap.UPPCH_LCR_Parameters_CTCH_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonTransportChannelReconfigurationResponse_PDU,
-      { "CommonTransportChannelReconfigurationResponse", "nbap.CommonTransportChannelReconfigurationResponse",
+      { "CommonTransportChannelReconfigurationResponse", "nbap.CommonTransportChannelReconfigurationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonTransportChannelReconfigurationFailure_PDU,
-      { "CommonTransportChannelReconfigurationFailure", "nbap.CommonTransportChannelReconfigurationFailure",
+      { "CommonTransportChannelReconfigurationFailure", "nbap.CommonTransportChannelReconfigurationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonTransportChannelDeletionRequest_PDU,
-      { "CommonTransportChannelDeletionRequest", "nbap.CommonTransportChannelDeletionRequest",
+      { "CommonTransportChannelDeletionRequest", "nbap.CommonTransportChannelDeletionRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonTransportChannelDeletionResponse_PDU,
-      { "CommonTransportChannelDeletionResponse", "nbap.CommonTransportChannelDeletionResponse",
+      { "CommonTransportChannelDeletionResponse", "nbap.CommonTransportChannelDeletionResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_BlockResourceRequest_PDU,
-      { "BlockResourceRequest", "nbap.BlockResourceRequest",
+      { "BlockResourceRequest", "nbap.BlockResourceRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_BlockResourceResponse_PDU,
-      { "BlockResourceResponse", "nbap.BlockResourceResponse",
+      { "BlockResourceResponse", "nbap.BlockResourceResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_BlockResourceFailure_PDU,
-      { "BlockResourceFailure", "nbap.BlockResourceFailure",
+      { "BlockResourceFailure", "nbap.BlockResourceFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UnblockResourceIndication_PDU,
-      { "UnblockResourceIndication", "nbap.UnblockResourceIndication",
+      { "UnblockResourceIndication", "nbap.UnblockResourceIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_AuditRequiredIndication_PDU,
-      { "AuditRequiredIndication", "nbap.AuditRequiredIndication",
+      { "AuditRequiredIndication", "nbap.AuditRequiredIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_AuditRequest_PDU,
-      { "AuditRequest", "nbap.AuditRequest",
+      { "AuditRequest", "nbap.AuditRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_AuditResponse_PDU,
-      { "AuditResponse", "nbap.AuditResponse",
+      { "AuditResponse", "nbap.AuditResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Cell_InformationList_AuditRsp_PDU,
@@ -57320,7 +57320,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Cell_InformationItem_AuditRsp_PDU,
-      { "Cell-InformationItem-AuditRsp", "nbap.Cell_InformationItem_AuditRsp",
+      { "Cell-InformationItem-AuditRsp", "nbap.Cell_InformationItem_AuditRsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_FPACH_LCR_InformationList_AuditRsp_PDU,
@@ -57328,7 +57328,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HS_DSCH_Resources_Information_AuditRsp_PDU,
-      { "HS-DSCH-Resources-Information-AuditRsp", "nbap.HS_DSCH_Resources_Information_AuditRsp",
+      { "HS-DSCH-Resources-Information-AuditRsp", "nbap.HS_DSCH_Resources_Information_AuditRsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_S_CCPCH_InformationListExt_AuditRsp_PDU,
@@ -57340,7 +57340,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_Resources_Information_AuditRsp_PDU,
-      { "E-DCH-Resources-Information-AuditRsp", "nbap.E_DCH_Resources_Information_AuditRsp",
+      { "E-DCH-Resources-Information-AuditRsp", "nbap.E_DCH_Resources_Information_AuditRsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PLCCH_InformationList_AuditRsp_PDU,
@@ -57368,7 +57368,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Cell_Frequency_List_InformationItem_LCR_MulFreq_AuditRsp_PDU,
-      { "Cell-Frequency-List-InformationItem-LCR-MulFreq-AuditRsp", "nbap.Cell_Frequency_List_InformationItem_LCR_MulFreq_AuditRsp",
+      { "Cell-Frequency-List-InformationItem-LCR-MulFreq-AuditRsp", "nbap.Cell_Frequency_List_InformationItem_LCR_MulFreq_AuditRsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UPPCH_LCR_InformationList_AuditRsp_PDU,
@@ -57376,7 +57376,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UPPCH_LCR_InformationItem_AuditRsp_PDU,
-      { "UPPCH-LCR-InformationItem-AuditRsp", "nbap.UPPCH_LCR_InformationItem_AuditRsp",
+      { "UPPCH-LCR-InformationItem-AuditRsp", "nbap.UPPCH_LCR_InformationItem_AuditRsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MultipleFreq_HS_DSCH_Resources_InformationList_AuditRsp_PDU,
@@ -57392,7 +57392,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CCP_InformationItem_AuditRsp_PDU,
-      { "CCP-InformationItem-AuditRsp", "nbap.CCP_InformationItem_AuditRsp",
+      { "CCP-InformationItem-AuditRsp", "nbap.CCP_InformationItem_AuditRsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Local_Cell_InformationList_AuditRsp_PDU,
@@ -57400,7 +57400,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Local_Cell_InformationItem_AuditRsp_PDU,
-      { "Local-Cell-InformationItem-AuditRsp", "nbap.Local_Cell_InformationItem_AuditRsp",
+      { "Local-Cell-InformationItem-AuditRsp", "nbap.Local_Cell_InformationItem_AuditRsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Local_Cell_Group_InformationList_AuditRsp_PDU,
@@ -57408,7 +57408,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Local_Cell_Group_InformationItem_AuditRsp_PDU,
-      { "Local-Cell-Group-InformationItem-AuditRsp", "nbap.Local_Cell_Group_InformationItem_AuditRsp",
+      { "Local-Cell-Group-InformationItem-AuditRsp", "nbap.Local_Cell_Group_InformationItem_AuditRsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Power_Local_Cell_Group_InformationList_AuditRsp_PDU,
@@ -57416,15 +57416,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Power_Local_Cell_Group_InformationItem_AuditRsp_PDU,
-      { "Power-Local-Cell-Group-InformationItem-AuditRsp", "nbap.Power_Local_Cell_Group_InformationItem_AuditRsp",
+      { "Power-Local-Cell-Group-InformationItem-AuditRsp", "nbap.Power_Local_Cell_Group_InformationItem_AuditRsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_AuditFailure_PDU,
-      { "AuditFailure", "nbap.AuditFailure",
+      { "AuditFailure", "nbap.AuditFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonMeasurementInitiationRequest_PDU,
-      { "CommonMeasurementInitiationRequest", "nbap.CommonMeasurementInitiationRequest",
+      { "CommonMeasurementInitiationRequest", "nbap.CommonMeasurementInitiationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonMeasurementObjectType_CM_Rqst_PDU,
@@ -57432,15 +57432,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_CommonMeasurementObjectType_CM_Rqst_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_ERACH_CM_Rqst_PDU,
-      { "ERACH-CM-Rqst", "nbap.ERACH_CM_Rqst",
+      { "ERACH-CM-Rqst", "nbap.ERACH_CM_Rqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PowerLocalCellGroup_CM_Rqst_PDU,
-      { "PowerLocalCellGroup-CM-Rqst", "nbap.PowerLocalCellGroup_CM_Rqst",
+      { "PowerLocalCellGroup-CM-Rqst", "nbap.PowerLocalCellGroup_CM_Rqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonMeasurementInitiationResponse_PDU,
-      { "CommonMeasurementInitiationResponse", "nbap.CommonMeasurementInitiationResponse",
+      { "CommonMeasurementInitiationResponse", "nbap.CommonMeasurementInitiationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonMeasurementObjectType_CM_Rsp_PDU,
@@ -57448,19 +57448,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_CommonMeasurementObjectType_CM_Rsp_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_ERACH_CM_Rsp_PDU,
-      { "ERACH-CM-Rsp", "nbap.ERACH_CM_Rsp",
+      { "ERACH-CM-Rsp", "nbap.ERACH_CM_Rsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PowerLocalCellGroup_CM_Rsp_PDU,
-      { "PowerLocalCellGroup-CM-Rsp", "nbap.PowerLocalCellGroup_CM_Rsp",
+      { "PowerLocalCellGroup-CM-Rsp", "nbap.PowerLocalCellGroup_CM_Rsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonMeasurementInitiationFailure_PDU,
-      { "CommonMeasurementInitiationFailure", "nbap.CommonMeasurementInitiationFailure",
+      { "CommonMeasurementInitiationFailure", "nbap.CommonMeasurementInitiationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonMeasurementReport_PDU,
-      { "CommonMeasurementReport", "nbap.CommonMeasurementReport",
+      { "CommonMeasurementReport", "nbap.CommonMeasurementReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonMeasurementObjectType_CM_Rprt_PDU,
@@ -57468,39 +57468,39 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_CommonMeasurementObjectType_CM_Rprt_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_ERACH_CM_Rprt_PDU,
-      { "ERACH-CM-Rprt", "nbap.ERACH_CM_Rprt",
+      { "ERACH-CM-Rprt", "nbap.ERACH_CM_Rprt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PowerLocalCellGroup_CM_Rprt_PDU,
-      { "PowerLocalCellGroup-CM-Rprt", "nbap.PowerLocalCellGroup_CM_Rprt",
+      { "PowerLocalCellGroup-CM-Rprt", "nbap.PowerLocalCellGroup_CM_Rprt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonMeasurementTerminationRequest_PDU,
-      { "CommonMeasurementTerminationRequest", "nbap.CommonMeasurementTerminationRequest",
+      { "CommonMeasurementTerminationRequest", "nbap.CommonMeasurementTerminationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonMeasurementFailureIndication_PDU,
-      { "CommonMeasurementFailureIndication", "nbap.CommonMeasurementFailureIndication",
+      { "CommonMeasurementFailureIndication", "nbap.CommonMeasurementFailureIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellSetupRequestFDD_PDU,
-      { "CellSetupRequestFDD", "nbap.CellSetupRequestFDD",
+      { "CellSetupRequestFDD", "nbap.CellSetupRequestFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Synchronisation_Configuration_Cell_SetupRqst_PDU,
-      { "Synchronisation-Configuration-Cell-SetupRqst", "nbap.Synchronisation_Configuration_Cell_SetupRqst",
+      { "Synchronisation-Configuration-Cell-SetupRqst", "nbap.Synchronisation_Configuration_Cell_SetupRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PrimarySCH_Information_Cell_SetupRqstFDD_PDU,
-      { "PrimarySCH-Information-Cell-SetupRqstFDD", "nbap.PrimarySCH_Information_Cell_SetupRqstFDD",
+      { "PrimarySCH-Information-Cell-SetupRqstFDD", "nbap.PrimarySCH_Information_Cell_SetupRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SecondarySCH_Information_Cell_SetupRqstFDD_PDU,
-      { "SecondarySCH-Information-Cell-SetupRqstFDD", "nbap.SecondarySCH_Information_Cell_SetupRqstFDD",
+      { "SecondarySCH-Information-Cell-SetupRqstFDD", "nbap.SecondarySCH_Information_Cell_SetupRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PrimaryCPICH_Information_Cell_SetupRqstFDD_PDU,
-      { "PrimaryCPICH-Information-Cell-SetupRqstFDD", "nbap.PrimaryCPICH_Information_Cell_SetupRqstFDD",
+      { "PrimaryCPICH-Information-Cell-SetupRqstFDD", "nbap.PrimaryCPICH_Information_Cell_SetupRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SecondaryCPICH_InformationList_Cell_SetupRqstFDD_PDU,
@@ -57508,19 +57508,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SecondaryCPICH_InformationItem_Cell_SetupRqstFDD_PDU,
-      { "SecondaryCPICH-InformationItem-Cell-SetupRqstFDD", "nbap.SecondaryCPICH_InformationItem_Cell_SetupRqstFDD",
+      { "SecondaryCPICH-InformationItem-Cell-SetupRqstFDD", "nbap.SecondaryCPICH_InformationItem_Cell_SetupRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PrimaryCCPCH_Information_Cell_SetupRqstFDD_PDU,
-      { "PrimaryCCPCH-Information-Cell-SetupRqstFDD", "nbap.PrimaryCCPCH_Information_Cell_SetupRqstFDD",
+      { "PrimaryCCPCH-Information-Cell-SetupRqstFDD", "nbap.PrimaryCCPCH_Information_Cell_SetupRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Limited_power_increase_information_Cell_SetupRqstFDD_PDU,
-      { "Limited-power-increase-information-Cell-SetupRqstFDD", "nbap.Limited_power_increase_information_Cell_SetupRqstFDD",
+      { "Limited-power-increase-information-Cell-SetupRqstFDD", "nbap.Limited_power_increase_information_Cell_SetupRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_IPDLParameter_Information_Cell_SetupRqstFDD_PDU,
-      { "IPDLParameter-Information-Cell-SetupRqstFDD", "nbap.IPDLParameter_Information_Cell_SetupRqstFDD",
+      { "IPDLParameter-Information-Cell-SetupRqstFDD", "nbap.IPDLParameter_Information_Cell_SetupRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellPortion_InformationList_Cell_SetupRqstFDD_PDU,
@@ -57528,15 +57528,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellPortion_InformationItem_Cell_SetupRqstFDD_PDU,
-      { "CellPortion-InformationItem-Cell-SetupRqstFDD", "nbap.CellPortion_InformationItem_Cell_SetupRqstFDD",
+      { "CellPortion-InformationItem-Cell-SetupRqstFDD", "nbap.CellPortion_InformationItem_Cell_SetupRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellSetupRequestTDD_PDU,
-      { "CellSetupRequestTDD", "nbap.CellSetupRequestTDD",
+      { "CellSetupRequestTDD", "nbap.CellSetupRequestTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SCH_Information_Cell_SetupRqstTDD_PDU,
-      { "SCH-Information-Cell-SetupRqstTDD", "nbap.SCH_Information_Cell_SetupRqstTDD",
+      { "SCH-Information-Cell-SetupRqstTDD", "nbap.SCH_Information_Cell_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SyncCaseIndicatorItem_Cell_SetupRqstTDD_PSCH_PDU,
@@ -57544,7 +57544,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_SyncCaseIndicatorItem_Cell_SetupRqstTDD_PSCH_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_PCCPCH_Information_Cell_SetupRqstTDD_PDU,
-      { "PCCPCH-Information-Cell-SetupRqstTDD", "nbap.PCCPCH_Information_Cell_SetupRqstTDD",
+      { "PCCPCH-Information-Cell-SetupRqstTDD", "nbap.PCCPCH_Information_Cell_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_TimeSlotConfigurationList_Cell_SetupRqstTDD_PDU,
@@ -57556,27 +57556,27 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PCCPCH_LCR_Information_Cell_SetupRqstTDD_PDU,
-      { "PCCPCH-LCR-Information-Cell-SetupRqstTDD", "nbap.PCCPCH_LCR_Information_Cell_SetupRqstTDD",
+      { "PCCPCH-LCR-Information-Cell-SetupRqstTDD", "nbap.PCCPCH_LCR_Information_Cell_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DwPCH_LCR_Information_Cell_SetupRqstTDD_PDU,
-      { "DwPCH-LCR-Information-Cell-SetupRqstTDD", "nbap.DwPCH_LCR_Information_Cell_SetupRqstTDD",
+      { "DwPCH-LCR-Information-Cell-SetupRqstTDD", "nbap.DwPCH_LCR_Information_Cell_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_IPDLParameter_Information_Cell_SetupRqstTDD_PDU,
-      { "IPDLParameter-Information-Cell-SetupRqstTDD", "nbap.IPDLParameter_Information_Cell_SetupRqstTDD",
+      { "IPDLParameter-Information-Cell-SetupRqstTDD", "nbap.IPDLParameter_Information_Cell_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_IPDLParameter_Information_LCR_Cell_SetupRqstTDD_PDU,
-      { "IPDLParameter-Information-LCR-Cell-SetupRqstTDD", "nbap.IPDLParameter_Information_LCR_Cell_SetupRqstTDD",
+      { "IPDLParameter-Information-LCR-Cell-SetupRqstTDD", "nbap.IPDLParameter_Information_LCR_Cell_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PCCPCH_768_Information_Cell_SetupRqstTDD_PDU,
-      { "PCCPCH-768-Information-Cell-SetupRqstTDD", "nbap.PCCPCH_768_Information_Cell_SetupRqstTDD",
+      { "PCCPCH-768-Information-Cell-SetupRqstTDD", "nbap.PCCPCH_768_Information_Cell_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SCH_768_Information_Cell_SetupRqstTDD_PDU,
-      { "SCH-768-Information-Cell-SetupRqstTDD", "nbap.SCH_768_Information_Cell_SetupRqstTDD",
+      { "SCH-768-Information-Cell-SetupRqstTDD", "nbap.SCH_768_Information_Cell_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Cell_Frequency_List_LCR_MulFreq_Cell_SetupRqstTDD_PDU,
@@ -57584,31 +57584,31 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellSetupResponse_PDU,
-      { "CellSetupResponse", "nbap.CellSetupResponse",
+      { "CellSetupResponse", "nbap.CellSetupResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellSetupFailure_PDU,
-      { "CellSetupFailure", "nbap.CellSetupFailure",
+      { "CellSetupFailure", "nbap.CellSetupFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellReconfigurationRequestFDD_PDU,
-      { "CellReconfigurationRequestFDD", "nbap.CellReconfigurationRequestFDD",
+      { "CellReconfigurationRequestFDD", "nbap.CellReconfigurationRequestFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Synchronisation_Configuration_Cell_ReconfRqst_PDU,
-      { "Synchronisation-Configuration-Cell-ReconfRqst", "nbap.Synchronisation_Configuration_Cell_ReconfRqst",
+      { "Synchronisation-Configuration-Cell-ReconfRqst", "nbap.Synchronisation_Configuration_Cell_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PrimarySCH_Information_Cell_ReconfRqstFDD_PDU,
-      { "PrimarySCH-Information-Cell-ReconfRqstFDD", "nbap.PrimarySCH_Information_Cell_ReconfRqstFDD",
+      { "PrimarySCH-Information-Cell-ReconfRqstFDD", "nbap.PrimarySCH_Information_Cell_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SecondarySCH_Information_Cell_ReconfRqstFDD_PDU,
-      { "SecondarySCH-Information-Cell-ReconfRqstFDD", "nbap.SecondarySCH_Information_Cell_ReconfRqstFDD",
+      { "SecondarySCH-Information-Cell-ReconfRqstFDD", "nbap.SecondarySCH_Information_Cell_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PrimaryCPICH_Information_Cell_ReconfRqstFDD_PDU,
-      { "PrimaryCPICH-Information-Cell-ReconfRqstFDD", "nbap.PrimaryCPICH_Information_Cell_ReconfRqstFDD",
+      { "PrimaryCPICH-Information-Cell-ReconfRqstFDD", "nbap.PrimaryCPICH_Information_Cell_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SecondaryCPICH_InformationList_Cell_ReconfRqstFDD_PDU,
@@ -57616,15 +57616,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SecondaryCPICH_InformationItem_Cell_ReconfRqstFDD_PDU,
-      { "SecondaryCPICH-InformationItem-Cell-ReconfRqstFDD", "nbap.SecondaryCPICH_InformationItem_Cell_ReconfRqstFDD",
+      { "SecondaryCPICH-InformationItem-Cell-ReconfRqstFDD", "nbap.SecondaryCPICH_InformationItem_Cell_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PrimaryCCPCH_Information_Cell_ReconfRqstFDD_PDU,
-      { "PrimaryCCPCH-Information-Cell-ReconfRqstFDD", "nbap.PrimaryCCPCH_Information_Cell_ReconfRqstFDD",
+      { "PrimaryCCPCH-Information-Cell-ReconfRqstFDD", "nbap.PrimaryCCPCH_Information_Cell_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_IPDLParameter_Information_Cell_ReconfRqstFDD_PDU,
-      { "IPDLParameter-Information-Cell-ReconfRqstFDD", "nbap.IPDLParameter_Information_Cell_ReconfRqstFDD",
+      { "IPDLParameter-Information-Cell-ReconfRqstFDD", "nbap.IPDLParameter_Information_Cell_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellPortion_InformationList_Cell_ReconfRqstFDD_PDU,
@@ -57632,19 +57632,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellPortion_InformationItem_Cell_ReconfRqstFDD_PDU,
-      { "CellPortion-InformationItem-Cell-ReconfRqstFDD", "nbap.CellPortion_InformationItem_Cell_ReconfRqstFDD",
+      { "CellPortion-InformationItem-Cell-ReconfRqstFDD", "nbap.CellPortion_InformationItem_Cell_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellReconfigurationRequestTDD_PDU,
-      { "CellReconfigurationRequestTDD", "nbap.CellReconfigurationRequestTDD",
+      { "CellReconfigurationRequestTDD", "nbap.CellReconfigurationRequestTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SCH_Information_Cell_ReconfRqstTDD_PDU,
-      { "SCH-Information-Cell-ReconfRqstTDD", "nbap.SCH_Information_Cell_ReconfRqstTDD",
+      { "SCH-Information-Cell-ReconfRqstTDD", "nbap.SCH_Information_Cell_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PCCPCH_Information_Cell_ReconfRqstTDD_PDU,
-      { "PCCPCH-Information-Cell-ReconfRqstTDD", "nbap.PCCPCH_Information_Cell_ReconfRqstTDD",
+      { "PCCPCH-Information-Cell-ReconfRqstTDD", "nbap.PCCPCH_Information_Cell_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_TimeSlotConfigurationList_Cell_ReconfRqstTDD_PDU,
@@ -57656,23 +57656,23 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DwPCH_LCR_Information_Cell_ReconfRqstTDD_PDU,
-      { "DwPCH-LCR-Information-Cell-ReconfRqstTDD", "nbap.DwPCH_LCR_Information_Cell_ReconfRqstTDD",
+      { "DwPCH-LCR-Information-Cell-ReconfRqstTDD", "nbap.DwPCH_LCR_Information_Cell_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_IPDLParameter_Information_Cell_ReconfRqstTDD_PDU,
-      { "IPDLParameter-Information-Cell-ReconfRqstTDD", "nbap.IPDLParameter_Information_Cell_ReconfRqstTDD",
+      { "IPDLParameter-Information-Cell-ReconfRqstTDD", "nbap.IPDLParameter_Information_Cell_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_IPDLParameter_Information_LCR_Cell_ReconfRqstTDD_PDU,
-      { "IPDLParameter-Information-LCR-Cell-ReconfRqstTDD", "nbap.IPDLParameter_Information_LCR_Cell_ReconfRqstTDD",
+      { "IPDLParameter-Information-LCR-Cell-ReconfRqstTDD", "nbap.IPDLParameter_Information_LCR_Cell_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SCH_768_Information_Cell_ReconfRqstTDD_PDU,
-      { "SCH-768-Information-Cell-ReconfRqstTDD", "nbap.SCH_768_Information_Cell_ReconfRqstTDD",
+      { "SCH-768-Information-Cell-ReconfRqstTDD", "nbap.SCH_768_Information_Cell_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PCCPCH_768_Information_Cell_ReconfRqstTDD_PDU,
-      { "PCCPCH-768-Information-Cell-ReconfRqstTDD", "nbap.PCCPCH_768_Information_Cell_ReconfRqstTDD",
+      { "PCCPCH-768-Information-Cell-ReconfRqstTDD", "nbap.PCCPCH_768_Information_Cell_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UARFCN_Adjustment_PDU,
@@ -57680,23 +57680,23 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_UARFCN_Adjustment_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_CellReconfigurationResponse_PDU,
-      { "CellReconfigurationResponse", "nbap.CellReconfigurationResponse",
+      { "CellReconfigurationResponse", "nbap.CellReconfigurationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellReconfigurationFailure_PDU,
-      { "CellReconfigurationFailure", "nbap.CellReconfigurationFailure",
+      { "CellReconfigurationFailure", "nbap.CellReconfigurationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellDeletionRequest_PDU,
-      { "CellDeletionRequest", "nbap.CellDeletionRequest",
+      { "CellDeletionRequest", "nbap.CellDeletionRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellDeletionResponse_PDU,
-      { "CellDeletionResponse", "nbap.CellDeletionResponse",
+      { "CellDeletionResponse", "nbap.CellDeletionResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ResourceStatusIndication_PDU,
-      { "ResourceStatusIndication", "nbap.ResourceStatusIndication",
+      { "ResourceStatusIndication", "nbap.ResourceStatusIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_IndicationType_ResourceStatusInd_PDU,
@@ -57704,11 +57704,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_IndicationType_ResourceStatusInd_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_Local_Cell_InformationItem_ResourceStatusInd_PDU,
-      { "Local-Cell-InformationItem-ResourceStatusInd", "nbap.Local_Cell_InformationItem_ResourceStatusInd",
+      { "Local-Cell-InformationItem-ResourceStatusInd", "nbap.Local_Cell_InformationItem_ResourceStatusInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Local_Cell_Group_InformationItem_ResourceStatusInd_PDU,
-      { "Local-Cell-Group-InformationItem-ResourceStatusInd", "nbap.Local_Cell_Group_InformationItem_ResourceStatusInd",
+      { "Local-Cell-Group-InformationItem-ResourceStatusInd", "nbap.Local_Cell_Group_InformationItem_ResourceStatusInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Power_Local_Cell_Group_InformationList_ResourceStatusInd_PDU,
@@ -57716,23 +57716,23 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Power_Local_Cell_Group_InformationItem_ResourceStatusInd_PDU,
-      { "Power-Local-Cell-Group-InformationItem-ResourceStatusInd", "nbap.Power_Local_Cell_Group_InformationItem_ResourceStatusInd",
+      { "Power-Local-Cell-Group-InformationItem-ResourceStatusInd", "nbap.Power_Local_Cell_Group_InformationItem_ResourceStatusInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Local_Cell_InformationItem2_ResourceStatusInd_PDU,
-      { "Local-Cell-InformationItem2-ResourceStatusInd", "nbap.Local_Cell_InformationItem2_ResourceStatusInd",
+      { "Local-Cell-InformationItem2-ResourceStatusInd", "nbap.Local_Cell_InformationItem2_ResourceStatusInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Local_Cell_Group_InformationItem2_ResourceStatusInd_PDU,
-      { "Local-Cell-Group-InformationItem2-ResourceStatusInd", "nbap.Local_Cell_Group_InformationItem2_ResourceStatusInd",
+      { "Local-Cell-Group-InformationItem2-ResourceStatusInd", "nbap.Local_Cell_Group_InformationItem2_ResourceStatusInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CCP_InformationItem_ResourceStatusInd_PDU,
-      { "CCP-InformationItem-ResourceStatusInd", "nbap.CCP_InformationItem_ResourceStatusInd",
+      { "CCP-InformationItem-ResourceStatusInd", "nbap.CCP_InformationItem_ResourceStatusInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Cell_InformationItem_ResourceStatusInd_PDU,
-      { "Cell-InformationItem-ResourceStatusInd", "nbap.Cell_InformationItem_ResourceStatusInd",
+      { "Cell-InformationItem-ResourceStatusInd", "nbap.Cell_InformationItem_ResourceStatusInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_FPACH_LCR_InformationList_ResourceStatusInd_PDU,
@@ -57740,11 +57740,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DwPCH_LCR_Information_ResourceStatusInd_PDU,
-      { "DwPCH-LCR-Information-ResourceStatusInd", "nbap.DwPCH_LCR_Information_ResourceStatusInd",
+      { "DwPCH-LCR-Information-ResourceStatusInd", "nbap.DwPCH_LCR_Information_ResourceStatusInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HS_DSCH_Resources_Information_ResourceStatusInd_PDU,
-      { "HS-DSCH-Resources-Information-ResourceStatusInd", "nbap.HS_DSCH_Resources_Information_ResourceStatusInd",
+      { "HS-DSCH-Resources-Information-ResourceStatusInd", "nbap.HS_DSCH_Resources_Information_ResourceStatusInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_S_CCPCH_InformationListExt_ResourceStatusInd_PDU,
@@ -57756,7 +57756,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_Resources_Information_ResourceStatusInd_PDU,
-      { "E-DCH-Resources-Information-ResourceStatusInd", "nbap.E_DCH_Resources_Information_ResourceStatusInd",
+      { "E-DCH-Resources-Information-ResourceStatusInd", "nbap.E_DCH_Resources_Information_ResourceStatusInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PLCCH_InformationList_ResourceStatusInd_PDU,
@@ -57784,7 +57784,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Cell_Frequency_List_InformationItem_LCR_MulFreq_ResourceStatusInd_PDU,
-      { "Cell-Frequency-List-InformationItem-LCR-MulFreq-ResourceStatusInd", "nbap.Cell_Frequency_List_InformationItem_LCR_MulFreq_ResourceStatusInd",
+      { "Cell-Frequency-List-InformationItem-LCR-MulFreq-ResourceStatusInd", "nbap.Cell_Frequency_List_InformationItem_LCR_MulFreq_ResourceStatusInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UPPCH_LCR_InformationList_ResourceStatusInd_PDU,
@@ -57792,7 +57792,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UPPCH_LCR_InformationItem_ResourceStatusInd_PDU,
-      { "UPPCH-LCR-InformationItem-ResourceStatusInd", "nbap.UPPCH_LCR_InformationItem_ResourceStatusInd",
+      { "UPPCH-LCR-InformationItem-ResourceStatusInd", "nbap.UPPCH_LCR_InformationItem_ResourceStatusInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MultipleFreq_HS_DSCH_Resources_InformationList_ResourceStatusInd_PDU,
@@ -57804,7 +57804,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Power_Local_Cell_Group_InformationItem2_ResourceStatusInd_PDU,
-      { "Power-Local-Cell-Group-InformationItem2-ResourceStatusInd", "nbap.Power_Local_Cell_Group_InformationItem2_ResourceStatusInd",
+      { "Power-Local-Cell-Group-InformationItem2-ResourceStatusInd", "nbap.Power_Local_Cell_Group_InformationItem2_ResourceStatusInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MultipleFreq_E_DCH_Resources_InformationList_ResourceStatusInd_PDU,
@@ -57812,7 +57812,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SystemInformationUpdateRequest_PDU,
-      { "SystemInformationUpdateRequest", "nbap.SystemInformationUpdateRequest",
+      { "SystemInformationUpdateRequest", "nbap.SystemInformationUpdateRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MIB_SB_SIB_InformationList_SystemInfoUpdateRqst_PDU,
@@ -57824,15 +57824,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SystemInformationUpdateResponse_PDU,
-      { "SystemInformationUpdateResponse", "nbap.SystemInformationUpdateResponse",
+      { "SystemInformationUpdateResponse", "nbap.SystemInformationUpdateResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SystemInformationUpdateFailure_PDU,
-      { "SystemInformationUpdateFailure", "nbap.SystemInformationUpdateFailure",
+      { "SystemInformationUpdateFailure", "nbap.SystemInformationUpdateFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkSetupRequestFDD_PDU,
-      { "RadioLinkSetupRequestFDD", "nbap.RadioLinkSetupRequestFDD",
+      { "RadioLinkSetupRequestFDD", "nbap.RadioLinkSetupRequestFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_HS_Cell_Information_RL_Setup_List_PDU,
@@ -57840,11 +57840,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_DPCH_Information_RL_SetupRqstFDD_PDU,
-      { "UL-DPCH-Information-RL-SetupRqstFDD", "nbap.UL_DPCH_Information_RL_SetupRqstFDD",
+      { "UL-DPCH-Information-RL-SetupRqstFDD", "nbap.UL_DPCH_Information_RL_SetupRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_DPCH_Information_RL_SetupRqstFDD_PDU,
-      { "DL-DPCH-Information-RL-SetupRqstFDD", "nbap.DL_DPCH_Information_RL_SetupRqstFDD",
+      { "DL-DPCH-Information-RL-SetupRqstFDD", "nbap.DL_DPCH_Information_RL_SetupRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationList_RL_SetupRqstFDD_PDU,
@@ -57852,19 +57852,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationItem_RL_SetupRqstFDD_PDU,
-      { "RL-InformationItem-RL-SetupRqstFDD", "nbap.RL_InformationItem_RL_SetupRqstFDD",
+      { "RL-InformationItem-RL-SetupRqstFDD", "nbap.RL_InformationItem_RL_SetupRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DPCH_Information_RL_SetupRqstFDD_PDU,
-      { "E-DPCH-Information-RL-SetupRqstFDD", "nbap.E_DPCH_Information_RL_SetupRqstFDD",
+      { "E-DPCH-Information-RL-SetupRqstFDD", "nbap.E_DPCH_Information_RL_SetupRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_F_DPCH_Information_RL_SetupRqstFDD_PDU,
-      { "F-DPCH-Information-RL-SetupRqstFDD", "nbap.F_DPCH_Information_RL_SetupRqstFDD",
+      { "F-DPCH-Information-RL-SetupRqstFDD", "nbap.F_DPCH_Information_RL_SetupRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkSetupRequestTDD_PDU,
-      { "RadioLinkSetupRequestTDD", "nbap.RadioLinkSetupRequestTDD",
+      { "RadioLinkSetupRequestTDD", "nbap.RadioLinkSetupRequestTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_CCTrCH_InformationList_RL_SetupRqstTDD_PDU,
@@ -57872,19 +57872,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_CCTrCH_InformationItem_RL_SetupRqstTDD_PDU,
-      { "UL-CCTrCH-InformationItem-RL-SetupRqstTDD", "nbap.UL_CCTrCH_InformationItem_RL_SetupRqstTDD",
+      { "UL-CCTrCH-InformationItem-RL-SetupRqstTDD", "nbap.UL_CCTrCH_InformationItem_RL_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_DPCH_InformationItem_RL_SetupRqstTDD_PDU,
-      { "UL-DPCH-InformationItem-RL-SetupRqstTDD", "nbap.UL_DPCH_InformationItem_RL_SetupRqstTDD",
+      { "UL-DPCH-InformationItem-RL-SetupRqstTDD", "nbap.UL_DPCH_InformationItem_RL_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_DPCH_LCR_Information_RL_SetupRqstTDD_PDU,
-      { "UL-DPCH-LCR-Information-RL-SetupRqstTDD", "nbap.UL_DPCH_LCR_Information_RL_SetupRqstTDD",
+      { "UL-DPCH-LCR-Information-RL-SetupRqstTDD", "nbap.UL_DPCH_LCR_Information_RL_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_DPCH_768_Information_RL_SetupRqstTDD_PDU,
-      { "UL-DPCH-768-Information-RL-SetupRqstTDD", "nbap.UL_DPCH_768_Information_RL_SetupRqstTDD",
+      { "UL-DPCH-768-Information-RL-SetupRqstTDD", "nbap.UL_DPCH_768_Information_RL_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_CCTrCH_InformationList_RL_SetupRqstTDD_PDU,
@@ -57892,27 +57892,27 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_CCTrCH_InformationItem_RL_SetupRqstTDD_PDU,
-      { "DL-CCTrCH-InformationItem-RL-SetupRqstTDD", "nbap.DL_CCTrCH_InformationItem_RL_SetupRqstTDD",
+      { "DL-CCTrCH-InformationItem-RL-SetupRqstTDD", "nbap.DL_CCTrCH_InformationItem_RL_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_DPCH_InformationItem_RL_SetupRqstTDD_PDU,
-      { "DL-DPCH-InformationItem-RL-SetupRqstTDD", "nbap.DL_DPCH_InformationItem_RL_SetupRqstTDD",
+      { "DL-DPCH-InformationItem-RL-SetupRqstTDD", "nbap.DL_DPCH_InformationItem_RL_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_DPCH_LCR_Information_RL_SetupRqstTDD_PDU,
-      { "DL-DPCH-LCR-Information-RL-SetupRqstTDD", "nbap.DL_DPCH_LCR_Information_RL_SetupRqstTDD",
+      { "DL-DPCH-LCR-Information-RL-SetupRqstTDD", "nbap.DL_DPCH_LCR_Information_RL_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_DPCH_768_Information_RL_SetupRqstTDD_PDU,
-      { "DL-DPCH-768-Information-RL-SetupRqstTDD", "nbap.DL_DPCH_768_Information_RL_SetupRqstTDD",
+      { "DL-DPCH-768-Information-RL-SetupRqstTDD", "nbap.DL_DPCH_768_Information_RL_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_Information_RL_SetupRqstTDD_PDU,
-      { "RL-Information-RL-SetupRqstTDD", "nbap.RL_Information_RL_SetupRqstTDD",
+      { "RL-Information-RL-SetupRqstTDD", "nbap.RL_Information_RL_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkSetupResponseFDD_PDU,
-      { "RadioLinkSetupResponseFDD", "nbap.RadioLinkSetupResponseFDD",
+      { "RadioLinkSetupResponseFDD", "nbap.RadioLinkSetupResponseFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_HS_Cell_Information_Response_List_PDU,
@@ -57924,23 +57924,23 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationResponseItem_RL_SetupRspFDD_PDU,
-      { "RL-InformationResponseItem-RL-SetupRspFDD", "nbap.RL_InformationResponseItem_RL_SetupRspFDD",
+      { "RL-InformationResponseItem-RL-SetupRspFDD", "nbap.RL_InformationResponseItem_RL_SetupRspFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkSetupResponseTDD_PDU,
-      { "RadioLinkSetupResponseTDD", "nbap.RadioLinkSetupResponseTDD",
+      { "RadioLinkSetupResponseTDD", "nbap.RadioLinkSetupResponseTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationResponse_RL_SetupRspTDD_PDU,
-      { "RL-InformationResponse-RL-SetupRspTDD", "nbap.RL_InformationResponse_RL_SetupRspTDD",
+      { "RL-InformationResponse-RL-SetupRspTDD", "nbap.RL_InformationResponse_RL_SetupRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationResponse_LCR_RL_SetupRspTDD_PDU,
-      { "RL-InformationResponse-LCR-RL-SetupRspTDD", "nbap.RL_InformationResponse_LCR_RL_SetupRspTDD",
+      { "RL-InformationResponse-LCR-RL-SetupRspTDD", "nbap.RL_InformationResponse_LCR_RL_SetupRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkSetupFailureFDD_PDU,
-      { "RadioLinkSetupFailureFDD", "nbap.RadioLinkSetupFailureFDD",
+      { "RadioLinkSetupFailureFDD", "nbap.RadioLinkSetupFailureFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CauseLevel_RL_SetupFailureFDD_PDU,
@@ -57948,15 +57948,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_CauseLevel_RL_SetupFailureFDD_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_Unsuccessful_RL_InformationRespItem_RL_SetupFailureFDD_PDU,
-      { "Unsuccessful-RL-InformationRespItem-RL-SetupFailureFDD", "nbap.Unsuccessful_RL_InformationRespItem_RL_SetupFailureFDD",
+      { "Unsuccessful-RL-InformationRespItem-RL-SetupFailureFDD", "nbap.Unsuccessful_RL_InformationRespItem_RL_SetupFailureFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Successful_RL_InformationRespItem_RL_SetupFailureFDD_PDU,
-      { "Successful-RL-InformationRespItem-RL-SetupFailureFDD", "nbap.Successful_RL_InformationRespItem_RL_SetupFailureFDD",
+      { "Successful-RL-InformationRespItem-RL-SetupFailureFDD", "nbap.Successful_RL_InformationRespItem_RL_SetupFailureFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkSetupFailureTDD_PDU,
-      { "RadioLinkSetupFailureTDD", "nbap.RadioLinkSetupFailureTDD",
+      { "RadioLinkSetupFailureTDD", "nbap.RadioLinkSetupFailureTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CauseLevel_RL_SetupFailureTDD_PDU,
@@ -57964,11 +57964,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_CauseLevel_RL_SetupFailureTDD_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_Unsuccessful_RL_InformationResp_RL_SetupFailureTDD_PDU,
-      { "Unsuccessful-RL-InformationResp-RL-SetupFailureTDD", "nbap.Unsuccessful_RL_InformationResp_RL_SetupFailureTDD",
+      { "Unsuccessful-RL-InformationResp-RL-SetupFailureTDD", "nbap.Unsuccessful_RL_InformationResp_RL_SetupFailureTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkAdditionRequestFDD_PDU,
-      { "RadioLinkAdditionRequestFDD", "nbap.RadioLinkAdditionRequestFDD",
+      { "RadioLinkAdditionRequestFDD", "nbap.RadioLinkAdditionRequestFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_HS_Cell_Information_RL_Addition_List_PDU,
@@ -57976,7 +57976,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_EDCH_Cell_Information_RL_Add_Req_PDU,
-      { "Additional-EDCH-Cell-Information-RL-Add-Req", "nbap.Additional_EDCH_Cell_Information_RL_Add_Req",
+      { "Additional-EDCH-Cell-Information-RL-Add-Req", "nbap.Additional_EDCH_Cell_Information_RL_Add_Req_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationList_RL_AdditionRqstFDD_PDU,
@@ -57984,15 +57984,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationItem_RL_AdditionRqstFDD_PDU,
-      { "RL-InformationItem-RL-AdditionRqstFDD", "nbap.RL_InformationItem_RL_AdditionRqstFDD",
+      { "RL-InformationItem-RL-AdditionRqstFDD", "nbap.RL_InformationItem_RL_AdditionRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DPCH_Information_RL_AdditionReqFDD_PDU,
-      { "E-DPCH-Information-RL-AdditionReqFDD", "nbap.E_DPCH_Information_RL_AdditionReqFDD",
+      { "E-DPCH-Information-RL-AdditionReqFDD", "nbap.E_DPCH_Information_RL_AdditionReqFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkAdditionRequestTDD_PDU,
-      { "RadioLinkAdditionRequestTDD", "nbap.RadioLinkAdditionRequestTDD",
+      { "RadioLinkAdditionRequestTDD", "nbap.RadioLinkAdditionRequestTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_CCTrCH_InformationList_RL_AdditionRqstTDD_PDU,
@@ -58000,15 +58000,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_DPCH_InformationItem_RL_AdditionRqstTDD_PDU,
-      { "UL-DPCH-InformationItem-RL-AdditionRqstTDD", "nbap.UL_DPCH_InformationItem_RL_AdditionRqstTDD",
+      { "UL-DPCH-InformationItem-RL-AdditionRqstTDD", "nbap.UL_DPCH_InformationItem_RL_AdditionRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_DPCH_InformationItem_LCR_RL_AdditionRqstTDD_PDU,
-      { "UL-DPCH-InformationItem-LCR-RL-AdditionRqstTDD", "nbap.UL_DPCH_InformationItem_LCR_RL_AdditionRqstTDD",
+      { "UL-DPCH-InformationItem-LCR-RL-AdditionRqstTDD", "nbap.UL_DPCH_InformationItem_LCR_RL_AdditionRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_DPCH_InformationItem_768_RL_AdditionRqstTDD_PDU,
-      { "UL-DPCH-InformationItem-768-RL-AdditionRqstTDD", "nbap.UL_DPCH_InformationItem_768_RL_AdditionRqstTDD",
+      { "UL-DPCH-InformationItem-768-RL-AdditionRqstTDD", "nbap.UL_DPCH_InformationItem_768_RL_AdditionRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_CCTrCH_InformationList_RL_AdditionRqstTDD_PDU,
@@ -58016,23 +58016,23 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_DPCH_InformationItem_RL_AdditionRqstTDD_PDU,
-      { "DL-DPCH-InformationItem-RL-AdditionRqstTDD", "nbap.DL_DPCH_InformationItem_RL_AdditionRqstTDD",
+      { "DL-DPCH-InformationItem-RL-AdditionRqstTDD", "nbap.DL_DPCH_InformationItem_RL_AdditionRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_DPCH_InformationItem_LCR_RL_AdditionRqstTDD_PDU,
-      { "DL-DPCH-InformationItem-LCR-RL-AdditionRqstTDD", "nbap.DL_DPCH_InformationItem_LCR_RL_AdditionRqstTDD",
+      { "DL-DPCH-InformationItem-LCR-RL-AdditionRqstTDD", "nbap.DL_DPCH_InformationItem_LCR_RL_AdditionRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_DPCH_InformationItem_768_RL_AdditionRqstTDD_PDU,
-      { "DL-DPCH-InformationItem-768-RL-AdditionRqstTDD", "nbap.DL_DPCH_InformationItem_768_RL_AdditionRqstTDD",
+      { "DL-DPCH-InformationItem-768-RL-AdditionRqstTDD", "nbap.DL_DPCH_InformationItem_768_RL_AdditionRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_Information_RL_AdditionRqstTDD_PDU,
-      { "RL-Information-RL-AdditionRqstTDD", "nbap.RL_Information_RL_AdditionRqstTDD",
+      { "RL-Information-RL-AdditionRqstTDD", "nbap.RL_Information_RL_AdditionRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkAdditionResponseFDD_PDU,
-      { "RadioLinkAdditionResponseFDD", "nbap.RadioLinkAdditionResponseFDD",
+      { "RadioLinkAdditionResponseFDD", "nbap.RadioLinkAdditionResponseFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_HS_Cell_Change_Information_Response_List_PDU,
@@ -58044,23 +58044,23 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationResponseItem_RL_AdditionRspFDD_PDU,
-      { "RL-InformationResponseItem-RL-AdditionRspFDD", "nbap.RL_InformationResponseItem_RL_AdditionRspFDD",
+      { "RL-InformationResponseItem-RL-AdditionRspFDD", "nbap.RL_InformationResponseItem_RL_AdditionRspFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkAdditionResponseTDD_PDU,
-      { "RadioLinkAdditionResponseTDD", "nbap.RadioLinkAdditionResponseTDD",
+      { "RadioLinkAdditionResponseTDD", "nbap.RadioLinkAdditionResponseTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationResponse_RL_AdditionRspTDD_PDU,
-      { "RL-InformationResponse-RL-AdditionRspTDD", "nbap.RL_InformationResponse_RL_AdditionRspTDD",
+      { "RL-InformationResponse-RL-AdditionRspTDD", "nbap.RL_InformationResponse_RL_AdditionRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationResponse_LCR_RL_AdditionRspTDD_PDU,
-      { "RL-InformationResponse-LCR-RL-AdditionRspTDD", "nbap.RL_InformationResponse_LCR_RL_AdditionRspTDD",
+      { "RL-InformationResponse-LCR-RL-AdditionRspTDD", "nbap.RL_InformationResponse_LCR_RL_AdditionRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkAdditionFailureFDD_PDU,
-      { "RadioLinkAdditionFailureFDD", "nbap.RadioLinkAdditionFailureFDD",
+      { "RadioLinkAdditionFailureFDD", "nbap.RadioLinkAdditionFailureFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CauseLevel_RL_AdditionFailureFDD_PDU,
@@ -58068,15 +58068,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_CauseLevel_RL_AdditionFailureFDD_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_Unsuccessful_RL_InformationRespItem_RL_AdditionFailureFDD_PDU,
-      { "Unsuccessful-RL-InformationRespItem-RL-AdditionFailureFDD", "nbap.Unsuccessful_RL_InformationRespItem_RL_AdditionFailureFDD",
+      { "Unsuccessful-RL-InformationRespItem-RL-AdditionFailureFDD", "nbap.Unsuccessful_RL_InformationRespItem_RL_AdditionFailureFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Successful_RL_InformationRespItem_RL_AdditionFailureFDD_PDU,
-      { "Successful-RL-InformationRespItem-RL-AdditionFailureFDD", "nbap.Successful_RL_InformationRespItem_RL_AdditionFailureFDD",
+      { "Successful-RL-InformationRespItem-RL-AdditionFailureFDD", "nbap.Successful_RL_InformationRespItem_RL_AdditionFailureFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkAdditionFailureTDD_PDU,
-      { "RadioLinkAdditionFailureTDD", "nbap.RadioLinkAdditionFailureTDD",
+      { "RadioLinkAdditionFailureTDD", "nbap.RadioLinkAdditionFailureTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CauseLevel_RL_AdditionFailureTDD_PDU,
@@ -58084,11 +58084,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_CauseLevel_RL_AdditionFailureTDD_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_Unsuccessful_RL_InformationResp_RL_AdditionFailureTDD_PDU,
-      { "Unsuccessful-RL-InformationResp-RL-AdditionFailureTDD", "nbap.Unsuccessful_RL_InformationResp_RL_AdditionFailureTDD",
+      { "Unsuccessful-RL-InformationResp-RL-AdditionFailureTDD", "nbap.Unsuccessful_RL_InformationResp_RL_AdditionFailureTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkReconfigurationPrepareFDD_PDU,
-      { "RadioLinkReconfigurationPrepareFDD", "nbap.RadioLinkReconfigurationPrepareFDD",
+      { "RadioLinkReconfigurationPrepareFDD", "nbap.RadioLinkReconfigurationPrepareFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_HS_Cell_Information_RL_Reconf_Prep_PDU,
@@ -58096,19 +58096,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_EDCH_Cell_Information_RL_Reconf_Prep_PDU,
-      { "Additional-EDCH-Cell-Information-RL-Reconf-Prep", "nbap.Additional_EDCH_Cell_Information_RL_Reconf_Prep",
+      { "Additional-EDCH-Cell-Information-RL-Reconf-Prep", "nbap.Additional_EDCH_Cell_Information_RL_Reconf_Prep_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_DPCH_Information_RL_ReconfPrepFDD_PDU,
-      { "UL-DPCH-Information-RL-ReconfPrepFDD", "nbap.UL_DPCH_Information_RL_ReconfPrepFDD",
+      { "UL-DPCH-Information-RL-ReconfPrepFDD", "nbap.UL_DPCH_Information_RL_ReconfPrepFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_DPCH_Information_RL_ReconfPrepFDD_PDU,
-      { "DL-DPCH-Information-RL-ReconfPrepFDD", "nbap.DL_DPCH_Information_RL_ReconfPrepFDD",
+      { "DL-DPCH-Information-RL-ReconfPrepFDD", "nbap.DL_DPCH_Information_RL_ReconfPrepFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_DPCH_Power_Information_RL_ReconfPrepFDD_PDU,
-      { "DL-DPCH-Power-Information-RL-ReconfPrepFDD", "nbap.DL_DPCH_Power_Information_RL_ReconfPrepFDD",
+      { "DL-DPCH-Power-Information-RL-ReconfPrepFDD", "nbap.DL_DPCH_Power_Information_RL_ReconfPrepFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DCH_DeleteList_RL_ReconfPrepFDD_PDU,
@@ -58120,19 +58120,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationItem_RL_ReconfPrepFDD_PDU,
-      { "RL-InformationItem-RL-ReconfPrepFDD", "nbap.RL_InformationItem_RL_ReconfPrepFDD",
+      { "RL-InformationItem-RL-ReconfPrepFDD", "nbap.RL_InformationItem_RL_ReconfPrepFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DPCH_Information_RL_ReconfPrepFDD_PDU,
-      { "E-DPCH-Information-RL-ReconfPrepFDD", "nbap.E_DPCH_Information_RL_ReconfPrepFDD",
+      { "E-DPCH-Information-RL-ReconfPrepFDD", "nbap.E_DPCH_Information_RL_ReconfPrepFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_F_DPCH_Information_RL_ReconfPrepFDD_PDU,
-      { "F-DPCH-Information-RL-ReconfPrepFDD", "nbap.F_DPCH_Information_RL_ReconfPrepFDD",
+      { "F-DPCH-Information-RL-ReconfPrepFDD", "nbap.F_DPCH_Information_RL_ReconfPrepFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkReconfigurationPrepareTDD_PDU,
-      { "RadioLinkReconfigurationPrepareTDD", "nbap.RadioLinkReconfigurationPrepareTDD",
+      { "RadioLinkReconfigurationPrepareTDD", "nbap.RadioLinkReconfigurationPrepareTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_CCTrCH_InformationAddList_RL_ReconfPrepTDD_PDU,
@@ -58140,11 +58140,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_DPCH_InformationAddItem_RL_ReconfPrepTDD_PDU,
-      { "UL-DPCH-InformationAddItem-RL-ReconfPrepTDD", "nbap.UL_DPCH_InformationAddItem_RL_ReconfPrepTDD",
+      { "UL-DPCH-InformationAddItem-RL-ReconfPrepTDD", "nbap.UL_DPCH_InformationAddItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_DPCH_LCR_InformationAddList_RL_ReconfPrepTDD_PDU,
-      { "UL-DPCH-LCR-InformationAddList-RL-ReconfPrepTDD", "nbap.UL_DPCH_LCR_InformationAddList_RL_ReconfPrepTDD",
+      { "UL-DPCH-LCR-InformationAddList-RL-ReconfPrepTDD", "nbap.UL_DPCH_LCR_InformationAddList_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MultipleRL_UL_DPCH_InformationAddList_RL_ReconfPrepTDD_PDU,
@@ -58152,7 +58152,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_DPCH_768_InformationAddList_RL_ReconfPrepTDD_PDU,
-      { "UL-DPCH-768-InformationAddList-RL-ReconfPrepTDD", "nbap.UL_DPCH_768_InformationAddList_RL_ReconfPrepTDD",
+      { "UL-DPCH-768-InformationAddList-RL-ReconfPrepTDD", "nbap.UL_DPCH_768_InformationAddList_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD_PDU,
@@ -58160,11 +58160,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_DPCH_InformationModify_AddItem_RL_ReconfPrepTDD_PDU,
-      { "UL-DPCH-InformationModify-AddItem-RL-ReconfPrepTDD", "nbap.UL_DPCH_InformationModify_AddItem_RL_ReconfPrepTDD",
+      { "UL-DPCH-InformationModify-AddItem-RL-ReconfPrepTDD", "nbap.UL_DPCH_InformationModify_AddItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_DPCH_InformationModify_ModifyItem_RL_ReconfPrepTDD_PDU,
-      { "UL-DPCH-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.UL_DPCH_InformationModify_ModifyItem_RL_ReconfPrepTDD",
+      { "UL-DPCH-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.UL_DPCH_InformationModify_ModifyItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_TimeslotLCR_InformationModify_ModifyList_RL_ReconfPrepTDD_PDU,
@@ -58180,7 +58180,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_DPCH_LCR_InformationModify_AddList_RL_ReconfPrepTDD_PDU,
-      { "UL-DPCH-LCR-InformationModify-AddList-RL-ReconfPrepTDD", "nbap.UL_DPCH_LCR_InformationModify_AddList_RL_ReconfPrepTDD",
+      { "UL-DPCH-LCR-InformationModify-AddList-RL-ReconfPrepTDD", "nbap.UL_DPCH_LCR_InformationModify_AddList_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MultipleRL_UL_DPCH_InformationModifyList_RL_ReconfPrepTDD_PDU,
@@ -58188,7 +58188,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_DPCH_768_InformationModify_AddList_RL_ReconfPrepTDD_PDU,
-      { "UL-DPCH-768-InformationModify-AddList-RL-ReconfPrepTDD", "nbap.UL_DPCH_768_InformationModify_AddList_RL_ReconfPrepTDD",
+      { "UL-DPCH-768-InformationModify-AddList-RL-ReconfPrepTDD", "nbap.UL_DPCH_768_InformationModify_AddList_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD_PDU,
@@ -58200,11 +58200,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_DPCH_InformationAddItem_RL_ReconfPrepTDD_PDU,
-      { "DL-DPCH-InformationAddItem-RL-ReconfPrepTDD", "nbap.DL_DPCH_InformationAddItem_RL_ReconfPrepTDD",
+      { "DL-DPCH-InformationAddItem-RL-ReconfPrepTDD", "nbap.DL_DPCH_InformationAddItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_DPCH_LCR_InformationAddList_RL_ReconfPrepTDD_PDU,
-      { "DL-DPCH-LCR-InformationAddList-RL-ReconfPrepTDD", "nbap.DL_DPCH_LCR_InformationAddList_RL_ReconfPrepTDD",
+      { "DL-DPCH-LCR-InformationAddList-RL-ReconfPrepTDD", "nbap.DL_DPCH_LCR_InformationAddList_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MultipleRL_DL_DPCH_InformationAddList_RL_ReconfPrepTDD_PDU,
@@ -58212,7 +58212,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_DPCH_768_InformationAddList_RL_ReconfPrepTDD_PDU,
-      { "DL-DPCH-768-InformationAddList-RL-ReconfPrepTDD", "nbap.DL_DPCH_768_InformationAddList_RL_ReconfPrepTDD",
+      { "DL-DPCH-768-InformationAddList-RL-ReconfPrepTDD", "nbap.DL_DPCH_768_InformationAddList_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD_PDU,
@@ -58220,11 +58220,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_DPCH_InformationModify_AddItem_RL_ReconfPrepTDD_PDU,
-      { "DL-DPCH-InformationModify-AddItem-RL-ReconfPrepTDD", "nbap.DL_DPCH_InformationModify_AddItem_RL_ReconfPrepTDD",
+      { "DL-DPCH-InformationModify-AddItem-RL-ReconfPrepTDD", "nbap.DL_DPCH_InformationModify_AddItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_DPCH_InformationModify_ModifyItem_RL_ReconfPrepTDD_PDU,
-      { "DL-DPCH-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.DL_DPCH_InformationModify_ModifyItem_RL_ReconfPrepTDD",
+      { "DL-DPCH-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.DL_DPCH_InformationModify_ModifyItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_Timeslot_LCR_InformationModify_ModifyList_RL_ReconfPrepTDD_PDU,
@@ -58240,7 +58240,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_DPCH_LCR_InformationModify_AddList_RL_ReconfPrepTDD_PDU,
-      { "DL-DPCH-LCR-InformationModify-AddList-RL-ReconfPrepTDD", "nbap.DL_DPCH_LCR_InformationModify_AddList_RL_ReconfPrepTDD",
+      { "DL-DPCH-LCR-InformationModify-AddList-RL-ReconfPrepTDD", "nbap.DL_DPCH_LCR_InformationModify_AddList_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MultipleRL_DL_DPCH_InformationModifyList_RL_ReconfPrepTDD_PDU,
@@ -58248,7 +58248,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_DPCH_768_InformationModify_AddList_RL_ReconfPrepTDD_PDU,
-      { "DL-DPCH-768-InformationModify-AddList-RL-ReconfPrepTDD", "nbap.DL_DPCH_768_InformationModify_AddList_RL_ReconfPrepTDD",
+      { "DL-DPCH-768-InformationModify-AddList-RL-ReconfPrepTDD", "nbap.DL_DPCH_768_InformationModify_AddList_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD_PDU,
@@ -58280,11 +58280,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_Information_RL_ReconfPrepTDD_PDU,
-      { "RL-Information-RL-ReconfPrepTDD", "nbap.RL_Information_RL_ReconfPrepTDD",
+      { "RL-Information-RL-ReconfPrepTDD", "nbap.RL_Information_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkReconfigurationReady_PDU,
-      { "RadioLinkReconfigurationReady", "nbap.RadioLinkReconfigurationReady",
+      { "RadioLinkReconfigurationReady", "nbap.RadioLinkReconfigurationReady_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationResponseList_RL_ReconfReady_PDU,
@@ -58292,11 +58292,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationResponseItem_RL_ReconfReady_PDU,
-      { "RL-InformationResponseItem-RL-ReconfReady", "nbap.RL_InformationResponseItem_RL_ReconfReady",
+      { "RL-InformationResponseItem-RL-ReconfReady", "nbap.RL_InformationResponseItem_RL_ReconfReady_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkReconfigurationFailure_PDU,
-      { "RadioLinkReconfigurationFailure", "nbap.RadioLinkReconfigurationFailure",
+      { "RadioLinkReconfigurationFailure", "nbap.RadioLinkReconfigurationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CauseLevel_RL_ReconfFailure_PDU,
@@ -58304,19 +58304,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_CauseLevel_RL_ReconfFailure_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_RL_ReconfigurationFailureItem_RL_ReconfFailure_PDU,
-      { "RL-ReconfigurationFailureItem-RL-ReconfFailure", "nbap.RL_ReconfigurationFailureItem_RL_ReconfFailure",
+      { "RL-ReconfigurationFailureItem-RL-ReconfFailure", "nbap.RL_ReconfigurationFailureItem_RL_ReconfFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkReconfigurationCommit_PDU,
-      { "RadioLinkReconfigurationCommit", "nbap.RadioLinkReconfigurationCommit",
+      { "RadioLinkReconfigurationCommit", "nbap.RadioLinkReconfigurationCommit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkReconfigurationCancel_PDU,
-      { "RadioLinkReconfigurationCancel", "nbap.RadioLinkReconfigurationCancel",
+      { "RadioLinkReconfigurationCancel", "nbap.RadioLinkReconfigurationCancel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkReconfigurationRequestFDD_PDU,
-      { "RadioLinkReconfigurationRequestFDD", "nbap.RadioLinkReconfigurationRequestFDD",
+      { "RadioLinkReconfigurationRequestFDD", "nbap.RadioLinkReconfigurationRequestFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_HS_Cell_Information_RL_Reconf_Req_PDU,
@@ -58324,15 +58324,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_EDCH_Cell_Information_RL_Reconf_Req_PDU,
-      { "Additional-EDCH-Cell-Information-RL-Reconf-Req", "nbap.Additional_EDCH_Cell_Information_RL_Reconf_Req",
+      { "Additional-EDCH-Cell-Information-RL-Reconf-Req", "nbap.Additional_EDCH_Cell_Information_RL_Reconf_Req_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_DPCH_Information_RL_ReconfRqstFDD_PDU,
-      { "UL-DPCH-Information-RL-ReconfRqstFDD", "nbap.UL_DPCH_Information_RL_ReconfRqstFDD",
+      { "UL-DPCH-Information-RL-ReconfRqstFDD", "nbap.UL_DPCH_Information_RL_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_DPCH_Information_RL_ReconfRqstFDD_PDU,
-      { "DL-DPCH-Information-RL-ReconfRqstFDD", "nbap.DL_DPCH_Information_RL_ReconfRqstFDD",
+      { "DL-DPCH-Information-RL-ReconfRqstFDD", "nbap.DL_DPCH_Information_RL_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DCH_DeleteList_RL_ReconfRqstFDD_PDU,
@@ -58344,15 +58344,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationItem_RL_ReconfRqstFDD_PDU,
-      { "RL-InformationItem-RL-ReconfRqstFDD", "nbap.RL_InformationItem_RL_ReconfRqstFDD",
+      { "RL-InformationItem-RL-ReconfRqstFDD", "nbap.RL_InformationItem_RL_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DPCH_Information_RL_ReconfRqstFDD_PDU,
-      { "E-DPCH-Information-RL-ReconfRqstFDD", "nbap.E_DPCH_Information_RL_ReconfRqstFDD",
+      { "E-DPCH-Information-RL-ReconfRqstFDD", "nbap.E_DPCH_Information_RL_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkReconfigurationRequestTDD_PDU,
-      { "RadioLinkReconfigurationRequestTDD", "nbap.RadioLinkReconfigurationRequestTDD",
+      { "RadioLinkReconfigurationRequestTDD", "nbap.RadioLinkReconfigurationRequestTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_PDU,
@@ -58360,7 +58360,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD_PDU,
-      { "UL-CCTrCH-InformationModifyItem-RL-ReconfRqstTDD", "nbap.UL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD",
+      { "UL-CCTrCH-InformationModifyItem-RL-ReconfRqstTDD", "nbap.UL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_PDU,
@@ -58368,7 +58368,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD_PDU,
-      { "UL-CCTrCH-InformationDeleteItem-RL-ReconfRqstTDD", "nbap.UL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD",
+      { "UL-CCTrCH-InformationDeleteItem-RL-ReconfRqstTDD", "nbap.UL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_PDU,
@@ -58376,7 +58376,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD_PDU,
-      { "DL-CCTrCH-InformationModifyItem-RL-ReconfRqstTDD", "nbap.DL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD",
+      { "DL-CCTrCH-InformationModifyItem-RL-ReconfRqstTDD", "nbap.DL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MultipleRL_DL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_PDU,
@@ -58384,7 +58384,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_DPCH_LCR_InformationModify_ModifyList_RL_ReconfRqstTDD_PDU,
-      { "DL-DPCH-LCR-InformationModify-ModifyList-RL-ReconfRqstTDD", "nbap.DL_DPCH_LCR_InformationModify_ModifyList_RL_ReconfRqstTDD",
+      { "DL-DPCH-LCR-InformationModify-ModifyList-RL-ReconfRqstTDD", "nbap.DL_DPCH_LCR_InformationModify_ModifyList_RL_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_PDU,
@@ -58392,7 +58392,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD_PDU,
-      { "DL-CCTrCH-InformationDeleteItem-RL-ReconfRqstTDD", "nbap.DL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD",
+      { "DL-CCTrCH-InformationDeleteItem-RL-ReconfRqstTDD", "nbap.DL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DCH_DeleteList_RL_ReconfRqstTDD_PDU,
@@ -58404,11 +58404,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_Information_RL_ReconfRqstTDD_PDU,
-      { "RL-Information-RL-ReconfRqstTDD", "nbap.RL_Information_RL_ReconfRqstTDD",
+      { "RL-Information-RL-ReconfRqstTDD", "nbap.RL_Information_RL_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkReconfigurationResponse_PDU,
-      { "RadioLinkReconfigurationResponse", "nbap.RadioLinkReconfigurationResponse",
+      { "RadioLinkReconfigurationResponse", "nbap.RadioLinkReconfigurationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationResponseList_RL_ReconfRsp_PDU,
@@ -58416,11 +58416,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationResponseItem_RL_ReconfRsp_PDU,
-      { "RL-InformationResponseItem-RL-ReconfRsp", "nbap.RL_InformationResponseItem_RL_ReconfRsp",
+      { "RL-InformationResponseItem-RL-ReconfRsp", "nbap.RL_InformationResponseItem_RL_ReconfRsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkDeletionRequest_PDU,
-      { "RadioLinkDeletionRequest", "nbap.RadioLinkDeletionRequest",
+      { "RadioLinkDeletionRequest", "nbap.RadioLinkDeletionRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_informationList_RL_DeletionRqst_PDU,
@@ -58428,15 +58428,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_informationItem_RL_DeletionRqst_PDU,
-      { "RL-informationItem-RL-DeletionRqst", "nbap.RL_informationItem_RL_DeletionRqst",
+      { "RL-informationItem-RL-DeletionRqst", "nbap.RL_informationItem_RL_DeletionRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkDeletionResponse_PDU,
-      { "RadioLinkDeletionResponse", "nbap.RadioLinkDeletionResponse",
+      { "RadioLinkDeletionResponse", "nbap.RadioLinkDeletionResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_PowerControlRequest_PDU,
-      { "DL-PowerControlRequest", "nbap.DL_PowerControlRequest",
+      { "DL-PowerControlRequest", "nbap.DL_PowerControlRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_ReferencePowerInformationList_DL_PC_Rqst_PDU,
@@ -58444,15 +58444,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_ReferencePowerInformationItem_DL_PC_Rqst_PDU,
-      { "DL-ReferencePowerInformationItem-DL-PC-Rqst", "nbap.DL_ReferencePowerInformationItem_DL_PC_Rqst",
+      { "DL-ReferencePowerInformationItem-DL-PC-Rqst", "nbap.DL_ReferencePowerInformationItem_DL_PC_Rqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_PowerTimeslotControlRequest_PDU,
-      { "DL-PowerTimeslotControlRequest", "nbap.DL_PowerTimeslotControlRequest",
+      { "DL-PowerTimeslotControlRequest", "nbap.DL_PowerTimeslotControlRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DedicatedMeasurementInitiationRequest_PDU,
-      { "DedicatedMeasurementInitiationRequest", "nbap.DedicatedMeasurementInitiationRequest",
+      { "DedicatedMeasurementInitiationRequest", "nbap.DedicatedMeasurementInitiationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DedicatedMeasurementObjectType_DM_Rqst_PDU,
@@ -58460,7 +58460,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_DedicatedMeasurementObjectType_DM_Rqst_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationItem_DM_Rqst_PDU,
-      { "RL-InformationItem-DM-Rqst", "nbap.RL_InformationItem_DM_Rqst",
+      { "RL-InformationItem-DM-Rqst", "nbap.RL_InformationItem_DM_Rqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PUSCH_Info_DM_Rqst_PDU,
@@ -58476,7 +58476,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DedicatedMeasurementInitiationResponse_PDU,
-      { "DedicatedMeasurementInitiationResponse", "nbap.DedicatedMeasurementInitiationResponse",
+      { "DedicatedMeasurementInitiationResponse", "nbap.DedicatedMeasurementInitiationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DedicatedMeasurementObjectType_DM_Rsp_PDU,
@@ -58484,7 +58484,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_DedicatedMeasurementObjectType_DM_Rsp_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationItem_DM_Rsp_PDU,
-      { "RL-InformationItem-DM-Rsp", "nbap.RL_InformationItem_DM_Rsp",
+      { "RL-InformationItem-DM-Rsp", "nbap.RL_InformationItem_DM_Rsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PUSCH_Info_DM_Rsp_PDU,
@@ -58512,15 +58512,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_Set_InformationItem_DM_Rsp_PDU,
-      { "RL-Set-InformationItem-DM-Rsp", "nbap.RL_Set_InformationItem_DM_Rsp",
+      { "RL-Set-InformationItem-DM-Rsp", "nbap.RL_Set_InformationItem_DM_Rsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DedicatedMeasurementInitiationFailure_PDU,
-      { "DedicatedMeasurementInitiationFailure", "nbap.DedicatedMeasurementInitiationFailure",
+      { "DedicatedMeasurementInitiationFailure", "nbap.DedicatedMeasurementInitiationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DedicatedMeasurementReport_PDU,
-      { "DedicatedMeasurementReport", "nbap.DedicatedMeasurementReport",
+      { "DedicatedMeasurementReport", "nbap.DedicatedMeasurementReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DedicatedMeasurementObjectType_DM_Rprt_PDU,
@@ -58528,7 +58528,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_DedicatedMeasurementObjectType_DM_Rprt_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationItem_DM_Rprt_PDU,
-      { "RL-InformationItem-DM-Rprt", "nbap.RL_InformationItem_DM_Rprt",
+      { "RL-InformationItem-DM-Rprt", "nbap.RL_InformationItem_DM_Rprt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PUSCH_Info_DM_Rprt_PDU,
@@ -58540,19 +58540,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_Set_InformationItem_DM_Rprt_PDU,
-      { "RL-Set-InformationItem-DM-Rprt", "nbap.RL_Set_InformationItem_DM_Rprt",
+      { "RL-Set-InformationItem-DM-Rprt", "nbap.RL_Set_InformationItem_DM_Rprt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DedicatedMeasurementTerminationRequest_PDU,
-      { "DedicatedMeasurementTerminationRequest", "nbap.DedicatedMeasurementTerminationRequest",
+      { "DedicatedMeasurementTerminationRequest", "nbap.DedicatedMeasurementTerminationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DedicatedMeasurementFailureIndication_PDU,
-      { "DedicatedMeasurementFailureIndication", "nbap.DedicatedMeasurementFailureIndication",
+      { "DedicatedMeasurementFailureIndication", "nbap.DedicatedMeasurementFailureIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkFailureIndication_PDU,
-      { "RadioLinkFailureIndication", "nbap.RadioLinkFailureIndication",
+      { "RadioLinkFailureIndication", "nbap.RadioLinkFailureIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Reporting_Object_RL_FailureInd_PDU,
@@ -58560,19 +58560,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_Reporting_Object_RL_FailureInd_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationItem_RL_FailureInd_PDU,
-      { "RL-InformationItem-RL-FailureInd", "nbap.RL_InformationItem_RL_FailureInd",
+      { "RL-InformationItem-RL-FailureInd", "nbap.RL_InformationItem_RL_FailureInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_Set_InformationItem_RL_FailureInd_PDU,
-      { "RL-Set-InformationItem-RL-FailureInd", "nbap.RL_Set_InformationItem_RL_FailureInd",
+      { "RL-Set-InformationItem-RL-FailureInd", "nbap.RL_Set_InformationItem_RL_FailureInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CCTrCH_InformationItem_RL_FailureInd_PDU,
-      { "CCTrCH-InformationItem-RL-FailureInd", "nbap.CCTrCH_InformationItem_RL_FailureInd",
+      { "CCTrCH-InformationItem-RL-FailureInd", "nbap.CCTrCH_InformationItem_RL_FailureInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkPreemptionRequiredIndication_PDU,
-      { "RadioLinkPreemptionRequiredIndication", "nbap.RadioLinkPreemptionRequiredIndication",
+      { "RadioLinkPreemptionRequiredIndication", "nbap.RadioLinkPreemptionRequiredIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationList_RL_PreemptRequiredInd_PDU,
@@ -58580,11 +58580,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationItem_RL_PreemptRequiredInd_PDU,
-      { "RL-InformationItem-RL-PreemptRequiredInd", "nbap.RL_InformationItem_RL_PreemptRequiredInd",
+      { "RL-InformationItem-RL-PreemptRequiredInd", "nbap.RL_InformationItem_RL_PreemptRequiredInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkRestoreIndication_PDU,
-      { "RadioLinkRestoreIndication", "nbap.RadioLinkRestoreIndication",
+      { "RadioLinkRestoreIndication", "nbap.RadioLinkRestoreIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Reporting_Object_RL_RestoreInd_PDU,
@@ -58592,31 +58592,31 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_Reporting_Object_RL_RestoreInd_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationItem_RL_RestoreInd_PDU,
-      { "RL-InformationItem-RL-RestoreInd", "nbap.RL_InformationItem_RL_RestoreInd",
+      { "RL-InformationItem-RL-RestoreInd", "nbap.RL_InformationItem_RL_RestoreInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_Set_InformationItem_RL_RestoreInd_PDU,
-      { "RL-Set-InformationItem-RL-RestoreInd", "nbap.RL_Set_InformationItem_RL_RestoreInd",
+      { "RL-Set-InformationItem-RL-RestoreInd", "nbap.RL_Set_InformationItem_RL_RestoreInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CCTrCH_InformationItem_RL_RestoreInd_PDU,
-      { "CCTrCH-InformationItem-RL-RestoreInd", "nbap.CCTrCH_InformationItem_RL_RestoreInd",
+      { "CCTrCH-InformationItem-RL-RestoreInd", "nbap.CCTrCH_InformationItem_RL_RestoreInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CompressedModeCommand_PDU,
-      { "CompressedModeCommand", "nbap.CompressedModeCommand",
+      { "CompressedModeCommand", "nbap.CompressedModeCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ErrorIndication_PDU,
-      { "ErrorIndication", "nbap.ErrorIndication",
+      { "ErrorIndication", "nbap.ErrorIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PrivateMessage_PDU,
-      { "PrivateMessage", "nbap.PrivateMessage",
+      { "PrivateMessage", "nbap.PrivateMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PhysicalSharedChannelReconfigurationRequestFDD_PDU,
-      { "PhysicalSharedChannelReconfigurationRequestFDD", "nbap.PhysicalSharedChannelReconfigurationRequestFDD",
+      { "PhysicalSharedChannelReconfigurationRequestFDD", "nbap.PhysicalSharedChannelReconfigurationRequestFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSDPA_And_EDCH_CellPortion_InformationList_PSCH_ReconfRqst_PDU,
@@ -58624,7 +58624,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PhysicalSharedChannelReconfigurationRequestTDD_PDU,
-      { "PhysicalSharedChannelReconfigurationRequestTDD", "nbap.PhysicalSharedChannelReconfigurationRequestTDD",
+      { "PhysicalSharedChannelReconfigurationRequestTDD", "nbap.PhysicalSharedChannelReconfigurationRequestTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PDSCHSets_AddList_PSCH_ReconfRqst_PDU,
@@ -58632,15 +58632,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PDSCH_Information_AddItem_PSCH_ReconfRqst_PDU,
-      { "PDSCH-Information-AddItem-PSCH-ReconfRqst", "nbap.PDSCH_Information_AddItem_PSCH_ReconfRqst",
+      { "PDSCH-Information-AddItem-PSCH-ReconfRqst", "nbap.PDSCH_Information_AddItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PDSCH_AddInformation_LCR_AddItem_PSCH_ReconfRqst_PDU,
-      { "PDSCH-AddInformation-LCR-AddItem-PSCH-ReconfRqst", "nbap.PDSCH_AddInformation_LCR_AddItem_PSCH_ReconfRqst",
+      { "PDSCH-AddInformation-LCR-AddItem-PSCH-ReconfRqst", "nbap.PDSCH_AddInformation_LCR_AddItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PDSCH_AddInformation_768_AddItem_PSCH_ReconfRqst_PDU,
-      { "PDSCH-AddInformation-768-AddItem-PSCH-ReconfRqst", "nbap.PDSCH_AddInformation_768_AddItem_PSCH_ReconfRqst",
+      { "PDSCH-AddInformation-768-AddItem-PSCH-ReconfRqst", "nbap.PDSCH_AddInformation_768_AddItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PDSCHSets_ModifyList_PSCH_ReconfRqst_PDU,
@@ -58648,15 +58648,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PDSCH_Information_ModifyItem_PSCH_ReconfRqst_PDU,
-      { "PDSCH-Information-ModifyItem-PSCH-ReconfRqst", "nbap.PDSCH_Information_ModifyItem_PSCH_ReconfRqst",
+      { "PDSCH-Information-ModifyItem-PSCH-ReconfRqst", "nbap.PDSCH_Information_ModifyItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PDSCH_ModifyInformation_LCR_ModifyItem_PSCH_ReconfRqst_PDU,
-      { "PDSCH-ModifyInformation-LCR-ModifyItem-PSCH-ReconfRqst", "nbap.PDSCH_ModifyInformation_LCR_ModifyItem_PSCH_ReconfRqst",
+      { "PDSCH-ModifyInformation-LCR-ModifyItem-PSCH-ReconfRqst", "nbap.PDSCH_ModifyInformation_LCR_ModifyItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PDSCH_ModifyInformation_768_ModifyItem_PSCH_ReconfRqst_PDU,
-      { "PDSCH-ModifyInformation-768-ModifyItem-PSCH-ReconfRqst", "nbap.PDSCH_ModifyInformation_768_ModifyItem_PSCH_ReconfRqst",
+      { "PDSCH-ModifyInformation-768-ModifyItem-PSCH-ReconfRqst", "nbap.PDSCH_ModifyInformation_768_ModifyItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PDSCHSets_DeleteList_PSCH_ReconfRqst_PDU,
@@ -58668,15 +58668,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PUSCH_Information_AddItem_PSCH_ReconfRqst_PDU,
-      { "PUSCH-Information-AddItem-PSCH-ReconfRqst", "nbap.PUSCH_Information_AddItem_PSCH_ReconfRqst",
+      { "PUSCH-Information-AddItem-PSCH-ReconfRqst", "nbap.PUSCH_Information_AddItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PUSCH_AddInformation_LCR_AddItem_PSCH_ReconfRqst_PDU,
-      { "PUSCH-AddInformation-LCR-AddItem-PSCH-ReconfRqst", "nbap.PUSCH_AddInformation_LCR_AddItem_PSCH_ReconfRqst",
+      { "PUSCH-AddInformation-LCR-AddItem-PSCH-ReconfRqst", "nbap.PUSCH_AddInformation_LCR_AddItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PUSCH_AddInformation_768_AddItem_PSCH_ReconfRqst_PDU,
-      { "PUSCH-AddInformation-768-AddItem-PSCH-ReconfRqst", "nbap.PUSCH_AddInformation_768_AddItem_PSCH_ReconfRqst",
+      { "PUSCH-AddInformation-768-AddItem-PSCH-ReconfRqst", "nbap.PUSCH_AddInformation_768_AddItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PUSCHSets_ModifyList_PSCH_ReconfRqst_PDU,
@@ -58684,15 +58684,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PUSCH_Information_ModifyItem_PSCH_ReconfRqst_PDU,
-      { "PUSCH-Information-ModifyItem-PSCH-ReconfRqst", "nbap.PUSCH_Information_ModifyItem_PSCH_ReconfRqst",
+      { "PUSCH-Information-ModifyItem-PSCH-ReconfRqst", "nbap.PUSCH_Information_ModifyItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PUSCH_ModifyInformation_LCR_ModifyItem_PSCH_ReconfRqst_PDU,
-      { "PUSCH-ModifyInformation-LCR-ModifyItem-PSCH-ReconfRqst", "nbap.PUSCH_ModifyInformation_LCR_ModifyItem_PSCH_ReconfRqst",
+      { "PUSCH-ModifyInformation-LCR-ModifyItem-PSCH-ReconfRqst", "nbap.PUSCH_ModifyInformation_LCR_ModifyItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PUSCH_ModifyInformation_768_ModifyItem_PSCH_ReconfRqst_PDU,
-      { "PUSCH-ModifyInformation-768-ModifyItem-PSCH-ReconfRqst", "nbap.PUSCH_ModifyInformation_768_ModifyItem_PSCH_ReconfRqst",
+      { "PUSCH-ModifyInformation-768-ModifyItem-PSCH-ReconfRqst", "nbap.PUSCH_ModifyInformation_768_ModifyItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PUSCHSets_DeleteList_PSCH_ReconfRqst_PDU,
@@ -58700,7 +58700,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HS_PDSCH_TDD_Information_PSCH_ReconfRqst_PDU,
-      { "HS-PDSCH-TDD-Information-PSCH-ReconfRqst", "nbap.HS_PDSCH_TDD_Information_PSCH_ReconfRqst",
+      { "HS-PDSCH-TDD-Information-PSCH-ReconfRqst", "nbap.HS_PDSCH_TDD_Information_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_HS_PDSCH_Timeslot_Information_768_PSCH_ReconfRqst_PDU,
@@ -58712,11 +58712,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MultipleFreq_DL_HS_PDSCH_Timeslot_Information_LCRItem_PSCH_ReconfRqst_PDU,
-      { "MultipleFreq-DL-HS-PDSCH-Timeslot-Information-LCRItem-PSCH-ReconfRqst", "nbap.MultipleFreq_DL_HS_PDSCH_Timeslot_Information_LCRItem_PSCH_ReconfRqst",
+      { "MultipleFreq-DL-HS-PDSCH-Timeslot-Information-LCRItem-PSCH-ReconfRqst", "nbap.MultipleFreq_DL_HS_PDSCH_Timeslot_Information_LCRItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Add_To_HS_SCCH_Resource_Pool_PSCH_ReconfRqst_PDU,
-      { "Add-To-HS-SCCH-Resource-Pool-PSCH-ReconfRqst", "nbap.Add_To_HS_SCCH_Resource_Pool_PSCH_ReconfRqst",
+      { "Add-To-HS-SCCH-Resource-Pool-PSCH-ReconfRqst", "nbap.Add_To_HS_SCCH_Resource_Pool_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HS_SCCH_Information_768_PSCH_ReconfRqst_PDU,
@@ -58728,7 +58728,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Modify_HS_SCCH_Resource_Pool_PSCH_ReconfRqst_PDU,
-      { "Modify-HS-SCCH-Resource-Pool-PSCH-ReconfRqst", "nbap.Modify_HS_SCCH_Resource_Pool_PSCH_ReconfRqst",
+      { "Modify-HS-SCCH-Resource-Pool-PSCH-ReconfRqst", "nbap.Modify_HS_SCCH_Resource_Pool_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HS_SCCH_InformationModifyExt_LCR_PSCH_ReconfRqst_PDU,
@@ -58744,15 +58744,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_PUCH_Information_PSCH_ReconfRqst_PDU,
-      { "E-PUCH-Information-PSCH-ReconfRqst", "nbap.E_PUCH_Information_PSCH_ReconfRqst",
+      { "E-PUCH-Information-PSCH-ReconfRqst", "nbap.E_PUCH_Information_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Add_To_E_AGCH_Resource_Pool_PSCH_ReconfRqst_PDU,
-      { "Add-To-E-AGCH-Resource-Pool-PSCH-ReconfRqst", "nbap.Add_To_E_AGCH_Resource_Pool_PSCH_ReconfRqst",
+      { "Add-To-E-AGCH-Resource-Pool-PSCH-ReconfRqst", "nbap.Add_To_E_AGCH_Resource_Pool_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Modify_E_AGCH_Resource_Pool_PSCH_ReconfRqst_PDU,
-      { "Modify-E-AGCH-Resource-Pool-PSCH-ReconfRqst", "nbap.Modify_E_AGCH_Resource_Pool_PSCH_ReconfRqst",
+      { "Modify-E-AGCH-Resource-Pool-PSCH-ReconfRqst", "nbap.Modify_E_AGCH_Resource_Pool_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Delete_From_E_AGCH_Resource_Pool_PSCH_ReconfRqst_PDU,
@@ -58760,43 +58760,43 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_HICH_Information_PSCH_ReconfRqst_PDU,
-      { "E-HICH-Information-PSCH-ReconfRqst", "nbap.E_HICH_Information_PSCH_ReconfRqst",
+      { "E-HICH-Information-PSCH-ReconfRqst", "nbap.E_HICH_Information_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_PUCH_Information_768_PSCH_ReconfRqst_PDU,
-      { "E-PUCH-Information-768-PSCH-ReconfRqst", "nbap.E_PUCH_Information_768_PSCH_ReconfRqst",
+      { "E-PUCH-Information-768-PSCH-ReconfRqst", "nbap.E_PUCH_Information_768_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Add_To_E_AGCH_Resource_Pool_768_PSCH_ReconfRqst_PDU,
-      { "Add-To-E-AGCH-Resource-Pool-768-PSCH-ReconfRqst", "nbap.Add_To_E_AGCH_Resource_Pool_768_PSCH_ReconfRqst",
+      { "Add-To-E-AGCH-Resource-Pool-768-PSCH-ReconfRqst", "nbap.Add_To_E_AGCH_Resource_Pool_768_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Modify_E_AGCH_Resource_Pool_768_PSCH_ReconfRqst_PDU,
-      { "Modify-E-AGCH-Resource-Pool-768-PSCH-ReconfRqst", "nbap.Modify_E_AGCH_Resource_Pool_768_PSCH_ReconfRqst",
+      { "Modify-E-AGCH-Resource-Pool-768-PSCH-ReconfRqst", "nbap.Modify_E_AGCH_Resource_Pool_768_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_HICH_Information_768_PSCH_ReconfRqst_PDU,
-      { "E-HICH-Information-768-PSCH-ReconfRqst", "nbap.E_HICH_Information_768_PSCH_ReconfRqst",
+      { "E-HICH-Information-768-PSCH-ReconfRqst", "nbap.E_HICH_Information_768_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_PUCH_Information_LCR_PSCH_ReconfRqst_PDU,
-      { "E-PUCH-Information-LCR-PSCH-ReconfRqst", "nbap.E_PUCH_Information_LCR_PSCH_ReconfRqst",
+      { "E-PUCH-Information-LCR-PSCH-ReconfRqst", "nbap.E_PUCH_Information_LCR_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Add_To_E_AGCH_Resource_Pool_LCR_PSCH_ReconfRqst_PDU,
-      { "Add-To-E-AGCH-Resource-Pool-LCR-PSCH-ReconfRqst", "nbap.Add_To_E_AGCH_Resource_Pool_LCR_PSCH_ReconfRqst",
+      { "Add-To-E-AGCH-Resource-Pool-LCR-PSCH-ReconfRqst", "nbap.Add_To_E_AGCH_Resource_Pool_LCR_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Modify_E_AGCH_Resource_Pool_LCR_PSCH_ReconfRqst_PDU,
-      { "Modify-E-AGCH-Resource-Pool-LCR-PSCH-ReconfRqst", "nbap.Modify_E_AGCH_Resource_Pool_LCR_PSCH_ReconfRqst",
+      { "Modify-E-AGCH-Resource-Pool-LCR-PSCH-ReconfRqst", "nbap.Modify_E_AGCH_Resource_Pool_LCR_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Add_To_E_HICH_Resource_Pool_LCR_PSCH_ReconfRqst_PDU,
-      { "Add-To-E-HICH-Resource-Pool-LCR-PSCH-ReconfRqst", "nbap.Add_To_E_HICH_Resource_Pool_LCR_PSCH_ReconfRqst",
+      { "Add-To-E-HICH-Resource-Pool-LCR-PSCH-ReconfRqst", "nbap.Add_To_E_HICH_Resource_Pool_LCR_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Modify_E_HICH_Resource_Pool_LCR_PSCH_ReconfRqst_PDU,
-      { "Modify-E-HICH-Resource-Pool-LCR-PSCH-ReconfRqst", "nbap.Modify_E_HICH_Resource_Pool_LCR_PSCH_ReconfRqst",
+      { "Modify-E-HICH-Resource-Pool-LCR-PSCH-ReconfRqst", "nbap.Modify_E_HICH_Resource_Pool_LCR_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Delete_From_E_HICH_Resource_Pool_PSCH_ReconfRqst_PDU,
@@ -58804,7 +58804,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SYNC_UL_Partition_LCR_PDU,
-      { "SYNC-UL-Partition-LCR", "nbap.SYNC_UL_Partition_LCR",
+      { "SYNC-UL-Partition-LCR", "nbap.SYNC_UL_Partition_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Delete_From_HS_SCCH_Resource_PoolExt_PSCH_ReconfRqst_PDU,
@@ -58816,7 +58816,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MultipleFreq_E_PUCH_Timeslot_Information_LCRItem_PSCH_ReconfRqst_PDU,
-      { "MultipleFreq-E-PUCH-Timeslot-Information-LCRItem-PSCH-ReconfRqst", "nbap.MultipleFreq_E_PUCH_Timeslot_Information_LCRItem_PSCH_ReconfRqst",
+      { "MultipleFreq-E-PUCH-Timeslot-Information-LCRItem-PSCH-ReconfRqst", "nbap.MultipleFreq_E_PUCH_Timeslot_Information_LCRItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Max_RTWP_perUARFCN_Information_LCR_PSCH_ReconfRqst_PDU,
@@ -58824,7 +58824,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PhysicalSharedChannelReconfigurationResponse_PDU,
-      { "PhysicalSharedChannelReconfigurationResponse", "nbap.PhysicalSharedChannelReconfigurationResponse",
+      { "PhysicalSharedChannelReconfigurationResponse", "nbap.PhysicalSharedChannelReconfigurationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_HICH_TimeOffset_ExtensionLCR_PDU,
@@ -58832,11 +58832,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MultipleFreq_E_HICH_TimeOffsetLCR_PDU,
-      { "MultipleFreq-E-HICH-TimeOffsetLCR", "nbap.MultipleFreq_E_HICH_TimeOffsetLCR",
+      { "MultipleFreq-E-HICH-TimeOffsetLCR", "nbap.MultipleFreq_E_HICH_TimeOffsetLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PhysicalSharedChannelReconfigurationFailure_PDU,
-      { "PhysicalSharedChannelReconfigurationFailure", "nbap.PhysicalSharedChannelReconfigurationFailure",
+      { "PhysicalSharedChannelReconfigurationFailure", "nbap.PhysicalSharedChannelReconfigurationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CauseLevel_PSCH_ReconfFailure_PDU,
@@ -58844,11 +58844,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_CauseLevel_PSCH_ReconfFailure_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_Unsuccessful_PDSCHSetItem_PSCH_ReconfFailureTDD_PDU,
-      { "Unsuccessful-PDSCHSetItem-PSCH-ReconfFailureTDD", "nbap.Unsuccessful_PDSCHSetItem_PSCH_ReconfFailureTDD",
+      { "Unsuccessful-PDSCHSetItem-PSCH-ReconfFailureTDD", "nbap.Unsuccessful_PDSCHSetItem_PSCH_ReconfFailureTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Unsuccessful_PUSCHSetItem_PSCH_ReconfFailureTDD_PDU,
-      { "Unsuccessful-PUSCHSetItem-PSCH-ReconfFailureTDD", "nbap.Unsuccessful_PUSCHSetItem_PSCH_ReconfFailureTDD",
+      { "Unsuccessful-PUSCHSetItem-PSCH-ReconfFailureTDD", "nbap.Unsuccessful_PUSCHSetItem_PSCH_ReconfFailureTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UARFCNSpecificCauseList_PSCH_ReconfFailureTDD_PDU,
@@ -58856,7 +58856,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Unsuccessful_UARFCNItem_PSCH_ReconfFailureTDD_PDU,
-      { "Unsuccessful-UARFCNItem-PSCH-ReconfFailureTDD", "nbap.Unsuccessful_UARFCNItem_PSCH_ReconfFailureTDD",
+      { "Unsuccessful-UARFCNItem-PSCH-ReconfFailureTDD", "nbap.Unsuccessful_UARFCNItem_PSCH_ReconfFailureTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_HICH_TimeOffset_ReconfFailureTDD_PDU,
@@ -58864,11 +58864,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Common_System_Information_ResponseLCR_PDU,
-      { "Common-System-Information-ResponseLCR", "nbap.Common_System_Information_ResponseLCR",
+      { "Common-System-Information-ResponseLCR", "nbap.Common_System_Information_ResponseLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ResetRequest_PDU,
-      { "ResetRequest", "nbap.ResetRequest",
+      { "ResetRequest", "nbap.ResetRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ResetIndicator_PDU,
@@ -58876,19 +58876,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_ResetIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_CommunicationContextInfoItem_Reset_PDU,
-      { "CommunicationContextInfoItem-Reset", "nbap.CommunicationContextInfoItem_Reset",
+      { "CommunicationContextInfoItem-Reset", "nbap.CommunicationContextInfoItem_Reset_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommunicationControlPortInfoItem_Reset_PDU,
-      { "CommunicationControlPortInfoItem-Reset", "nbap.CommunicationControlPortInfoItem_Reset",
+      { "CommunicationControlPortInfoItem-Reset", "nbap.CommunicationControlPortInfoItem_Reset_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ResetResponse_PDU,
-      { "ResetResponse", "nbap.ResetResponse",
+      { "ResetResponse", "nbap.ResetResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_InformationExchangeInitiationRequest_PDU,
-      { "InformationExchangeInitiationRequest", "nbap.InformationExchangeInitiationRequest",
+      { "InformationExchangeInitiationRequest", "nbap.InformationExchangeInitiationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_InformationExchangeObjectType_InfEx_Rqst_PDU,
@@ -58896,7 +58896,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_InformationExchangeObjectType_InfEx_Rqst_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_InformationExchangeInitiationResponse_PDU,
-      { "InformationExchangeInitiationResponse", "nbap.InformationExchangeInitiationResponse",
+      { "InformationExchangeInitiationResponse", "nbap.InformationExchangeInitiationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_InformationExchangeObjectType_InfEx_Rsp_PDU,
@@ -58904,11 +58904,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_InformationExchangeObjectType_InfEx_Rsp_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_InformationExchangeInitiationFailure_PDU,
-      { "InformationExchangeInitiationFailure", "nbap.InformationExchangeInitiationFailure",
+      { "InformationExchangeInitiationFailure", "nbap.InformationExchangeInitiationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_InformationReport_PDU,
-      { "InformationReport", "nbap.InformationReport",
+      { "InformationReport", "nbap.InformationReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_InformationExchangeObjectType_InfEx_Rprt_PDU,
@@ -58916,15 +58916,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_InformationExchangeObjectType_InfEx_Rprt_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_InformationExchangeTerminationRequest_PDU,
-      { "InformationExchangeTerminationRequest", "nbap.InformationExchangeTerminationRequest",
+      { "InformationExchangeTerminationRequest", "nbap.InformationExchangeTerminationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_InformationExchangeFailureIndication_PDU,
-      { "InformationExchangeFailureIndication", "nbap.InformationExchangeFailureIndication",
+      { "InformationExchangeFailureIndication", "nbap.InformationExchangeFailureIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellSynchronisationInitiationRequestTDD_PDU,
-      { "CellSynchronisationInitiationRequestTDD", "nbap.CellSynchronisationInitiationRequestTDD",
+      { "CellSynchronisationInitiationRequestTDD", "nbap.CellSynchronisationInitiationRequestTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_TimeslotInfo_CellSyncInitiationRqstTDD_PDU,
@@ -58932,31 +58932,31 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellSyncBurstTransInit_CellSyncInitiationRqstTDD_PDU,
-      { "CellSyncBurstTransInit-CellSyncInitiationRqstTDD", "nbap.CellSyncBurstTransInit_CellSyncInitiationRqstTDD",
+      { "CellSyncBurstTransInit-CellSyncInitiationRqstTDD", "nbap.CellSyncBurstTransInit_CellSyncInitiationRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellSyncBurstMeasureInit_CellSyncInitiationRqstTDD_PDU,
-      { "CellSyncBurstMeasureInit-CellSyncInitiationRqstTDD", "nbap.CellSyncBurstMeasureInit_CellSyncInitiationRqstTDD",
+      { "CellSyncBurstMeasureInit-CellSyncInitiationRqstTDD", "nbap.CellSyncBurstMeasureInit_CellSyncInitiationRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SYNCDlCodeId_TransInitLCR_CellSyncInitiationRqstTDD_PDU,
-      { "SYNCDlCodeId-TransInitLCR-CellSyncInitiationRqstTDD", "nbap.SYNCDlCodeId_TransInitLCR_CellSyncInitiationRqstTDD",
+      { "SYNCDlCodeId-TransInitLCR-CellSyncInitiationRqstTDD", "nbap.SYNCDlCodeId_TransInitLCR_CellSyncInitiationRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SYNCDlCodeId_MeasureInitLCR_CellSyncInitiationRqstTDD_PDU,
-      { "SYNCDlCodeId-MeasureInitLCR-CellSyncInitiationRqstTDD", "nbap.SYNCDlCodeId_MeasureInitLCR_CellSyncInitiationRqstTDD",
+      { "SYNCDlCodeId-MeasureInitLCR-CellSyncInitiationRqstTDD", "nbap.SYNCDlCodeId_MeasureInitLCR_CellSyncInitiationRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellSynchronisationInitiationResponseTDD_PDU,
-      { "CellSynchronisationInitiationResponseTDD", "nbap.CellSynchronisationInitiationResponseTDD",
+      { "CellSynchronisationInitiationResponseTDD", "nbap.CellSynchronisationInitiationResponseTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellSynchronisationInitiationFailureTDD_PDU,
-      { "CellSynchronisationInitiationFailureTDD", "nbap.CellSynchronisationInitiationFailureTDD",
+      { "CellSynchronisationInitiationFailureTDD", "nbap.CellSynchronisationInitiationFailureTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellSynchronisationReconfigurationRequestTDD_PDU,
-      { "CellSynchronisationReconfigurationRequestTDD", "nbap.CellSynchronisationReconfigurationRequestTDD",
+      { "CellSynchronisationReconfigurationRequestTDD", "nbap.CellSynchronisationReconfigurationRequestTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellSyncBurstTransReconfInfo_CellSyncReconfRqstTDD_PDU,
@@ -58964,7 +58964,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellSyncBurstMeasInfo_CellSyncReconfRqstTDD_PDU,
-      { "CellSyncBurstMeasInfo-CellSyncReconfRqstTDD", "nbap.CellSyncBurstMeasInfo_CellSyncReconfRqstTDD",
+      { "CellSyncBurstMeasInfo-CellSyncReconfRqstTDD", "nbap.CellSyncBurstMeasInfo_CellSyncReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellSyncBurstMeasInfoListIE_CellSyncReconfRqstTDD_PDU,
@@ -58976,19 +58976,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SYNCDlCodeIdMeasInfoLCR_CellSyncReconfRqstTDD_PDU,
-      { "SYNCDlCodeIdMeasInfoLCR-CellSyncReconfRqstTDD", "nbap.SYNCDlCodeIdMeasInfoLCR_CellSyncReconfRqstTDD",
+      { "SYNCDlCodeIdMeasInfoLCR-CellSyncReconfRqstTDD", "nbap.SYNCDlCodeIdMeasInfoLCR_CellSyncReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellSynchronisationReconfigurationResponseTDD_PDU,
-      { "CellSynchronisationReconfigurationResponseTDD", "nbap.CellSynchronisationReconfigurationResponseTDD",
+      { "CellSynchronisationReconfigurationResponseTDD", "nbap.CellSynchronisationReconfigurationResponseTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellSynchronisationReconfigurationFailureTDD_PDU,
-      { "CellSynchronisationReconfigurationFailureTDD", "nbap.CellSynchronisationReconfigurationFailureTDD",
+      { "CellSynchronisationReconfigurationFailureTDD", "nbap.CellSynchronisationReconfigurationFailureTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellSynchronisationAdjustmentRequestTDD_PDU,
-      { "CellSynchronisationAdjustmentRequestTDD", "nbap.CellSynchronisationAdjustmentRequestTDD",
+      { "CellSynchronisationAdjustmentRequestTDD", "nbap.CellSynchronisationAdjustmentRequestTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellAdjustmentInfo_SyncAdjustmentRqstTDD_PDU,
@@ -58996,15 +58996,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellAdjustmentInfoItem_SyncAdjustmentRqstTDD_PDU,
-      { "CellAdjustmentInfoItem-SyncAdjustmentRqstTDD", "nbap.CellAdjustmentInfoItem_SyncAdjustmentRqstTDD",
+      { "CellAdjustmentInfoItem-SyncAdjustmentRqstTDD", "nbap.CellAdjustmentInfoItem_SyncAdjustmentRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellSynchronisationAdjustmentResponseTDD_PDU,
-      { "CellSynchronisationAdjustmentResponseTDD", "nbap.CellSynchronisationAdjustmentResponseTDD",
+      { "CellSynchronisationAdjustmentResponseTDD", "nbap.CellSynchronisationAdjustmentResponseTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellSynchronisationAdjustmentFailureTDD_PDU,
-      { "CellSynchronisationAdjustmentFailureTDD", "nbap.CellSynchronisationAdjustmentFailureTDD",
+      { "CellSynchronisationAdjustmentFailureTDD", "nbap.CellSynchronisationAdjustmentFailureTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CauseLevel_SyncAdjustmntFailureTDD_PDU,
@@ -59012,19 +59012,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_CauseLevel_SyncAdjustmntFailureTDD_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_Unsuccessful_cell_InformationRespItem_SyncAdjustmntFailureTDD_PDU,
-      { "Unsuccessful-cell-InformationRespItem-SyncAdjustmntFailureTDD", "nbap.Unsuccessful_cell_InformationRespItem_SyncAdjustmntFailureTDD",
+      { "Unsuccessful-cell-InformationRespItem-SyncAdjustmntFailureTDD", "nbap.Unsuccessful_cell_InformationRespItem_SyncAdjustmntFailureTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellSynchronisationTerminationRequestTDD_PDU,
-      { "CellSynchronisationTerminationRequestTDD", "nbap.CellSynchronisationTerminationRequestTDD",
+      { "CellSynchronisationTerminationRequestTDD", "nbap.CellSynchronisationTerminationRequestTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellSynchronisationFailureIndicationTDD_PDU,
-      { "CellSynchronisationFailureIndicationTDD", "nbap.CellSynchronisationFailureIndicationTDD",
+      { "CellSynchronisationFailureIndicationTDD", "nbap.CellSynchronisationFailureIndicationTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellSynchronisationReportTDD_PDU,
-      { "CellSynchronisationReportTDD", "nbap.CellSynchronisationReportTDD",
+      { "CellSynchronisationReportTDD", "nbap.CellSynchronisationReportTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellSyncInfo_CellSyncReprtTDD_PDU,
@@ -59040,7 +59040,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_BearerRearrangementIndication_PDU,
-      { "BearerRearrangementIndication", "nbap.BearerRearrangementIndication",
+      { "BearerRearrangementIndication", "nbap.BearerRearrangementIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DCH_RearrangeList_Bearer_RearrangeInd_PDU,
@@ -59068,7 +59068,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkActivationCommandFDD_PDU,
-      { "RadioLinkActivationCommandFDD", "nbap.RadioLinkActivationCommandFDD",
+      { "RadioLinkActivationCommandFDD", "nbap.RadioLinkActivationCommandFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DelayedActivationInformationList_RL_ActivationCmdFDD_PDU,
@@ -59076,11 +59076,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DelayedActivationInformation_RL_ActivationCmdFDD_PDU,
-      { "DelayedActivationInformation-RL-ActivationCmdFDD", "nbap.DelayedActivationInformation_RL_ActivationCmdFDD",
+      { "DelayedActivationInformation-RL-ActivationCmdFDD", "nbap.DelayedActivationInformation_RL_ActivationCmdFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkActivationCommandTDD_PDU,
-      { "RadioLinkActivationCommandTDD", "nbap.RadioLinkActivationCommandTDD",
+      { "RadioLinkActivationCommandTDD", "nbap.RadioLinkActivationCommandTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DelayedActivationInformationList_RL_ActivationCmdTDD_PDU,
@@ -59088,11 +59088,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DelayedActivationInformation_RL_ActivationCmdTDD_PDU,
-      { "DelayedActivationInformation-RL-ActivationCmdTDD", "nbap.DelayedActivationInformation_RL_ActivationCmdTDD",
+      { "DelayedActivationInformation-RL-ActivationCmdTDD", "nbap.DelayedActivationInformation_RL_ActivationCmdTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkParameterUpdateIndicationFDD_PDU,
-      { "RadioLinkParameterUpdateIndicationFDD", "nbap.RadioLinkParameterUpdateIndicationFDD",
+      { "RadioLinkParameterUpdateIndicationFDD", "nbap.RadioLinkParameterUpdateIndicationFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_HS_Cell_Information_RL_Param_Upd_PDU,
@@ -59104,23 +59104,23 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RadioLinkParameterUpdateIndicationTDD_PDU,
-      { "RadioLinkParameterUpdateIndicationTDD", "nbap.RadioLinkParameterUpdateIndicationTDD",
+      { "RadioLinkParameterUpdateIndicationTDD", "nbap.RadioLinkParameterUpdateIndicationTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MBMSNotificationUpdateCommand_PDU,
-      { "MBMSNotificationUpdateCommand", "nbap.MBMSNotificationUpdateCommand",
+      { "MBMSNotificationUpdateCommand", "nbap.MBMSNotificationUpdateCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UEStatusUpdateCommand_PDU,
-      { "UEStatusUpdateCommand", "nbap.UEStatusUpdateCommand",
+      { "UEStatusUpdateCommand", "nbap.UEStatusUpdateCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SecondaryULFrequencyReport_PDU,
-      { "SecondaryULFrequencyReport", "nbap.SecondaryULFrequencyReport",
+      { "SecondaryULFrequencyReport", "nbap.SecondaryULFrequencyReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SecondaryULFrequencyUpdateIndication_PDU,
-      { "SecondaryULFrequencyUpdateIndication", "nbap.SecondaryULFrequencyUpdateIndication",
+      { "SecondaryULFrequencyUpdateIndication", "nbap.SecondaryULFrequencyUpdateIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_NBAP_PDU_PDU,
@@ -59128,7 +59128,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_NBAP_PDU_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_NULL_PDU,
-      { "NULL", "nbap.NULL",
+      { "NULL", "nbap.NULL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_local,
@@ -59156,7 +59156,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_32767", HFILL }},
     { &hf_nbap_ProtocolIE_Container_item,
-      { "ProtocolIE-Field", "nbap.ProtocolIE_Field",
+      { "ProtocolIE-Field", "nbap.ProtocolIE_Field_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_id,
@@ -59168,19 +59168,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_Criticality_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_ie_field_value,
-      { "value", "nbap.value",
+      { "value", "nbap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProtocolIE_Field_value", HFILL }},
     { &hf_nbap_ProtocolExtensionContainer_item,
-      { "ProtocolExtensionField", "nbap.ProtocolExtensionField",
+      { "ProtocolExtensionField", "nbap.ProtocolExtensionField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_extensionValue,
-      { "extensionValue", "nbap.extensionValue",
+      { "extensionValue", "nbap.extensionValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PrivateIE_Container_item,
-      { "PrivateIE-Field", "nbap.PrivateIE_Field",
+      { "PrivateIE-Field", "nbap.PrivateIE_Field_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_id_01,
@@ -59188,11 +59188,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_PrivateIE_ID_vals), 0,
         "PrivateIE_ID", HFILL }},
     { &hf_nbap_private_value,
-      { "value", "nbap.value",
+      { "value", "nbap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrivateIE_Field_value", HFILL }},
     { &hf_nbap_ActivationInformation_item,
-      { "ActivationInformationItem", "nbap.ActivationInformationItem",
+      { "ActivationInformationItem", "nbap.ActivationInformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uU_ActivationState,
@@ -59212,11 +59212,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_EDCH_Cell_Information_Setup_item,
-      { "Additional-EDCH-FDD-Setup-Cell-Information", "nbap.Additional_EDCH_FDD_Setup_Cell_Information",
+      { "Additional-EDCH-FDD-Setup-Cell-Information", "nbap.Additional_EDCH_FDD_Setup_Cell_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_additional_EDCH_UL_DPCH_Information_Setup,
-      { "additional-EDCH-UL-DPCH-Information-Setup", "nbap.additional_EDCH_UL_DPCH_Information_Setup",
+      { "additional-EDCH-UL-DPCH-Information-Setup", "nbap.additional_EDCH_UL_DPCH_Information_Setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_additional_EDCH_RL_Specific_Information_To_Setup,
@@ -59224,19 +59224,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Additional_EDCH_RL_Specific_Information_To_Setup_List", HFILL }},
     { &hf_nbap_additional_EDCH_FDD_Information,
-      { "additional-EDCH-FDD-Information", "nbap.additional_EDCH_FDD_Information",
+      { "additional-EDCH-FDD-Information", "nbap.additional_EDCH_FDD_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_additional_EDCH_F_DPCH_Information_Setup,
-      { "additional-EDCH-F-DPCH-Information-Setup", "nbap.additional_EDCH_F_DPCH_Information_Setup",
+      { "additional-EDCH-F-DPCH-Information-Setup", "nbap.additional_EDCH_F_DPCH_Information_Setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Additional_EDCH_F_DPCH_Information", HFILL }},
     { &hf_nbap_multicell_EDCH_Information,
-      { "multicell-EDCH-Information", "nbap.multicell_EDCH_Information",
+      { "multicell-EDCH-Information", "nbap.multicell_EDCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ul_ScramblingCode,
-      { "ul-ScramblingCode", "nbap.ul_ScramblingCode",
+      { "ul-ScramblingCode", "nbap.ul_ScramblingCode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ul_SIR_Target,
@@ -59256,7 +59256,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_InnerLoopDLPCStatus_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_EDCH_RL_Specific_Information_To_Setup_List_item,
-      { "Additional-EDCH-RL-Specific-Information-To-Setup-ItemIEs", "nbap.Additional_EDCH_RL_Specific_Information_To_Setup_ItemIEs",
+      { "Additional-EDCH-RL-Specific-Information-To-Setup-ItemIEs", "nbap.Additional_EDCH_RL_Specific_Information_To_Setup_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_eDCH_Additional_RL_ID,
@@ -59300,11 +59300,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_multicell_EDCH_RL_Specific_Information,
-      { "multicell-EDCH-RL-Specific-Information", "nbap.multicell_EDCH_RL_Specific_Information",
+      { "multicell-EDCH-RL-Specific-Information", "nbap.multicell_EDCH_RL_Specific_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_EDCH_Cell_Information_To_Add_List_item,
-      { "Additional-EDCH-Cell-Information-To-Add-ItemIEs", "nbap.Additional_EDCH_Cell_Information_To_Add_ItemIEs",
+      { "Additional-EDCH-Cell-Information-To-Add-ItemIEs", "nbap.Additional_EDCH_Cell_Information_To_Add_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_additional_EDCH_RL_Specific_Information_To_Add_ItemIEs,
@@ -59312,11 +59312,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_EDCH_RL_Specific_Information_To_Add_ItemIEs_item,
-      { "EDCH-Additional-RL-Specific-Information-To-Add-List", "nbap.EDCH_Additional_RL_Specific_Information_To_Add_List",
+      { "EDCH-Additional-RL-Specific-Information-To-Add-List", "nbap.EDCH_Additional_RL_Specific_Information_To_Add_List_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_EDCH_RL_Specific_Information_To_Modify_List_item,
-      { "Additional-EDCH-RL-Specific-Information-To-Modify-ItemIEs", "nbap.Additional_EDCH_RL_Specific_Information_To_Modify_ItemIEs",
+      { "Additional-EDCH-RL-Specific-Information-To-Modify-ItemIEs", "nbap.Additional_EDCH_RL_Specific_Information_To_Modify_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_additional_EDCH_MAC_d_Flows_Specific_Information,
@@ -59340,7 +59340,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_TFCI", HFILL }},
     { &hf_nbap_Additional_EDCH_MAC_d_Flows_Specific_Info_List_item,
-      { "Additional-EDCH-MAC-d-Flows-Specific-Info", "nbap.Additional_EDCH_MAC_d_Flows_Specific_Info",
+      { "Additional-EDCH-MAC-d-Flows-Specific-Info", "nbap.Additional_EDCH_MAC_d_Flows_Specific_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_MACdFlow_ID,
@@ -59356,7 +59356,7 @@ void proto_register_nbap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_EDCH_Cell_Information_Response_List_item,
-      { "Additional-EDCH-FDD-Information-Response-ItemIEs", "nbap.Additional_EDCH_FDD_Information_Response_ItemIEs",
+      { "Additional-EDCH-FDD-Information-Response-ItemIEs", "nbap.Additional_EDCH_FDD_Information_Response_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_eDCH_Additional_RL_Specific_Information_Response,
@@ -59368,7 +59368,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Additional_EDCH_MAC_d_Flow_Specific_Information_Response_List", HFILL }},
     { &hf_nbap_EDCH_Additional_RL_Specific_Information_Response_List_item,
-      { "EDCH-Additional-RL-Specific-Information-Response-ItemIEs", "nbap.EDCH_Additional_RL_Specific_Information_Response_ItemIEs",
+      { "EDCH-Additional-RL-Specific-Information-Response-ItemIEs", "nbap.EDCH_Additional_RL_Specific_Information_Response_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_received_total_wide_band_power,
@@ -59388,19 +59388,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "RL_Set_ID", HFILL }},
     { &hf_nbap_e_DCH_FDD_DL_Control_Channel_Information,
-      { "e-DCH-FDD-DL-Control-Channel-Information", "nbap.e_DCH_FDD_DL_Control_Channel_Information",
+      { "e-DCH-FDD-DL-Control-Channel-Information", "nbap.e_DCH_FDD_DL_Control_Channel_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_EDCH_Cell_Information_Response_RLReconf_List_item,
-      { "Additional-EDCH-FDD-Information-Response-RLReconf-Items", "nbap.Additional_EDCH_FDD_Information_Response_RLReconf_Items",
+      { "Additional-EDCH-FDD-Information-Response-RLReconf-Items", "nbap.Additional_EDCH_FDD_Information_Response_RLReconf_Items_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_additional_EDCH_FDD_Information_Response_ItemIEs,
-      { "additional-EDCH-FDD-Information-Response-ItemIEs", "nbap.additional_EDCH_FDD_Information_Response_ItemIEs",
+      { "additional-EDCH-FDD-Information-Response-ItemIEs", "nbap.additional_EDCH_FDD_Information_Response_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_additional_Modififed_EDCH_FDD_Information_Response_ItemIEs,
-      { "additional-Modififed-EDCH-FDD-Information-Response-ItemIEs", "nbap.additional_Modififed_EDCH_FDD_Information_Response_ItemIEs",
+      { "additional-Modififed-EDCH-FDD-Information-Response-ItemIEs", "nbap.additional_Modififed_EDCH_FDD_Information_Response_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_eDCH_Additional_Modified_RL_Specific_Information_Response,
@@ -59408,7 +59408,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "EDCH_Additional_Modified_RL_Specific_Information_Response_List", HFILL }},
     { &hf_nbap_EDCH_Additional_Modified_RL_Specific_Information_Response_List_item,
-      { "EDCH-Additional-Modified-RL-Specific-Information-Response-List-Items", "nbap.EDCH_Additional_Modified_RL_Specific_Information_Response_List_Items",
+      { "EDCH-Additional-Modified-RL-Specific-Information-Response-List-Items", "nbap.EDCH_Additional_Modified_RL_Specific_Information_Response_List_Items_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dL_PowerBalancing_UpdatedIndicator,
@@ -59416,27 +59416,27 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_DL_PowerBalancing_UpdatedIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_EDCH_MAC_d_Flow_Specific_Information_Response_List_item,
-      { "Additional-EDCH-MAC-d-Flows-Specific-Info-Response", "nbap.Additional_EDCH_MAC_d_Flows_Specific_Info_Response",
+      { "Additional-EDCH-MAC-d-Flows-Specific-Info-Response", "nbap.Additional_EDCH_MAC_d_Flows_Specific_Info_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_EDCH_Cell_Information_Response_RL_Add_List_item,
-      { "Additional-EDCH-Cell-Information-Response-RL-Add-ItemIEs", "nbap.Additional_EDCH_Cell_Information_Response_RL_Add_ItemIEs",
+      { "Additional-EDCH-Cell-Information-Response-RL-Add-ItemIEs", "nbap.Additional_EDCH_Cell_Information_Response_RL_Add_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_additional_EDCH_FDD_Information_Response,
-      { "additional-EDCH-FDD-Information-Response", "nbap.additional_EDCH_FDD_Information_Response",
+      { "additional-EDCH-FDD-Information-Response", "nbap.additional_EDCH_FDD_Information_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Additional_EDCH_FDD_Information_Response_ItemIEs", HFILL }},
     { &hf_nbap_additional_EDCH_Serving_Cell_Change_Information_Response,
-      { "additional-EDCH-Serving-Cell-Change-Information-Response", "nbap.additional_EDCH_Serving_Cell_Change_Information_Response",
+      { "additional-EDCH-Serving-Cell-Change-Information-Response", "nbap.additional_EDCH_Serving_Cell_Change_Information_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_DCH_Serving_Cell_Change_Info_Response", HFILL }},
     { &hf_nbap_Additional_EDCH_Cell_Information_ConfigurationChange_List_item,
-      { "Additional-EDCH-ConfigurationChange-Info-ItemIEs", "nbap.Additional_EDCH_ConfigurationChange_Info_ItemIEs",
+      { "Additional-EDCH-ConfigurationChange-Info-ItemIEs", "nbap.Additional_EDCH_ConfigurationChange_Info_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_additional_EDCH_UL_DPCH_Information_Modify,
-      { "additional-EDCH-UL-DPCH-Information-Modify", "nbap.additional_EDCH_UL_DPCH_Information_Modify",
+      { "additional-EDCH-UL-DPCH-Information-Modify", "nbap.additional_EDCH_UL_DPCH_Information_Modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_additional_EDCH_RL_Specific_Information_To_Add,
@@ -59448,15 +59448,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Additional_EDCH_RL_Specific_Information_To_Modify_List", HFILL }},
     { &hf_nbap_additional_EDCH_FDD_Information_To_Modify,
-      { "additional-EDCH-FDD-Information-To-Modify", "nbap.additional_EDCH_FDD_Information_To_Modify",
+      { "additional-EDCH-FDD-Information-To-Modify", "nbap.additional_EDCH_FDD_Information_To_Modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Additional_EDCH_FDD_Information", HFILL }},
     { &hf_nbap_additional_EDCH_F_DPCH_Information_Modify,
-      { "additional-EDCH-F-DPCH-Information-Modify", "nbap.additional_EDCH_F_DPCH_Information_Modify",
+      { "additional-EDCH-F-DPCH-Information-Modify", "nbap.additional_EDCH_F_DPCH_Information_Modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Additional_EDCH_F_DPCH_Information", HFILL }},
     { &hf_nbap_Additional_EDCH_Cell_Information_Removal_List_item,
-      { "Additional-EDCH-Cell-Information-Removal-Info-ItemIEs", "nbap.Additional_EDCH_Cell_Information_Removal_Info_ItemIEs",
+      { "Additional-EDCH-Cell-Information-Removal-Info-ItemIEs", "nbap.Additional_EDCH_Cell_Information_Removal_Info_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_rL_on_Secondary_UL_Frequency,
@@ -59468,11 +59468,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Additional_EDCH_DL_Control_Channel_Change_Information_List", HFILL }},
     { &hf_nbap_Additional_EDCH_DL_Control_Channel_Change_Information_List_item,
-      { "Additional-EDCH-DL-Control-Channel-Change-Info-ItemIEs", "nbap.Additional_EDCH_DL_Control_Channel_Change_Info_ItemIEs",
+      { "Additional-EDCH-DL-Control-Channel-Change-Info-ItemIEs", "nbap.Additional_EDCH_DL_Control_Channel_Change_Info_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_AdditionalMeasurementValueList_item,
-      { "AdditionalMeasurementValue", "nbap.AdditionalMeasurementValue",
+      { "AdditionalMeasurementValue", "nbap.AdditionalMeasurementValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uARFCN,
@@ -59484,7 +59484,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_AdditionalTimeSlotListLCR_item,
-      { "AdditionalTimeSlotLCR", "nbap.AdditionalTimeSlotLCR",
+      { "AdditionalTimeSlotLCR", "nbap.AdditionalTimeSlotLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_timeslot_InitiatedListLCR,
@@ -59500,7 +59500,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Transmission_Gap_Pattern_Sequence_Status_List", HFILL }},
     { &hf_nbap_Transmission_Gap_Pattern_Sequence_Status_List_item,
-      { "Transmission-Gap-Pattern-Sequence-Status-List item", "nbap.Transmission_Gap_Pattern_Sequence_Status_List_item",
+      { "Transmission-Gap-Pattern-Sequence-Status-List item", "nbap.Transmission_Gap_Pattern_Sequence_Status_List_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_tGPSID,
@@ -59548,7 +59548,7 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         "DL_Power", HFILL }},
     { &hf_nbap_Best_Cell_Portions_Value_item,
-      { "Best-Cell-Portions-Item", "nbap.Best_Cell_Portions_Item",
+      { "Best-Cell-Portions-Item", "nbap.Best_Cell_Portions_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_cellPortionID,
@@ -59560,7 +59560,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "SIR_Value", HFILL }},
     { &hf_nbap_Best_Cell_Portions_ValueLCR_item,
-      { "Best-Cell-Portions-ItemLCR", "nbap.Best_Cell_Portions_ItemLCR",
+      { "Best-Cell-Portions-ItemLCR", "nbap.Best_Cell_Portions_ItemLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_cellPortionLCRID,
@@ -59596,7 +59596,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_CauseMisc_vals), 0,
         "CauseMisc", HFILL }},
     { &hf_nbap_Cell_ERNTI_Status_Information_item,
-      { "Cell-ERNTI-Status-Information-Item", "nbap.Cell_ERNTI_Status_Information_Item",
+      { "Cell-ERNTI-Status-Information-Item", "nbap.Cell_ERNTI_Status_Information_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_vacant_ERNTI,
@@ -59624,7 +59624,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_127_", HFILL }},
     { &hf_nbap_CommonChannelsCapacityConsumptionLaw_item,
-      { "CommonChannelsCapacityConsumptionLaw item", "nbap.CommonChannelsCapacityConsumptionLaw_item",
+      { "CommonChannelsCapacityConsumptionLaw item", "nbap.CommonChannelsCapacityConsumptionLaw_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dl_Cost,
@@ -59636,27 +59636,27 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_65535", HFILL }},
     { &hf_nbap_common_E_DCH_UL_DPCH_Information,
-      { "common-E-DCH-UL-DPCH-Information", "nbap.common_E_DCH_UL_DPCH_Information",
+      { "common-E-DCH-UL-DPCH-Information", "nbap.common_E_DCH_UL_DPCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Common_E_DCH_UL_DPCH_InfoItem", HFILL }},
     { &hf_nbap_common_E_DCH_EDPCH_Information,
-      { "common-E-DCH-EDPCH-Information", "nbap.common_E_DCH_EDPCH_Information",
+      { "common-E-DCH-EDPCH-Information", "nbap.common_E_DCH_EDPCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Common_E_DCH_EDPCH_InfoItem", HFILL }},
     { &hf_nbap_common_E_DCH_Information,
-      { "common-E-DCH-Information", "nbap.common_E_DCH_Information",
+      { "common-E-DCH-Information", "nbap.common_E_DCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Common_E_DCH_InfoItem", HFILL }},
     { &hf_nbap_common_E_DCH_HSDPCCH_Information,
-      { "common-E-DCH-HSDPCCH-Information", "nbap.common_E_DCH_HSDPCCH_Information",
+      { "common-E-DCH-HSDPCCH-Information", "nbap.common_E_DCH_HSDPCCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Common_E_DCH_HSDPCCH_InfoItem", HFILL }},
     { &hf_nbap_common_E_DCH_Preamble_Control_Information,
-      { "common-E-DCH-Preamble-Control-Information", "nbap.common_E_DCH_Preamble_Control_Information",
+      { "common-E-DCH-Preamble-Control-Information", "nbap.common_E_DCH_Preamble_Control_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Common_E_DCH_Preamble_Control_InfoItem", HFILL }},
     { &hf_nbap_common_E_DCH_FDPCH_Information,
-      { "common-E-DCH-FDPCH-Information", "nbap.common_E_DCH_FDPCH_Information",
+      { "common-E-DCH-FDPCH-Information", "nbap.common_E_DCH_FDPCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Common_E_DCH_FDPCH_InfoItem", HFILL }},
     { &hf_nbap_common_E_DCH_E_AGCH_ChannelisationCodeNumber,
@@ -59688,7 +59688,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "PunctureLimit", HFILL }},
     { &hf_nbap_e_TFCS_Information,
-      { "e-TFCS-Information", "nbap.e_TFCS_Information",
+      { "e-TFCS-Information", "nbap.e_TFCS_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_TTI,
@@ -59728,7 +59728,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_max_TB_Sizes,
-      { "max-TB-Sizes", "nbap.max_TB_Sizes",
+      { "max-TB-Sizes", "nbap.max_TB_Sizes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_common_E_DCH_ImplicitRelease_Indicator,
@@ -59748,7 +59748,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Nack_Power_Offset", HFILL }},
     { &hf_nbap_common_E_DCH_CQI_Info,
-      { "common-E-DCH-CQI-Info", "nbap.common_E_DCH_CQI_Info",
+      { "common-E-DCH-CQI-Info", "nbap.common_E_DCH_CQI_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_cqiFeedback_CycleK,
@@ -59788,7 +59788,7 @@ void proto_register_nbap(void)
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_common_E_DCH_AICH_Information,
-      { "common-E-DCH-AICH-Information", "nbap.common_E_DCH_AICH_Information",
+      { "common-E-DCH-AICH-Information", "nbap.common_E_DCH_AICH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_aICH_TransmissionTiming,
@@ -59808,7 +59808,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_STTD_Indicator_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_Common_E_DCH_Resource_Combination_InfoList_item,
-      { "Common-E-DCH-Resource-Combination-InfoList-Item", "nbap.Common_E_DCH_Resource_Combination_InfoList_Item",
+      { "Common-E-DCH-Resource-Combination-InfoList-Item", "nbap.Common_E_DCH_Resource_Combination_InfoList_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_soffset,
@@ -59820,7 +59820,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "FDD_DL_ChannelisationCodeNumber", HFILL }},
     { &hf_nbap_ul_DPCH_ScramblingCode,
-      { "ul-DPCH-ScramblingCode", "nbap.ul_DPCH_ScramblingCode",
+      { "ul-DPCH-ScramblingCode", "nbap.ul_DPCH_ScramblingCode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_ScramblingCode", HFILL }},
     { &hf_nbap_e_RGCH_E_HICH_Channelisation_Code,
@@ -59836,7 +59836,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Ul_common_E_DCH_MACflow_Specific_InfoList_item,
-      { "Ul-common-E-DCH-MACflow-Specific-InfoList-Item", "nbap.Ul_common_E_DCH_MACflow_Specific_InfoList_Item",
+      { "Ul-common-E-DCH-MACflow-Specific-InfoList-Item", "nbap.Ul_common_E_DCH_MACflow_Specific_InfoList_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ul_Common_MACFlowID,
@@ -59864,7 +59864,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Common_E_DCH_MACdFlow_Specific_InfoList", HFILL }},
     { &hf_nbap_Common_E_DCH_MACdFlow_Specific_InfoList_item,
-      { "Common-E-DCH-MACdFlow-Specific-InfoList-Item", "nbap.Common_E_DCH_MACdFlow_Specific_InfoList_Item",
+      { "Common-E-DCH-MACdFlow-Specific-InfoList-Item", "nbap.Common_E_DCH_MACdFlow_Specific_InfoList_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_common_e_DCH_MACdFlow_ID,
@@ -59888,7 +59888,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Common_E_DCH_LogicalChannel_InfoList", HFILL }},
     { &hf_nbap_Common_E_DCH_LogicalChannel_InfoList_item,
-      { "Common-E-DCH-LogicalChannel-InfoList-Item", "nbap.Common_E_DCH_LogicalChannel_InfoList_Item",
+      { "Common-E-DCH-LogicalChannel-InfoList-Item", "nbap.Common_E_DCH_LogicalChannel_InfoList_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_logicalChannelId,
@@ -59912,11 +59912,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Ul_common_E_DCH_MACflow_Specific_InfoResponseList_item,
-      { "Ul-common-E-DCH-MACflow-Specific-InfoResponseList-Item", "nbap.Ul_common_E_DCH_MACflow_Specific_InfoResponseList_Item",
+      { "Ul-common-E-DCH-MACflow-Specific-InfoResponseList-Item", "nbap.Ul_common_E_DCH_MACflow_Specific_InfoResponseList_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Common_MACFlows_to_DeleteFDD_item,
-      { "Common-MACFlows-to-DeleteFDD-Item", "nbap.Common_MACFlows_to_DeleteFDD_Item",
+      { "Common-MACFlows-to-DeleteFDD-Item", "nbap.Common_MACFlows_to_DeleteFDD_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_common_MACFlow_ID,
@@ -59924,7 +59924,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonMACFlow_Specific_InfoList_item,
-      { "CommonMACFlow-Specific-InfoItem", "nbap.CommonMACFlow_Specific_InfoItem",
+      { "CommonMACFlow-Specific-InfoItem", "nbap.CommonMACFlow_Specific_InfoItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_common_MACFlow_Id,
@@ -59940,7 +59940,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonMACFlow_Specific_InfoList_Response_item,
-      { "CommonMACFlow-Specific-InfoItem-Response", "nbap.CommonMACFlow_Specific_InfoItem_Response",
+      { "CommonMACFlow-Specific-InfoItem-Response", "nbap.CommonMACFlow_Specific_InfoItem_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_commonMACFlow_ID,
@@ -59952,11 +59952,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Common_MACFlow_PriorityQueue_Information_item,
-      { "Common-MACFlow-PriorityQueue-Item", "nbap.Common_MACFlow_PriorityQueue_Item",
+      { "Common-MACFlow-PriorityQueue-Item", "nbap.Common_MACFlow_PriorityQueue_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_priority_Queue_Information_for_Enhanced_FACH,
-      { "priority-Queue-Information-for-Enhanced-FACH", "nbap.priority_Queue_Information_for_Enhanced_FACH",
+      { "priority-Queue-Information-for-Enhanced-FACH", "nbap.priority_Queue_Information_for_Enhanced_FACH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Priority_Queue_Information_for_Enhanced_FACH_PCH", HFILL }},
     { &hf_nbap_tUTRANGPSMeasurementAccuracyClass,
@@ -59980,23 +59980,23 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "UL_TimeslotISCP_Value", HFILL }},
     { &hf_nbap_notUsed_1_acknowledged_PCPCH_access_preambles,
-      { "notUsed-1-acknowledged-PCPCH-access-preambles", "nbap.notUsed_1_acknowledged_PCPCH_access_preambles",
+      { "notUsed-1-acknowledged-PCPCH-access-preambles", "nbap.notUsed_1_acknowledged_PCPCH_access_preambles_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_notUsed_2_detected_PCPCH_access_preambles,
-      { "notUsed-2-detected-PCPCH-access-preambles", "nbap.notUsed_2_detected_PCPCH_access_preambles",
+      { "notUsed-2-detected-PCPCH-access-preambles", "nbap.notUsed_2_detected_PCPCH_access_preambles_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_extension_CommonMeasurementValue,
-      { "extension-CommonMeasurementValue", "nbap.extension_CommonMeasurementValue",
+      { "extension-CommonMeasurementValue", "nbap.extension_CommonMeasurementValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_measurementAvailable,
-      { "measurementAvailable", "nbap.measurementAvailable",
+      { "measurementAvailable", "nbap.measurementAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CommonMeasurementAvailable", HFILL }},
     { &hf_nbap_measurementnotAvailable,
-      { "measurementnotAvailable", "nbap.measurementnotAvailable",
+      { "measurementnotAvailable", "nbap.measurementnotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CommonMeasurementnotAvailable", HFILL }},
     { &hf_nbap_commonmeasurementValue,
@@ -60028,11 +60028,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_Enabling_Delay_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_dTX_Information,
-      { "dTX-Information", "nbap.dTX_Information",
+      { "dTX-Information", "nbap.dTX_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dRX_Information,
-      { "dRX-Information", "nbap.dRX_Information",
+      { "dRX-Information", "nbap.dRX_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dTX_Information_to_Modify,
@@ -60044,7 +60044,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_DRX_Information_to_Modify_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_ContinuousPacketConnectivityHS_SCCH_less_Information_item,
-      { "ContinuousPacketConnectivityHS-SCCH-less-InformationItem", "nbap.ContinuousPacketConnectivityHS_SCCH_less_InformationItem",
+      { "ContinuousPacketConnectivityHS-SCCH-less-InformationItem", "nbap.ContinuousPacketConnectivityHS_SCCH_less_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_transport_Block_Size_Index,
@@ -60064,11 +60064,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_continuousPacketConnectivityDTX_DRX_Information,
-      { "continuousPacketConnectivityDTX-DRX-Information", "nbap.continuousPacketConnectivityDTX_DRX_Information",
+      { "continuousPacketConnectivityDTX-DRX-Information", "nbap.continuousPacketConnectivityDTX_DRX_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_continuousPacketConnectivityDTX_DRX_Information_to_Modify,
-      { "continuousPacketConnectivityDTX-DRX-Information-to-Modify", "nbap.continuousPacketConnectivityDTX_DRX_Information_to_Modify",
+      { "continuousPacketConnectivityDTX-DRX-Information-to-Modify", "nbap.continuousPacketConnectivityDTX_DRX_Information_to_Modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_continuousPacketConnectivityHS_SCCH_less_Information,
@@ -60076,7 +60076,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_procedureID,
-      { "procedureID", "nbap.procedureID",
+      { "procedureID", "nbap.procedureID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_triggeringMessage,
@@ -60096,7 +60096,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "CriticalityDiagnostics_IE_List", HFILL }},
     { &hf_nbap_CriticalityDiagnostics_IE_List_item,
-      { "CriticalityDiagnostics-IE-List item", "nbap.CriticalityDiagnostics_IE_List_item",
+      { "CriticalityDiagnostics-IE-List item", "nbap.CriticalityDiagnostics_IE_List_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_iECriticality,
@@ -60116,11 +60116,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Ul_common_E_DCH_MACflow_Specific_InfoListLCR", HFILL }},
     { &hf_nbap_common_E_PUCH_InformationLCR,
-      { "common-E-PUCH-InformationLCR", "nbap.common_E_PUCH_InformationLCR",
+      { "common-E-PUCH-InformationLCR", "nbap.common_E_PUCH_InformationLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_TFCS_Information_TDD,
-      { "e-TFCS-Information-TDD", "nbap.e_TFCS_Information_TDD",
+      { "e-TFCS-Information-TDD", "nbap.e_TFCS_Information_TDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_maximum_Number_of_Retransmissions_For_SchedulingInfo,
@@ -60160,7 +60160,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "ControlGAP", HFILL }},
     { &hf_nbap_PRXdes_base_perURAFCN_item,
-      { "PRXdes-base-Item", "nbap.PRXdes_base_Item",
+      { "PRXdes-base-Item", "nbap.PRXdes_base_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_pRXdes_base,
@@ -60168,7 +60168,7 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Ul_common_E_DCH_MACflow_Specific_InfoListLCR_item,
-      { "Ul-common-E-DCH-MACflow-Specific-InfoList-ItemLCR", "nbap.Ul_common_E_DCH_MACflow_Specific_InfoList_ItemLCR",
+      { "Ul-common-E-DCH-MACflow-Specific-InfoList-ItemLCR", "nbap.Ul_common_E_DCH_MACflow_Specific_InfoList_ItemLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ul_Common_MACFlowIDLCR,
@@ -60180,7 +60180,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Common_E_DCH_MACdFlow_Specific_InfoListLCR", HFILL }},
     { &hf_nbap_Common_E_DCH_MACdFlow_Specific_InfoListLCR_item,
-      { "Common-E-DCH-MACdFlow-Specific-InfoList-ItemLCR", "nbap.Common_E_DCH_MACdFlow_Specific_InfoList_ItemLCR",
+      { "Common-E-DCH-MACdFlow-Specific-InfoList-ItemLCR", "nbap.Common_E_DCH_MACdFlow_Specific_InfoList_ItemLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_common_e_DCH_MACdFlow_ID_01,
@@ -60212,11 +60212,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Ul_common_E_DCH_MACflow_Specific_InfoResponseListLCR_item,
-      { "Ul-common-E-DCH-MACflow-Specific-InfoResponseList-ItemLCR", "nbap.Ul_common_E_DCH_MACflow_Specific_InfoResponseList_ItemLCR",
+      { "Ul-common-E-DCH-MACflow-Specific-InfoResponseList-ItemLCR", "nbap.Ul_common_E_DCH_MACflow_Specific_InfoResponseList_ItemLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Ul_common_E_DCH_MACflow_Specific_InfoResponseListLCR_Ext_item,
-      { "Ul-common-E-DCH-MACflow-Specific-InfoResponseList-ItemLCR", "nbap.Ul_common_E_DCH_MACflow_Specific_InfoResponseList_ItemLCR",
+      { "Ul-common-E-DCH-MACflow-Specific-InfoResponseList-ItemLCR", "nbap.Ul_common_E_DCH_MACflow_Specific_InfoResponseList_ItemLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ul_Common_MACFlowID_LCR,
@@ -60224,7 +60224,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Common_MACFlow_ID_LCR", HFILL }},
     { &hf_nbap_Common_E_AGCH_ListLCR_item,
-      { "Common-E-AGCH-ItemLCR", "nbap.Common_E_AGCH_ItemLCR",
+      { "Common-E-AGCH-ItemLCR", "nbap.Common_E_AGCH_ItemLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_AGCH_ID,
@@ -60232,7 +60232,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Common_E_HICH_ListLCR_item,
-      { "Common-E-HICH-ItemLCR", "nbap.Common_E_HICH_ItemLCR",
+      { "Common-E-HICH-ItemLCR", "nbap.Common_E_HICH_ItemLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_eI,
@@ -60244,7 +60244,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_HICH_ID_LCR", HFILL }},
     { &hf_nbap_Common_E_RNTI_Info_LCR_item,
-      { "Common-E-RNTI-Info-ItemLCR", "nbap.Common_E_RNTI_Info_ItemLCR",
+      { "Common-E-RNTI-Info-ItemLCR", "nbap.Common_E_RNTI_Info_ItemLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_starting_E_RNTI,
@@ -60260,7 +60260,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_7", HFILL }},
     { &hf_nbap_Common_MACFlows_to_DeleteLCR_item,
-      { "Common-MACFlows-to-DeleteLCR-Item", "nbap.Common_MACFlows_to_DeleteLCR_Item",
+      { "Common-MACFlows-to-DeleteLCR-Item", "nbap.Common_MACFlows_to_DeleteLCR_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_common_MACFlow_ID_LCR,
@@ -60268,7 +60268,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonMACFlow_Specific_InfoListLCR_item,
-      { "CommonMACFlow-Specific-InfoItemLCR", "nbap.CommonMACFlow_Specific_InfoItemLCR",
+      { "CommonMACFlow-Specific-InfoItemLCR", "nbap.CommonMACFlow_Specific_InfoItemLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_common_MACFlow_PriorityQueue_InformationLCR,
@@ -60276,7 +60276,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Common_MACFlow_PriorityQueue_Information", HFILL }},
     { &hf_nbap_Common_H_RNTI_InformationLCR_item,
-      { "Common-H-RNTI-InfoItemLCR", "nbap.Common_H_RNTI_InfoItemLCR",
+      { "Common-H-RNTI-InfoItemLCR", "nbap.Common_H_RNTI_InfoItemLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_common_H_RNTI,
@@ -60296,43 +60296,43 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommonMACFlow_Specific_InfoList_ResponseLCR_item,
-      { "CommonMACFlow-Specific-InfoItem-ResponseLCR", "nbap.CommonMACFlow_Specific_InfoItem_ResponseLCR",
+      { "CommonMACFlow-Specific-InfoItem-ResponseLCR", "nbap.CommonMACFlow_Specific_InfoItem_ResponseLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_continuousPacketConnectivity_DRX_InformationLCR,
-      { "continuousPacketConnectivity-DRX-InformationLCR", "nbap.continuousPacketConnectivity_DRX_InformationLCR",
+      { "continuousPacketConnectivity-DRX-InformationLCR", "nbap.continuousPacketConnectivity_DRX_InformationLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_continuousPacketConnectivity_DRX_Information_to_Modify_LCR,
-      { "continuousPacketConnectivity-DRX-Information-to-Modify-LCR", "nbap.continuousPacketConnectivity_DRX_Information_to_Modify_LCR",
+      { "continuousPacketConnectivity-DRX-Information-to-Modify-LCR", "nbap.continuousPacketConnectivity_DRX_Information_to_Modify_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_DSCH_Semi_PersistentScheduling_Information_LCR,
-      { "hS-DSCH-Semi-PersistentScheduling-Information-LCR", "nbap.hS_DSCH_Semi_PersistentScheduling_Information_LCR",
+      { "hS-DSCH-Semi-PersistentScheduling-Information-LCR", "nbap.hS_DSCH_Semi_PersistentScheduling_Information_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_DSCH_Semi_PersistentScheduling_Information_to_Modify_LCR,
-      { "hS-DSCH-Semi-PersistentScheduling-Information-to-Modify-LCR", "nbap.hS_DSCH_Semi_PersistentScheduling_Information_to_Modify_LCR",
+      { "hS-DSCH-Semi-PersistentScheduling-Information-to-Modify-LCR", "nbap.hS_DSCH_Semi_PersistentScheduling_Information_to_Modify_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_DSCH_SPS_Deactivate_Indicator_LCR,
-      { "hS-DSCH-SPS-Deactivate-Indicator-LCR", "nbap.hS_DSCH_SPS_Deactivate_Indicator_LCR",
+      { "hS-DSCH-SPS-Deactivate-Indicator-LCR", "nbap.hS_DSCH_SPS_Deactivate_Indicator_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_Semi_PersistentScheduling_Information_LCR,
-      { "e-DCH-Semi-PersistentScheduling-Information-LCR", "nbap.e_DCH_Semi_PersistentScheduling_Information_LCR",
+      { "e-DCH-Semi-PersistentScheduling-Information-LCR", "nbap.e_DCH_Semi_PersistentScheduling_Information_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_Semi_PersistentScheduling_Information_to_Modify_LCR,
-      { "e-DCH-Semi-PersistentScheduling-Information-to-Modify-LCR", "nbap.e_DCH_Semi_PersistentScheduling_Information_to_Modify_LCR",
+      { "e-DCH-Semi-PersistentScheduling-Information-to-Modify-LCR", "nbap.e_DCH_Semi_PersistentScheduling_Information_to_Modify_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_SPS_Deactivate_Indicator_LCR,
-      { "e-DCH-SPS-Deactivate-Indicator-LCR", "nbap.e_DCH_SPS_Deactivate_Indicator_LCR",
+      { "e-DCH-SPS-Deactivate-Indicator-LCR", "nbap.e_DCH_SPS_Deactivate_Indicator_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_SCCH_DRX_Information_LCR,
-      { "hS-SCCH-DRX-Information-LCR", "nbap.hS_SCCH_DRX_Information_LCR",
+      { "hS-SCCH-DRX-Information-LCR", "nbap.hS_SCCH_DRX_Information_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_AGCH_DRX_Information_LCR,
@@ -60352,11 +60352,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "UE_DRX_Offset_LCR", HFILL }},
     { &hf_nbap_sameAsHS_SCCH,
-      { "sameAsHS-SCCH", "nbap.sameAsHS_SCCH",
+      { "sameAsHS-SCCH", "nbap.sameAsHS_SCCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_AGCH_DRX_Parameters,
-      { "e-AGCH-DRX-Parameters", "nbap.e_AGCH_DRX_Parameters",
+      { "e-AGCH-DRX-Parameters", "nbap.e_AGCH_DRX_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_AGCH_UE_DRX_Cycle_LCR,
@@ -60376,15 +60376,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_DRX_Information_to_Modify_LCR_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_modify,
-      { "modify", "nbap.modify",
+      { "modify", "nbap.modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DRX_Information_to_Modify_Items_LCR", HFILL }},
     { &hf_nbap_deactivate,
-      { "deactivate", "nbap.deactivate",
+      { "deactivate", "nbap.deactivate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_SCCH_DRX_Information_ResponseLCR,
-      { "hS-SCCH-DRX-Information-ResponseLCR", "nbap.hS_SCCH_DRX_Information_ResponseLCR",
+      { "hS-SCCH-DRX-Information-ResponseLCR", "nbap.hS_SCCH_DRX_Information_ResponseLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_AGCH_DRX_Information_ResponseLCR,
@@ -60392,11 +60392,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_E_AGCH_DRX_Information_ResponseLCR_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_e_AGCH_DRX_Parameters_Response,
-      { "e-AGCH-DRX-Parameters-Response", "nbap.e_AGCH_DRX_Parameters_Response",
+      { "e-AGCH-DRX-Parameters-Response", "nbap.e_AGCH_DRX_Parameters_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DCH_FDD_Information_item,
-      { "DCH-FDD-InformationItem", "nbap.DCH_FDD_InformationItem",
+      { "DCH-FDD-InformationItem", "nbap.DCH_FDD_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ul_FP_Mode,
@@ -60416,7 +60416,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "DCH_Specific_FDD_InformationList", HFILL }},
     { &hf_nbap_DCH_Specific_FDD_InformationList_item,
-      { "DCH-Specific-FDD-Item", "nbap.DCH_Specific_FDD_Item",
+      { "DCH-Specific-FDD-Item", "nbap.DCH_Specific_FDD_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dCH_ID,
@@ -60424,15 +60424,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ul_TransportFormatSet,
-      { "ul-TransportFormatSet", "nbap.ul_TransportFormatSet",
+      { "ul-TransportFormatSet", "nbap.ul_TransportFormatSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dl_TransportFormatSet,
-      { "dl-TransportFormatSet", "nbap.dl_TransportFormatSet",
+      { "dl-TransportFormatSet", "nbap.dl_TransportFormatSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_allocationRetentionPriority,
-      { "allocationRetentionPriority", "nbap.allocationRetentionPriority",
+      { "allocationRetentionPriority", "nbap.allocationRetentionPriority_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_frameHandlingPriority,
@@ -60444,7 +60444,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_QE_Selector_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_DCH_InformationResponse_item,
-      { "DCH-InformationResponseItem", "nbap.DCH_InformationResponseItem",
+      { "DCH-InformationResponseItem", "nbap.DCH_InformationResponseItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dCH_ID_01,
@@ -60452,7 +60452,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DCH_MeasurementOccasion_Information_item,
-      { "DchMeasurementOccasionInformation-Item", "nbap.DchMeasurementOccasionInformation_Item",
+      { "DchMeasurementOccasionInformation-Item", "nbap.DchMeasurementOccasionInformation_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_pattern_Sequence_Identifier,
@@ -60464,7 +60464,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_Status_Flag_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_measurement_Occasion_Pattern_Sequence_parameters,
-      { "measurement-Occasion-Pattern-Sequence-parameters", "nbap.measurement_Occasion_Pattern_Sequence_parameters",
+      { "measurement-Occasion-Pattern-Sequence-parameters", "nbap.measurement_Occasion_Pattern_Sequence_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_measurement_Occasion_Pattern_Sequence_parameters_k,
@@ -60484,7 +60484,7 @@ void proto_register_nbap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_7", HFILL }},
     { &hf_nbap_DCH_TDD_Information_item,
-      { "DCH-TDD-InformationItem", "nbap.DCH_TDD_InformationItem",
+      { "DCH-TDD-InformationItem", "nbap.DCH_TDD_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dCH_SpecificInformationList_01,
@@ -60492,7 +60492,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "DCH_Specific_TDD_InformationList", HFILL }},
     { &hf_nbap_DCH_Specific_TDD_InformationList_item,
-      { "DCH-Specific-TDD-Item", "nbap.DCH_Specific_TDD_Item",
+      { "DCH-Specific-TDD-Item", "nbap.DCH_Specific_TDD_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ul_CCTrCH_ID,
@@ -60504,15 +60504,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "CCTrCH_ID", HFILL }},
     { &hf_nbap_ul_TransportFormatSet_01,
-      { "ul-TransportFormatSet", "nbap.ul_TransportFormatSet",
+      { "ul-TransportFormatSet", "nbap.ul_TransportFormatSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportFormatSet", HFILL }},
     { &hf_nbap_dl_TransportFormatSet_01,
-      { "dl-TransportFormatSet", "nbap.dl_TransportFormatSet",
+      { "dl-TransportFormatSet", "nbap.dl_TransportFormatSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportFormatSet", HFILL }},
     { &hf_nbap_FDD_DCHs_to_Modify_item,
-      { "FDD-DCHs-to-ModifyItem", "nbap.FDD_DCHs_to_ModifyItem",
+      { "FDD-DCHs-to-ModifyItem", "nbap.FDD_DCHs_to_ModifyItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dCH_SpecificInformationList_02,
@@ -60520,7 +60520,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "DCH_ModifySpecificInformation_FDD", HFILL }},
     { &hf_nbap_DCH_ModifySpecificInformation_FDD_item,
-      { "DCH-ModifySpecificItem-FDD", "nbap.DCH_ModifySpecificItem_FDD",
+      { "DCH-ModifySpecificItem-FDD", "nbap.DCH_ModifySpecificItem_FDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dCH_ID_02,
@@ -60528,15 +60528,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_dCH_ID_01", HFILL }},
     { &hf_nbap_ul_TransportFormatSet_02,
-      { "ul-TransportFormatSet", "nbap.ul_TransportFormatSet",
+      { "ul-TransportFormatSet", "nbap.ul_TransportFormatSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ul_TransportFormatSet_01", HFILL }},
     { &hf_nbap_dl_TransportFormatSet_02,
-      { "dl-TransportFormatSet", "nbap.dl_TransportFormatSet",
+      { "dl-TransportFormatSet", "nbap.dl_TransportFormatSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_dl_TransportFormatSet_01", HFILL }},
     { &hf_nbap_TDD_DCHs_to_Modify_item,
-      { "DCH-ModifyItem-TDD", "nbap.DCH_ModifyItem_TDD",
+      { "DCH-ModifyItem-TDD", "nbap.DCH_ModifyItem_TDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dCH_SpecificInformationList_03,
@@ -60544,11 +60544,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "DCH_ModifySpecificInformation_TDD", HFILL }},
     { &hf_nbap_DCH_ModifySpecificInformation_TDD_item,
-      { "DCH-ModifySpecificItem-TDD", "nbap.DCH_ModifySpecificItem_TDD",
+      { "DCH-ModifySpecificItem-TDD", "nbap.DCH_ModifySpecificItem_TDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DedicatedChannelsCapacityConsumptionLaw_item,
-      { "DedicatedChannelsCapacityConsumptionLaw item", "nbap.DedicatedChannelsCapacityConsumptionLaw_item",
+      { "DedicatedChannelsCapacityConsumptionLaw item", "nbap.DedicatedChannelsCapacityConsumptionLaw_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dl_Cost_1,
@@ -60592,15 +60592,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Round_Trip_Time_Value", HFILL }},
     { &hf_nbap_extension_DedicatedMeasurementValue,
-      { "extension-DedicatedMeasurementValue", "nbap.extension_DedicatedMeasurementValue",
+      { "extension-DedicatedMeasurementValue", "nbap.extension_DedicatedMeasurementValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_measurementAvailable_01,
-      { "measurementAvailable", "nbap.measurementAvailable",
+      { "measurementAvailable", "nbap.measurementAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DedicatedMeasurementAvailable", HFILL }},
     { &hf_nbap_measurementnotAvailable_01,
-      { "measurementnotAvailable", "nbap.measurementnotAvailable",
+      { "measurementnotAvailable", "nbap.measurementnotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DedicatedMeasurementnotAvailable", HFILL }},
     { &hf_nbap_dedicatedmeasurementValue,
@@ -60616,15 +60616,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_separate_indication,
-      { "separate-indication", "nbap.separate_indication",
+      { "separate-indication", "nbap.separate_indication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_activate,
-      { "activate", "nbap.activate",
+      { "activate", "nbap.activate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Activate_Info", HFILL }},
     { &hf_nbap_deactivate_01,
-      { "deactivate", "nbap.deactivate",
+      { "deactivate", "nbap.deactivate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Deactivate_Info", HFILL }},
     { &hf_nbap_activation_type,
@@ -60652,7 +60652,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "CFN", HFILL }},
     { &hf_nbap_unsynchronised,
-      { "unsynchronised", "nbap.unsynchronised",
+      { "unsynchronised", "nbap.unsynchronised_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dGANSS_ReferenceTime,
@@ -60668,7 +60668,7 @@ void proto_register_nbap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_DGANSS_Information_item,
-      { "DGANSS-InformationItem", "nbap.DGANSS_InformationItem",
+      { "DGANSS-InformationItem", "nbap.DGANSS_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_gANSS_SignalId,
@@ -60684,7 +60684,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DGANSS_SignalInformation_item,
-      { "DGANSS-SignalInformationItem", "nbap.DGANSS_SignalInformationItem",
+      { "DGANSS-SignalInformationItem", "nbap.DGANSS_SignalInformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_satId,
@@ -60736,7 +60736,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_PRCDeviation_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_DL_Timeslot_Information_item,
-      { "DL-Timeslot-InformationItem", "nbap.DL_Timeslot_InformationItem",
+      { "DL-Timeslot-InformationItem", "nbap.DL_Timeslot_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_timeSlot,
@@ -60756,7 +60756,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "TDD_DL_Code_Information", HFILL }},
     { &hf_nbap_DL_TimeslotLCR_Information_item,
-      { "DL-TimeslotLCR-InformationItem", "nbap.DL_TimeslotLCR_InformationItem",
+      { "DL-TimeslotLCR-InformationItem", "nbap.DL_TimeslotLCR_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_timeSlotLCR,
@@ -60764,7 +60764,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_midambleShiftLCR,
-      { "midambleShiftLCR", "nbap.midambleShiftLCR",
+      { "midambleShiftLCR", "nbap.midambleShiftLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dL_Code_LCR_Information,
@@ -60772,7 +60772,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "TDD_DL_Code_LCR_Information", HFILL }},
     { &hf_nbap_DL_Timeslot768_Information_item,
-      { "DL-Timeslot768-InformationItem", "nbap.DL_Timeslot768_InformationItem",
+      { "DL-Timeslot768-InformationItem", "nbap.DL_Timeslot768_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_midambleShiftAndBurstType768,
@@ -60808,7 +60808,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "ScaledAdjustmentRatio", HFILL }},
     { &hf_nbap_DL_ReferencePowerInformationList_item,
-      { "DL-ReferencePowerInformationItem", "nbap.DL_ReferencePowerInformationItem",
+      { "DL-ReferencePowerInformationItem", "nbap.DL_ReferencePowerInformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_rL_ID,
@@ -60820,7 +60820,7 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         "DL_Power", HFILL }},
     { &hf_nbap_DL_TimeslotISCPInfo_item,
-      { "DL-TimeslotISCPInfoItem", "nbap.DL_TimeslotISCPInfoItem",
+      { "DL-TimeslotISCPInfoItem", "nbap.DL_TimeslotISCPInfoItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dL_TimeslotISCP,
@@ -60828,15 +60828,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_TimeslotISCPInfoLCR_item,
-      { "DL-TimeslotISCPInfoItemLCR", "nbap.DL_TimeslotISCPInfoItemLCR",
+      { "DL-TimeslotISCPInfoItemLCR", "nbap.DL_TimeslotISCPInfoItemLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_HS_PDSCH_Timeslot_Information_LCR_PSCH_ReconfRqst_item,
-      { "DL-HS-PDSCH-Timeslot-InformationItem-LCR-PSCH-ReconfRqst", "nbap.DL_HS_PDSCH_Timeslot_InformationItem_LCR_PSCH_ReconfRqst",
+      { "DL-HS-PDSCH-Timeslot-InformationItem-LCR-PSCH-ReconfRqst", "nbap.DL_HS_PDSCH_Timeslot_InformationItem_LCR_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_midambleShiftAndBurstType_01,
-      { "midambleShiftAndBurstType", "nbap.midambleShiftAndBurstType",
+      { "midambleShiftAndBurstType", "nbap.midambleShiftAndBurstType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MidambleShiftLCR", HFILL }},
     { &hf_nbap_dl_HS_PDSCH_Codelist_LCR_PSCH_ReconfRqst,
@@ -60848,7 +60848,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "MaximumTransmissionPower", HFILL }},
     { &hf_nbap_MaxHSDSCH_HSSCCH_Power_per_CELLPORTION_item,
-      { "MaxHSDSCH-HSSCCH-Power-per-CELLPORTION-Item", "nbap.MaxHSDSCH_HSSCCH_Power_per_CELLPORTION_Item",
+      { "MaxHSDSCH-HSSCCH-Power-per-CELLPORTION-Item", "nbap.MaxHSDSCH_HSSCCH_Power_per_CELLPORTION_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_HS_PDSCH_Codelist_LCR_PSCH_ReconfRqst_item,
@@ -60872,11 +60872,11 @@ void proto_register_nbap(void)
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_modify_01,
-      { "modify", "nbap.modify",
+      { "modify", "nbap.modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DRX_Information_to_Modify_Items", HFILL }},
     { &hf_nbap_DSCH_InformationResponse_item,
-      { "DSCH-InformationResponseItem", "nbap.DSCH_InformationResponseItem",
+      { "DSCH-InformationResponseItem", "nbap.DSCH_InformationResponseItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dSCH_ID,
@@ -60884,7 +60884,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DSCH_TDD_Information_item,
-      { "DSCH-TDD-InformationItem", "nbap.DSCH_TDD_InformationItem",
+      { "DSCH-TDD-InformationItem", "nbap.DSCH_TDD_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_cCTrCH_ID,
@@ -60892,7 +60892,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_transportFormatSet,
-      { "transportFormatSet", "nbap.transportFormatSet",
+      { "transportFormatSet", "nbap.transportFormatSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uE_DTX_Cycle1_2ms,
@@ -60948,7 +60948,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_UE_DPCCH_burst2_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_modify_02,
-      { "modify", "nbap.modify",
+      { "modify", "nbap.modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DTX_Information_to_Modify_Items", HFILL }},
     { &hf_nbap_e_DCH_TTI_Length_to_Modify,
@@ -60968,7 +60968,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_AGCH_FDD_Code_List", HFILL }},
     { &hf_nbap_remove,
-      { "remove", "nbap.remove",
+      { "remove", "nbap.remove_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_AGCH_FDD_Code_List_item,
@@ -60980,7 +60980,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_SF_allocation_item,
-      { "E-DCH-SF-allocation item", "nbap.E_DCH_SF_allocation_item",
+      { "E-DCH-SF-allocation item", "nbap.E_DCH_SF_allocation_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_AGCH_And_E_RGCH_E_HICH_FDD_Scrambling_Code,
@@ -61008,7 +61008,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_E_RGCH_Release_Indicator_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_MACdFlows_Information,
-      { "e-DCH-MACdFlows-Information", "nbap.e_DCH_MACdFlows_Information",
+      { "e-DCH-MACdFlows-Information", "nbap.e_DCH_MACdFlows_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_MACdFlow_Specific_InformationResp,
@@ -61028,7 +61028,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_MACdFlow_Specific_UpdateInformation_item,
-      { "E-DCH-MACdFlow-Specific-UpdateInformation-Item", "nbap.E_DCH_MACdFlow_Specific_UpdateInformation_Item",
+      { "E-DCH-MACdFlow-Specific-UpdateInformation-Item", "nbap.E_DCH_MACdFlow_Specific_UpdateInformation_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hARQ_Process_Allocation_NonSched_2ms_EDCH,
@@ -61036,7 +61036,7 @@ void proto_register_nbap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         "HARQ_Process_Allocation_2ms_EDCH", HFILL }},
     { &hf_nbap_E_DCH_DL_Control_Channel_Change_Information_item,
-      { "E-DCH-DL-Control-Channel-Change-Information-Item", "nbap.E_DCH_DL_Control_Channel_Change_Information_Item",
+      { "E-DCH-DL-Control-Channel-Change-Information-Item", "nbap.E_DCH_DL_Control_Channel_Change_Information_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_RL_ID,
@@ -61044,19 +61044,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "RL_ID", HFILL }},
     { &hf_nbap_E_DCH_DL_Control_Channel_Grant_Information_item,
-      { "E-DCH-DL-Control-Channel-Grant-Information-Item", "nbap.E_DCH_DL_Control_Channel_Grant_Information_Item",
+      { "E-DCH-DL-Control-Channel-Grant-Information-Item", "nbap.E_DCH_DL_Control_Channel_Grant_Information_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_Non_Scheduled_Transmission_Grant,
-      { "e-DCH-Non-Scheduled-Transmission-Grant", "nbap.e_DCH_Non_Scheduled_Transmission_Grant",
+      { "e-DCH-Non-Scheduled-Transmission-Grant", "nbap.e_DCH_Non_Scheduled_Transmission_Grant_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_DCH_Non_Scheduled_Transmission_Grant_Items", HFILL }},
     { &hf_nbap_e_DCH_Scheduled_Transmission_Grant,
-      { "e-DCH-Scheduled-Transmission-Grant", "nbap.e_DCH_Scheduled_Transmission_Grant",
+      { "e-DCH-Scheduled-Transmission-Grant", "nbap.e_DCH_Scheduled_Transmission_Grant_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_LogicalChannelInformation_item,
-      { "E-DCH-LogicalChannelInformationItem", "nbap.E_DCH_LogicalChannelInformationItem",
+      { "E-DCH-LogicalChannelInformationItem", "nbap.E_DCH_LogicalChannelInformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_schedulingPriorityIndicator,
@@ -61080,7 +61080,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_DCH_MACdPDU_SizeList", HFILL }},
     { &hf_nbap_E_DCH_MACdPDU_SizeList_item,
-      { "E-DCH-MACdPDU-SizeListItem", "nbap.E_DCH_MACdPDU_SizeListItem",
+      { "E-DCH-MACdPDU-SizeListItem", "nbap.E_DCH_MACdPDU_SizeListItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_mACdPDU_Size,
@@ -61088,7 +61088,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_LogicalChannelToModify_item,
-      { "E-DCH-LogicalChannelToModifyItem", "nbap.E_DCH_LogicalChannelToModifyItem",
+      { "E-DCH-LogicalChannelToModifyItem", "nbap.E_DCH_LogicalChannelToModifyItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_mACd_PDU_Size_List_01,
@@ -61096,11 +61096,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_DCH_MACdPDU_SizeToModifyList", HFILL }},
     { &hf_nbap_E_DCH_MACdPDU_SizeToModifyList_item,
-      { "E-DCH-MACdPDU-SizeListItem", "nbap.E_DCH_MACdPDU_SizeListItem",
+      { "E-DCH-MACdPDU-SizeListItem", "nbap.E_DCH_MACdPDU_SizeListItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_LogicalChannelToDelete_item,
-      { "E-DCH-LogicalChannelToDeleteItem", "nbap.E_DCH_LogicalChannelToDeleteItem",
+      { "E-DCH-LogicalChannelToDeleteItem", "nbap.E_DCH_LogicalChannelToDeleteItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_MACdFlow_Specific_Info,
@@ -61108,7 +61108,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_DCH_MACdFlow_Specific_InfoList", HFILL }},
     { &hf_nbap_E_DCH_MACdFlow_Specific_InfoList_item,
-      { "E-DCH-MACdFlow-Specific-InfoItem", "nbap.E_DCH_MACdFlow_Specific_InfoItem",
+      { "E-DCH-MACdFlow-Specific-InfoItem", "nbap.E_DCH_MACdFlow_Specific_InfoItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_eDCH_Grant_Type_Information,
@@ -61120,11 +61120,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_DCH_LogicalChannelInformation", HFILL }},
     { &hf_nbap_E_DCH_MACdFlow_Specific_InformationResp_item,
-      { "E-DCH-MACdFlow-Specific-InformationResp-Item", "nbap.E_DCH_MACdFlow_Specific_InformationResp_Item",
+      { "E-DCH-MACdFlow-Specific-InformationResp-Item", "nbap.E_DCH_MACdFlow_Specific_InformationResp_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_MACdFlow_Specific_InfoList_to_Modify_item,
-      { "E-DCH-MACdFlow-Specific-InfoItem-to-Modify", "nbap.E_DCH_MACdFlow_Specific_InfoItem_to_Modify",
+      { "E-DCH-MACdFlow-Specific-InfoItem-to-Modify", "nbap.E_DCH_MACdFlow_Specific_InfoItem_to_Modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_eDCH_LogicalChannelToAdd,
@@ -61140,7 +61140,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_DCH_LogicalChannelToDelete", HFILL }},
     { &hf_nbap_E_DCH_MACdFlows_to_Delete_item,
-      { "E-DCH-MACdFlow-to-Delete-Item", "nbap.E_DCH_MACdFlow_to_Delete_Item",
+      { "E-DCH-MACdFlow-to-Delete-Item", "nbap.E_DCH_MACdFlow_to_Delete_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_maxBits_MACe_PDU_non_scheduled,
@@ -61156,11 +61156,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_E_DCH_serving_cell_choice_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_serving_cell_change_successful,
-      { "e-DCH-serving-cell-change-successful", "nbap.e_DCH_serving_cell_change_successful",
+      { "e-DCH-serving-cell-change-successful", "nbap.e_DCH_serving_cell_change_successful_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_serving_cell_change_unsuccessful,
-      { "e-DCH-serving-cell-change-unsuccessful", "nbap.e_DCH_serving_cell_change_unsuccessful",
+      { "e-DCH-serving-cell-change-unsuccessful", "nbap.e_DCH_serving_cell_change_unsuccessful_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_RL_InformationList_Rsp,
@@ -61168,7 +61168,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_RL_InformationList_Rsp_item,
-      { "E-DCH-RL-InformationList-Rsp-Item", "nbap.E_DCH_RL_InformationList_Rsp_Item",
+      { "E-DCH-RL-InformationList-Rsp-Item", "nbap.E_DCH_RL_InformationList_Rsp_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_rl_ID,
@@ -61176,7 +61176,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_FDD_DL_Control_Channel_Info,
-      { "e-DCH-FDD-DL-Control-Channel-Info", "nbap.e_DCH_FDD_DL_Control_Channel_Info",
+      { "e-DCH-FDD-DL-Control-Channel-Info", "nbap.e_DCH_FDD_DL_Control_Channel_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_DCH_FDD_DL_Control_Channel_Information", HFILL }},
     { &hf_nbap_cause,
@@ -61184,7 +61184,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_Cause_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_EDCH_RACH_Report_Value_item,
-      { "EDCH-RACH-Report-Value item", "nbap.EDCH_RACH_Report_Value_item",
+      { "EDCH-RACH-Report-Value item", "nbap.EDCH_RACH_Report_Value_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_granted_EDCH_RACH_resources,
@@ -61196,23 +61196,23 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Denied_EDCH_RACH_Resources_Value", HFILL }},
     { &hf_nbap_two_ms,
-      { "two-ms", "nbap.two_ms",
+      { "two-ms", "nbap.two_ms_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DTX_Cycle_2ms_Items", HFILL }},
     { &hf_nbap_ten_ms,
-      { "ten-ms", "nbap.ten_ms",
+      { "ten-ms", "nbap.ten_ms_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DTX_Cycle_10ms_Items", HFILL }},
     { &hf_nbap_two_ms_01,
-      { "two-ms", "nbap.two_ms",
+      { "two-ms", "nbap.two_ms_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DTX_Cycle_2ms_to_Modify_Items", HFILL }},
     { &hf_nbap_ten_ms_01,
-      { "ten-ms", "nbap.ten_ms",
+      { "ten-ms", "nbap.ten_ms_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DTX_Cycle_10ms_to_Modify_Items", HFILL }},
     { &hf_nbap_E_DCH_MACdFlows_to_DeleteLCR_item,
-      { "E-DCH-MACdFlow-to-Delete-ItemLCR", "nbap.E_DCH_MACdFlow_to_Delete_ItemLCR",
+      { "E-DCH-MACdFlow-to-Delete-ItemLCR", "nbap.E_DCH_MACdFlow_to_Delete_ItemLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_MACdFlow_ID_LCR,
@@ -61256,7 +61256,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCHProvidedBitRate_item,
-      { "E-DCHProvidedBitRate-Item", "nbap.E_DCHProvidedBitRate_Item",
+      { "E-DCHProvidedBitRate-Item", "nbap.E_DCHProvidedBitRate_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCHProvidedBitRateValue,
@@ -61264,7 +61264,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCHProvidedBitRateValueInformation_For_CellPortion_item,
-      { "E-DCHProvidedBitRateValueInformation-For-CellPortion-Item", "nbap.E_DCHProvidedBitRateValueInformation_For_CellPortion_Item",
+      { "E-DCHProvidedBitRateValueInformation-For-CellPortion-Item", "nbap.E_DCHProvidedBitRateValueInformation_For_CellPortion_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCHProvidedBitRateValue_01,
@@ -61272,7 +61272,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_DCHProvidedBitRate", HFILL }},
     { &hf_nbap_e_PUCH_Information,
-      { "e-PUCH-Information", "nbap.e_PUCH_Information",
+      { "e-PUCH-Information", "nbap.e_PUCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_MACdFlows_Information_TDD,
@@ -61280,11 +61280,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_Non_Scheduled_Grant_Info,
-      { "e-DCH-Non-Scheduled-Grant-Info", "nbap.e_DCH_Non_Scheduled_Grant_Info",
+      { "e-DCH-Non-Scheduled-Grant-Info", "nbap.e_DCH_Non_Scheduled_Grant_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_TDD_Information,
-      { "e-DCH-TDD-Information", "nbap.e_DCH_TDD_Information",
+      { "e-DCH-TDD-Information", "nbap.e_DCH_TDD_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_n_E_UCCH,
@@ -61300,11 +61300,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_QPSK_RefBetaInfo_item,
-      { "E-DCH-RefBeta-Item", "nbap.E_DCH_RefBeta_Item",
+      { "E-DCH-RefBeta-Item", "nbap.E_DCH_RefBeta_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_sixteenQAM_RefBetaInfo_item,
-      { "E-DCH-RefBeta-Item", "nbap.E_DCH_RefBeta_Item",
+      { "E-DCH-RefBeta-Item", "nbap.E_DCH_RefBeta_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_refCodeRate,
@@ -61316,7 +61316,7 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_MACdFlows_Information_TDD_item,
-      { "E-DCH-MACdFlow-InfoTDDItem", "nbap.E_DCH_MACdFlow_InfoTDDItem",
+      { "E-DCH-MACdFlow-InfoTDDItem", "nbap.E_DCH_MACdFlow_InfoTDDItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_eDCH_Grant_TypeTDD,
@@ -61364,7 +61364,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Scheduled_E_HICH_Specific_Information_ResponseLCRTDD", HFILL }},
     { &hf_nbap_Scheduled_E_HICH_Specific_Information_ResponseLCRTDD_item,
-      { "Scheduled-E-HICH-Specific-InformationItem-ResponseLCRTDD", "nbap.Scheduled_E_HICH_Specific_InformationItem_ResponseLCRTDD",
+      { "Scheduled-E-HICH-Specific-InformationItem-ResponseLCRTDD", "nbap.Scheduled_E_HICH_Specific_InformationItem_ResponseLCRTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_HICH_ID_TDD,
@@ -61372,7 +61372,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_TDD_MACdFlow_Specific_InformationResp_item,
-      { "E-DCH-TDD-MACdFlow-Specific-InformationResp-Item", "nbap.E_DCH_TDD_MACdFlow_Specific_InformationResp_Item",
+      { "E-DCH-TDD-MACdFlow-Specific-InformationResp-Item", "nbap.E_DCH_TDD_MACdFlow_Specific_InformationResp_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_MacdFlow_Id,
@@ -61380,7 +61380,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_AGCH_Specific_InformationRespListTDD_item,
-      { "E-AGCH-Specific-InformationResp-ItemTDD", "nbap.E_AGCH_Specific_InformationResp_ItemTDD",
+      { "E-AGCH-Specific-InformationResp-ItemTDD", "nbap.E_AGCH_Specific_InformationResp_ItemTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_AGCH_Id,
@@ -61396,7 +61396,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_TDD_Information_to_Modify,
-      { "e-DCH-TDD-Information-to-Modify", "nbap.e_DCH_TDD_Information_to_Modify",
+      { "e-DCH-TDD-Information-to-Modify", "nbap.e_DCH_TDD_Information_to_Modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_TDD_Information_to_Modify_List,
@@ -61404,7 +61404,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_TDD_Information_to_Modify_List_item,
-      { "E-DCH-MACdFlow-ModifyTDDItem", "nbap.E_DCH_MACdFlow_ModifyTDDItem",
+      { "E-DCH-MACdFlow-ModifyTDDItem", "nbap.E_DCH_MACdFlow_ModifyTDDItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_LogicalChannelToAdd,
@@ -61420,11 +61420,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_Non_Scheduled_Grant_Info768,
-      { "e-DCH-Non-Scheduled-Grant-Info768", "nbap.e_DCH_Non_Scheduled_Grant_Info768",
+      { "e-DCH-Non-Scheduled-Grant-Info768", "nbap.e_DCH_Non_Scheduled_Grant_Info768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_TDD_Information768,
-      { "e-DCH-TDD-Information768", "nbap.e_DCH_TDD_Information768",
+      { "e-DCH-TDD-Information768", "nbap.e_DCH_TDD_Information768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_tdd_ChannelisationCode768,
@@ -61436,15 +61436,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_PUCH_LCR_Information,
-      { "e-PUCH-LCR-Information", "nbap.e_PUCH_LCR_Information",
+      { "e-PUCH-LCR-Information", "nbap.e_PUCH_LCR_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_Non_Scheduled_Grant_LCR_Info,
-      { "e-DCH-Non-Scheduled-Grant-LCR-Info", "nbap.e_DCH_Non_Scheduled_Grant_LCR_Info",
+      { "e-DCH-Non-Scheduled-Grant-LCR-Info", "nbap.e_DCH_Non_Scheduled_Grant_LCR_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_LCRTDD_Information,
-      { "e-DCH-LCRTDD-Information", "nbap.e_DCH_LCRTDD_Information",
+      { "e-DCH-LCRTDD-Information", "nbap.e_DCH_LCRTDD_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_timeslotResourceLCR,
@@ -61460,7 +61460,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_HICH_LCR_Information,
-      { "e-HICH-LCR-Information", "nbap.e_HICH_LCR_Information",
+      { "e-HICH-LCR-Information", "nbap.e_HICH_LCR_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_signatureSequenceGroupIndex,
@@ -61484,7 +61484,7 @@ void proto_register_nbap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_sPS_E_DCH_releted_E_HICH_Information,
-      { "sPS-E-DCH-releted-E-HICH-Information", "nbap.sPS_E_DCH_releted_E_HICH_Information",
+      { "sPS-E-DCH-releted-E-HICH-Information", "nbap.sPS_E_DCH_releted_E_HICH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_HICH_LCR_Information", HFILL }},
     { &hf_nbap_timeslot_Resource_Related_Information,
@@ -61496,7 +61496,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_T_subframeNumber_01_vals), 0,
         "T_subframeNumber_01", HFILL }},
     { &hf_nbap_FDD_DL_CodeInformation_item,
-      { "FDD-DL-CodeInformationItem", "nbap.FDD_DL_CodeInformationItem",
+      { "FDD-DL-CodeInformationItem", "nbap.FDD_DL_CodeInformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dl_ScramblingCode,
@@ -61512,35 +61512,35 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_TransmissionGapPatternSequenceCodeInformation_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_navClockModel,
-      { "navClockModel", "nbap.navClockModel",
+      { "navClockModel", "nbap.navClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_NAVclockModel", HFILL }},
     { &hf_nbap_cnavClockModel,
-      { "cnavClockModel", "nbap.cnavClockModel",
+      { "cnavClockModel", "nbap.cnavClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_CNAVclockModel", HFILL }},
     { &hf_nbap_glonassClockModel,
-      { "glonassClockModel", "nbap.glonassClockModel",
+      { "glonassClockModel", "nbap.glonassClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_GLONASSclockModel", HFILL }},
     { &hf_nbap_sbasClockModel,
-      { "sbasClockModel", "nbap.sbasClockModel",
+      { "sbasClockModel", "nbap.sbasClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_SBASclockModel", HFILL }},
     { &hf_nbap_navKeplerianSet,
-      { "navKeplerianSet", "nbap.navKeplerianSet",
+      { "navKeplerianSet", "nbap.navKeplerianSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_NavModel_NAVKeplerianSet", HFILL }},
     { &hf_nbap_cnavKeplerianSet,
-      { "cnavKeplerianSet", "nbap.cnavKeplerianSet",
+      { "cnavKeplerianSet", "nbap.cnavKeplerianSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_NavModel_CNAVKeplerianSet", HFILL }},
     { &hf_nbap_glonassECEF,
-      { "glonassECEF", "nbap.glonassECEF",
+      { "glonassECEF", "nbap.glonassECEF_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_NavModel_GLONASSecef", HFILL }},
     { &hf_nbap_sbasECEF,
-      { "sbasECEF", "nbap.sbasECEF",
+      { "sbasECEF", "nbap.sbasECEF_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_NavModel_SBASecef", HFILL }},
     { &hf_nbap_dataID,
@@ -61548,11 +61548,11 @@ void proto_register_nbap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_2", HFILL }},
     { &hf_nbap_alpha_beta_parameters,
-      { "alpha-beta-parameters", "nbap.alpha_beta_parameters",
+      { "alpha-beta-parameters", "nbap.alpha_beta_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GPS_Ionospheric_Model", HFILL }},
     { &hf_nbap_ganss_Transmission_Time,
-      { "ganss-Transmission-Time", "nbap.ganss_Transmission_Time",
+      { "ganss-Transmission-Time", "nbap.ganss_Transmission_Time_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_non_broadcastIndication,
@@ -61564,19 +61564,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Ganss_Sat_Info_AddNavList", HFILL }},
     { &hf_nbap_GANSS_Additional_Time_Models_item,
-      { "GANSS-Time-Model", "nbap.GANSS_Time_Model",
+      { "GANSS-Time-Model", "nbap.GANSS_Time_Model_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_utcModel1,
-      { "utcModel1", "nbap.utcModel1",
+      { "utcModel1", "nbap.utcModel1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_UTCmodelSet1", HFILL }},
     { &hf_nbap_utcModel2,
-      { "utcModel2", "nbap.utcModel2",
+      { "utcModel2", "nbap.utcModel2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_UTCmodelSet2", HFILL }},
     { &hf_nbap_utcModel3,
-      { "utcModel3", "nbap.utcModel3",
+      { "utcModel3", "nbap.utcModel3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_UTCmodelSet3", HFILL }},
     { &hf_nbap_ganss_wk_number,
@@ -61588,11 +61588,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_GANSS_AlmanacModel_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_gANSS_keplerianParameters,
-      { "gANSS-keplerianParameters", "nbap.gANSS_keplerianParameters",
+      { "gANSS-keplerianParameters", "nbap.gANSS_keplerianParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_KeplerianParametersAlm", HFILL }},
     { &hf_nbap_extension_GANSS_AlmanacModel,
-      { "extension-GANSS-AlmanacModel", "nbap.extension_GANSS_AlmanacModel",
+      { "extension-GANSS-AlmanacModel", "nbap.extension_GANSS_AlmanacModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_sat_info_SBASecefList,
@@ -61628,7 +61628,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "GANSS_AuxInfoGANSS_ID3", HFILL }},
     { &hf_nbap_GANSS_AuxInfoGANSS_ID1_item,
-      { "GANSS-AuxInfoGANSS-ID1-element", "nbap.GANSS_AuxInfoGANSS_ID1_element",
+      { "GANSS-AuxInfoGANSS-ID1-element", "nbap.GANSS_AuxInfoGANSS_ID1_element_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_svID,
@@ -61640,7 +61640,7 @@ void proto_register_nbap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_GANSS_AuxInfoGANSS_ID3_item,
-      { "GANSS-AuxInfoGANSS-ID3-element", "nbap.GANSS_AuxInfoGANSS_ID3_element",
+      { "GANSS-AuxInfoGANSS-ID3-element", "nbap.GANSS_AuxInfoGANSS_ID3_element_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_channelNumber,
@@ -61648,7 +61648,7 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M7_13", HFILL }},
     { &hf_nbap_GANSS_Clock_Model_item,
-      { "GANSS-SatelliteClockModelItem", "nbap.GANSS_SatelliteClockModelItem",
+      { "GANSS-SatelliteClockModelItem", "nbap.GANSS_SatelliteClockModelItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_cnavToc,
@@ -61712,11 +61712,11 @@ void proto_register_nbap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_13", HFILL }},
     { &hf_nbap_ganss_Ionospheric_Model,
-      { "ganss-Ionospheric-Model", "nbap.ganss_Ionospheric_Model",
+      { "ganss-Ionospheric-Model", "nbap.ganss_Ionospheric_Model_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ganss_Rx_Pos,
-      { "ganss-Rx-Pos", "nbap.ganss_Rx_Pos",
+      { "ganss-Rx-Pos", "nbap.ganss_Rx_Pos_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ionospheric_Model,
@@ -61732,7 +61732,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "GANSS_DataBitAssistanceList", HFILL }},
     { &hf_nbap_GANSS_DataBitAssistanceList_item,
-      { "GANSS-DataBitAssistanceItem", "nbap.GANSS_DataBitAssistanceItem",
+      { "GANSS-DataBitAssistanceItem", "nbap.GANSS_DataBitAssistanceItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dataBitAssistanceSgnList,
@@ -61740,7 +61740,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "GANSS_DataBitAssistanceSgnList", HFILL }},
     { &hf_nbap_GANSS_DataBitAssistanceSgnList_item,
-      { "GANSS-DataBitAssistanceSgnItem", "nbap.GANSS_DataBitAssistanceSgnItem",
+      { "GANSS-DataBitAssistanceSgnItem", "nbap.GANSS_DataBitAssistanceSgnItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ganss_SignalId,
@@ -61756,7 +61756,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_86399", HFILL }},
     { &hf_nbap_ganss_Data_Bit_Assistance_ReqList,
-      { "ganss-Data-Bit-Assistance-ReqList", "nbap.ganss_Data_Bit_Assistance_ReqList",
+      { "ganss-Data-Bit-Assistance-ReqList", "nbap.ganss_Data_Bit_Assistance_ReqList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ganss_DataBitInterval,
@@ -61808,7 +61808,7 @@ void proto_register_nbap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_19", HFILL }},
     { &hf_nbap_GANSS_GenericDataInfoReqList_item,
-      { "GANSS-GenericDataInfoReqItem", "nbap.GANSS_GenericDataInfoReqItem",
+      { "GANSS-GenericDataInfoReqItem", "nbap.GANSS_GenericDataInfoReqItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ganss_Id,
@@ -61836,31 +61836,31 @@ void proto_register_nbap(void)
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_nbap_ganss_Data_Bit_Assistance_Req,
-      { "ganss-Data-Bit-Assistance-Req", "nbap.ganss_Data_Bit_Assistance_Req",
+      { "ganss-Data-Bit-Assistance-Req", "nbap.ganss_Data_Bit_Assistance_Req_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_Data_Bit_Assistance_ReqItem", HFILL }},
     { &hf_nbap_GANSS_Generic_Data_item,
-      { "GANSS-Generic-DataItem", "nbap.GANSS_Generic_DataItem",
+      { "GANSS-Generic-DataItem", "nbap.GANSS_Generic_DataItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dganss_Correction,
-      { "dganss-Correction", "nbap.dganss_Correction",
+      { "dganss-Correction", "nbap.dganss_Correction_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DGANSSCorrections", HFILL }},
     { &hf_nbap_ganss_Navigation_Model_And_Time_Recovery_01,
-      { "ganss-Navigation-Model-And-Time-Recovery", "nbap.ganss_Navigation_Model_And_Time_Recovery",
+      { "ganss-Navigation-Model-And-Time-Recovery", "nbap.ganss_Navigation_Model_And_Time_Recovery_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ganss_Time_Model,
-      { "ganss-Time-Model", "nbap.ganss_Time_Model",
+      { "ganss-Time-Model", "nbap.ganss_Time_Model_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ganss_UTC_TIME,
-      { "ganss-UTC-TIME", "nbap.ganss_UTC_TIME",
+      { "ganss-UTC-TIME", "nbap.ganss_UTC_TIME_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_UTC_Model", HFILL }},
     { &hf_nbap_ganss_Almanac_01,
-      { "ganss-Almanac", "nbap.ganss_Almanac",
+      { "ganss-Almanac", "nbap.ganss_Almanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ganss_Real_Time_Integrity_01,
@@ -61868,7 +61868,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ganss_Data_Bit_Assistance,
-      { "ganss-Data-Bit-Assistance", "nbap.ganss_Data_Bit_Assistance",
+      { "ganss-Data-Bit-Assistance", "nbap.ganss_Data_Bit_Assistance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_gloTau,
@@ -61884,7 +61884,7 @@ void proto_register_nbap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_5", HFILL }},
     { &hf_nbap_gANSS_CommonDataInfoReq,
-      { "gANSS-CommonDataInfoReq", "nbap.gANSS_CommonDataInfoReq",
+      { "gANSS-CommonDataInfoReq", "nbap.gANSS_CommonDataInfoReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_gANSS_GenericDataInfoReqList,
@@ -61904,7 +61904,7 @@ void proto_register_nbap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_12", HFILL }},
     { &hf_nbap_gANSS_IonosphereRegionalStormFlags,
-      { "gANSS-IonosphereRegionalStormFlags", "nbap.gANSS_IonosphereRegionalStormFlags",
+      { "gANSS-IonosphereRegionalStormFlags", "nbap.gANSS_IonosphereRegionalStormFlags_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_storm_flag_one,
@@ -62268,11 +62268,11 @@ void proto_register_nbap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_10", HFILL }},
     { &hf_nbap_gANSS_keplerianParameters_01,
-      { "gANSS-keplerianParameters", "nbap.gANSS_keplerianParameters",
+      { "gANSS-keplerianParameters", "nbap.gANSS_keplerianParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_KeplerianParametersOrb", HFILL }},
     { &hf_nbap_GANSS_Real_Time_Integrity_item,
-      { "GANSS-RealTimeInformationItem", "nbap.GANSS_RealTimeInformationItem",
+      { "GANSS-RealTimeInformationItem", "nbap.GANSS_RealTimeInformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_bad_ganss_satId,
@@ -62328,7 +62328,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_1_", HFILL }},
     { &hf_nbap_GANSS_SatelliteInformationKP_item,
-      { "GANSS-SatelliteInformationKPItem", "nbap.GANSS_SatelliteInformationKPItem",
+      { "GANSS-SatelliteInformationKPItem", "nbap.GANSS_SatelliteInformationKPItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ganss_e_alm,
@@ -62372,7 +62372,7 @@ void proto_register_nbap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_11", HFILL }},
     { &hf_nbap_Ganss_Sat_Info_AddNavList_item,
-      { "Ganss-Sat-Info-AddNavList item", "nbap.Ganss_Sat_Info_AddNavList_item",
+      { "Ganss-Sat-Info-AddNavList item", "nbap.Ganss_Sat_Info_AddNavList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_svHealth,
@@ -62392,7 +62392,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_GANSS_AddOrbitModels_vals), 0,
         "GANSS_AddOrbitModels", HFILL }},
     { &hf_nbap_GANSS_SAT_Info_Almanac_GLOkpList_item,
-      { "GANSS-SAT-Info-Almanac-GLOkp", "nbap.GANSS_SAT_Info_Almanac_GLOkp",
+      { "GANSS-SAT-Info-Almanac-GLOkp", "nbap.GANSS_SAT_Info_Almanac_GLOkp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_gloAlmNA,
@@ -62448,7 +62448,7 @@ void proto_register_nbap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_2", HFILL }},
     { &hf_nbap_GANSS_SAT_Info_Almanac_MIDIkpList_item,
-      { "GANSS-SAT-Info-Almanac-MIDIkp", "nbap.GANSS_SAT_Info_Almanac_MIDIkp",
+      { "GANSS-SAT-Info-Almanac-MIDIkp", "nbap.GANSS_SAT_Info_Almanac_MIDIkp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_midiAlmE,
@@ -62500,7 +62500,7 @@ void proto_register_nbap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_1", HFILL }},
     { &hf_nbap_GANSS_SAT_Info_Almanac_NAVkpList_item,
-      { "GANSS-SAT-Info-Almanac-NAVkp", "nbap.GANSS_SAT_Info_Almanac_NAVkp",
+      { "GANSS-SAT-Info-Almanac-NAVkp", "nbap.GANSS_SAT_Info_Almanac_NAVkp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_navAlmE,
@@ -62544,7 +62544,7 @@ void proto_register_nbap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_11", HFILL }},
     { &hf_nbap_GANSS_SAT_Info_Almanac_REDkpList_item,
-      { "GANSS-SAT-Info-Almanac-REDkp", "nbap.GANSS_SAT_Info_Almanac_REDkp",
+      { "GANSS-SAT-Info-Almanac-REDkp", "nbap.GANSS_SAT_Info_Almanac_REDkp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_redAlmDeltaA,
@@ -62572,7 +62572,7 @@ void proto_register_nbap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_1", HFILL }},
     { &hf_nbap_GANSS_SAT_Info_Almanac_SBASecefList_item,
-      { "GANSS-SAT-Info-Almanac-SBASecef", "nbap.GANSS_SAT_Info_Almanac_SBASecef",
+      { "GANSS-SAT-Info-Almanac-SBASecef", "nbap.GANSS_SAT_Info_Almanac_SBASecef_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_sbasAlmDataID,
@@ -62612,7 +62612,7 @@ void proto_register_nbap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_11", HFILL }},
     { &hf_nbap_GANSS_Sat_Info_Nav_item,
-      { "GANSS-Sat-Info-Nav item", "nbap.GANSS_Sat_Info_Nav_item",
+      { "GANSS-Sat-Info-Nav item", "nbap.GANSS_Sat_Info_Nav_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_svHealth_01,
@@ -62744,7 +62744,7 @@ void proto_register_nbap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_32", HFILL }},
     { &hf_nbap_deltaUT1_01,
-      { "deltaUT1", "nbap.deltaUT1",
+      { "deltaUT1", "nbap.deltaUT1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_DeltaUT1", HFILL }},
     { &hf_nbap_kp,
@@ -62824,11 +62824,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_GPS_Information_Item_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_bad_satellites,
-      { "bad-satellites", "nbap.bad_satellites",
+      { "bad-satellites", "nbap.bad_satellites_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GPSBadSat_Info_RealTime_Integrity", HFILL }},
     { &hf_nbap_no_bad_satellites,
-      { "no-bad-satellites", "nbap.no_bad_satellites",
+      { "no-bad-satellites", "nbap.no_bad_satellites_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_sat_info,
@@ -62836,7 +62836,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "SATInfo_RealTime_Integrity", HFILL }},
     { &hf_nbap_GPS_NavigationModel_and_TimeRecovery_item,
-      { "GPS-NavandRecovery-Item", "nbap.GPS_NavandRecovery_Item",
+      { "GPS-NavandRecovery-Item", "nbap.GPS_NavandRecovery_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_tx_tow_nav,
@@ -62948,11 +62948,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_T_directionOfAltitude_01_vals), 0,
         "T_directionOfAltitude_01", HFILL }},
     { &hf_nbap_implicit,
-      { "implicit", "nbap.implicit",
+      { "implicit", "nbap.implicit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HARQ_MemoryPartitioning_Implicit", HFILL }},
     { &hf_nbap_explicit,
-      { "explicit", "nbap.explicit",
+      { "explicit", "nbap.explicit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HARQ_MemoryPartitioning_Explicit", HFILL }},
     { &hf_nbap_number_of_Processes,
@@ -62964,11 +62964,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HARQ_MemoryPartitioningList_item,
-      { "HARQ-MemoryPartitioningItem", "nbap.HARQ_MemoryPartitioningItem",
+      { "HARQ-MemoryPartitioningItem", "nbap.HARQ_MemoryPartitioningItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HARQ_MemoryPartitioningInfoExtForMIMO_item,
-      { "HARQ-MemoryPartitioningItem", "nbap.HARQ_MemoryPartitioningItem",
+      { "HARQ-MemoryPartitioningItem", "nbap.HARQ_MemoryPartitioningItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_process_Memory_Size,
@@ -62976,7 +62976,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_T_process_Memory_Size_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_HS_DSCHProvidedBitRate_item,
-      { "HS-DSCHProvidedBitRate-Item", "nbap.HS_DSCHProvidedBitRate_Item",
+      { "HS-DSCHProvidedBitRate-Item", "nbap.HS_DSCHProvidedBitRate_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_DSCHProvidedBitRateValue,
@@ -62984,7 +62984,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HS_DSCHProvidedBitRateValueInformation_For_CellPortion_item,
-      { "HS-DSCHProvidedBitRateValueInformation-For-CellPortion-Item", "nbap.HS_DSCHProvidedBitRateValueInformation_For_CellPortion_Item",
+      { "HS-DSCHProvidedBitRateValueInformation-For-CellPortion-Item", "nbap.HS_DSCHProvidedBitRateValueInformation_For_CellPortion_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_DSCHProvidedBitRateValue_01,
@@ -62992,11 +62992,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "HS_DSCHProvidedBitRate", HFILL }},
     { &hf_nbap_HS_DSCHProvidedBitRateValueInformation_For_CellPortionLCR_item,
-      { "HS-DSCHProvidedBitRateValueInformation-For-CellPortionLCR-Item", "nbap.HS_DSCHProvidedBitRateValueInformation_For_CellPortionLCR_Item",
+      { "HS-DSCHProvidedBitRateValueInformation-For-CellPortionLCR-Item", "nbap.HS_DSCHProvidedBitRateValueInformation_For_CellPortionLCR_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HS_DSCHRequiredPower_item,
-      { "HS-DSCHRequiredPower-Item", "nbap.HS_DSCHRequiredPower_Item",
+      { "HS-DSCHRequiredPower-Item", "nbap.HS_DSCHRequiredPower_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_DSCHRequiredPowerValue,
@@ -63008,7 +63008,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HS_DSCHRequiredPowerPerUEInformation_item,
-      { "HS-DSCHRequiredPowerPerUEInformation-Item", "nbap.HS_DSCHRequiredPowerPerUEInformation_Item",
+      { "HS-DSCHRequiredPowerPerUEInformation-Item", "nbap.HS_DSCHRequiredPowerPerUEInformation_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_cRNC_CommunicationContextID,
@@ -63020,7 +63020,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HS_DSCHRequiredPowerValueInformation_For_CellPortion_item,
-      { "HS-DSCHRequiredPowerValueInformation-For-CellPortion-Item", "nbap.HS_DSCHRequiredPowerValueInformation_For_CellPortion_Item",
+      { "HS-DSCHRequiredPowerValueInformation-For-CellPortion-Item", "nbap.HS_DSCHRequiredPowerValueInformation_For_CellPortion_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_DSCHRequiredPowerValue_01,
@@ -63028,15 +63028,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "HS_DSCHRequiredPower", HFILL }},
     { &hf_nbap_HS_DSCHRequiredPowerValueInformation_For_CellPortionLCR_item,
-      { "HS-DSCHRequiredPowerValueInformation-For-CellPortionLCR-Item", "nbap.HS_DSCHRequiredPowerValueInformation_For_CellPortionLCR_Item",
+      { "HS-DSCHRequiredPowerValueInformation-For-CellPortionLCR-Item", "nbap.HS_DSCHRequiredPowerValueInformation_For_CellPortionLCR_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hsdpa_PICH_Shared_with_PCH,
-      { "hsdpa-PICH-Shared-with-PCH", "nbap.hsdpa_PICH_Shared_with_PCH",
+      { "hsdpa-PICH-Shared-with-PCH", "nbap.hsdpa_PICH_Shared_with_PCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hsdpa_PICH_notShared_with_PCH,
-      { "hsdpa-PICH-notShared-with-PCH", "nbap.hsdpa_PICH_notShared_with_PCH",
+      { "hsdpa-PICH-notShared-with-PCH", "nbap.hsdpa_PICH_notShared_with_PCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hsdpa_PICH_SharedPCH_ID,
@@ -63064,7 +63064,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_STTD_Indicator_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_hsdsch_Common_Information,
-      { "hsdsch-Common-Information", "nbap.hsdsch_Common_Information",
+      { "hsdsch-Common-Information", "nbap.hsdsch_Common_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_commonMACFlow_Specific_Information,
@@ -63104,15 +63104,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_RACH_Measurement_Result_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_bCCH_Specific_HSDSCH_RNTI_Information,
-      { "bCCH-Specific-HSDSCH-RNTI-Information", "nbap.bCCH_Specific_HSDSCH_RNTI_Information",
+      { "bCCH-Specific-HSDSCH-RNTI-Information", "nbap.bCCH_Specific_HSDSCH_RNTI_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hSDSCH_MACdFlows_Information,
-      { "hSDSCH-MACdFlows-Information", "nbap.hSDSCH_MACdFlows_Information",
+      { "hSDSCH-MACdFlows-Information", "nbap.hSDSCH_MACdFlows_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ueCapability_Info,
-      { "ueCapability-Info", "nbap.ueCapability_Info",
+      { "ueCapability-Info", "nbap.ueCapability_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Capability_Information", HFILL }},
     { &hf_nbap_mAChs_Reordering_Buffer_Size_for_RLC_UM,
@@ -63144,7 +63144,7 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         "TDD_AckNack_Power_Offset", HFILL }},
     { &hf_nbap_HSDSCH_MACdFlow_Specific_InfoList_to_Modify_item,
-      { "HSDSCH-MACdFlow-Specific-InfoItem-to-Modify", "nbap.HSDSCH_MACdFlow_Specific_InfoItem_to_Modify",
+      { "HSDSCH-MACdFlow-Specific-InfoItem-to-Modify", "nbap.HSDSCH_MACdFlow_Specific_InfoItem_to_Modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hsDSCH_MACdFlow_ID,
@@ -63192,15 +63192,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_HS_DSCH_Secondary_Serving_cell_change_choice_vals), 0,
         "HS_DSCH_Secondary_Serving_cell_change_choice", HFILL }},
     { &hf_nbap_hS_Secondary_Serving_cell_change_successful,
-      { "hS-Secondary-Serving-cell-change-successful", "nbap.hS_Secondary_Serving_cell_change_successful",
+      { "hS-Secondary-Serving-cell-change-successful", "nbap.hS_Secondary_Serving_cell_change_successful_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_Secondary_Serving_cell_change_unsuccessful,
-      { "hS-Secondary-Serving-cell-change-unsuccessful", "nbap.hS_Secondary_Serving_cell_change_unsuccessful",
+      { "hS-Secondary-Serving-cell-change-unsuccessful", "nbap.hS_Secondary_Serving_cell_change_unsuccessful_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_DSCH_FDD_Secondary_Serving_Information_Response,
-      { "hS-DSCH-FDD-Secondary-Serving-Information-Response", "nbap.hS_DSCH_FDD_Secondary_Serving_Information_Response",
+      { "hS-DSCH-FDD-Secondary-Serving-Information-Response", "nbap.hS_DSCH_FDD_Secondary_Serving_Information_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_paging_MACFlow_Specific_Information,
@@ -63216,7 +63216,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSDSCH_Paging_System_Information_ResponseFDD_item,
-      { "HSDSCH-Paging-System-Information-ResponseList", "nbap.HSDSCH_Paging_System_Information_ResponseList",
+      { "HSDSCH-Paging-System-Information-ResponseList", "nbap.HSDSCH_Paging_System_Information_ResponseList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_pagingMACFlow_ID,
@@ -63236,7 +63236,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "HSSCCH_Specific_InformationRespListTDDLCR", HFILL }},
     { &hf_nbap_HSDSCH_MACdFlow_Specific_InformationResp_item,
-      { "HSDSCH-MACdFlow-Specific-InformationResp-Item", "nbap.HSDSCH_MACdFlow_Specific_InformationResp_Item",
+      { "HSDSCH-MACdFlow-Specific-InformationResp-Item", "nbap.HSDSCH_MACdFlow_Specific_InformationResp_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hsDSCHMacdFlow_Id,
@@ -63252,15 +63252,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "PriorityQueue_InfoList", HFILL }},
     { &hf_nbap_HSDSCH_MACdFlow_Specific_InfoList_item,
-      { "HSDSCH-MACdFlow-Specific-InfoItem", "nbap.HSDSCH_MACdFlow_Specific_InfoItem",
+      { "HSDSCH-MACdFlow-Specific-InfoItem", "nbap.HSDSCH_MACdFlow_Specific_InfoItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSDSCH_MACdFlows_to_Delete_item,
-      { "HSDSCH-MACdFlows-to-Delete-Item", "nbap.HSDSCH_MACdFlows_to_Delete_Item",
+      { "HSDSCH-MACdFlows-to-Delete-Item", "nbap.HSDSCH_MACdFlows_to_Delete_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSDSCH_Initial_Capacity_Allocation_item,
-      { "HSDSCH-Initial-Capacity-AllocationItem", "nbap.HSDSCH_Initial_Capacity_AllocationItem",
+      { "HSDSCH-Initial-Capacity-AllocationItem", "nbap.HSDSCH_Initial_Capacity_AllocationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_maximum_MACdPDU_Size,
@@ -63284,11 +63284,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_MIMO_N_M_Ratio_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_continuousPacketConnectivityHS_SCCH_less_Information_Response,
-      { "continuousPacketConnectivityHS-SCCH-less-Information-Response", "nbap.continuousPacketConnectivityHS_SCCH_less_Information_Response",
+      { "continuousPacketConnectivityHS-SCCH-less-Information-Response", "nbap.continuousPacketConnectivityHS_SCCH_less_Information_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_EDCH_Preconfiguration_Information_item,
-      { "Additional-EDCH-Preconfiguration-Information-ItemIEs", "nbap.Additional_EDCH_Preconfiguration_Information_ItemIEs",
+      { "Additional-EDCH-Preconfiguration-Information-ItemIEs", "nbap.Additional_EDCH_Preconfiguration_Information_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_mAChsResetScheme,
@@ -63312,7 +63312,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_HARQ_Preamble_Mode_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_mIMO_ActivationIndicator,
-      { "mIMO-ActivationIndicator", "nbap.mIMO_ActivationIndicator",
+      { "mIMO-ActivationIndicator", "nbap.mIMO_ActivationIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hSDSCH_MACdPDUSizeFormat,
@@ -63320,11 +63320,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_HSDSCH_MACdPDUSizeFormat_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_uE_with_enhanced_HS_SCCH_support_indicator,
-      { "uE-with-enhanced-HS-SCCH-support-indicator", "nbap.uE_with_enhanced_HS_SCCH_support_indicator",
+      { "uE-with-enhanced-HS-SCCH-support-indicator", "nbap.uE_with_enhanced_HS_SCCH_support_indicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HS_SCCH_PreconfiguredCodes_item,
-      { "HS-SCCH-PreconfiguredCodesItem", "nbap.HS_SCCH_PreconfiguredCodesItem",
+      { "HS-SCCH-PreconfiguredCodesItem", "nbap.HS_SCCH_PreconfiguredCodesItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_SCCH_CodeNumber,
@@ -63332,7 +63332,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSSCCH_Specific_InformationRespListFDD_item,
-      { "HSSCCH-Codes", "nbap.HSSCCH_Codes",
+      { "HSSCCH-Codes", "nbap.HSSCCH_Codes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_codeNumber,
@@ -63340,7 +63340,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_127", HFILL }},
     { &hf_nbap_HSSCCH_Specific_InformationRespListTDD_item,
-      { "HSSCCH-Specific-InformationRespItemTDD", "nbap.HSSCCH_Specific_InformationRespItemTDD",
+      { "HSSCCH-Specific-InformationRespItemTDD", "nbap.HSSCCH_Specific_InformationRespItemTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_timeslot,
@@ -63352,11 +63352,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &nbap_TDD_ChannelisationCode_vals_ext, 0,
         NULL, HFILL }},
     { &hf_nbap_hSSICH_Info,
-      { "hSSICH-Info", "nbap.hSSICH_Info",
+      { "hSSICH-Info", "nbap.hSSICH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSSCCH_Specific_InformationRespListTDDLCR_item,
-      { "HSSCCH-Specific-InformationRespItemTDDLCR", "nbap.HSSCCH_Specific_InformationRespItemTDDLCR",
+      { "HSSCCH-Specific-InformationRespItemTDDLCR", "nbap.HSSCCH_Specific_InformationRespItemTDDLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_timeslotLCR,
@@ -63372,11 +63372,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &nbap_TDD_ChannelisationCode_vals_ext, 0,
         "TDD_ChannelisationCode", HFILL }},
     { &hf_nbap_hSSICH_InfoLCR,
-      { "hSSICH-InfoLCR", "nbap.hSSICH_InfoLCR",
+      { "hSSICH-InfoLCR", "nbap.hSSICH_InfoLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSSCCH_Specific_InformationRespListTDD768_item,
-      { "HSSCCH-Specific-InformationRespItemTDD768", "nbap.HSSCCH_Specific_InformationRespItemTDD768",
+      { "HSSCCH-Specific-InformationRespItemTDD768", "nbap.HSSCCH_Specific_InformationRespItemTDD768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_tDD_ChannelisationCode768,
@@ -63384,7 +63384,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &nbap_TDD_ChannelisationCode768_vals_ext, 0,
         NULL, HFILL }},
     { &hf_nbap_hSSICH_Info768,
-      { "hSSICH-Info768", "nbap.hSSICH_Info768",
+      { "hSSICH-Info768", "nbap.hSSICH_Info768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hsSICH_ID,
@@ -63424,7 +63424,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "RL_ID", HFILL }},
     { &hf_nbap_hSDSCH_FDD_Information,
-      { "hSDSCH-FDD-Information", "nbap.hSDSCH_FDD_Information",
+      { "hSDSCH-FDD-Information", "nbap.hSDSCH_FDD_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hsdsch_RNTI,
@@ -63436,23 +63436,23 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_HS_DSCH_serving_cell_choice_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_hS_serving_cell_change_successful,
-      { "hS-serving-cell-change-successful", "nbap.hS_serving_cell_change_successful",
+      { "hS-serving-cell-change-successful", "nbap.hS_serving_cell_change_successful_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_serving_cell_change_unsuccessful,
-      { "hS-serving-cell-change-unsuccessful", "nbap.hS_serving_cell_change_unsuccessful",
+      { "hS-serving-cell-change-unsuccessful", "nbap.hS_serving_cell_change_unsuccessful_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hSDSCH_FDD_Information_Response,
-      { "hSDSCH-FDD-Information-Response", "nbap.hSDSCH_FDD_Information_Response",
+      { "hSDSCH-FDD-Information-Response", "nbap.hSDSCH_FDD_Information_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hsdpa_PICH_notShared_with_PCHLCR,
-      { "hsdpa-PICH-notShared-with-PCHLCR", "nbap.hsdpa_PICH_notShared_with_PCHLCR",
+      { "hsdpa-PICH-notShared-with-PCHLCR", "nbap.hsdpa_PICH_notShared_with_PCHLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_tdd_ChannelisationCodeLCR,
-      { "tdd-ChannelisationCodeLCR", "nbap.tdd_ChannelisationCodeLCR",
+      { "tdd-ChannelisationCodeLCR", "nbap.tdd_ChannelisationCodeLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_tdd_PhysicalChannelOffset,
@@ -63468,11 +63468,11 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_second_TDD_ChannelisationCodeLCR,
-      { "second-TDD-ChannelisationCodeLCR", "nbap.second_TDD_ChannelisationCodeLCR",
+      { "second-TDD-ChannelisationCodeLCR", "nbap.second_TDD_ChannelisationCodeLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TDD_ChannelisationCodeLCR", HFILL }},
     { &hf_nbap_hsdsch_Common_InformationLCR,
-      { "hsdsch-Common-InformationLCR", "nbap.hsdsch_Common_InformationLCR",
+      { "hsdsch-Common-InformationLCR", "nbap.hsdsch_Common_InformationLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_commonMACFlow_Specific_InformationLCR,
@@ -63484,7 +63484,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_sync_InformationLCR,
-      { "sync-InformationLCR", "nbap.sync_InformationLCR",
+      { "sync-InformationLCR", "nbap.sync_InformationLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hSSICH_SIRTarget,
@@ -63508,7 +63508,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Common_MACFlow_ID_LCR", HFILL }},
     { &hf_nbap_bCCH_Specific_HSDSCH_RNTI_InformationLCR,
-      { "bCCH-Specific-HSDSCH-RNTI-InformationLCR", "nbap.bCCH_Specific_HSDSCH_RNTI_InformationLCR",
+      { "bCCH-Specific-HSDSCH-RNTI-InformationLCR", "nbap.bCCH_Specific_HSDSCH_RNTI_InformationLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_paging_MACFlow_Specific_InformationLCR,
@@ -63528,7 +63528,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_3", HFILL }},
     { &hf_nbap_HSDSCH_Paging_System_Information_ResponseLCR_item,
-      { "HSDSCH-Paging-System-Information-ResponseListLCR", "nbap.HSDSCH_Paging_System_Information_ResponseListLCR",
+      { "HSDSCH-Paging-System-Information-ResponseListLCR", "nbap.HSDSCH_Paging_System_Information_ResponseListLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dL_HS_PDSCH_Timeslot_Information_LCR_PSCH_ReconfRqst,
@@ -63536,7 +63536,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSSCCH_Specific_InformationRespListLCR_item,
-      { "HSSCCH-Specific-InformationRespItemLCR", "nbap.HSSCCH_Specific_InformationRespItemLCR",
+      { "HSSCCH-Specific-InformationRespItemLCR", "nbap.HSSCCH_Specific_InformationRespItemLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_SCCH_ID_LCR,
@@ -63556,7 +63556,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_HS_DSCH_SPS_Operation_Indicator_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_Transport_Block_Size_List_LCR_item,
-      { "Transport-Block-Size-Item-LCR", "nbap.Transport_Block_Size_Item_LCR",
+      { "Transport-Block-Size-Item-LCR", "nbap.Transport_Block_Size_Item_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_transport_Block_Size_maping_Index_LCR,
@@ -63568,7 +63568,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Repetition_Period_List_LCR_item,
-      { "Repetition-Period-Item-LCR", "nbap.Repetition_Period_Item_LCR",
+      { "Repetition-Period-Item-LCR", "nbap.Repetition_Period_Item_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_repetitionPeriodIndex,
@@ -63588,7 +63588,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_initial_HS_PDSCH_SPS_Resource,
-      { "initial-HS-PDSCH-SPS-Resource", "nbap.initial_HS_PDSCH_SPS_Resource",
+      { "initial-HS-PDSCH-SPS-Resource", "nbap.initial_HS_PDSCH_SPS_Resource_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_buffer_Size_for_HS_DSCH_SPS,
@@ -63600,7 +63600,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HS_SICH_InformationList_for_HS_DSCH_SPS_item,
-      { "HS-SICH-InformationItem-for-HS-DSCH-SPS", "nbap.HS_SICH_InformationItem_for_HS_DSCH_SPS",
+      { "HS-SICH-InformationItem-for-HS-DSCH-SPS", "nbap.HS_SICH_InformationItem_for_HS_DSCH_SPS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_SICH_Mapping_Index,
@@ -63612,11 +63612,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_HS_SICH_Type_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_hS_SCCH_Associated_HS_SICH,
-      { "hS-SCCH-Associated-HS-SICH", "nbap.hS_SCCH_Associated_HS_SICH",
+      { "hS-SCCH-Associated-HS-SICH", "nbap.hS_SCCH_Associated_HS_SICH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_non_HS_SCCH_Associated_HS_SICH,
-      { "non-HS-SCCH-Associated-HS-SICH", "nbap.non_HS_SCCH_Associated_HS_SICH",
+      { "non-HS-SCCH-Associated-HS-SICH", "nbap.non_HS_SCCH_Associated_HS_SICH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_extended_HS_SICH_ID,
@@ -63656,11 +63656,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Non_HS_SCCH_Associated_HS_SICH_InformationList_item,
-      { "Non-HS-SCCH-Associated-HS-SICH-InformationItem", "nbap.Non_HS_SCCH_Associated_HS_SICH_InformationItem",
+      { "Non-HS-SCCH-Associated-HS-SICH-InformationItem", "nbap.Non_HS_SCCH_Associated_HS_SICH_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Non_HS_SCCH_Associated_HS_SICH_InformationList_Ext_item,
-      { "Non-HS-SCCH-Associated-HS-SICH-InformationItem", "nbap.Non_HS_SCCH_Associated_HS_SICH_InformationItem",
+      { "Non-HS-SCCH-Associated-HS-SICH-InformationItem", "nbap.Non_HS_SCCH_Associated_HS_SICH_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_modify_non_HS_SCCH_Associated_HS_SICH_InformationList,
@@ -63668,23 +63668,23 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Modify_Non_HS_SCCH_Associated_HS_SICH_InformationList_item,
-      { "Modify-Non-HS-SCCH-Associated-HS-SICH-InformationItem", "nbap.Modify_Non_HS_SCCH_Associated_HS_SICH_InformationItem",
+      { "Modify-Non-HS-SCCH-Associated-HS-SICH-InformationItem", "nbap.Modify_Non_HS_SCCH_Associated_HS_SICH_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Modify_Non_HS_SCCH_Associated_HS_SICH_InformationList_Ext_item,
-      { "Modify-Non-HS-SCCH-Associated-HS-SICH-InformationItem", "nbap.Modify_Non_HS_SCCH_Associated_HS_SICH_InformationItem",
+      { "Modify-Non-HS-SCCH-Associated-HS-SICH-InformationItem", "nbap.Modify_Non_HS_SCCH_Associated_HS_SICH_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Delete_From_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst_item,
-      { "Delete-From-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqstItem", "nbap.Delete_From_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqstItem",
+      { "Delete-From-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqstItem", "nbap.Delete_From_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqstItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Delete_From_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqst_Ext_item,
-      { "Delete-From-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqstItem", "nbap.Delete_From_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqstItem",
+      { "Delete-From-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqstItem", "nbap.Delete_From_Non_HS_SCCH_Associated_HS_SICH_Resource_Pool_LCR_PSCH_ReconfRqstItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MIMO_ReferenceSignal_InformationListLCR_item,
-      { "HSSICH-ReferenceSignal-InformationLCR", "nbap.HSSICH_ReferenceSignal_InformationLCR",
+      { "HSSICH-ReferenceSignal-InformationLCR", "nbap.HSSICH_ReferenceSignal_InformationLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_midambleConfigurationLCR,
@@ -63696,7 +63696,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_15", HFILL }},
     { &hf_nbap_hSSICH_ReferenceSignal_InformationLCR,
-      { "hSSICH-ReferenceSignal-InformationLCR", "nbap.hSSICH_ReferenceSignal_InformationLCR",
+      { "hSSICH-ReferenceSignal-InformationLCR", "nbap.hSSICH_ReferenceSignal_InformationLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_sub_Frame_Number,
@@ -63704,7 +63704,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_onDemand,
-      { "onDemand", "nbap.onDemand",
+      { "onDemand", "nbap.onDemand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_periodic,
@@ -63712,7 +63712,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_InformationReportCharacteristicsType_ReportPeriodicity_vals), 0,
         "InformationReportCharacteristicsType_ReportPeriodicity", HFILL }},
     { &hf_nbap_onModification,
-      { "onModification", "nbap.onModification",
+      { "onModification", "nbap.onModification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InformationReportCharacteristicsType_OnModification", HFILL }},
     { &hf_nbap_min,
@@ -63728,11 +63728,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_InformationThresholds_vals), 0,
         "InformationThresholds", HFILL }},
     { &hf_nbap_dgps,
-      { "dgps", "nbap.dgps",
+      { "dgps", "nbap.dgps_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DGPSThresholds", HFILL }},
     { &hf_nbap_dGANSSThreshold,
-      { "dGANSSThreshold", "nbap.dGANSSThreshold",
+      { "dGANSSThreshold", "nbap.dGANSSThreshold_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_information_Type_Item,
@@ -63756,7 +63756,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_63", HFILL }},
     { &hf_nbap_burstModeParams,
-      { "burstModeParams", "nbap.burstModeParams",
+      { "burstModeParams", "nbap.burstModeParams_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_iP_Offset,
@@ -63820,7 +63820,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_T_maxPhysChPerTimeslot_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_MACdPDU_Size_Indexlist_item,
-      { "MACdPDU-Size-IndexItem", "nbap.MACdPDU_Size_IndexItem",
+      { "MACdPDU-Size-IndexItem", "nbap.MACdPDU_Size_IndexItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_sID,
@@ -63832,7 +63832,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MACdPDU_Size_Indexlist_to_Modify_item,
-      { "MACdPDU-Size-IndexItem-to-Modify", "nbap.MACdPDU_Size_IndexItem_to_Modify",
+      { "MACdPDU-Size-IndexItem-to-Modify", "nbap.MACdPDU_Size_IndexItem_to_Modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_maximum_TB_Size_cell_edge_users,
@@ -63844,7 +63844,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_5000_", HFILL }},
     { &hf_nbap_MessageStructure_item,
-      { "MessageStructure item", "nbap.MessageStructure_item",
+      { "MessageStructure item", "nbap.MessageStructure_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_repetitionNumber_01,
@@ -63852,7 +63852,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "RepetitionNumber1", HFILL }},
     { &hf_nbap_type1,
-      { "type1", "nbap.type1",
+      { "type1", "nbap.type1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_midambleConfigurationBurstType1And3,
@@ -63864,11 +63864,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_MidambleAllocationMode1_vals), 0,
         "MidambleAllocationMode1", HFILL }},
     { &hf_nbap_defaultMidamble,
-      { "defaultMidamble", "nbap.defaultMidamble",
+      { "defaultMidamble", "nbap.defaultMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_commonMidamble,
-      { "commonMidamble", "nbap.commonMidamble",
+      { "commonMidamble", "nbap.commonMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ueSpecificMidamble,
@@ -63876,7 +63876,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "MidambleShiftLong", HFILL }},
     { &hf_nbap_type2,
-      { "type2", "nbap.type2",
+      { "type2", "nbap.type2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_midambleConfigurationBurstType2,
@@ -63892,7 +63892,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "MidambleShiftShort", HFILL }},
     { &hf_nbap_type3,
-      { "type3", "nbap.type3",
+      { "type3", "nbap.type3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_midambleAllocationMode_02,
@@ -63908,7 +63908,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "MidambleShiftLong", HFILL }},
     { &hf_nbap_type1_01,
-      { "type1", "nbap.type1",
+      { "type1", "nbap.type1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Type7681", HFILL }},
     { &hf_nbap_midambleAllocationMode_04,
@@ -63916,7 +63916,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_MidambleAllocationMode7681_vals), 0,
         "MidambleAllocationMode7681", HFILL }},
     { &hf_nbap_type2_01,
-      { "type2", "nbap.type2",
+      { "type2", "nbap.type2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Type7682", HFILL }},
     { &hf_nbap_midambleConfigurationBurstType2_768,
@@ -63932,7 +63932,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "MidambleShiftShort768", HFILL }},
     { &hf_nbap_type3_01,
-      { "type3", "nbap.type3",
+      { "type3", "nbap.type3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Type7683", HFILL }},
     { &hf_nbap_midambleAllocationMode_06,
@@ -63944,23 +63944,23 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "CommonPhysicalChannelID", HFILL }},
     { &hf_nbap_normal_and_diversity_primary_CPICH,
-      { "normal-and-diversity-primary-CPICH", "nbap.normal_and_diversity_primary_CPICH",
+      { "normal-and-diversity-primary-CPICH", "nbap.normal_and_diversity_primary_CPICH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_primary_and_secondary_CPICH_01,
-      { "primary-and-secondary-CPICH", "nbap.primary_and_secondary_CPICH",
+      { "primary-and-secondary-CPICH", "nbap.primary_and_secondary_CPICH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrimaryAndSecondaryCPICHContainer", HFILL }},
     { &hf_nbap_normal_and_diversity_primary_CPICH_01,
-      { "normal-and-diversity-primary-CPICH", "nbap.normal_and_diversity_primary_CPICH",
+      { "normal-and-diversity-primary-CPICH", "nbap.normal_and_diversity_primary_CPICH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NormalAndDiversityPrimaryCPICHContainer", HFILL }},
     { &hf_nbap_addPriorityQueue,
-      { "addPriorityQueue", "nbap.addPriorityQueue",
+      { "addPriorityQueue", "nbap.addPriorityQueue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PriorityQueue_InfoItem_to_Add", HFILL }},
     { &hf_nbap_modifyPriorityQueue,
-      { "modifyPriorityQueue", "nbap.modifyPriorityQueue",
+      { "modifyPriorityQueue", "nbap.modifyPriorityQueue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PriorityQueue_InfoItem_to_Modify", HFILL }},
     { &hf_nbap_deletePriorityQueue,
@@ -63968,7 +63968,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "PriorityQueue_Id", HFILL }},
     { &hf_nbap_qPSK,
-      { "qPSK", "nbap.qPSK",
+      { "qPSK", "nbap.qPSK_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_sixteenQAM,
@@ -63976,11 +63976,11 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         "MBSFN_CPICH_secondary_CCPCH_power_offset", HFILL }},
     { &hf_nbap_MultipleFreq_HARQ_MemoryPartitioning_InformationList_item,
-      { "MultipleFreq-HARQ-MemoryPartitioning-InformationItem", "nbap.MultipleFreq_HARQ_MemoryPartitioning_InformationItem",
+      { "MultipleFreq-HARQ-MemoryPartitioning-InformationItem", "nbap.MultipleFreq_HARQ_MemoryPartitioning_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MultipleFreq_HSPDSCH_InformationList_ResponseTDDLCR_item,
-      { "MultipleFreq-HSPDSCH-InformationItem-ResponseTDDLCR", "nbap.MultipleFreq_HSPDSCH_InformationItem_ResponseTDDLCR",
+      { "MultipleFreq-HSPDSCH-InformationItem-ResponseTDDLCR", "nbap.MultipleFreq_HSPDSCH_InformationItem_ResponseTDDLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_multi_Cell_Capability,
@@ -63988,7 +63988,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_Multi_Cell_Capability_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_dL_PowerBalancing_Information,
-      { "dL-PowerBalancing-Information", "nbap.dL_PowerBalancing_Information",
+      { "dL-PowerBalancing-Information", "nbap.dL_PowerBalancing_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_minimumReducedE_DPDCH_GainFactor,
@@ -64028,7 +64028,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_DCH_DL_Control_Channel_Grant,
-      { "e-DCH-DL-Control-Channel-Grant", "nbap.e_DCH_DL_Control_Channel_Grant",
+      { "e-DCH-DL-Control-Channel-Grant", "nbap.e_DCH_DL_Control_Channel_Grant_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_NeighbouringCellMeasurementInformation_item,
@@ -64036,19 +64036,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_NeighbouringCellMeasurementInformation_item_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_neighbouringFDDCellMeasurementInformation,
-      { "neighbouringFDDCellMeasurementInformation", "nbap.neighbouringFDDCellMeasurementInformation",
+      { "neighbouringFDDCellMeasurementInformation", "nbap.neighbouringFDDCellMeasurementInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_neighbouringTDDCellMeasurementInformation,
-      { "neighbouringTDDCellMeasurementInformation", "nbap.neighbouringTDDCellMeasurementInformation",
+      { "neighbouringTDDCellMeasurementInformation", "nbap.neighbouringTDDCellMeasurementInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_extension_neighbouringCellMeasurementInformation,
-      { "extension-neighbouringCellMeasurementInformation", "nbap.extension_neighbouringCellMeasurementInformation",
+      { "extension-neighbouringCellMeasurementInformation", "nbap.extension_neighbouringCellMeasurementInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uC_Id,
-      { "uC-Id", "nbap.uC_Id",
+      { "uC-Id", "nbap.uC_Id_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_primaryScramblingCode,
@@ -64064,7 +64064,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Paging_MACFlows_to_DeleteFDD_item,
-      { "Paging-MACFlows-to-DeleteFDD-Item", "nbap.Paging_MACFlows_to_DeleteFDD_Item",
+      { "Paging-MACFlows-to-DeleteFDD-Item", "nbap.Paging_MACFlows_to_DeleteFDD_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_paging_MACFlow_ID,
@@ -64072,7 +64072,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Paging_MACFlow_Specific_Information_item,
-      { "Paging-MAC-Flow-Specific-Information-Item", "nbap.Paging_MAC_Flow_Specific_Information_Item",
+      { "Paging-MAC-Flow-Specific-Information-Item", "nbap.Paging_MAC_Flow_Specific_Information_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_paging_MACFlow_Id,
@@ -64088,11 +64088,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Paging_MACFlow_PriorityQueue_Information_item,
-      { "Paging-MACFlow-PriorityQueue-Item", "nbap.Paging_MACFlow_PriorityQueue_Item",
+      { "Paging-MACFlow-PriorityQueue-Item", "nbap.Paging_MACFlow_PriorityQueue_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_priority_Queue_Information_for_Enhanced_PCH,
-      { "priority-Queue-Information-for-Enhanced-PCH", "nbap.priority_Queue_Information_for_Enhanced_PCH",
+      { "priority-Queue-Information-for-Enhanced-PCH", "nbap.priority_Queue_Information_for_Enhanced_PCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Priority_Queue_Information_for_Enhanced_FACH_PCH", HFILL }},
     { &hf_nbap_sequenceNumber,
@@ -64100,7 +64100,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "PLCCHsequenceNumber", HFILL }},
     { &hf_nbap_Possible_Secondary_Serving_Cell_List_item,
-      { "Possible-Secondary-Serving-Cell", "nbap.Possible_Secondary_Serving_Cell",
+      { "Possible-Secondary-Serving-Cell", "nbap.Possible_Secondary_Serving_Cell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_local_Cell_ID,
@@ -64136,7 +64136,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "MAC_PDU_SizeExtended", HFILL }},
     { &hf_nbap_PriorityQueue_InfoList_item,
-      { "PriorityQueue-InfoItem", "nbap.PriorityQueue_InfoItem",
+      { "PriorityQueue-InfoItem", "nbap.PriorityQueue_InfoItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_priorityQueueId,
@@ -64168,15 +64168,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "MACdPDU_Size_Indexlist_to_Modify", HFILL }},
     { &hf_nbap_PriorityQueue_InfoList_to_Modify_Unsynchronised_item,
-      { "PriorityQueue-InfoItem-to-Modify-Unsynchronised", "nbap.PriorityQueue_InfoItem_to_Modify_Unsynchronised",
+      { "PriorityQueue-InfoItem-to-Modify-Unsynchronised", "nbap.PriorityQueue_InfoItem_to_Modify_Unsynchronised_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_none,
-      { "none", "nbap.none",
+      { "none", "nbap.none_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_selected_MBMS_Service,
-      { "selected-MBMS-Service", "nbap.selected_MBMS_Service",
+      { "selected-MBMS-Service", "nbap.selected_MBMS_Service_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_selected_MBMS_Service_List,
@@ -64184,7 +64184,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Selected_MBMS_Service_List_item,
-      { "Selected-MBMS-Service-Item", "nbap.Selected_MBMS_Service_Item",
+      { "Selected-MBMS-Service-Item", "nbap.Selected_MBMS_Service_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_selected_MBMS_Service_TimeSlot_Information_LCR,
@@ -64192,7 +64192,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_mBMS_Service_TDM_Information,
-      { "mBMS-Service-TDM-Information", "nbap.mBMS_Service_TDM_Information",
+      { "mBMS-Service-TDM-Information", "nbap.mBMS_Service_TDM_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Selected_MBMS_Service_TimeSlot_Information_LCR_item,
@@ -64216,7 +64216,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_8", HFILL }},
     { &hf_nbap_Paging_MACFlow_Specific_InformationLCR_item,
-      { "Paging-MAC-Flow-Specific-Information-ItemLCR", "nbap.Paging_MAC_Flow_Specific_Information_ItemLCR",
+      { "Paging-MAC-Flow-Specific-Information-ItemLCR", "nbap.Paging_MAC_Flow_Specific_Information_ItemLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hSDPA_associated_PICH_InfoLCR,
@@ -64228,11 +64228,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Paging_MACFlow_PriorityQueue_Information", HFILL }},
     { &hf_nbap_Paging_MACFlows_to_DeleteLCR_item,
-      { "Paging-MACFlows-to-DeleteLCR-Item", "nbap.Paging_MACFlows_to_DeleteLCR_Item",
+      { "Paging-MACFlows-to-DeleteLCR-Item", "nbap.Paging_MACFlows_to_DeleteLCR_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_Specific_DCH_Info_item,
-      { "RL-Specific-DCH-Info-Item", "nbap.RL_Specific_DCH_Info_Item",
+      { "RL-Specific-DCH-Info-Item", "nbap.RL_Specific_DCH_Info_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dCH_id,
@@ -64248,11 +64248,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_Specific_E_DCH_Information_item,
-      { "RL-Specific-E-DCH-Information-Item", "nbap.RL_Specific_E_DCH_Information_Item",
+      { "RL-Specific-E-DCH-Information-Item", "nbap.RL_Specific_E_DCH_Information_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Reference_E_TFCI_Information_item,
-      { "Reference-E-TFCI-Information-Item", "nbap.Reference_E_TFCI_Information_Item",
+      { "Reference-E-TFCI-Information-Item", "nbap.Reference_E_TFCI_Information_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_reference_E_TFCI,
@@ -64268,31 +64268,31 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_ReportCharacteristicsType_ReportPeriodicity_vals), 0,
         "ReportCharacteristicsType_ReportPeriodicity", HFILL }},
     { &hf_nbap_event_a,
-      { "event-a", "nbap.event_a",
+      { "event-a", "nbap.event_a_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReportCharacteristicsType_EventA", HFILL }},
     { &hf_nbap_event_b,
-      { "event-b", "nbap.event_b",
+      { "event-b", "nbap.event_b_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReportCharacteristicsType_EventB", HFILL }},
     { &hf_nbap_event_c,
-      { "event-c", "nbap.event_c",
+      { "event-c", "nbap.event_c_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReportCharacteristicsType_EventC", HFILL }},
     { &hf_nbap_event_d,
-      { "event-d", "nbap.event_d",
+      { "event-d", "nbap.event_d_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReportCharacteristicsType_EventD", HFILL }},
     { &hf_nbap_event_e,
-      { "event-e", "nbap.event_e",
+      { "event-e", "nbap.event_e_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReportCharacteristicsType_EventE", HFILL }},
     { &hf_nbap_event_f,
-      { "event-f", "nbap.event_f",
+      { "event-f", "nbap.event_f_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReportCharacteristicsType_EventF", HFILL }},
     { &hf_nbap_extension_ReportCharacteristics,
-      { "extension-ReportCharacteristics", "nbap.extension_ReportCharacteristics",
+      { "extension-ReportCharacteristics", "nbap.extension_ReportCharacteristics_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_measurementThreshold,
@@ -64356,7 +64356,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Round_Trip_Time_IncrDecrThres", HFILL }},
     { &hf_nbap_extension_ReportCharacteristicsType_MeasurementIncreaseDecreaseThreshold,
-      { "extension-ReportCharacteristicsType-MeasurementIncreaseDecreaseThreshold", "nbap.extension_ReportCharacteristicsType_MeasurementIncreaseDecreaseThreshold",
+      { "extension-ReportCharacteristicsType-MeasurementIncreaseDecreaseThreshold", "nbap.extension_ReportCharacteristicsType_MeasurementIncreaseDecreaseThreshold_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_sir_01,
@@ -64384,7 +64384,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Round_Trip_Time_Value", HFILL }},
     { &hf_nbap_extension_ReportCharacteristicsType_MeasurementThreshold,
-      { "extension-ReportCharacteristicsType-MeasurementThreshold", "nbap.extension_ReportCharacteristicsType_MeasurementThreshold",
+      { "extension-ReportCharacteristicsType-MeasurementThreshold", "nbap.extension_ReportCharacteristicsType_MeasurementThreshold_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_msec,
@@ -64400,7 +64400,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "ReportPeriodicity_Scaledmsec", HFILL }},
     { &hf_nbap_Received_total_wide_band_power_For_CellPortion_Value_item,
-      { "Received-total-wide-band-power-For-CellPortion-Value-Item", "nbap.Received_total_wide_band_power_For_CellPortion_Value_Item",
+      { "Received-total-wide-band-power-For-CellPortion-Value-Item", "nbap.Received_total_wide_band_power_For_CellPortion_Value_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_received_total_wide_band_power_value,
@@ -64408,11 +64408,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Received_total_wide_band_power_For_CellPortion_ValueLCR_item,
-      { "Received-total-wide-band-power-For-CellPortion-ValueLCR-Item", "nbap.Received_total_wide_band_power_For_CellPortion_ValueLCR_Item",
+      { "Received-total-wide-band-power-For-CellPortion-ValueLCR-Item", "nbap.Received_total_wide_band_power_For_CellPortion_ValueLCR_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Received_Scheduled_EDCH_Power_Share_For_CellPortion_Value_item,
-      { "Received-Scheduled-EDCH-Power-Share-For-CellPortion-Value-Item", "nbap.Received_Scheduled_EDCH_Power_Share_For_CellPortion_Value_Item",
+      { "Received-Scheduled-EDCH-Power-Share-For-CellPortion-Value-Item", "nbap.Received_Scheduled_EDCH_Power_Share_For_CellPortion_Value_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_received_Scheduled_power_share_value,
@@ -64420,19 +64420,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "RSEPS_Value", HFILL }},
     { &hf_nbap_informationAvailable,
-      { "informationAvailable", "nbap.informationAvailable",
+      { "informationAvailable", "nbap.informationAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_informationnotAvailable,
-      { "informationnotAvailable", "nbap.informationnotAvailable",
+      { "informationnotAvailable", "nbap.informationnotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_requesteddataValue,
-      { "requesteddataValue", "nbap.requesteddataValue",
+      { "requesteddataValue", "nbap.requesteddataValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dgps_corrections,
-      { "dgps-corrections", "nbap.dgps_corrections",
+      { "dgps-corrections", "nbap.dgps_corrections_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DGPSCorrections", HFILL }},
     { &hf_nbap_gps_navandrecovery,
@@ -64440,15 +64440,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "GPS_NavigationModel_and_TimeRecovery", HFILL }},
     { &hf_nbap_gps_ionos_model,
-      { "gps-ionos-model", "nbap.gps_ionos_model",
+      { "gps-ionos-model", "nbap.gps_ionos_model_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GPS_Ionospheric_Model", HFILL }},
     { &hf_nbap_gps_utc_model,
-      { "gps-utc-model", "nbap.gps_utc_model",
+      { "gps-utc-model", "nbap.gps_utc_model_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_gps_almanac,
-      { "gps-almanac", "nbap.gps_almanac",
+      { "gps-almanac", "nbap.gps_almanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_gps_rt_integrity,
@@ -64456,11 +64456,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_GPS_RealTime_Integrity_vals), 0,
         "GPS_RealTime_Integrity", HFILL }},
     { &hf_nbap_gpsrxpos,
-      { "gpsrxpos", "nbap.gpsrxpos",
+      { "gpsrxpos", "nbap.gpsrxpos_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GPS_RX_POS", HFILL }},
     { &hf_nbap_SAT_Info_Almanac_item,
-      { "SAT-Info-Almanac-Item", "nbap.SAT_Info_Almanac_Item",
+      { "SAT-Info-Almanac-Item", "nbap.SAT_Info_Almanac_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_data_id,
@@ -64516,11 +64516,11 @@ void proto_register_nbap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_11", HFILL }},
     { &hf_nbap_SAT_Info_Almanac_ExtList_item,
-      { "SAT-Info-Almanac-ExtItem", "nbap.SAT_Info_Almanac_ExtItem",
+      { "SAT-Info-Almanac-ExtItem", "nbap.SAT_Info_Almanac_ExtItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SAT_Info_DGPSCorrections_item,
-      { "SAT-Info-DGPSCorrections-Item", "nbap.SAT_Info_DGPSCorrections_Item",
+      { "SAT-Info-DGPSCorrections-Item", "nbap.SAT_Info_DGPSCorrections_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_iode_dgps,
@@ -64536,7 +64536,7 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SATInfo_RealTime_Integrity_item,
-      { "SAT-Info-RealTime-Integrity-Item", "nbap.SAT_Info_RealTime_Integrity_Item",
+      { "SAT-Info-RealTime-Integrity-Item", "nbap.SAT_Info_RealTime_Integrity_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_bad_sat_id,
@@ -64544,7 +64544,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "SAT_ID", HFILL }},
     { &hf_nbap_SecondaryServingCells_item,
-      { "SecondaryServingCellsItem", "nbap.SecondaryServingCellsItem",
+      { "SecondaryServingCellsItem", "nbap.SecondaryServingCellsItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_secondaryC_ID,
@@ -64560,19 +64560,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "CommonPhysicalChannelID", HFILL }},
     { &hf_nbap_secondary_CPICH_shall_not_be_used,
-      { "secondary-CPICH-shall-not-be-used", "nbap.secondary_CPICH_shall_not_be_used",
+      { "secondary-CPICH-shall-not-be-used", "nbap.secondary_CPICH_shall_not_be_used_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_serving_E_DCH_RL_in_this_NodeB,
-      { "serving-E-DCH-RL-in-this-NodeB", "nbap.serving_E_DCH_RL_in_this_NodeB",
+      { "serving-E-DCH-RL-in-this-NodeB", "nbap.serving_E_DCH_RL_in_this_NodeB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_serving_E_DCH_RL_not_in_this_NodeB,
-      { "serving-E-DCH-RL-not-in-this-NodeB", "nbap.serving_E_DCH_RL_not_in_this_NodeB",
+      { "serving-E-DCH-RL-not-in-this-NodeB", "nbap.serving_E_DCH_RL_not_in_this_NodeB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SetsOfHS_SCCH_Codes_item,
-      { "SetsOfHS-SCCH-CodesItem", "nbap.SetsOfHS_SCCH_CodesItem",
+      { "SetsOfHS-SCCH-CodesItem", "nbap.SetsOfHS_SCCH_CodesItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_SCCH_PreconfiguredCodes,
@@ -64580,7 +64580,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_setup,
-      { "setup", "nbap.setup",
+      { "setup", "nbap.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Additional_EDCH_Setup_Info", HFILL }},
     { &hf_nbap_configurationChange,
@@ -64604,7 +64604,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item,
-      { "successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation item", "nbap.successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item",
+      { "successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation item", "nbap.successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_sFNSFNValue,
@@ -64632,7 +64632,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item,
-      { "unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation item", "nbap.unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item",
+      { "unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation item", "nbap.unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_sFNSFNTimeStamp_FDD,
@@ -64640,7 +64640,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "SFN", HFILL }},
     { &hf_nbap_sFNSFNTimeStamp_TDD,
-      { "sFNSFNTimeStamp-TDD", "nbap.sFNSFNTimeStamp_TDD",
+      { "sFNSFNTimeStamp-TDD", "nbap.sFNSFNTimeStamp_TDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_sFN,
@@ -64668,7 +64668,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SynchronisationReportCharactThreExc_item,
-      { "SynchronisationReportCharactThreInfoItem", "nbap.SynchronisationReportCharactThreInfoItem",
+      { "SynchronisationReportCharactThreInfoItem", "nbap.SynchronisationReportCharactThreInfoItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_syncFrameNumber,
@@ -64680,7 +64680,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxNrOfReceptsPerSyncFrame_OF_SynchronisationReportCharactCellSyncBurstInfoItem", HFILL }},
     { &hf_nbap_cellSyncBurstInformation_item,
-      { "SynchronisationReportCharactCellSyncBurstInfoItem", "nbap.SynchronisationReportCharactCellSyncBurstInfoItem",
+      { "SynchronisationReportCharactCellSyncBurstInfoItem", "nbap.SynchronisationReportCharactCellSyncBurstInfoItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_cellSyncBurstCode,
@@ -64700,7 +64700,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SyncDLCodeIdThreInfoLCR_item,
-      { "SyncDLCodeIdThreInfoList", "nbap.SyncDLCodeIdThreInfoList",
+      { "SyncDLCodeIdThreInfoList", "nbap.SyncDLCodeIdThreInfoList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_syncFrameNoToReceive,
@@ -64712,7 +64712,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "SyncDLCodeInfoListLCR", HFILL }},
     { &hf_nbap_SyncDLCodeInfoListLCR_item,
-      { "SyncDLCodeInfoItemLCR", "nbap.SyncDLCodeInfoItemLCR",
+      { "SyncDLCodeInfoItemLCR", "nbap.SyncDLCodeInfoItemLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_syncDLCodeId,
@@ -64732,7 +64732,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_Modulation_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_TDD_DL_Code_Information_item,
-      { "TDD-DL-Code-InformationItem", "nbap.TDD_DL_Code_InformationItem",
+      { "TDD-DL-Code-InformationItem", "nbap.TDD_DL_Code_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dPCH_ID,
@@ -64740,7 +64740,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_TDD_DL_Code_LCR_Information_item,
-      { "TDD-DL-Code-LCR-InformationItem", "nbap.TDD_DL_Code_LCR_InformationItem",
+      { "TDD-DL-Code-LCR-InformationItem", "nbap.TDD_DL_Code_LCR_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_tdd_DL_DPCH_TimeSlotFormat_LCR,
@@ -64748,7 +64748,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_TDD_DL_DPCH_TimeSlotFormat_LCR_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_TDD_DL_Code_768_Information_item,
-      { "TDD-DL-Code-768-InformationItem", "nbap.TDD_DL_Code_768_InformationItem",
+      { "TDD-DL-Code-768-InformationItem", "nbap.TDD_DL_Code_768_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_qPSK_01,
@@ -64768,7 +64768,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_63", HFILL }},
     { &hf_nbap_signalledGainFactors,
-      { "signalledGainFactors", "nbap.signalledGainFactors",
+      { "signalledGainFactors", "nbap.signalledGainFactors_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_gainFactor,
@@ -64776,7 +64776,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_T_gainFactor_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_fdd,
-      { "fdd", "nbap.fdd",
+      { "fdd", "nbap.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_betaC,
@@ -64800,11 +64800,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "RefTFCNumber", HFILL }},
     { &hf_nbap_TDD_UL_Code_Information_item,
-      { "TDD-UL-Code-InformationItem", "nbap.TDD_UL_Code_InformationItem",
+      { "TDD-UL-Code-InformationItem", "nbap.TDD_UL_Code_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_TDD_UL_Code_LCR_Information_item,
-      { "TDD-UL-Code-LCR-InformationItem", "nbap.TDD_UL_Code_LCR_InformationItem",
+      { "TDD-UL-Code-LCR-InformationItem", "nbap.TDD_UL_Code_LCR_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_tdd_UL_DPCH_TimeSlotFormat_LCR,
@@ -64812,7 +64812,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_TDD_UL_DPCH_TimeSlotFormat_LCR_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_TDD_UL_Code_768_Information_item,
-      { "TDD-UL-Code-768-InformationItem", "nbap.TDD_UL_Code_768_InformationItem",
+      { "TDD-UL-Code-768-InformationItem", "nbap.TDD_UL_Code_768_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_qPSK_02,
@@ -64828,11 +64828,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_TFCI_SignallingMode_TFCI_SignallingOption_vals), 0,
         "TFCI_SignallingMode_TFCI_SignallingOption", HFILL }},
     { &hf_nbap_not_Used_splitType,
-      { "not-Used-splitType", "nbap.not_Used_splitType",
+      { "not-Used-splitType", "nbap.not_Used_splitType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_not_Used_lengthOfTFCI2,
-      { "not-Used-lengthOfTFCI2", "nbap.not_Used_lengthOfTFCI2",
+      { "not-Used-lengthOfTFCI2", "nbap.not_Used_lengthOfTFCI2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_TimeSlot_InitiatedListLCR_item,
@@ -64840,7 +64840,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_TimeSlotMeasurementValueListLCR_item,
-      { "TimeSlotMeasurementValueLCR", "nbap.TimeSlotMeasurementValueLCR",
+      { "TimeSlotMeasurementValueLCR", "nbap.TimeSlotMeasurementValueLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_commonMeasurementValue,
@@ -64860,7 +64860,7 @@ void proto_register_nbap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Transmission_Gap_Pattern_Sequence_Information_item,
-      { "Transmission-Gap-Pattern-Sequence-Information item", "nbap.Transmission_Gap_Pattern_Sequence_Information_item",
+      { "Transmission-Gap-Pattern-Sequence-Information item", "nbap.Transmission_Gap_Pattern_Sequence_Information_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_tGSN,
@@ -64920,7 +64920,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "DeltaSIR", HFILL }},
     { &hf_nbap_TransmittedCarrierPowerOfAllCodesNotUsedForHS_PDSCH_HS_SCCH_E_AGCH_E_RGCHOrE_HICHTransmissionCellPortionValue_item,
-      { "TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCH-E-RGCHOrE-HICHTransmissionCellPortionValue-Item", "nbap.TransmittedCarrierPowerOfAllCodesNotUsedForHS_PDSCH_HS_SCCH_E_AGCH_E_RGCHOrE_HICHTransmissionCellPortionValue_Item",
+      { "TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCH-E-RGCHOrE-HICHTransmissionCellPortionValue-Item", "nbap.TransmittedCarrierPowerOfAllCodesNotUsedForHS_PDSCH_HS_SCCH_E_AGCH_E_RGCHOrE_HICHTransmissionCellPortionValue_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_transmittedCarrierPowerOfAllCodesNotUsedForHSTransmissionValue,
@@ -64928,11 +64928,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_TransmittedCarrierPowerOfAllCodesNotUsedForHS_PDSCH_HS_SCCH_E_AGCHOrE_HICHTransmissionCellPortionValue_item,
-      { "TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCHOrE-HICHTransmissionCellPortionValue-Item", "nbap.TransmittedCarrierPowerOfAllCodesNotUsedForHS_PDSCH_HS_SCCH_E_AGCHOrE_HICHTransmissionCellPortionValue_Item",
+      { "TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCHOrE-HICHTransmissionCellPortionValue-Item", "nbap.TransmittedCarrierPowerOfAllCodesNotUsedForHS_PDSCH_HS_SCCH_E_AGCHOrE_HICHTransmissionCellPortionValue_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Transmitted_Carrier_Power_For_CellPortion_Value_item,
-      { "Transmitted-Carrier-Power-For-CellPortion-Value-Item", "nbap.Transmitted_Carrier_Power_For_CellPortion_Value_Item",
+      { "Transmitted-Carrier-Power-For-CellPortion-Value-Item", "nbap.Transmitted_Carrier_Power_For_CellPortion_Value_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_transmitted_Carrier_Power_Value,
@@ -64940,7 +64940,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Transmitted_Carrier_Power_For_CellPortion_ValueLCR_item,
-      { "Transmitted-Carrier-Power-For-CellPortion-ValueLCR-Item", "nbap.Transmitted_Carrier_Power_For_CellPortion_ValueLCR_Item",
+      { "Transmitted-Carrier-Power-For-CellPortion-ValueLCR-Item", "nbap.Transmitted_Carrier_Power_For_CellPortion_ValueLCR_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_tFCSvalues,
@@ -64952,11 +64952,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "TFCS_TFCSList", HFILL }},
     { &hf_nbap_not_Used_split_in_TFCI,
-      { "not-Used-split-in-TFCI", "nbap.not_Used_split_in_TFCI",
+      { "not-Used-split-in-TFCI", "nbap.not_Used_split_in_TFCI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_TFCS_TFCSList_item,
-      { "TFCS-TFCSList item", "nbap.TFCS_TFCSList_item",
+      { "TFCS-TFCSList item", "nbap.TFCS_TFCSList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_cTFC,
@@ -64996,7 +64996,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_maxCTFC", HFILL }},
     { &hf_nbap_Transport_Block_Size_List_item,
-      { "Transport-Block-Size-List item", "nbap.Transport_Block_Size_List_item",
+      { "Transport-Block-Size-List item", "nbap.Transport_Block_Size_List_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_transport_Block_Size_Index_for_Enhanced_PCH,
@@ -65008,11 +65008,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "TransportFormatSet_DynamicPartList", HFILL }},
     { &hf_nbap_semi_staticPart,
-      { "semi-staticPart", "nbap.semi_staticPart",
+      { "semi-staticPart", "nbap.semi_staticPart_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportFormatSet_Semi_staticPart", HFILL }},
     { &hf_nbap_TransportFormatSet_DynamicPartList_item,
-      { "TransportFormatSet-DynamicPartList item", "nbap.TransportFormatSet_DynamicPartList_item",
+      { "TransportFormatSet-DynamicPartList item", "nbap.TransportFormatSet_DynamicPartList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_nrOfTransportBlocks,
@@ -65032,7 +65032,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_TransmissionTimeIntervalInformation_item,
-      { "TransmissionTimeIntervalInformation item", "nbap.TransmissionTimeIntervalInformation_item",
+      { "TransmissionTimeIntervalInformation item", "nbap.TransmissionTimeIntervalInformation_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_transmissionTimeInterval,
@@ -65064,11 +65064,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_TransportFormatSet_ModeSSP_vals), 0,
         "TransportFormatSet_ModeSSP", HFILL }},
     { &hf_nbap_tdd_01,
-      { "tdd", "nbap.tdd",
+      { "tdd", "nbap.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TDD_TransportFormatSet_ModeDP", HFILL }},
     { &hf_nbap_notApplicable,
-      { "notApplicable", "nbap.notApplicable",
+      { "notApplicable", "nbap.notApplicable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_tdd_02,
@@ -65092,7 +65092,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_256", HFILL }},
     { &hf_nbap_tUTRANGANSS,
-      { "tUTRANGANSS", "nbap.tUTRANGANSS",
+      { "tUTRANGANSS", "nbap.tUTRANGANSS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_tUTRANGANSSQuality,
@@ -65124,7 +65124,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_tUTRANGPS,
-      { "tUTRANGPS", "nbap.tUTRANGPS",
+      { "tUTRANGPS", "nbap.tUTRANGPS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_tUTRANGPSQuality,
@@ -65156,7 +65156,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_Timeslot_Information_item,
-      { "UL-Timeslot-InformationItem", "nbap.UL_Timeslot_InformationItem",
+      { "UL-Timeslot-InformationItem", "nbap.UL_Timeslot_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uL_Code_InformationList,
@@ -65164,7 +65164,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "TDD_UL_Code_Information", HFILL }},
     { &hf_nbap_UL_TimeslotLCR_Information_item,
-      { "UL-TimeslotLCR-InformationItem", "nbap.UL_TimeslotLCR_InformationItem",
+      { "UL-TimeslotLCR-InformationItem", "nbap.UL_TimeslotLCR_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uL_Code_InformationList_01,
@@ -65172,7 +65172,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "TDD_UL_Code_LCR_Information", HFILL }},
     { &hf_nbap_UL_Timeslot768_Information_item,
-      { "UL-Timeslot768-InformationItem", "nbap.UL_Timeslot768_InformationItem",
+      { "UL-Timeslot768-InformationItem", "nbap.UL_Timeslot768_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uL_Code_InformationList_02,
@@ -65196,7 +65196,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_TimeSlot_ISCP_Info_item,
-      { "UL-TimeSlot-ISCP-InfoItem", "nbap.UL_TimeSlot_ISCP_InfoItem",
+      { "UL-TimeSlot-ISCP-InfoItem", "nbap.UL_TimeSlot_ISCP_InfoItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_iSCP,
@@ -65204,11 +65204,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "UL_TimeslotISCP_Value", HFILL }},
     { &hf_nbap_UL_TimeSlot_ISCP_LCR_Info_item,
-      { "UL-TimeSlot-ISCP-LCR-InfoItem", "nbap.UL_TimeSlot_ISCP_LCR_InfoItem",
+      { "UL-TimeSlot-ISCP-LCR-InfoItem", "nbap.UL_TimeSlot_ISCP_LCR_InfoItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UpPTSInterference_For_CellPortion_Value_item,
-      { "UpPTSInterference-For-CellPortion-Value-Item", "nbap.UpPTSInterference_For_CellPortion_Value_Item",
+      { "UpPTSInterference-For-CellPortion-Value-Item", "nbap.UpPTSInterference_For_CellPortion_Value_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_upPTSInterferenceValue,
@@ -65216,7 +65216,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_USCH_Information_item,
-      { "USCH-InformationItem", "nbap.USCH_InformationItem",
+      { "USCH-InformationItem", "nbap.USCH_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uSCH_ID,
@@ -65224,11 +65224,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_USCH_InformationResponse_item,
-      { "USCH-InformationResponseItem", "nbap.USCH_InformationResponseItem",
+      { "USCH-InformationResponseItem", "nbap.USCH_InformationResponseItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_TimeslotISCP_For_CellPortion_Value_item,
-      { "UL-TimeslotISCP-For-CellPortion-Value-Item", "nbap.UL_TimeslotISCP_For_CellPortion_Value_Item",
+      { "UL-TimeslotISCP-For-CellPortion-Value-Item", "nbap.UL_TimeslotISCP_For_CellPortion_Value_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uL_TimeslotISCP_Value,
@@ -65244,15 +65244,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "ProtocolExtensionContainer", HFILL }},
     { &hf_nbap_secondary_CCPCH_parameters,
-      { "secondary-CCPCH-parameters", "nbap.secondary_CCPCH_parameters",
+      { "secondary-CCPCH-parameters", "nbap.secondary_CCPCH_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Secondary_CCPCH_CTCH_SetupRqstFDD", HFILL }},
     { &hf_nbap_pRACH_parameters,
-      { "pRACH-parameters", "nbap.pRACH_parameters",
+      { "pRACH-parameters", "nbap.pRACH_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PRACH_CTCH_SetupRqstFDD", HFILL }},
     { &hf_nbap_notUsed_pCPCHes_parameters,
-      { "notUsed-pCPCHes-parameters", "nbap.notUsed_pCPCHes_parameters",
+      { "notUsed-pCPCHes-parameters", "nbap.notUsed_pCPCHes_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_fdd_S_CCPCH_Offset,
@@ -65260,7 +65260,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_tFCS,
-      { "tFCS", "nbap.tFCS",
+      { "tFCS", "nbap.tFCS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_secondary_CCPCH_SlotFormat,
@@ -65272,15 +65272,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_MultiplexingPosition_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_powerOffsetInformation,
-      { "powerOffsetInformation", "nbap.powerOffsetInformation",
+      { "powerOffsetInformation", "nbap.powerOffsetInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PowerOffsetInformation_CTCH_SetupRqstFDD", HFILL }},
     { &hf_nbap_fACH_Parameters,
-      { "fACH-Parameters", "nbap.fACH_Parameters",
+      { "fACH-Parameters", "nbap.fACH_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FACH_ParametersList_CTCH_SetupRqstFDD", HFILL }},
     { &hf_nbap_pCH_Parameters,
-      { "pCH-Parameters", "nbap.pCH_Parameters",
+      { "pCH-Parameters", "nbap.pCH_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PCH_Parameters_CTCH_SetupRqstFDD", HFILL }},
     { &hf_nbap_pO1_ForTFCI_Bits,
@@ -65292,7 +65292,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "PowerOffset", HFILL }},
     { &hf_nbap_FACH_ParametersListIE_CTCH_SetupRqstFDD_item,
-      { "FACH-ParametersItem-CTCH-SetupRqstFDD", "nbap.FACH_ParametersItem_CTCH_SetupRqstFDD",
+      { "FACH-ParametersItem-CTCH-SetupRqstFDD", "nbap.FACH_ParametersItem_CTCH_SetupRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_maxFACH_Power,
@@ -65300,7 +65300,7 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         "DL_Power", HFILL }},
     { &hf_nbap_transportFormatSet_01,
-      { "transportFormatSet", "nbap.transportFormatSet",
+      { "transportFormatSet", "nbap.transportFormatSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_pCH_Power,
@@ -65308,7 +65308,7 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         "DL_Power", HFILL }},
     { &hf_nbap_pICH_Parameters,
-      { "pICH-Parameters", "nbap.pICH_Parameters",
+      { "pICH-Parameters", "nbap.pICH_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PICH_Parameters_CTCH_SetupRqstFDD", HFILL }},
     { &hf_nbap_pICH_Mode,
@@ -65340,15 +65340,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "PunctureLimit", HFILL }},
     { &hf_nbap_rACH_Parameters,
-      { "rACH-Parameters", "nbap.rACH_Parameters",
+      { "rACH-Parameters", "nbap.rACH_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RACH_Parameters_CTCH_SetupRqstFDD", HFILL }},
     { &hf_nbap_aICH_Parameters,
-      { "aICH-Parameters", "nbap.aICH_Parameters",
+      { "aICH-Parameters", "nbap.aICH_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AICH_Parameters_CTCH_SetupRqstFDD", HFILL }},
     { &hf_nbap_AllowedSlotFormatInformationList_CTCH_SetupRqstFDD_item,
-      { "AllowedSlotFormatInformationItem-CTCH-SetupRqstFDD", "nbap.AllowedSlotFormatInformationItem_CTCH_SetupRqstFDD",
+      { "AllowedSlotFormatInformationItem-CTCH-SetupRqstFDD", "nbap.AllowedSlotFormatInformationItem_CTCH_SetupRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_rACHSlotFormat,
@@ -65356,15 +65356,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_RACH_SlotFormat_vals), 0,
         "RACH_SlotFormat", HFILL }},
     { &hf_nbap_secondary_CCPCH_parameters_01,
-      { "secondary-CCPCH-parameters", "nbap.secondary_CCPCH_parameters",
+      { "secondary-CCPCH-parameters", "nbap.secondary_CCPCH_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Secondary_CCPCH_CTCH_SetupRqstTDD", HFILL }},
     { &hf_nbap_pRACH_parameters_01,
-      { "pRACH-parameters", "nbap.pRACH_parameters",
+      { "pRACH-parameters", "nbap.pRACH_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PRACH_CTCH_SetupRqstTDD", HFILL }},
     { &hf_nbap_extension_CommonPhysicalChannelType_CTCH_SetupRqstTDD,
-      { "extension-CommonPhysicalChannelType-CTCH-SetupRqstTDD", "nbap.extension_CommonPhysicalChannelType_CTCH_SetupRqstTDD",
+      { "extension-CommonPhysicalChannelType-CTCH-SetupRqstTDD", "nbap.extension_CommonPhysicalChannelType_CTCH_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_sCCPCH_CCTrCH_ID,
@@ -65380,19 +65380,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_secondaryCCPCH_parameterList,
-      { "secondaryCCPCH-parameterList", "nbap.secondaryCCPCH_parameterList",
+      { "secondaryCCPCH-parameterList", "nbap.secondaryCCPCH_parameterList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Secondary_CCPCH_parameterList_CTCH_SetupRqstTDD", HFILL }},
     { &hf_nbap_fACH_ParametersList,
-      { "fACH-ParametersList", "nbap.fACH_ParametersList",
+      { "fACH-ParametersList", "nbap.fACH_ParametersList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FACH_ParametersList_CTCH_SetupRqstTDD", HFILL }},
     { &hf_nbap_pCH_Parameters_01,
-      { "pCH-Parameters", "nbap.pCH_Parameters",
+      { "pCH-Parameters", "nbap.pCH_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PCH_Parameters_CTCH_SetupRqstTDD", HFILL }},
     { &hf_nbap_Secondary_CCPCH_parameterListIE_CTCH_SetupRqstTDD_item,
-      { "Secondary-CCPCH-parameterItem-CTCH-SetupRqstTDD", "nbap.Secondary_CCPCH_parameterItem_CTCH_SetupRqstTDD",
+      { "Secondary-CCPCH-parameterItem-CTCH-SetupRqstTDD", "nbap.Secondary_CCPCH_parameterItem_CTCH_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_midambleShiftandBurstType,
@@ -65404,7 +65404,7 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         "DL_Power", HFILL }},
     { &hf_nbap_Secondary_CCPCH_LCR_parameterList_CTCH_SetupRqstTDD_item,
-      { "Secondary-CCPCH-LCR-parameterItem-CTCH-SetupRqstTDD", "nbap.Secondary_CCPCH_LCR_parameterItem_CTCH_SetupRqstTDD",
+      { "Secondary-CCPCH-LCR-parameterItem-CTCH-SetupRqstTDD", "nbap.Secondary_CCPCH_LCR_parameterItem_CTCH_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_s_CCPCH_TimeSlotFormat_LCR,
@@ -65412,7 +65412,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_TDD_DL_DPCH_TimeSlotFormat_LCR_vals), 0,
         "TDD_DL_DPCH_TimeSlotFormat_LCR", HFILL }},
     { &hf_nbap_Secondary_CCPCH_768_parameterList_CTCH_SetupRqstTDD_item,
-      { "Secondary-CCPCH-768-parameterItem-CTCH-SetupRqstTDD", "nbap.Secondary_CCPCH_768_parameterItem_CTCH_SetupRqstTDD",
+      { "Secondary-CCPCH-768-parameterItem-CTCH-SetupRqstTDD", "nbap.Secondary_CCPCH_768_parameterItem_CTCH_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_tFCI_Presence768,
@@ -65424,7 +65424,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_MidambleShiftAndBurstType768_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_FACH_ParametersListIE_CTCH_SetupRqstTDD_item,
-      { "FACH-ParametersItem-CTCH-SetupRqstTDD", "nbap.FACH_ParametersItem_CTCH_SetupRqstTDD",
+      { "FACH-ParametersItem-CTCH-SetupRqstTDD", "nbap.FACH_ParametersItem_CTCH_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_fACH_CCTrCH_ID,
@@ -65436,7 +65436,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "CCTrCH_ID", HFILL }},
     { &hf_nbap_pICH_Parameters_01,
-      { "pICH-Parameters", "nbap.pICH_Parameters",
+      { "pICH-Parameters", "nbap.pICH_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PICH_Parameters_CTCH_SetupRqstTDD", HFILL }},
     { &hf_nbap_midambleshiftAndBurstType,
@@ -65456,15 +65456,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_MICH_TDDOption_Specific_Parameters_CTCH_SetupRqstTDD_vals), 0,
         "MICH_TDDOption_Specific_Parameters_CTCH_SetupRqstTDD", HFILL }},
     { &hf_nbap_hCR_TDD,
-      { "hCR-TDD", "nbap.hCR_TDD",
+      { "hCR-TDD", "nbap.hCR_TDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MICH_HCR_Parameters_CTCH_SetupRqstTDD", HFILL }},
     { &hf_nbap_lCR_TDD,
-      { "lCR-TDD", "nbap.lCR_TDD",
+      { "lCR-TDD", "nbap.lCR_TDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MICH_LCR_Parameters_CTCH_SetupRqstTDD", HFILL }},
     { &hf_nbap_cHipRate768_TDD,
-      { "cHipRate768-TDD", "nbap.cHipRate768_TDD",
+      { "cHipRate768-TDD", "nbap.cHipRate768_TDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MICH_768_Parameters_CTCH_SetupRqstTDD", HFILL }},
     { &hf_nbap_tSTD_Indicator,
@@ -65476,7 +65476,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_MidambleShiftAndBurstType768_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_TimeSlotConfigurationList_LCR_CTCH_SetupRqstTDD_item,
-      { "TimeSlotConfigurationItem-LCR-CTCH-SetupRqstTDD", "nbap.TimeSlotConfigurationItem_LCR_CTCH_SetupRqstTDD",
+      { "TimeSlotConfigurationItem-LCR-CTCH-SetupRqstTDD", "nbap.TimeSlotConfigurationItem_LCR_CTCH_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_timeslotLCR_Parameter_ID,
@@ -65484,15 +65484,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "CellParameterID", HFILL }},
     { &hf_nbap_Secondary_CCPCH_parameterExtendedList_CTCH_SetupRqstTDD_item,
-      { "Secondary-CCPCH-parameterItem-CTCH-SetupRqstTDD", "nbap.Secondary_CCPCH_parameterItem_CTCH_SetupRqstTDD",
+      { "Secondary-CCPCH-parameterItem-CTCH-SetupRqstTDD", "nbap.Secondary_CCPCH_parameterItem_CTCH_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Secondary_CCPCH_LCR_parameterExtendedList_CTCH_SetupRqstTDD_item,
-      { "Secondary-CCPCH-LCR-parameterItem-CTCH-SetupRqstTDD", "nbap.Secondary_CCPCH_LCR_parameterItem_CTCH_SetupRqstTDD",
+      { "Secondary-CCPCH-LCR-parameterItem-CTCH-SetupRqstTDD", "nbap.Secondary_CCPCH_LCR_parameterItem_CTCH_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_pRACH_Parameters_CTCH_SetupRqstTDD,
-      { "pRACH-Parameters-CTCH-SetupRqstTDD", "nbap.pRACH_Parameters_CTCH_SetupRqstTDD",
+      { "pRACH-Parameters-CTCH-SetupRqstTDD", "nbap.pRACH_Parameters_CTCH_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_maxPRACH_MidambleShifts,
@@ -65504,15 +65504,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_PRACH_Midamble_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_rACH,
-      { "rACH", "nbap.rACH",
+      { "rACH", "nbap.rACH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RACH_Parameter_CTCH_SetupRqstTDD", HFILL }},
     { &hf_nbap_uL_TransportFormatSet,
-      { "uL-TransportFormatSet", "nbap.uL_TransportFormatSet",
+      { "uL-TransportFormatSet", "nbap.uL_TransportFormatSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportFormatSet", HFILL }},
     { &hf_nbap_PRACH_LCR_ParametersList_CTCH_SetupRqstTDD_item,
-      { "PRACH-LCR-ParametersItem-CTCH-SetupRqstTDD", "nbap.PRACH_LCR_ParametersItem_CTCH_SetupRqstTDD",
+      { "PRACH-LCR-ParametersItem-CTCH-SetupRqstTDD", "nbap.PRACH_LCR_ParametersItem_CTCH_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_fPACH_Power,
@@ -65532,47 +65532,47 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_PRACH_Midamble_vals), 0,
         "PRACH_Midamble", HFILL }},
     { &hf_nbap_FACH_CommonTransportChannel_InformationResponse_item,
-      { "CommonTransportChannel-InformationResponse", "nbap.CommonTransportChannel_InformationResponse",
+      { "CommonTransportChannel-InformationResponse", "nbap.CommonTransportChannel_InformationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_secondary_CCPCH_parameters_02,
-      { "secondary-CCPCH-parameters", "nbap.secondary_CCPCH_parameters",
+      { "secondary-CCPCH-parameters", "nbap.secondary_CCPCH_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Secondary_CCPCHList_CTCH_ReconfRqstFDD", HFILL }},
     { &hf_nbap_pRACH_parameters_02,
-      { "pRACH-parameters", "nbap.pRACH_parameters",
+      { "pRACH-parameters", "nbap.pRACH_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PRACHList_CTCH_ReconfRqstFDD", HFILL }},
     { &hf_nbap_notUsed_cPCH_parameters,
-      { "notUsed-cPCH-parameters", "nbap.notUsed_cPCH_parameters",
+      { "notUsed-cPCH-parameters", "nbap.notUsed_cPCH_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_fACH_ParametersList_CTCH_ReconfRqstFDD,
-      { "fACH-ParametersList-CTCH-ReconfRqstFDD", "nbap.fACH_ParametersList_CTCH_ReconfRqstFDD",
+      { "fACH-ParametersList-CTCH-ReconfRqstFDD", "nbap.fACH_ParametersList_CTCH_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_pCH_Parameters_CTCH_ReconfRqstFDD,
-      { "pCH-Parameters-CTCH-ReconfRqstFDD", "nbap.pCH_Parameters_CTCH_ReconfRqstFDD",
+      { "pCH-Parameters-CTCH-ReconfRqstFDD", "nbap.pCH_Parameters_CTCH_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_pICH_Parameters_CTCH_ReconfRqstFDD,
-      { "pICH-Parameters-CTCH-ReconfRqstFDD", "nbap.pICH_Parameters_CTCH_ReconfRqstFDD",
+      { "pICH-Parameters-CTCH-ReconfRqstFDD", "nbap.pICH_Parameters_CTCH_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_FACH_ParametersListIE_CTCH_ReconfRqstFDD_item,
-      { "FACH-ParametersItem-CTCH-ReconfRqstFDD", "nbap.FACH_ParametersItem_CTCH_ReconfRqstFDD",
+      { "FACH-ParametersItem-CTCH-ReconfRqstFDD", "nbap.FACH_ParametersItem_CTCH_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_pRACH_ParametersList_CTCH_ReconfRqstFDD,
-      { "pRACH-ParametersList-CTCH-ReconfRqstFDD", "nbap.pRACH_ParametersList_CTCH_ReconfRqstFDD",
+      { "pRACH-ParametersList-CTCH-ReconfRqstFDD", "nbap.pRACH_ParametersList_CTCH_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_aICH_ParametersList_CTCH_ReconfRqstFDD,
-      { "aICH-ParametersList-CTCH-ReconfRqstFDD", "nbap.aICH_ParametersList_CTCH_ReconfRqstFDD",
+      { "aICH-ParametersList-CTCH-ReconfRqstFDD", "nbap.aICH_ParametersList_CTCH_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PRACH_ParametersListIE_CTCH_ReconfRqstFDD_item,
-      { "PRACH-ParametersItem-CTCH-ReconfRqstFDD", "nbap.PRACH_ParametersItem_CTCH_ReconfRqstFDD",
+      { "PRACH-ParametersItem-CTCH-ReconfRqstFDD", "nbap.PRACH_ParametersItem_CTCH_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_allowedSlotFormatInformation_01,
@@ -65580,7 +65580,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "AllowedSlotFormatInformationList_CTCH_ReconfRqstFDD", HFILL }},
     { &hf_nbap_AllowedSlotFormatInformationList_CTCH_ReconfRqstFDD_item,
-      { "AllowedSlotFormatInformationItem-CTCH-ReconfRqstFDD", "nbap.AllowedSlotFormatInformationItem_CTCH_ReconfRqstFDD",
+      { "AllowedSlotFormatInformationItem-CTCH-ReconfRqstFDD", "nbap.AllowedSlotFormatInformationItem_CTCH_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_rACH_SlotFormat,
@@ -65588,15 +65588,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_RACH_SlotFormat_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_AICH_ParametersListIE_CTCH_ReconfRqstFDD_item,
-      { "AICH-ParametersItem-CTCH-ReconfRqstFDD", "nbap.AICH_ParametersItem_CTCH_ReconfRqstFDD",
+      { "AICH-ParametersItem-CTCH-ReconfRqstFDD", "nbap.AICH_ParametersItem_CTCH_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_secondaryCCPCHList,
-      { "secondaryCCPCHList", "nbap.secondaryCCPCHList",
+      { "secondaryCCPCHList", "nbap.secondaryCCPCHList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Secondary_CCPCHList_CTCH_ReconfRqstTDD", HFILL }},
     { &hf_nbap_Secondary_CCPCHListIE_CTCH_ReconfRqstTDD_item,
-      { "Secondary-CCPCHItem-CTCH-ReconfRqstTDD", "nbap.Secondary_CCPCHItem_CTCH_ReconfRqstTDD",
+      { "Secondary-CCPCHItem-CTCH-ReconfRqstTDD", "nbap.Secondary_CCPCHItem_CTCH_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_sCCPCH_Power,
@@ -65604,15 +65604,15 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         "DL_Power", HFILL }},
     { &hf_nbap_Secondary_CCPCH_parameterExtendedList_CTCH_ReconfRqstTDD_item,
-      { "Secondary-CCPCHItem-CTCH-ReconfRqstTDD", "nbap.Secondary_CCPCHItem_CTCH_ReconfRqstTDD",
+      { "Secondary-CCPCHItem-CTCH-ReconfRqstTDD", "nbap.Secondary_CCPCHItem_CTCH_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Secondary_CCPCH_LCR_parameterExtendedList_CTCH_ReconfRqstTDD_item,
-      { "Secondary-CCPCHItem-CTCH-ReconfRqstTDD", "nbap.Secondary_CCPCHItem_CTCH_ReconfRqstTDD",
+      { "Secondary-CCPCHItem-CTCH-ReconfRqstTDD", "nbap.Secondary_CCPCHItem_CTCH_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_FACH_ParametersList_CTCH_ReconfRqstTDD_item,
-      { "FACH-ParametersItem-CTCH-ReconfRqstTDD", "nbap.FACH_ParametersItem_CTCH_ReconfRqstTDD",
+      { "FACH-ParametersItem-CTCH-ReconfRqstTDD", "nbap.FACH_ParametersItem_CTCH_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_commonPhysicalChannelId,
@@ -65628,7 +65628,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Secondary_CCPCH_768_List_CTCH_ReconfRqstTDD", HFILL }},
     { &hf_nbap_Secondary_CCPCH_768_List_CTCH_ReconfRqstTDD_item,
-      { "Secondary-CCPCH-768-Item-CTCH-ReconfRqstTDD", "nbap.Secondary_CCPCH_768_Item_CTCH_ReconfRqstTDD",
+      { "Secondary-CCPCH-768-Item-CTCH-ReconfRqstTDD", "nbap.Secondary_CCPCH_768_Item_CTCH_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uPPCHPositionLCR,
@@ -65636,7 +65636,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Cell_InformationList_AuditRsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_configurationGenerationID,
@@ -65644,15 +65644,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_primary_SCH_Information,
-      { "primary-SCH-Information", "nbap.primary_SCH_Information",
+      { "primary-SCH-Information", "nbap.primary_SCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "P_SCH_Information_AuditRsp", HFILL }},
     { &hf_nbap_secondary_SCH_Information,
-      { "secondary-SCH-Information", "nbap.secondary_SCH_Information",
+      { "secondary-SCH-Information", "nbap.secondary_SCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "S_SCH_Information_AuditRsp", HFILL }},
     { &hf_nbap_primary_CPICH_Information,
-      { "primary-CPICH-Information", "nbap.primary_CPICH_Information",
+      { "primary-CPICH-Information", "nbap.primary_CPICH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "P_CPICH_Information_AuditRsp", HFILL }},
     { &hf_nbap_secondary_CPICH_InformationList,
@@ -65660,11 +65660,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "S_CPICH_InformationList_AuditRsp", HFILL }},
     { &hf_nbap_primary_CCPCH_Information,
-      { "primary-CCPCH-Information", "nbap.primary_CCPCH_Information",
+      { "primary-CCPCH-Information", "nbap.primary_CCPCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "P_CCPCH_Information_AuditRsp", HFILL }},
     { &hf_nbap_bCH_Information,
-      { "bCH-Information", "nbap.bCH_Information",
+      { "bCH-Information", "nbap.bCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "BCH_Information_AuditRsp", HFILL }},
     { &hf_nbap_secondary_CCPCH_InformationList,
@@ -65672,11 +65672,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "S_CCPCH_InformationList_AuditRsp", HFILL }},
     { &hf_nbap_pCH_Information,
-      { "pCH-Information", "nbap.pCH_Information",
+      { "pCH-Information", "nbap.pCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PCH_Information_AuditRsp", HFILL }},
     { &hf_nbap_pICH_Information,
-      { "pICH-Information", "nbap.pICH_Information",
+      { "pICH-Information", "nbap.pICH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PICH_Information_AuditRsp", HFILL }},
     { &hf_nbap_fACH_InformationList,
@@ -65696,99 +65696,99 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "AICH_InformationList_AuditRsp", HFILL }},
     { &hf_nbap_notUsed_1_pCPCH_InformationList,
-      { "notUsed-1-pCPCH-InformationList", "nbap.notUsed_1_pCPCH_InformationList",
+      { "notUsed-1-pCPCH-InformationList", "nbap.notUsed_1_pCPCH_InformationList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_notUsed_2_cPCH_InformationList,
-      { "notUsed-2-cPCH-InformationList", "nbap.notUsed_2_cPCH_InformationList",
+      { "notUsed-2-cPCH-InformationList", "nbap.notUsed_2_cPCH_InformationList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_notUsed_3_aP_AICH_InformationList,
-      { "notUsed-3-aP-AICH-InformationList", "nbap.notUsed_3_aP_AICH_InformationList",
+      { "notUsed-3-aP-AICH-InformationList", "nbap.notUsed_3_aP_AICH_InformationList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_notUsed_4_cDCA_ICH_InformationList,
-      { "notUsed-4-cDCA-ICH-InformationList", "nbap.notUsed_4_cDCA_ICH_InformationList",
+      { "notUsed-4-cDCA-ICH-InformationList", "nbap.notUsed_4_cDCA_ICH_InformationList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_sCH_Information,
-      { "sCH-Information", "nbap.sCH_Information",
+      { "sCH-Information", "nbap.sCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SCH_Information_AuditRsp", HFILL }},
     { &hf_nbap_S_CPICH_InformationList_AuditRsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_S_CCPCH_InformationList_AuditRsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_FACH_InformationList_AuditRsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PRACH_InformationList_AuditRsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RACH_InformationList_AuditRsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_AICH_InformationList_AuditRsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_FPACH_LCR_InformationList_AuditRsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_S_CCPCH_InformationListExt_AuditRsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_S_CCPCH_LCR_InformationListExt_AuditRsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PLCCH_InformationList_AuditRsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_S_CCPCH_768_InformationList_AuditRsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PRACH_768_InformationList_AuditRsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_RUCCH_InformationList_AuditRsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_RUCCH_768_InformationList_AuditRsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Cell_Frequency_List_Information_LCR_MulFreq_AuditRsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UPPCH_LCR_InformationList_AuditRsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MultipleFreq_HS_DSCH_Resources_InformationList_AuditRsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MultipleFreq_E_DCH_Resources_InformationList_AuditRsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CCP_InformationList_AuditRsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_communicationControlPortID,
@@ -65796,7 +65796,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Local_Cell_InformationList_AuditRsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dl_or_global_capacityCredit,
@@ -65832,11 +65832,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Local_Cell_ID", HFILL }},
     { &hf_nbap_Local_Cell_Group_InformationList_AuditRsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Power_Local_Cell_Group_InformationList_AuditRsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_power_Local_Cell_Group_ID,
@@ -65844,19 +65844,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Local_Cell_ID", HFILL }},
     { &hf_nbap_cell,
-      { "cell", "nbap.cell",
+      { "cell", "nbap.cell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Cell_CM_Rqst", HFILL }},
     { &hf_nbap_rACH_01,
-      { "rACH", "nbap.rACH",
+      { "rACH", "nbap.rACH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RACH_CM_Rqst", HFILL }},
     { &hf_nbap_notUsed_cPCH,
-      { "notUsed-cPCH", "nbap.notUsed_cPCH",
+      { "notUsed-cPCH", "nbap.notUsed_cPCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_extension_CommonMeasurementObjectType_CM_Rqst,
-      { "extension-CommonMeasurementObjectType-CM-Rqst", "nbap.extension_CommonMeasurementObjectType_CM_Rqst",
+      { "extension-CommonMeasurementObjectType-CM-Rqst", "nbap.extension_CommonMeasurementObjectType_CM_Rqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_powerLocalCellGroupID,
@@ -65864,27 +65864,27 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Local_Cell_ID", HFILL }},
     { &hf_nbap_cell_01,
-      { "cell", "nbap.cell",
+      { "cell", "nbap.cell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Cell_CM_Rsp", HFILL }},
     { &hf_nbap_rACH_02,
-      { "rACH", "nbap.rACH",
+      { "rACH", "nbap.rACH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RACH_CM_Rsp", HFILL }},
     { &hf_nbap_extension_CommonMeasurementObjectType_CM_Rsp,
-      { "extension-CommonMeasurementObjectType-CM-Rsp", "nbap.extension_CommonMeasurementObjectType_CM_Rsp",
+      { "extension-CommonMeasurementObjectType-CM-Rsp", "nbap.extension_CommonMeasurementObjectType_CM_Rsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_cell_02,
-      { "cell", "nbap.cell",
+      { "cell", "nbap.cell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Cell_CM_Rprt", HFILL }},
     { &hf_nbap_rACH_03,
-      { "rACH", "nbap.rACH",
+      { "rACH", "nbap.rACH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RACH_CM_Rprt", HFILL }},
     { &hf_nbap_extension_CommonMeasurementObjectType_CM_Rprt,
-      { "extension-CommonMeasurementObjectType-CM-Rprt", "nbap.extension_CommonMeasurementObjectType_CM_Rprt",
+      { "extension-CommonMeasurementObjectType-CM-Rprt", "nbap.extension_CommonMeasurementObjectType_CM_Rprt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_commonMeasurementValueInformation,
@@ -65920,7 +65920,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_TransmitDiversityIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_SecondaryCPICH_InformationList_Cell_SetupRqstFDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_fDD_DL_ChannelisationCodeNumber,
@@ -65932,7 +65932,7 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         "DL_Power", HFILL }},
     { &hf_nbap_bCH_information,
-      { "bCH-information", "nbap.bCH_information",
+      { "bCH-information", "nbap.bCH_information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "BCH_Information_Cell_SetupRqstFDD", HFILL }},
     { &hf_nbap_bCH_Power,
@@ -65948,7 +65948,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_iPDL_FDD_Parameters,
-      { "iPDL-FDD-Parameters", "nbap.iPDL_FDD_Parameters",
+      { "iPDL-FDD-Parameters", "nbap.iPDL_FDD_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_iPDL_Indicator,
@@ -65956,7 +65956,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_IPDL_Indicator_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_CellPortion_InformationList_Cell_SetupRqstFDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_associatedSecondaryCPICH,
@@ -65968,7 +65968,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "MaximumTransmissionPower", HFILL }},
     { &hf_nbap_syncCaseIndicator,
-      { "syncCaseIndicator", "nbap.syncCaseIndicator",
+      { "syncCaseIndicator", "nbap.syncCaseIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SyncCaseIndicator_Cell_SetupRqstTDD_PSCH", HFILL }},
     { &hf_nbap_sCH_Power,
@@ -65976,11 +65976,11 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         "DL_Power", HFILL }},
     { &hf_nbap_case1,
-      { "case1", "nbap.case1",
+      { "case1", "nbap.case1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Case1_Cell_SetupRqstTDD", HFILL }},
     { &hf_nbap_case2,
-      { "case2", "nbap.case2",
+      { "case2", "nbap.case2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Case2_Cell_SetupRqstTDD", HFILL }},
     { &hf_nbap_sCH_TimeSlot,
@@ -65996,7 +65996,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_SCTD_Indicator_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_TimeSlotConfigurationList_Cell_SetupRqstTDD_item,
-      { "TimeSlotConfigurationItem-Cell-SetupRqstTDD", "nbap.TimeSlotConfigurationItem_Cell_SetupRqstTDD",
+      { "TimeSlotConfigurationItem-Cell-SetupRqstTDD", "nbap.TimeSlotConfigurationItem_Cell_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_timeSlotStatus,
@@ -66008,7 +66008,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_TimeSlotDirection_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_TimeSlotConfigurationList_LCR_Cell_SetupRqstTDD_item,
-      { "TimeSlotConfigurationItem-LCR-Cell-SetupRqstTDD", "nbap.TimeSlotConfigurationItem_LCR_Cell_SetupRqstTDD",
+      { "TimeSlotConfigurationItem-LCR-Cell-SetupRqstTDD", "nbap.TimeSlotConfigurationItem_LCR_Cell_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dwPCH_Power,
@@ -66016,15 +66016,15 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_iPDL_TDD_Parameters,
-      { "iPDL-TDD-Parameters", "nbap.iPDL_TDD_Parameters",
+      { "iPDL-TDD-Parameters", "nbap.iPDL_TDD_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_iPDL_TDD_Parameters_LCR,
-      { "iPDL-TDD-Parameters-LCR", "nbap.iPDL_TDD_Parameters_LCR",
+      { "iPDL-TDD-Parameters-LCR", "nbap.iPDL_TDD_Parameters_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Cell_Frequency_List_LCR_MulFreq_Cell_SetupRqstTDD_item,
-      { "Cell-Frequency-Item-LCR-MulFreq-Cell-SetupRqstTDD", "nbap.Cell_Frequency_Item_LCR_MulFreq_Cell_SetupRqstTDD",
+      { "Cell-Frequency-Item-LCR-MulFreq-Cell-SetupRqstTDD", "nbap.Cell_Frequency_Item_LCR_MulFreq_Cell_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_timeSlotConfigurationList_LCR_Cell_SetupRqstTDD,
@@ -66032,27 +66032,27 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SecondaryCPICH_InformationList_Cell_ReconfRqstFDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_bCH_information_01,
-      { "bCH-information", "nbap.bCH_information",
+      { "bCH-information", "nbap.bCH_information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "BCH_information_Cell_ReconfRqstFDD", HFILL }},
     { &hf_nbap_CellPortion_InformationList_Cell_ReconfRqstFDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_TimeSlotConfigurationList_Cell_ReconfRqstTDD_item,
-      { "TimeSlotConfigurationItem-Cell-ReconfRqstTDD", "nbap.TimeSlotConfigurationItem_Cell_ReconfRqstTDD",
+      { "TimeSlotConfigurationItem-Cell-ReconfRqstTDD", "nbap.TimeSlotConfigurationItem_Cell_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_TimeSlotConfigurationList_LCR_Cell_ReconfRqstTDD_item,
-      { "TimeSlotConfigurationItem-LCR-Cell-ReconfRqstTDD", "nbap.TimeSlotConfigurationItem_LCR_Cell_ReconfRqstTDD",
+      { "TimeSlotConfigurationItem-LCR-Cell-ReconfRqstTDD", "nbap.TimeSlotConfigurationItem_LCR_Cell_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_cell_Frequency_Add_LCR_MulFreq_Cell_ReconfRqstTDD,
-      { "cell-Frequency-Add-LCR-MulFreq-Cell-ReconfRqstTDD", "nbap.cell_Frequency_Add_LCR_MulFreq_Cell_ReconfRqstTDD",
+      { "cell-Frequency-Add-LCR-MulFreq-Cell-ReconfRqstTDD", "nbap.cell_Frequency_Add_LCR_MulFreq_Cell_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_cell_Frequency_ModifyList_LCR_MulFreq_Cell_ReconfRqstTDD,
@@ -66060,7 +66060,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_cell_Frequency_Delete_LCR_MulFreq_Cell_ReconfRqstTDD,
-      { "cell-Frequency-Delete-LCR-MulFreq-Cell-ReconfRqstTDD", "nbap.cell_Frequency_Delete_LCR_MulFreq_Cell_ReconfRqstTDD",
+      { "cell-Frequency-Delete-LCR-MulFreq-Cell-ReconfRqstTDD", "nbap.cell_Frequency_Delete_LCR_MulFreq_Cell_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_timeSlotConfigurationList_LCR_Cell_ReconfRqstTDD,
@@ -66068,15 +66068,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Cell_Frequency_ModifyList_LCR_MulFreq_Cell_ReconfRqstTDD_item,
-      { "Cell-Frequency-ModifyItem-LCR-MulFreq-Cell-ReconfRqstTDD", "nbap.Cell_Frequency_ModifyItem_LCR_MulFreq_Cell_ReconfRqstTDD",
+      { "Cell-Frequency-ModifyItem-LCR-MulFreq-Cell-ReconfRqstTDD", "nbap.Cell_Frequency_ModifyItem_LCR_MulFreq_Cell_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_no_Failure,
-      { "no-Failure", "nbap.no_Failure",
+      { "no-Failure", "nbap.no_Failure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "No_Failure_ResourceStatusInd", HFILL }},
     { &hf_nbap_serviceImpacting,
-      { "serviceImpacting", "nbap.serviceImpacting",
+      { "serviceImpacting", "nbap.serviceImpacting_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ServiceImpacting_ResourceStatusInd", HFILL }},
     { &hf_nbap_local_Cell_InformationList,
@@ -66088,7 +66088,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Local_Cell_Group_InformationList_ResourceStatusInd", HFILL }},
     { &hf_nbap_Local_Cell_InformationList_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_local_CellID,
@@ -66100,11 +66100,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_AddorDeleteIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_Local_Cell_Group_InformationList_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Power_Local_Cell_Group_InformationList_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_local_Cell_InformationList_01,
@@ -66124,7 +66124,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Cell_InformationList_ResourceStatusInd", HFILL }},
     { &hf_nbap_Local_Cell_InformationList2_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_maximum_DL_PowerCapability,
@@ -66132,27 +66132,27 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "MaximumDL_PowerCapability", HFILL }},
     { &hf_nbap_Local_Cell_Group_InformationList2_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CCP_InformationList_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Cell_InformationList_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_primary_SCH_Information_01,
-      { "primary-SCH-Information", "nbap.primary_SCH_Information",
+      { "primary-SCH-Information", "nbap.primary_SCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "P_SCH_Information_ResourceStatusInd", HFILL }},
     { &hf_nbap_secondary_SCH_Information_01,
-      { "secondary-SCH-Information", "nbap.secondary_SCH_Information",
+      { "secondary-SCH-Information", "nbap.secondary_SCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "S_SCH_Information_ResourceStatusInd", HFILL }},
     { &hf_nbap_primary_CPICH_Information_01,
-      { "primary-CPICH-Information", "nbap.primary_CPICH_Information",
+      { "primary-CPICH-Information", "nbap.primary_CPICH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "P_CPICH_Information_ResourceStatusInd", HFILL }},
     { &hf_nbap_secondary_CPICH_Information_01,
@@ -66160,11 +66160,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "S_CPICH_InformationList_ResourceStatusInd", HFILL }},
     { &hf_nbap_primary_CCPCH_Information_01,
-      { "primary-CCPCH-Information", "nbap.primary_CCPCH_Information",
+      { "primary-CCPCH-Information", "nbap.primary_CCPCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "P_CCPCH_Information_ResourceStatusInd", HFILL }},
     { &hf_nbap_bCH_Information_01,
-      { "bCH-Information", "nbap.bCH_Information",
+      { "bCH-Information", "nbap.bCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "BCH_Information_ResourceStatusInd", HFILL }},
     { &hf_nbap_secondary_CCPCH_InformationList_01,
@@ -66172,11 +66172,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "S_CCPCH_InformationList_ResourceStatusInd", HFILL }},
     { &hf_nbap_pCH_Information_01,
-      { "pCH-Information", "nbap.pCH_Information",
+      { "pCH-Information", "nbap.pCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PCH_Information_ResourceStatusInd", HFILL }},
     { &hf_nbap_pICH_Information_01,
-      { "pICH-Information", "nbap.pICH_Information",
+      { "pICH-Information", "nbap.pICH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PICH_Information_ResourceStatusInd", HFILL }},
     { &hf_nbap_fACH_InformationList_01,
@@ -66196,87 +66196,87 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "AICH_InformationList_ResourceStatusInd", HFILL }},
     { &hf_nbap_sCH_Information_01,
-      { "sCH-Information", "nbap.sCH_Information",
+      { "sCH-Information", "nbap.sCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SCH_Information_ResourceStatusInd", HFILL }},
     { &hf_nbap_S_CPICH_InformationList_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_S_CCPCH_InformationList_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_FACH_InformationList_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PRACH_InformationList_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RACH_InformationList_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_AICH_InformationList_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_FPACH_LCR_InformationList_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_S_CCPCH_InformationListExt_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_S_CCPCH_LCR_InformationListExt_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PLCCH_InformationList_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_S_CCPCH_768_InformationList_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PRACH_768_InformationList_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_RUCCH_InformationList_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_RUCCH_768_InformationList_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Cell_Frequency_List_Information_LCR_MulFreq_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UPPCH_LCR_InformationList_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MultipleFreq_HS_DSCH_Resources_InformationList_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Power_Local_Cell_Group_InformationList2_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MultipleFreq_E_DCH_Resources_InformationList_ResourceStatusInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MIB_SB_SIB_InformationList_SystemInfoUpdateRqst_item,
-      { "MIB-SB-SIB-InformationItem-SystemInfoUpdateRqst", "nbap.MIB_SB_SIB_InformationItem_SystemInfoUpdateRqst",
+      { "MIB-SB-SIB-InformationItem-SystemInfoUpdateRqst", "nbap.MIB_SB_SIB_InformationItem_SystemInfoUpdateRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_iB_Type,
@@ -66292,11 +66292,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_DeletionIndicator_SystemInfoUpdate_vals), 0,
         "DeletionIndicator_SystemInfoUpdate", HFILL }},
     { &hf_nbap_no_Deletion,
-      { "no-Deletion", "nbap.no_Deletion",
+      { "no-Deletion", "nbap.no_Deletion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "No_Deletion_SystemInfoUpdate", HFILL }},
     { &hf_nbap_yes_Deletion,
-      { "yes-Deletion", "nbap.yes_Deletion",
+      { "yes-Deletion", "nbap.yes_Deletion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_sIB_Originator,
@@ -66308,11 +66308,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_IB_SG_REP_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_segmentInformationList,
-      { "segmentInformationList", "nbap.segmentInformationList",
+      { "segmentInformationList", "nbap.segmentInformationList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SegmentInformationList_SystemInfoUpdate", HFILL }},
     { &hf_nbap_SegmentInformationListIE_SystemInfoUpdate_item,
-      { "SegmentInformationItem-SystemInfoUpdate", "nbap.SegmentInformationItem_SystemInfoUpdate",
+      { "SegmentInformationItem-SystemInfoUpdate", "nbap.SegmentInformationItem_SystemInfoUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_iB_SG_POS,
@@ -66328,7 +66328,7 @@ void proto_register_nbap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_HS_Cell_Information_RL_Setup_List_item,
-      { "Additional-HS-Cell-Information-RL-Setup-ItemIEs", "nbap.Additional_HS_Cell_Information_RL_Setup_ItemIEs",
+      { "Additional-HS-Cell-Information-RL-Setup-ItemIEs", "nbap.Additional_HS_Cell_Information_RL_Setup_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hSPDSCH_RL_ID,
@@ -66336,7 +66336,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "RL_ID", HFILL }},
     { &hf_nbap_hS_DSCH_FDD_Secondary_Serving_Information,
-      { "hS-DSCH-FDD-Secondary-Serving-Information", "nbap.hS_DSCH_FDD_Secondary_Serving_Information",
+      { "hS-DSCH-FDD-Secondary-Serving-Information", "nbap.hS_DSCH_FDD_Secondary_Serving_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_minUL_ChannelisationCodeLength,
@@ -66356,11 +66356,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_DiversityMode_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_not_Used_sSDT_CellID_Length,
-      { "not-Used-sSDT-CellID-Length", "nbap.not_Used_sSDT_CellID_Length",
+      { "not-Used-sSDT-CellID-Length", "nbap.not_Used_sSDT_CellID_Length_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_not_Used_s_FieldLength,
-      { "not-Used-s-FieldLength", "nbap.not_Used_s_FieldLength",
+      { "not-Used-s-FieldLength", "nbap.not_Used_s_FieldLength_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dl_DPCH_SlotFormat,
@@ -66368,19 +66368,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_tFCI_SignallingMode,
-      { "tFCI-SignallingMode", "nbap.tFCI_SignallingMode",
+      { "tFCI-SignallingMode", "nbap.tFCI_SignallingMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_not_Used_pDSCH_RL_ID,
-      { "not-Used-pDSCH-RL-ID", "nbap.not_Used_pDSCH_RL_ID",
+      { "not-Used-pDSCH-RL-ID", "nbap.not_Used_pDSCH_RL_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_not_Used_pDSCH_CodeMapping,
-      { "not-Used-pDSCH-CodeMapping", "nbap.not_Used_pDSCH_CodeMapping",
+      { "not-Used-pDSCH-CodeMapping", "nbap.not_Used_pDSCH_CodeMapping_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_powerOffsetInformation_01,
-      { "powerOffsetInformation", "nbap.powerOffsetInformation",
+      { "powerOffsetInformation", "nbap.powerOffsetInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PowerOffsetInformation_RL_SetupRqstFDD", HFILL }},
     { &hf_nbap_pO2_ForTPC_Bits,
@@ -66388,7 +66388,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "PowerOffset", HFILL }},
     { &hf_nbap_RL_InformationList_RL_SetupRqstFDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_frameOffset,
@@ -66404,7 +66404,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_DiversityControlField_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_not_Used_sSDT_Cell_Identity,
-      { "not-Used-sSDT-Cell-Identity", "nbap.not_Used_sSDT_Cell_Identity",
+      { "not-Used-sSDT-Cell-Identity", "nbap.not_Used_sSDT_Cell_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hSDSCH_Configured_Indicator,
@@ -66412,15 +66412,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_HSDSCH_Configured_Indicator_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_powerOffsetInformation_02,
-      { "powerOffsetInformation", "nbap.powerOffsetInformation",
+      { "powerOffsetInformation", "nbap.powerOffsetInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PowerOffsetInformation_F_DPCH_RL_SetupRqstFDD", HFILL }},
     { &hf_nbap_UL_CCTrCH_InformationList_RL_SetupRqstTDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uL_DPCH_Information,
-      { "uL-DPCH-Information", "nbap.uL_DPCH_Information",
+      { "uL-DPCH-Information", "nbap.uL_DPCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_Information_RL_SetupRqstTDD", HFILL }},
     { &hf_nbap_tdd_DPCHOffset,
@@ -66440,7 +66440,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_CCTrCH_InformationList_RL_SetupRqstTDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_tdd_TPC_DownlinkStepSize,
@@ -66452,11 +66452,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "CCTrCH_TPCList_RL_SetupRqstTDD", HFILL }},
     { &hf_nbap_dL_DPCH_Information,
-      { "dL-DPCH-Information", "nbap.dL_DPCH_Information",
+      { "dL-DPCH-Information", "nbap.dL_DPCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_Information_RL_SetupRqstTDD", HFILL }},
     { &hf_nbap_CCTrCH_TPCList_RL_SetupRqstTDD_item,
-      { "CCTrCH-TPCItem-RL-SetupRqstTDD", "nbap.CCTrCH_TPCItem_RL_SetupRqstTDD",
+      { "CCTrCH-TPCItem-RL-SetupRqstTDD", "nbap.CCTrCH_TPCItem_RL_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dL_Timeslot_Information,
@@ -66484,11 +66484,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_HS_Cell_Information_Response_List_item,
-      { "Additional-HS-Cell-Information-Response-ItemIEs", "nbap.Additional_HS_Cell_Information_Response_ItemIEs",
+      { "Additional-HS-Cell-Information-Response-ItemIEs", "nbap.Additional_HS_Cell_Information_Response_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationResponseList_RL_SetupRspFDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_diversityIndication,
@@ -66496,7 +66496,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_DiversityIndication_RL_SetupRspFDD_vals), 0,
         "DiversityIndication_RL_SetupRspFDD", HFILL }},
     { &hf_nbap_not_Used_dSCH_InformationResponseList,
-      { "not-Used-dSCH-InformationResponseList", "nbap.not_Used_dSCH_InformationResponseList",
+      { "not-Used-dSCH-InformationResponseList", "nbap.not_Used_dSCH_InformationResponseList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_sSDT_SupportIndicator,
@@ -66504,11 +66504,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_SSDT_SupportIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_combining,
-      { "combining", "nbap.combining",
+      { "combining", "nbap.combining_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Combining_RL_SetupRspFDD", HFILL }},
     { &hf_nbap_nonCombiningOrFirstRL,
-      { "nonCombiningOrFirstRL", "nbap.nonCombiningOrFirstRL",
+      { "nonCombiningOrFirstRL", "nbap.nonCombiningOrFirstRL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonCombiningOrFirstRL_RL_SetupRspFDD", HFILL }},
     { &hf_nbap_dCH_InformationResponse,
@@ -66524,15 +66524,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_UL_PhysCH_SF_Variation_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_dCH_InformationResponseList,
-      { "dCH-InformationResponseList", "nbap.dCH_InformationResponseList",
+      { "dCH-InformationResponseList", "nbap.dCH_InformationResponseList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DCH_InformationResponseList_RL_SetupRspTDD", HFILL }},
     { &hf_nbap_dSCH_InformationResponseList,
-      { "dSCH-InformationResponseList", "nbap.dSCH_InformationResponseList",
+      { "dSCH-InformationResponseList", "nbap.dSCH_InformationResponseList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DSCH_InformationResponseList_RL_SetupRspTDD", HFILL }},
     { &hf_nbap_uSCH_InformationResponseList,
-      { "uSCH-InformationResponseList", "nbap.uSCH_InformationResponseList",
+      { "uSCH-InformationResponseList", "nbap.uSCH_InformationResponseList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "USCH_InformationResponseList_RL_SetupRspTDD", HFILL }},
     { &hf_nbap_uL_TimeSlot_ISCP_LCR_Info,
@@ -66540,11 +66540,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_generalCause,
-      { "generalCause", "nbap.generalCause",
+      { "generalCause", "nbap.generalCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GeneralCauseList_RL_SetupFailureFDD", HFILL }},
     { &hf_nbap_rLSpecificCause,
-      { "rLSpecificCause", "nbap.rLSpecificCause",
+      { "rLSpecificCause", "nbap.rLSpecificCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLSpecificCauseList_RL_SetupFailureFDD", HFILL }},
     { &hf_nbap_unsuccessful_RL_InformationRespList_RL_SetupFailureFDD,
@@ -66556,11 +66556,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Unsuccessful_RL_InformationRespList_RL_SetupFailureFDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Successful_RL_InformationRespList_RL_SetupFailureFDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_diversityIndication_01,
@@ -66568,31 +66568,31 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_DiversityIndication_RL_SetupFailureFDD_vals), 0,
         "DiversityIndication_RL_SetupFailureFDD", HFILL }},
     { &hf_nbap_not_Used_tFCI2_BearerInformationResponse,
-      { "not-Used-tFCI2-BearerInformationResponse", "nbap.not_Used_tFCI2_BearerInformationResponse",
+      { "not-Used-tFCI2-BearerInformationResponse", "nbap.not_Used_tFCI2_BearerInformationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_combining_01,
-      { "combining", "nbap.combining",
+      { "combining", "nbap.combining_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Combining_RL_SetupFailureFDD", HFILL }},
     { &hf_nbap_nonCombiningOrFirstRL_01,
-      { "nonCombiningOrFirstRL", "nbap.nonCombiningOrFirstRL",
+      { "nonCombiningOrFirstRL", "nbap.nonCombiningOrFirstRL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonCombiningOrFirstRL_RL_SetupFailureFDD", HFILL }},
     { &hf_nbap_generalCause_01,
-      { "generalCause", "nbap.generalCause",
+      { "generalCause", "nbap.generalCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GeneralCauseList_RL_SetupFailureTDD", HFILL }},
     { &hf_nbap_rLSpecificCause_01,
-      { "rLSpecificCause", "nbap.rLSpecificCause",
+      { "rLSpecificCause", "nbap.rLSpecificCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLSpecificCauseList_RL_SetupFailureTDD", HFILL }},
     { &hf_nbap_unsuccessful_RL_InformationRespItem_RL_SetupFailureTDD,
-      { "unsuccessful-RL-InformationRespItem-RL-SetupFailureTDD", "nbap.unsuccessful_RL_InformationRespItem_RL_SetupFailureTDD",
+      { "unsuccessful-RL-InformationRespItem-RL-SetupFailureTDD", "nbap.unsuccessful_RL_InformationRespItem_RL_SetupFailureTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_HS_Cell_Information_RL_Addition_List_item,
-      { "Additional-HS-Cell-Information-RL-Addition-ItemIEs", "nbap.Additional_HS_Cell_Information_RL_Addition_ItemIEs",
+      { "Additional-HS-Cell-Information-RL-Addition-ItemIEs", "nbap.Additional_HS_Cell_Information_RL_Addition_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_setup_Or_Addition_Of_EDCH_On_secondary_UL_Frequency,
@@ -66604,7 +66604,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "Additional_EDCH_Cell_Information_To_Add_List", HFILL }},
     { &hf_nbap_RL_InformationList_RL_AdditionRqstFDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_initialDL_TransmissionPower,
@@ -66620,23 +66620,23 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         "DL_Power", HFILL }},
     { &hf_nbap_not_Used_sSDT_CellIdentity,
-      { "not-Used-sSDT-CellIdentity", "nbap.not_Used_sSDT_CellIdentity",
+      { "not-Used-sSDT-CellIdentity", "nbap.not_Used_sSDT_CellIdentity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_CCTrCH_InformationList_RL_AdditionRqstTDD_item,
-      { "UL-CCTrCH-InformationItem-RL-AdditionRqstTDD", "nbap.UL_CCTrCH_InformationItem_RL_AdditionRqstTDD",
+      { "UL-CCTrCH-InformationItem-RL-AdditionRqstTDD", "nbap.UL_CCTrCH_InformationItem_RL_AdditionRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uL_DPCH_Information_01,
-      { "uL-DPCH-Information", "nbap.uL_DPCH_Information",
+      { "uL-DPCH-Information", "nbap.uL_DPCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_InformationList_RL_AdditionRqstTDD", HFILL }},
     { &hf_nbap_DL_CCTrCH_InformationList_RL_AdditionRqstTDD_item,
-      { "DL-CCTrCH-InformationItem-RL-AdditionRqstTDD", "nbap.DL_CCTrCH_InformationItem_RL_AdditionRqstTDD",
+      { "DL-CCTrCH-InformationItem-RL-AdditionRqstTDD", "nbap.DL_CCTrCH_InformationItem_RL_AdditionRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dL_DPCH_Information_01,
-      { "dL-DPCH-Information", "nbap.dL_DPCH_Information",
+      { "dL-DPCH-Information", "nbap.dL_DPCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_InformationList_RL_AdditionRqstTDD", HFILL }},
     { &hf_nbap_initial_DL_Transmission_Power,
@@ -66644,15 +66644,15 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         "DL_Power", HFILL }},
     { &hf_nbap_Additional_HS_Cell_Change_Information_Response_List_item,
-      { "Additional-HS-Cell-Change-Information-Response-ItemIEs", "nbap.Additional_HS_Cell_Change_Information_Response_ItemIEs",
+      { "Additional-HS-Cell-Change-Information-Response-ItemIEs", "nbap.Additional_HS_Cell_Change_Information_Response_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_DSCH_Secondary_Serving_Cell_Change_Information_Response,
-      { "hS-DSCH-Secondary-Serving-Cell-Change-Information-Response", "nbap.hS_DSCH_Secondary_Serving_Cell_Change_Information_Response",
+      { "hS-DSCH-Secondary-Serving-Cell-Change-Information-Response", "nbap.hS_DSCH_Secondary_Serving_Cell_Change_Information_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationResponseList_RL_AdditionRspFDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_diversityIndication_02,
@@ -66660,23 +66660,23 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_DiversityIndication_RL_AdditionRspFDD_vals), 0,
         "DiversityIndication_RL_AdditionRspFDD", HFILL }},
     { &hf_nbap_combining_02,
-      { "combining", "nbap.combining",
+      { "combining", "nbap.combining_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Combining_RL_AdditionRspFDD", HFILL }},
     { &hf_nbap_non_combining,
-      { "non-combining", "nbap.non_combining",
+      { "non-combining", "nbap.non_combining_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Non_Combining_RL_AdditionRspFDD", HFILL }},
     { &hf_nbap_dCH_Information,
-      { "dCH-Information", "nbap.dCH_Information",
+      { "dCH-Information", "nbap.dCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DCH_Information_RL_AdditionRspTDD", HFILL }},
     { &hf_nbap_dSCH_InformationResponseList_01,
-      { "dSCH-InformationResponseList", "nbap.dSCH_InformationResponseList",
+      { "dSCH-InformationResponseList", "nbap.dSCH_InformationResponseList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DSCH_InformationResponseList_RL_AdditionRspTDD", HFILL }},
     { &hf_nbap_uSCH_InformationResponseList_01,
-      { "uSCH-InformationResponseList", "nbap.uSCH_InformationResponseList",
+      { "uSCH-InformationResponseList", "nbap.uSCH_InformationResponseList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "USCH_InformationResponseList_RL_AdditionRspTDD", HFILL }},
     { &hf_nbap_diversityIndication_03,
@@ -66684,11 +66684,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_DiversityIndication_RL_AdditionRspTDD_vals), 0,
         "DiversityIndication_RL_AdditionRspTDD", HFILL }},
     { &hf_nbap_combining_03,
-      { "combining", "nbap.combining",
+      { "combining", "nbap.combining_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Combining_RL_AdditionRspTDD", HFILL }},
     { &hf_nbap_non_Combining,
-      { "non-Combining", "nbap.non_Combining",
+      { "non-Combining", "nbap.non_Combining_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Non_Combining_RL_AdditionRspTDD", HFILL }},
     { &hf_nbap_uL_TimeSlot_ISCP_InfoLCR,
@@ -66696,11 +66696,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "UL_TimeSlot_ISCP_LCR_Info", HFILL }},
     { &hf_nbap_generalCause_02,
-      { "generalCause", "nbap.generalCause",
+      { "generalCause", "nbap.generalCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GeneralCauseList_RL_AdditionFailureFDD", HFILL }},
     { &hf_nbap_rLSpecificCause_02,
-      { "rLSpecificCause", "nbap.rLSpecificCause",
+      { "rLSpecificCause", "nbap.rLSpecificCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLSpecificCauseList_RL_AdditionFailureFDD", HFILL }},
     { &hf_nbap_unsuccessful_RL_InformationRespList_RL_AdditionFailureFDD,
@@ -66712,11 +66712,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Unsuccessful_RL_InformationRespList_RL_AdditionFailureFDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Successful_RL_InformationRespList_RL_AdditionFailureFDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_diversityIndication_04,
@@ -66724,35 +66724,35 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_DiversityIndication_RL_AdditionFailureFDD_vals), 0,
         "DiversityIndication_RL_AdditionFailureFDD", HFILL }},
     { &hf_nbap_combining_04,
-      { "combining", "nbap.combining",
+      { "combining", "nbap.combining_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Combining_RL_AdditionFailureFDD", HFILL }},
     { &hf_nbap_non_Combining_01,
-      { "non-Combining", "nbap.non_Combining",
+      { "non-Combining", "nbap.non_Combining_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Non_Combining_RL_AdditionFailureFDD", HFILL }},
     { &hf_nbap_generalCause_03,
-      { "generalCause", "nbap.generalCause",
+      { "generalCause", "nbap.generalCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GeneralCauseList_RL_AdditionFailureTDD", HFILL }},
     { &hf_nbap_rLSpecificCause_03,
-      { "rLSpecificCause", "nbap.rLSpecificCause",
+      { "rLSpecificCause", "nbap.rLSpecificCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLSpecificCauseList_RL_AdditionFailureTDD", HFILL }},
     { &hf_nbap_unsuccessful_RL_InformationRespItem_RL_AdditionFailureTDD,
-      { "unsuccessful-RL-InformationRespItem-RL-AdditionFailureTDD", "nbap.unsuccessful_RL_InformationRespItem_RL_AdditionFailureTDD",
+      { "unsuccessful-RL-InformationRespItem-RL-AdditionFailureTDD", "nbap.unsuccessful_RL_InformationRespItem_RL_AdditionFailureTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_HS_Cell_Information_RL_Reconf_Prep_item,
-      { "Additional-HS-Cell-Information-RL-Reconf-Prep-ItemIEs", "nbap.Additional_HS_Cell_Information_RL_Reconf_Prep_ItemIEs",
+      { "Additional-HS-Cell-Information-RL-Reconf-Prep-ItemIEs", "nbap.Additional_HS_Cell_Information_RL_Reconf_Prep_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_DSCH_Secondary_Serving_Information_To_Modify,
-      { "hS-DSCH-Secondary-Serving-Information-To-Modify", "nbap.hS_DSCH_Secondary_Serving_Information_To_Modify",
+      { "hS-DSCH-Secondary-Serving-Information-To-Modify", "nbap.hS_DSCH_Secondary_Serving_Information_To_Modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_HS_DSCH_Secondary_Serving_Remove,
-      { "hS-HS-DSCH-Secondary-Serving-Remove", "nbap.hS_HS_DSCH_Secondary_Serving_Remove",
+      { "hS-HS-DSCH-Secondary-Serving-Remove", "nbap.hS_HS_DSCH_Secondary_Serving_Remove_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_DSCH_Secondary_Serving_Remove", HFILL }},
     { &hf_nbap_setup_Or_ConfigurationChange_Or_Removal_Of_EDCH_On_secondary_UL_Frequency,
@@ -66760,19 +66760,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_Setup_Or_ConfigurationChange_Or_Removal_Of_EDCH_On_secondary_UL_Frequency_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_not_Used_sSDT_CellIDLength,
-      { "not-Used-sSDT-CellIDLength", "nbap.not_Used_sSDT_CellIDLength",
+      { "not-Used-sSDT-CellIDLength", "nbap.not_Used_sSDT_CellIDLength_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_powerOffsetInformation_03,
-      { "powerOffsetInformation", "nbap.powerOffsetInformation",
+      { "powerOffsetInformation", "nbap.powerOffsetInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PowerOffsetInformation_RL_ReconfPrepFDD", HFILL }},
     { &hf_nbap_DCH_DeleteList_RL_ReconfPrepFDD_item,
-      { "DCH-DeleteItem-RL-ReconfPrepFDD", "nbap.DCH_DeleteItem_RL_ReconfPrepFDD",
+      { "DCH-DeleteItem-RL-ReconfPrepFDD", "nbap.DCH_DeleteItem_RL_ReconfPrepFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationList_RL_ReconfPrepFDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_maxDL_Power,
@@ -66784,19 +66784,19 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         "DL_Power", HFILL }},
     { &hf_nbap_not_Used_sSDT_Indication,
-      { "not-Used-sSDT-Indication", "nbap.not_Used_sSDT_Indication",
+      { "not-Used-sSDT-Indication", "nbap.not_Used_sSDT_Indication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_powerOffsetInformation_04,
-      { "powerOffsetInformation", "nbap.powerOffsetInformation",
+      { "powerOffsetInformation", "nbap.powerOffsetInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PowerOffsetInformation_F_DPCH_RL_ReconfPrepFDD", HFILL }},
     { &hf_nbap_UL_CCTrCH_InformationAddList_RL_ReconfPrepTDD_item,
-      { "UL-CCTrCH-InformationAddItem-RL-ReconfPrepTDD", "nbap.UL_CCTrCH_InformationAddItem_RL_ReconfPrepTDD",
+      { "UL-CCTrCH-InformationAddItem-RL-ReconfPrepTDD", "nbap.UL_CCTrCH_InformationAddItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ul_DPCH_InformationList,
-      { "ul-DPCH-InformationList", "nbap.ul_DPCH_InformationList",
+      { "ul-DPCH-InformationList", "nbap.ul_DPCH_InformationList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_InformationAddList_RL_ReconfPrepTDD", HFILL }},
     { &hf_nbap_uL_Timeslot_InformationLCR,
@@ -66804,11 +66804,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "UL_TimeslotLCR_Information", HFILL }},
     { &hf_nbap_MultipleRL_UL_DPCH_InformationAddList_RL_ReconfPrepTDD_item,
-      { "MultipleRL-UL-DPCH-InformationAddListIE-RL-ReconfPrepTDD", "nbap.MultipleRL_UL_DPCH_InformationAddListIE_RL_ReconfPrepTDD",
+      { "MultipleRL-UL-DPCH-InformationAddListIE-RL-ReconfPrepTDD", "nbap.MultipleRL_UL_DPCH_InformationAddListIE_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ul_DPCH_InformationListLCR,
-      { "ul-DPCH-InformationListLCR", "nbap.ul_DPCH_InformationListLCR",
+      { "ul-DPCH-InformationListLCR", "nbap.ul_DPCH_InformationListLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_LCR_InformationAddList_RL_ReconfPrepTDD", HFILL }},
     { &hf_nbap_ul_sir_target,
@@ -66824,19 +66824,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "UL_Timeslot768_Information", HFILL }},
     { &hf_nbap_UL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD_item,
-      { "UL-CCTrCH-InformationModifyItem-RL-ReconfPrepTDD", "nbap.UL_CCTrCH_InformationModifyItem_RL_ReconfPrepTDD",
+      { "UL-CCTrCH-InformationModifyItem-RL-ReconfPrepTDD", "nbap.UL_CCTrCH_InformationModifyItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ul_DPCH_InformationAddList,
-      { "ul-DPCH-InformationAddList", "nbap.ul_DPCH_InformationAddList",
+      { "ul-DPCH-InformationAddList", "nbap.ul_DPCH_InformationAddList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_InformationModify_AddList_RL_ReconfPrepTDD", HFILL }},
     { &hf_nbap_ul_DPCH_InformationModifyList,
-      { "ul-DPCH-InformationModifyList", "nbap.ul_DPCH_InformationModifyList",
+      { "ul-DPCH-InformationModifyList", "nbap.ul_DPCH_InformationModifyList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_InformationModify_ModifyList_RL_ReconfPrepTDD", HFILL }},
     { &hf_nbap_ul_DPCH_InformationDeleteList,
-      { "ul-DPCH-InformationDeleteList", "nbap.ul_DPCH_InformationDeleteList",
+      { "ul-DPCH-InformationDeleteList", "nbap.ul_DPCH_InformationDeleteList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_InformationModify_DeleteList_RL_ReconfPrepTDD", HFILL }},
     { &hf_nbap_uL_Timeslot_InformationModify_ModifyList_RL_ReconfPrepTDD,
@@ -66844,7 +66844,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_Timeslot_InformationModify_ModifyList_RL_ReconfPrepTDD_item,
-      { "UL-Timeslot-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.UL_Timeslot_InformationModify_ModifyItem_RL_ReconfPrepTDD",
+      { "UL-Timeslot-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.UL_Timeslot_InformationModify_ModifyItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uL_Code_InformationModify_ModifyList_RL_ReconfPrepTDD,
@@ -66852,11 +66852,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_Code_InformationModify_ModifyList_RL_ReconfPrepTDD_item,
-      { "UL-Code-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.UL_Code_InformationModify_ModifyItem_RL_ReconfPrepTDD",
+      { "UL-Code-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.UL_Code_InformationModify_ModifyItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_TimeslotLCR_InformationModify_ModifyList_RL_ReconfPrepTDD_item,
-      { "UL-Timeslot-LCR-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.UL_Timeslot_LCR_InformationModify_ModifyItem_RL_ReconfPrepTDD",
+      { "UL-Timeslot-LCR-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.UL_Timeslot_LCR_InformationModify_ModifyItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uL_Code_InformationModify_ModifyList_RL_ReconfPrepTDDLCR,
@@ -66864,11 +66864,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_Code_InformationModify_ModifyList_RL_ReconfPrepTDDLCR_item,
-      { "UL-Code-InformationModify-ModifyItem-RL-ReconfPrepTDDLCR", "nbap.UL_Code_InformationModify_ModifyItem_RL_ReconfPrepTDDLCR",
+      { "UL-Code-InformationModify-ModifyItem-RL-ReconfPrepTDDLCR", "nbap.UL_Code_InformationModify_ModifyItem_RL_ReconfPrepTDDLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_Timeslot768_InformationModify_ModifyList_RL_ReconfPrepTDD_item,
-      { "UL-Timeslot-768-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.UL_Timeslot_768_InformationModify_ModifyItem_RL_ReconfPrepTDD",
+      { "UL-Timeslot-768-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.UL_Timeslot_768_InformationModify_ModifyItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uL_Code_InformationModify_ModifyList_RL_ReconfPrepTDD768,
@@ -66876,27 +66876,27 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_Code_InformationModify_ModifyList_RL_ReconfPrepTDD768_item,
-      { "UL-Code-InformationModify-ModifyItem-RL-ReconfPrepTDD768", "nbap.UL_Code_InformationModify_ModifyItem_RL_ReconfPrepTDD768",
+      { "UL-Code-InformationModify-ModifyItem-RL-ReconfPrepTDD768", "nbap.UL_Code_InformationModify_ModifyItem_RL_ReconfPrepTDD768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_DPCH_InformationModify_DeleteListIE_RL_ReconfPrepTDD_item,
-      { "UL-DPCH-InformationModify-DeleteItem-RL-ReconfPrepTDD", "nbap.UL_DPCH_InformationModify_DeleteItem_RL_ReconfPrepTDD",
+      { "UL-DPCH-InformationModify-DeleteItem-RL-ReconfPrepTDD", "nbap.UL_DPCH_InformationModify_DeleteItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MultipleRL_UL_DPCH_InformationModifyList_RL_ReconfPrepTDD_item,
-      { "MultipleRL-UL-DPCH-InformationModifyListIE-RL-ReconfPrepTDD", "nbap.MultipleRL_UL_DPCH_InformationModifyListIE_RL_ReconfPrepTDD",
+      { "MultipleRL-UL-DPCH-InformationModifyListIE-RL-ReconfPrepTDD", "nbap.MultipleRL_UL_DPCH_InformationModifyListIE_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ul_DPCH_InformationAddListLCR,
-      { "ul-DPCH-InformationAddListLCR", "nbap.ul_DPCH_InformationAddListLCR",
+      { "ul-DPCH-InformationAddListLCR", "nbap.ul_DPCH_InformationAddListLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_LCR_InformationModify_AddList_RL_ReconfPrepTDD", HFILL }},
     { &hf_nbap_UL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD_item,
-      { "UL-CCTrCH-InformationDeleteItem-RL-ReconfPrepTDD", "nbap.UL_CCTrCH_InformationDeleteItem_RL_ReconfPrepTDD",
+      { "UL-CCTrCH-InformationDeleteItem-RL-ReconfPrepTDD", "nbap.UL_CCTrCH_InformationDeleteItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_CCTrCH_InformationAddList_RL_ReconfPrepTDD_item,
-      { "DL-CCTrCH-InformationAddItem-RL-ReconfPrepTDD", "nbap.DL_CCTrCH_InformationAddItem_RL_ReconfPrepTDD",
+      { "DL-CCTrCH-InformationAddItem-RL-ReconfPrepTDD", "nbap.DL_CCTrCH_InformationAddItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_cCTrCH_TPCList_01,
@@ -66904,11 +66904,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "CCTrCH_TPCAddList_RL_ReconfPrepTDD", HFILL }},
     { &hf_nbap_dl_DPCH_InformationList,
-      { "dl-DPCH-InformationList", "nbap.dl_DPCH_InformationList",
+      { "dl-DPCH-InformationList", "nbap.dl_DPCH_InformationList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_InformationAddList_RL_ReconfPrepTDD", HFILL }},
     { &hf_nbap_CCTrCH_TPCAddList_RL_ReconfPrepTDD_item,
-      { "CCTrCH-TPCAddItem-RL-ReconfPrepTDD", "nbap.CCTrCH_TPCAddItem_RL_ReconfPrepTDD",
+      { "CCTrCH-TPCAddItem-RL-ReconfPrepTDD", "nbap.CCTrCH_TPCAddItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dL_Timeslot_InformationLCR,
@@ -66916,11 +66916,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "DL_TimeslotLCR_Information", HFILL }},
     { &hf_nbap_MultipleRL_DL_DPCH_InformationAddList_RL_ReconfPrepTDD_item,
-      { "MultipleRL-DL-DPCH-InformationAddListIE-RL-ReconfPrepTDD", "nbap.MultipleRL_DL_DPCH_InformationAddListIE_RL_ReconfPrepTDD",
+      { "MultipleRL-DL-DPCH-InformationAddListIE-RL-ReconfPrepTDD", "nbap.MultipleRL_DL_DPCH_InformationAddListIE_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dl_DPCH_InformationListLCR,
-      { "dl-DPCH-InformationListLCR", "nbap.dl_DPCH_InformationListLCR",
+      { "dl-DPCH-InformationListLCR", "nbap.dl_DPCH_InformationListLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_LCR_InformationAddList_RL_ReconfPrepTDD", HFILL }},
     { &hf_nbap_cCTrCH_Initial_DL_Power,
@@ -66944,7 +66944,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "DL_Timeslot768_Information", HFILL }},
     { &hf_nbap_DL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD_item,
-      { "DL-CCTrCH-InformationModifyItem-RL-ReconfPrepTDD", "nbap.DL_CCTrCH_InformationModifyItem_RL_ReconfPrepTDD",
+      { "DL-CCTrCH-InformationModifyItem-RL-ReconfPrepTDD", "nbap.DL_CCTrCH_InformationModifyItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_cCTrCH_TPCList_02,
@@ -66952,19 +66952,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "CCTrCH_TPCModifyList_RL_ReconfPrepTDD", HFILL }},
     { &hf_nbap_dl_DPCH_InformationAddList,
-      { "dl-DPCH-InformationAddList", "nbap.dl_DPCH_InformationAddList",
+      { "dl-DPCH-InformationAddList", "nbap.dl_DPCH_InformationAddList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_InformationModify_AddList_RL_ReconfPrepTDD", HFILL }},
     { &hf_nbap_dl_DPCH_InformationModifyList,
-      { "dl-DPCH-InformationModifyList", "nbap.dl_DPCH_InformationModifyList",
+      { "dl-DPCH-InformationModifyList", "nbap.dl_DPCH_InformationModifyList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_InformationModify_ModifyList_RL_ReconfPrepTDD", HFILL }},
     { &hf_nbap_dl_DPCH_InformationDeleteList,
-      { "dl-DPCH-InformationDeleteList", "nbap.dl_DPCH_InformationDeleteList",
+      { "dl-DPCH-InformationDeleteList", "nbap.dl_DPCH_InformationDeleteList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_InformationModify_DeleteList_RL_ReconfPrepTDD", HFILL }},
     { &hf_nbap_CCTrCH_TPCModifyList_RL_ReconfPrepTDD_item,
-      { "CCTrCH-TPCModifyItem-RL-ReconfPrepTDD", "nbap.CCTrCH_TPCModifyItem_RL_ReconfPrepTDD",
+      { "CCTrCH-TPCModifyItem-RL-ReconfPrepTDD", "nbap.CCTrCH_TPCModifyItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dL_Timeslot_InformationAddModify_ModifyList_RL_ReconfPrepTDD,
@@ -66972,7 +66972,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "DL_Timeslot_InformationModify_ModifyList_RL_ReconfPrepTDD", HFILL }},
     { &hf_nbap_DL_Timeslot_InformationModify_ModifyList_RL_ReconfPrepTDD_item,
-      { "DL-Timeslot-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.DL_Timeslot_InformationModify_ModifyItem_RL_ReconfPrepTDD",
+      { "DL-Timeslot-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.DL_Timeslot_InformationModify_ModifyItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dL_Code_InformationModify_ModifyList_RL_ReconfPrepTDD,
@@ -66980,11 +66980,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_Code_InformationModify_ModifyList_RL_ReconfPrepTDD_item,
-      { "DL-Code-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.DL_Code_InformationModify_ModifyItem_RL_ReconfPrepTDD",
+      { "DL-Code-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.DL_Code_InformationModify_ModifyItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_Timeslot_LCR_InformationModify_ModifyList_RL_ReconfPrepTDD_item,
-      { "DL-Timeslot-LCR-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.DL_Timeslot_LCR_InformationModify_ModifyItem_RL_ReconfPrepTDD",
+      { "DL-Timeslot-LCR-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.DL_Timeslot_LCR_InformationModify_ModifyItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dL_Code_LCR_InformationModify_ModifyList_RL_ReconfPrepTDD,
@@ -66992,11 +66992,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_Code_LCR_InformationModify_ModifyList_RL_ReconfPrepTDD_item,
-      { "DL-Code-LCR-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.DL_Code_LCR_InformationModify_ModifyItem_RL_ReconfPrepTDD",
+      { "DL-Code-LCR-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.DL_Code_LCR_InformationModify_ModifyItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_Timeslot_768_InformationModify_ModifyList_RL_ReconfPrepTDD_item,
-      { "DL-Timeslot-768-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.DL_Timeslot_768_InformationModify_ModifyItem_RL_ReconfPrepTDD",
+      { "DL-Timeslot-768-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.DL_Timeslot_768_InformationModify_ModifyItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dL_Code_768_InformationModify_ModifyList_RL_ReconfPrepTDD,
@@ -67004,7 +67004,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_Code_768_InformationModify_ModifyList_RL_ReconfPrepTDD_item,
-      { "DL-Code-768-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.DL_Code_768_InformationModify_ModifyItem_RL_ReconfPrepTDD",
+      { "DL-Code-768-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.DL_Code_768_InformationModify_ModifyItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dPCH_ID768,
@@ -67012,15 +67012,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_DPCH_InformationModify_DeleteListIE_RL_ReconfPrepTDD_item,
-      { "DL-DPCH-InformationModify-DeleteItem-RL-ReconfPrepTDD", "nbap.DL_DPCH_InformationModify_DeleteItem_RL_ReconfPrepTDD",
+      { "DL-DPCH-InformationModify-DeleteItem-RL-ReconfPrepTDD", "nbap.DL_DPCH_InformationModify_DeleteItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MultipleRL_DL_DPCH_InformationModifyList_RL_ReconfPrepTDD_item,
-      { "MultipleRL-DL-DPCH-InformationModifyListIE-RL-ReconfPrepTDD", "nbap.MultipleRL_DL_DPCH_InformationModifyListIE_RL_ReconfPrepTDD",
+      { "MultipleRL-DL-DPCH-InformationModifyListIE-RL-ReconfPrepTDD", "nbap.MultipleRL_DL_DPCH_InformationModifyListIE_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dl_DPCH_InformationAddListLCR,
-      { "dl-DPCH-InformationAddListLCR", "nbap.dl_DPCH_InformationAddListLCR",
+      { "dl-DPCH-InformationAddListLCR", "nbap.dl_DPCH_InformationAddListLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_LCR_InformationModify_AddList_RL_ReconfPrepTDD", HFILL }},
     { &hf_nbap_tDD_TPC_DownlinkStepSize_InformationModify_RL_ReconfPrepTDD,
@@ -67036,55 +67036,55 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         "DL_Power", HFILL }},
     { &hf_nbap_DL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD_item,
-      { "DL-CCTrCH-InformationDeleteItem-RL-ReconfPrepTDD", "nbap.DL_CCTrCH_InformationDeleteItem_RL_ReconfPrepTDD",
+      { "DL-CCTrCH-InformationDeleteItem-RL-ReconfPrepTDD", "nbap.DL_CCTrCH_InformationDeleteItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DCH_DeleteList_RL_ReconfPrepTDD_item,
-      { "DCH-DeleteItem-RL-ReconfPrepTDD", "nbap.DCH_DeleteItem_RL_ReconfPrepTDD",
+      { "DCH-DeleteItem-RL-ReconfPrepTDD", "nbap.DCH_DeleteItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DSCH_Information_ModifyList_RL_ReconfPrepTDD_item,
-      { "DSCH-Information-ModifyItem-RL-ReconfPrepTDD", "nbap.DSCH_Information_ModifyItem_RL_ReconfPrepTDD",
+      { "DSCH-Information-ModifyItem-RL-ReconfPrepTDD", "nbap.DSCH_Information_ModifyItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DSCH_Information_DeleteList_RL_ReconfPrepTDD_item,
-      { "DSCH-Information-DeleteItem-RL-ReconfPrepTDD", "nbap.DSCH_Information_DeleteItem_RL_ReconfPrepTDD",
+      { "DSCH-Information-DeleteItem-RL-ReconfPrepTDD", "nbap.DSCH_Information_DeleteItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_USCH_Information_ModifyList_RL_ReconfPrepTDD_item,
-      { "USCH-Information-ModifyItem-RL-ReconfPrepTDD", "nbap.USCH_Information_ModifyItem_RL_ReconfPrepTDD",
+      { "USCH-Information-ModifyItem-RL-ReconfPrepTDD", "nbap.USCH_Information_ModifyItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_USCH_Information_DeleteList_RL_ReconfPrepTDD_item,
-      { "USCH-Information-DeleteItem-RL-ReconfPrepTDD", "nbap.USCH_Information_DeleteItem_RL_ReconfPrepTDD",
+      { "USCH-Information-DeleteItem-RL-ReconfPrepTDD", "nbap.USCH_Information_DeleteItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MultipleRL_Information_RL_ReconfPrepTDD_item,
-      { "RL-Information-RL-ReconfPrepTDD", "nbap.RL_Information_RL_ReconfPrepTDD",
+      { "RL-Information-RL-ReconfPrepTDD", "nbap.RL_Information_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationResponseList_RL_ReconfReady_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dCH_InformationResponseList_RL_ReconfReady,
-      { "dCH-InformationResponseList-RL-ReconfReady", "nbap.dCH_InformationResponseList_RL_ReconfReady",
+      { "dCH-InformationResponseList-RL-ReconfReady", "nbap.dCH_InformationResponseList_RL_ReconfReady_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dSCH_InformationResponseList_RL_ReconfReady,
-      { "dSCH-InformationResponseList-RL-ReconfReady", "nbap.dSCH_InformationResponseList_RL_ReconfReady",
+      { "dSCH-InformationResponseList-RL-ReconfReady", "nbap.dSCH_InformationResponseList_RL_ReconfReady_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uSCH_InformationResponseList_RL_ReconfReady,
-      { "uSCH-InformationResponseList-RL-ReconfReady", "nbap.uSCH_InformationResponseList_RL_ReconfReady",
+      { "uSCH-InformationResponseList-RL-ReconfReady", "nbap.uSCH_InformationResponseList_RL_ReconfReady_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_generalCause_04,
-      { "generalCause", "nbap.generalCause",
+      { "generalCause", "nbap.generalCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GeneralCauseList_RL_ReconfFailure", HFILL }},
     { &hf_nbap_rLSpecificCause_04,
-      { "rLSpecificCause", "nbap.rLSpecificCause",
+      { "rLSpecificCause", "nbap.rLSpecificCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLSpecificCauseList_RL_ReconfFailure", HFILL }},
     { &hf_nbap_rL_ReconfigurationFailureList_RL_ReconfFailure,
@@ -67092,55 +67092,55 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_ReconfigurationFailureList_RL_ReconfFailure_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_HS_Cell_Information_RL_Reconf_Req_item,
-      { "Additional-HS-Cell-Information-RL-Reconf-Req-ItemIEs", "nbap.Additional_HS_Cell_Information_RL_Reconf_Req_ItemIEs",
+      { "Additional-HS-Cell-Information-RL-Reconf-Req-ItemIEs", "nbap.Additional_HS_Cell_Information_RL_Reconf_Req_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_DSCH_FDD_Secondary_Serving_Information_To_Modify_Unsynchronised,
-      { "hS-DSCH-FDD-Secondary-Serving-Information-To-Modify-Unsynchronised", "nbap.hS_DSCH_FDD_Secondary_Serving_Information_To_Modify_Unsynchronised",
+      { "hS-DSCH-FDD-Secondary-Serving-Information-To-Modify-Unsynchronised", "nbap.hS_DSCH_FDD_Secondary_Serving_Information_To_Modify_Unsynchronised_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_DSCH_Secondary_Serving_Remove,
-      { "hS-DSCH-Secondary-Serving-Remove", "nbap.hS_DSCH_Secondary_Serving_Remove",
+      { "hS-DSCH-Secondary-Serving-Remove", "nbap.hS_DSCH_Secondary_Serving_Remove_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_ul_TFCS,
-      { "ul-TFCS", "nbap.ul_TFCS",
+      { "ul-TFCS", "nbap.ul_TFCS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TFCS", HFILL }},
     { &hf_nbap_dl_TFCS,
-      { "dl-TFCS", "nbap.dl_TFCS",
+      { "dl-TFCS", "nbap.dl_TFCS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TFCS", HFILL }},
     { &hf_nbap_DCH_DeleteList_RL_ReconfRqstFDD_item,
-      { "DCH-DeleteItem-RL-ReconfRqstFDD", "nbap.DCH_DeleteItem_RL_ReconfRqstFDD",
+      { "DCH-DeleteItem-RL-ReconfRqstFDD", "nbap.DCH_DeleteItem_RL_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationList_RL_ReconfRqstFDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MultipleRL_DL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_item,
-      { "MultipleRL-DL-CCTrCH-InformationModifyListIE-RL-ReconfRqstTDD", "nbap.MultipleRL_DL_CCTrCH_InformationModifyListIE_RL_ReconfRqstTDD",
+      { "MultipleRL-DL-CCTrCH-InformationModifyListIE-RL-ReconfRqstTDD", "nbap.MultipleRL_DL_CCTrCH_InformationModifyListIE_RL_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dl_DPCH_LCR_InformationModifyList,
-      { "dl-DPCH-LCR-InformationModifyList", "nbap.dl_DPCH_LCR_InformationModifyList",
+      { "dl-DPCH-LCR-InformationModifyList", "nbap.dl_DPCH_LCR_InformationModifyList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_LCR_InformationModify_ModifyList_RL_ReconfRqstTDD", HFILL }},
     { &hf_nbap_cCTrCH_Maximum_DL_Power_InformationModify_RL_ReconfRqstTDD,
@@ -67156,7 +67156,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_Timeslot_LCR_InformationModify_ModifyList_RL_ReconfRqstTDD_item,
-      { "DL-Timeslot-LCR-InformationModify-ModifyItem-RL-ReconfRqstTDD", "nbap.DL_Timeslot_LCR_InformationModify_ModifyItem_RL_ReconfRqstTDD",
+      { "DL-Timeslot-LCR-InformationModify-ModifyItem-RL-ReconfRqstTDD", "nbap.DL_Timeslot_LCR_InformationModify_ModifyItem_RL_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_maxPowerLCR,
@@ -67168,31 +67168,31 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         "DL_Power", HFILL }},
     { &hf_nbap_DL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DCH_DeleteList_RL_ReconfRqstTDD_item,
-      { "DCH-DeleteItem-RL-ReconfRqstTDD", "nbap.DCH_DeleteItem_RL_ReconfRqstTDD",
+      { "DCH-DeleteItem-RL-ReconfRqstTDD", "nbap.DCH_DeleteItem_RL_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Multiple_RL_Information_RL_ReconfRqstTDD_item,
-      { "RL-Information-RL-ReconfRqstTDD", "nbap.RL_Information_RL_ReconfRqstTDD",
+      { "RL-Information-RL-ReconfRqstTDD", "nbap.RL_Information_RL_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationResponseList_RL_ReconfRsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dCH_InformationResponseList_RL_ReconfRsp,
-      { "dCH-InformationResponseList-RL-ReconfRsp", "nbap.dCH_InformationResponseList_RL_ReconfRsp",
+      { "dCH-InformationResponseList-RL-ReconfRsp", "nbap.dCH_InformationResponseList_RL_ReconfRsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_informationList_RL_DeletionRqst_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_ReferencePowerInformationList_DL_PC_Rqst_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dl_ReferencePower,
@@ -67200,19 +67200,19 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         "DL_Power", HFILL }},
     { &hf_nbap_rL,
-      { "rL", "nbap.rL",
+      { "rL", "nbap.rL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_DM_Rqst", HFILL }},
     { &hf_nbap_rLS,
-      { "rLS", "nbap.rLS",
+      { "rLS", "nbap.rLS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_Set_DM_Rqst", HFILL }},
     { &hf_nbap_all_RL,
-      { "all-RL", "nbap.all_RL",
+      { "all-RL", "nbap.all_RL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AllRL_DM_Rqst", HFILL }},
     { &hf_nbap_all_RLS,
-      { "all-RLS", "nbap.all_RLS",
+      { "all-RLS", "nbap.all_RLS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AllRL_Set_DM_Rqst", HFILL }},
     { &hf_nbap_rL_InformationList,
@@ -67220,7 +67220,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "RL_InformationList_DM_Rqst", HFILL }},
     { &hf_nbap_RL_InformationList_DM_Rqst_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PUSCH_Info_DM_Rqst_item,
@@ -67240,23 +67240,23 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_Set_InformationList_DM_Rqst_item,
-      { "RL-Set-InformationItem-DM-Rqst", "nbap.RL_Set_InformationItem_DM_Rqst",
+      { "RL-Set-InformationItem-DM-Rqst", "nbap.RL_Set_InformationItem_DM_Rqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_rL_01,
-      { "rL", "nbap.rL",
+      { "rL", "nbap.rL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_DM_Rsp", HFILL }},
     { &hf_nbap_rLS_01,
-      { "rLS", "nbap.rLS",
+      { "rLS", "nbap.rLS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_Set_DM_Rsp", HFILL }},
     { &hf_nbap_all_RL_01,
-      { "all-RL", "nbap.all_RL",
+      { "all-RL", "nbap.all_RL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_DM_Rsp", HFILL }},
     { &hf_nbap_all_RLS_01,
-      { "all-RLS", "nbap.all_RLS",
+      { "all-RLS", "nbap.all_RLS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_Set_DM_Rsp", HFILL }},
     { &hf_nbap_rL_InformationList_DM_Rsp,
@@ -67264,7 +67264,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationList_DM_Rsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dedicatedMeasurementValue,
@@ -67276,7 +67276,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Multiple_PUSCH_InfoList_DM_Rsp_item,
-      { "Multiple-PUSCH-InfoListIE-DM-Rsp", "nbap.Multiple_PUSCH_InfoListIE_DM_Rsp",
+      { "Multiple-PUSCH-InfoListIE-DM-Rsp", "nbap.Multiple_PUSCH_InfoListIE_DM_Rsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_pUSCH_ID,
@@ -67284,19 +67284,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Multiple_DedicatedMeasurementValueList_TDD_DM_Rsp_item,
-      { "Multiple-DedicatedMeasurementValueItem-TDD-DM-Rsp", "nbap.Multiple_DedicatedMeasurementValueItem_TDD_DM_Rsp",
+      { "Multiple-DedicatedMeasurementValueItem-TDD-DM-Rsp", "nbap.Multiple_DedicatedMeasurementValueItem_TDD_DM_Rsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Multiple_DedicatedMeasurementValueList_LCR_TDD_DM_Rsp_item,
-      { "Multiple-DedicatedMeasurementValueItem-LCR-TDD-DM-Rsp", "nbap.Multiple_DedicatedMeasurementValueItem_LCR_TDD_DM_Rsp",
+      { "Multiple-DedicatedMeasurementValueItem-LCR-TDD-DM-Rsp", "nbap.Multiple_DedicatedMeasurementValueItem_LCR_TDD_DM_Rsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Multiple_HSSICHMeasurementValueList_TDD_DM_Rsp_item,
-      { "Multiple-HSSICHMeasurementValueItem-TDD-DM-Rsp", "nbap.Multiple_HSSICHMeasurementValueItem_TDD_DM_Rsp",
+      { "Multiple-HSSICHMeasurementValueItem-TDD-DM-Rsp", "nbap.Multiple_HSSICHMeasurementValueItem_TDD_DM_Rsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Multiple_DedicatedMeasurementValueList_768_TDD_DM_Rsp_item,
-      { "Multiple-DedicatedMeasurementValueItem-768-TDD-DM-Rsp", "nbap.Multiple_DedicatedMeasurementValueItem_768_TDD_DM_Rsp",
+      { "Multiple-DedicatedMeasurementValueItem-768-TDD-DM-Rsp", "nbap.Multiple_DedicatedMeasurementValueItem_768_TDD_DM_Rsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_rL_Set_InformationList_DM_Rsp,
@@ -67304,23 +67304,23 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_Set_InformationList_DM_Rsp_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_rL_02,
-      { "rL", "nbap.rL",
+      { "rL", "nbap.rL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_DM_Rprt", HFILL }},
     { &hf_nbap_rLS_02,
-      { "rLS", "nbap.rLS",
+      { "rLS", "nbap.rLS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_Set_DM_Rprt", HFILL }},
     { &hf_nbap_all_RL_02,
-      { "all-RL", "nbap.all_RL",
+      { "all-RL", "nbap.all_RL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_DM_Rprt", HFILL }},
     { &hf_nbap_all_RLS_02,
-      { "all-RLS", "nbap.all_RLS",
+      { "all-RLS", "nbap.all_RLS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_Set_DM_Rprt", HFILL }},
     { &hf_nbap_rL_InformationList_DM_Rprt,
@@ -67328,7 +67328,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationList_DM_Rprt_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dedicatedMeasurementValueInformation,
@@ -67340,7 +67340,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Multiple_PUSCH_InfoList_DM_Rprt_item,
-      { "Multiple-PUSCH-InfoListIE-DM-Rprt", "nbap.Multiple_PUSCH_InfoListIE_DM_Rprt",
+      { "Multiple-PUSCH-InfoListIE-DM-Rprt", "nbap.Multiple_PUSCH_InfoListIE_DM_Rprt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_rL_Set_InformationList_DM_Rprt,
@@ -67348,19 +67348,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_Set_InformationList_DM_Rprt_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_rL_03,
-      { "rL", "nbap.rL",
+      { "rL", "nbap.rL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_RL_FailureInd", HFILL }},
     { &hf_nbap_rL_Set,
-      { "rL-Set", "nbap.rL_Set",
+      { "rL-Set", "nbap.rL_Set_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_Set_RL_FailureInd", HFILL }},
     { &hf_nbap_cCTrCH,
-      { "cCTrCH", "nbap.cCTrCH",
+      { "cCTrCH", "nbap.cCTrCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CCTrCH_RL_FailureInd", HFILL }},
     { &hf_nbap_rL_InformationList_RL_FailureInd,
@@ -67368,7 +67368,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationList_RL_FailureInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_rL_Set_InformationList_RL_FailureInd,
@@ -67376,7 +67376,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_Set_InformationList_RL_FailureInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_cCTrCH_InformationList_RL_FailureInd,
@@ -67384,23 +67384,23 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CCTrCH_InformationList_RL_FailureInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationList_RL_PreemptRequiredInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_rL_04,
-      { "rL", "nbap.rL",
+      { "rL", "nbap.rL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_RL_RestoreInd", HFILL }},
     { &hf_nbap_rL_Set_01,
-      { "rL-Set", "nbap.rL_Set",
+      { "rL-Set", "nbap.rL_Set_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_Set_RL_RestoreInd", HFILL }},
     { &hf_nbap_cCTrCH_01,
-      { "cCTrCH", "nbap.cCTrCH",
+      { "cCTrCH", "nbap.cCTrCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CCTrCH_RL_RestoreInd", HFILL }},
     { &hf_nbap_rL_InformationList_RL_RestoreInd,
@@ -67408,7 +67408,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_InformationList_RL_RestoreInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_rL_Set_InformationList_RL_RestoreInd,
@@ -67416,7 +67416,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_RL_Set_InformationList_RL_RestoreInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_cCTrCH_InformationList_RL_RestoreInd,
@@ -67424,7 +67424,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CCTrCH_InformationList_RL_RestoreInd_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_privateIEs,
@@ -67432,7 +67432,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "PrivateIE_Container", HFILL }},
     { &hf_nbap_HSDPA_And_EDCH_CellPortion_InformationList_PSCH_ReconfRqst_item,
-      { "HSDPA-And-EDCH-CellPortion-InformationItem-PSCH-ReconfRqst", "nbap.HSDPA_And_EDCH_CellPortion_InformationItem_PSCH_ReconfRqst",
+      { "HSDPA-And-EDCH-CellPortion-InformationItem-PSCH-ReconfRqst", "nbap.HSDPA_And_EDCH_CellPortion_InformationItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_PDSCH_HS_SCCH_ScramblingCode_PSCH_ReconfRqst,
@@ -67440,7 +67440,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "DL_ScramblingCode", HFILL }},
     { &hf_nbap_hS_PDSCH_FDD_Code_Information_PSCH_ReconfRqst,
-      { "hS-PDSCH-FDD-Code-Information-PSCH-ReconfRqst", "nbap.hS_PDSCH_FDD_Code_Information_PSCH_ReconfRqst",
+      { "hS-PDSCH-FDD-Code-Information-PSCH-ReconfRqst", "nbap.hS_PDSCH_FDD_Code_Information_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_PDSCH_FDD_Code_Information", HFILL }},
     { &hf_nbap_hS_SCCH_FDD_Code_Information_PSCH_ReconfRqst,
@@ -67460,7 +67460,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_E_RGCH_E_HICH_FDD_Code_Information_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_PDSCHSets_AddList_PSCH_ReconfRqst_item,
-      { "PDSCHSets-AddItem-PSCH-ReconfRqst", "nbap.PDSCHSets_AddItem_PSCH_ReconfRqst",
+      { "PDSCHSets-AddItem-PSCH-ReconfRqst", "nbap.PDSCHSets_AddItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_pDSCHSet_ID,
@@ -67468,7 +67468,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_pDSCH_InformationList,
-      { "pDSCH-InformationList", "nbap.pDSCH_InformationList",
+      { "pDSCH-InformationList", "nbap.pDSCH_InformationList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PDSCH_Information_AddList_PSCH_ReconfRqst", HFILL }},
     { &hf_nbap_dL_Timeslot_InformationAddList_PSCH_ReconfRqst,
@@ -67476,7 +67476,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_Timeslot_InformationAddList_PSCH_ReconfRqst_item,
-      { "DL-Timeslot-InformationAddItem-PSCH-ReconfRqst", "nbap.DL_Timeslot_InformationAddItem_PSCH_ReconfRqst",
+      { "DL-Timeslot-InformationAddItem-PSCH-ReconfRqst", "nbap.DL_Timeslot_InformationAddItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dL_Code_InformationAddList_PSCH_ReconfRqst,
@@ -67484,7 +67484,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_Code_InformationAddList_PSCH_ReconfRqst_item,
-      { "DL-Code-InformationAddItem-PSCH-ReconfRqst", "nbap.DL_Code_InformationAddItem_PSCH_ReconfRqst",
+      { "DL-Code-InformationAddItem-PSCH-ReconfRqst", "nbap.DL_Code_InformationAddItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_pDSCH_ID,
@@ -67496,7 +67496,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_Timeslot_InformationAddList_LCR_PSCH_ReconfRqst_item,
-      { "DL-Timeslot-InformationAddItem-LCR-PSCH-ReconfRqst", "nbap.DL_Timeslot_InformationAddItem_LCR_PSCH_ReconfRqst",
+      { "DL-Timeslot-InformationAddItem-LCR-PSCH-ReconfRqst", "nbap.DL_Timeslot_InformationAddItem_LCR_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dL_Code_InformationAddList_LCR_PSCH_ReconfRqst,
@@ -67504,7 +67504,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_Code_InformationAddList_LCR_PSCH_ReconfRqst_item,
-      { "DL-Code-InformationAddItem-LCR-PSCH-ReconfRqst", "nbap.DL_Code_InformationAddItem_LCR_PSCH_ReconfRqst",
+      { "DL-Code-InformationAddItem-LCR-PSCH-ReconfRqst", "nbap.DL_Code_InformationAddItem_LCR_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dL_Timeslot_InformationAddList_768_PSCH_ReconfRqst,
@@ -67512,7 +67512,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_Timeslot_InformationAddList_768_PSCH_ReconfRqst_item,
-      { "DL-Timeslot-InformationAddItem-768-PSCH-ReconfRqst", "nbap.DL_Timeslot_InformationAddItem_768_PSCH_ReconfRqst",
+      { "DL-Timeslot-InformationAddItem-768-PSCH-ReconfRqst", "nbap.DL_Timeslot_InformationAddItem_768_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dL_Code_InformationAddList_768_PSCH_ReconfRqst,
@@ -67520,7 +67520,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_Code_InformationAddList_768_PSCH_ReconfRqst_item,
-      { "DL-Code-InformationAddItem-768-PSCH-ReconfRqst", "nbap.DL_Code_InformationAddItem_768_PSCH_ReconfRqst",
+      { "DL-Code-InformationAddItem-768-PSCH-ReconfRqst", "nbap.DL_Code_InformationAddItem_768_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_pDSCH_ID768,
@@ -67528,11 +67528,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PDSCHSets_ModifyList_PSCH_ReconfRqst_item,
-      { "PDSCHSets-ModifyItem-PSCH-ReconfRqst", "nbap.PDSCHSets_ModifyItem_PSCH_ReconfRqst",
+      { "PDSCHSets-ModifyItem-PSCH-ReconfRqst", "nbap.PDSCHSets_ModifyItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_pDSCH_InformationList_01,
-      { "pDSCH-InformationList", "nbap.pDSCH_InformationList",
+      { "pDSCH-InformationList", "nbap.pDSCH_InformationList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PDSCH_Information_ModifyList_PSCH_ReconfRqst", HFILL }},
     { &hf_nbap_dL_Timeslot_InformationModifyList_PSCH_ReconfRqst,
@@ -67540,7 +67540,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_Timeslot_InformationModifyList_PSCH_ReconfRqst_item,
-      { "DL-Timeslot-InformationModifyItem-PSCH-ReconfRqst", "nbap.DL_Timeslot_InformationModifyItem_PSCH_ReconfRqst",
+      { "DL-Timeslot-InformationModifyItem-PSCH-ReconfRqst", "nbap.DL_Timeslot_InformationModifyItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dL_Code_InformationModifyList_PSCH_ReconfRqst,
@@ -67548,7 +67548,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_Code_InformationModifyList_PSCH_ReconfRqst_item,
-      { "DL-Code-InformationModifyItem-PSCH-ReconfRqst", "nbap.DL_Code_InformationModifyItem_PSCH_ReconfRqst",
+      { "DL-Code-InformationModifyItem-PSCH-ReconfRqst", "nbap.DL_Code_InformationModifyItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dL_Timeslot_LCR_InformationModifyList_PSCH_ReconfRqst,
@@ -67556,7 +67556,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_Timeslot_LCR_InformationModifyList_PSCH_ReconfRqst_item,
-      { "DL-Timeslot-LCR-InformationModifyItem-PSCH-ReconfRqst", "nbap.DL_Timeslot_LCR_InformationModifyItem_PSCH_ReconfRqst",
+      { "DL-Timeslot-LCR-InformationModifyItem-PSCH-ReconfRqst", "nbap.DL_Timeslot_LCR_InformationModifyItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dL_Code_LCR_InformationModifyList_PSCH_ReconfRqst,
@@ -67564,7 +67564,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_Code_LCR_InformationModifyList_PSCH_ReconfRqst_item,
-      { "DL-Code-LCR-InformationModifyItem-PSCH-ReconfRqst", "nbap.DL_Code_LCR_InformationModifyItem_PSCH_ReconfRqst",
+      { "DL-Code-LCR-InformationModifyItem-PSCH-ReconfRqst", "nbap.DL_Code_LCR_InformationModifyItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dL_Timeslot_768_InformationModifyList_PSCH_ReconfRqst,
@@ -67572,7 +67572,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_Timeslot_768_InformationModifyList_PSCH_ReconfRqst_item,
-      { "DL-Timeslot-768-InformationModifyItem-PSCH-ReconfRqst", "nbap.DL_Timeslot_768_InformationModifyItem_PSCH_ReconfRqst",
+      { "DL-Timeslot-768-InformationModifyItem-PSCH-ReconfRqst", "nbap.DL_Timeslot_768_InformationModifyItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dL_Code_768_InformationModifyList_PSCH_ReconfRqst,
@@ -67580,15 +67580,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_Code_768_InformationModifyList_PSCH_ReconfRqst_item,
-      { "DL-Code-768-InformationModifyItem-PSCH-ReconfRqst", "nbap.DL_Code_768_InformationModifyItem_PSCH_ReconfRqst",
+      { "DL-Code-768-InformationModifyItem-PSCH-ReconfRqst", "nbap.DL_Code_768_InformationModifyItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PDSCHSets_DeleteList_PSCH_ReconfRqst_item,
-      { "PDSCHSets-DeleteItem-PSCH-ReconfRqst", "nbap.PDSCHSets_DeleteItem_PSCH_ReconfRqst",
+      { "PDSCHSets-DeleteItem-PSCH-ReconfRqst", "nbap.PDSCHSets_DeleteItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PUSCHSets_AddList_PSCH_ReconfRqst_item,
-      { "PUSCHSets-AddItem-PSCH-ReconfRqst", "nbap.PUSCHSets_AddItem_PSCH_ReconfRqst",
+      { "PUSCHSets-AddItem-PSCH-ReconfRqst", "nbap.PUSCHSets_AddItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_pUSCHSet_ID,
@@ -67596,7 +67596,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_pUSCH_InformationList,
-      { "pUSCH-InformationList", "nbap.pUSCH_InformationList",
+      { "pUSCH-InformationList", "nbap.pUSCH_InformationList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PUSCH_Information_AddList_PSCH_ReconfRqst", HFILL }},
     { &hf_nbap_uL_Timeslot_InformationAddList_PSCH_ReconfRqst,
@@ -67604,7 +67604,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_Timeslot_InformationAddList_PSCH_ReconfRqst_item,
-      { "UL-Timeslot-InformationAddItem-PSCH-ReconfRqst", "nbap.UL_Timeslot_InformationAddItem_PSCH_ReconfRqst",
+      { "UL-Timeslot-InformationAddItem-PSCH-ReconfRqst", "nbap.UL_Timeslot_InformationAddItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uL_Code_InformationAddList_PSCH_ReconfRqst,
@@ -67612,7 +67612,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_Code_InformationAddList_PSCH_ReconfRqst_item,
-      { "UL-Code-InformationAddItem-PSCH-ReconfRqst", "nbap.UL_Code_InformationAddItem_PSCH_ReconfRqst",
+      { "UL-Code-InformationAddItem-PSCH-ReconfRqst", "nbap.UL_Code_InformationAddItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uL_Timeslot_InformationAddList_LCR_PSCH_ReconfRqst,
@@ -67620,7 +67620,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_Timeslot_InformationAddList_LCR_PSCH_ReconfRqst_item,
-      { "UL-Timeslot-InformationAddItem-LCR-PSCH-ReconfRqst", "nbap.UL_Timeslot_InformationAddItem_LCR_PSCH_ReconfRqst",
+      { "UL-Timeslot-InformationAddItem-LCR-PSCH-ReconfRqst", "nbap.UL_Timeslot_InformationAddItem_LCR_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uL_Code_InformationAddList_LCR_PSCH_ReconfRqst,
@@ -67628,7 +67628,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_Code_InformationAddList_LCR_PSCH_ReconfRqst_item,
-      { "UL-Code-InformationAddItem-LCR-PSCH-ReconfRqst", "nbap.UL_Code_InformationAddItem_LCR_PSCH_ReconfRqst",
+      { "UL-Code-InformationAddItem-LCR-PSCH-ReconfRqst", "nbap.UL_Code_InformationAddItem_LCR_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uL_Timeslot_InformationAddList_768_PSCH_ReconfRqst,
@@ -67636,7 +67636,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_Timeslot_InformationAddList_768_PSCH_ReconfRqst_item,
-      { "UL-Timeslot-InformationAddItem-768-PSCH-ReconfRqst", "nbap.UL_Timeslot_InformationAddItem_768_PSCH_ReconfRqst",
+      { "UL-Timeslot-InformationAddItem-768-PSCH-ReconfRqst", "nbap.UL_Timeslot_InformationAddItem_768_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uL_Code_InformationAddList_768_PSCH_ReconfRqst,
@@ -67644,15 +67644,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_Code_InformationAddList_768_PSCH_ReconfRqst_item,
-      { "UL-Code-InformationAddItem-768-PSCH-ReconfRqst", "nbap.UL_Code_InformationAddItem_768_PSCH_ReconfRqst",
+      { "UL-Code-InformationAddItem-768-PSCH-ReconfRqst", "nbap.UL_Code_InformationAddItem_768_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PUSCHSets_ModifyList_PSCH_ReconfRqst_item,
-      { "PUSCHSets-ModifyItem-PSCH-ReconfRqst", "nbap.PUSCHSets_ModifyItem_PSCH_ReconfRqst",
+      { "PUSCHSets-ModifyItem-PSCH-ReconfRqst", "nbap.PUSCHSets_ModifyItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_pUSCH_InformationList_01,
-      { "pUSCH-InformationList", "nbap.pUSCH_InformationList",
+      { "pUSCH-InformationList", "nbap.pUSCH_InformationList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PUSCH_Information_ModifyList_PSCH_ReconfRqst", HFILL }},
     { &hf_nbap_uL_Timeslot_InformationModifyList_PSCH_ReconfRqst,
@@ -67660,7 +67660,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_Timeslot_InformationModifyList_PSCH_ReconfRqst_item,
-      { "UL-Timeslot-InformationModifyItem-PSCH-ReconfRqst", "nbap.UL_Timeslot_InformationModifyItem_PSCH_ReconfRqst",
+      { "UL-Timeslot-InformationModifyItem-PSCH-ReconfRqst", "nbap.UL_Timeslot_InformationModifyItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uL_Code_InformationModifyList_PSCH_ReconfRqst,
@@ -67668,7 +67668,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_Code_InformationModifyList_PSCH_ReconfRqst_item,
-      { "UL-Code-InformationModifyItem-PSCH-ReconfRqst", "nbap.UL_Code_InformationModifyItem_PSCH_ReconfRqst",
+      { "UL-Code-InformationModifyItem-PSCH-ReconfRqst", "nbap.UL_Code_InformationModifyItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uL_Timeslot_InformationModifyList_LCR_PSCH_ReconfRqst,
@@ -67676,7 +67676,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "UL_Timeslot_LCR_InformationModifyList_PSCH_ReconfRqst", HFILL }},
     { &hf_nbap_UL_Timeslot_LCR_InformationModifyList_PSCH_ReconfRqst_item,
-      { "UL-Timeslot-LCR-InformationModifyItem-PSCH-ReconfRqst", "nbap.UL_Timeslot_LCR_InformationModifyItem_PSCH_ReconfRqst",
+      { "UL-Timeslot-LCR-InformationModifyItem-PSCH-ReconfRqst", "nbap.UL_Timeslot_LCR_InformationModifyItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uL_Code_LCR_InformationModifyList_PSCH_ReconfRqst,
@@ -67684,7 +67684,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_Code_LCR_InformationModifyList_PSCH_ReconfRqst_item,
-      { "UL-Code-LCR-InformationModifyItem-PSCH-ReconfRqst", "nbap.UL_Code_LCR_InformationModifyItem_PSCH_ReconfRqst",
+      { "UL-Code-LCR-InformationModifyItem-PSCH-ReconfRqst", "nbap.UL_Code_LCR_InformationModifyItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uL_Timeslot_InformationModifyList_768_PSCH_ReconfRqst,
@@ -67692,7 +67692,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "UL_Timeslot_768_InformationModifyList_PSCH_ReconfRqst", HFILL }},
     { &hf_nbap_UL_Timeslot_768_InformationModifyList_PSCH_ReconfRqst_item,
-      { "UL-Timeslot-768-InformationModifyItem-PSCH-ReconfRqst", "nbap.UL_Timeslot_768_InformationModifyItem_PSCH_ReconfRqst",
+      { "UL-Timeslot-768-InformationModifyItem-PSCH-ReconfRqst", "nbap.UL_Timeslot_768_InformationModifyItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_uL_Code_768_InformationModifyList_PSCH_ReconfRqst,
@@ -67700,11 +67700,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UL_Code_768_InformationModifyList_PSCH_ReconfRqst_item,
-      { "UL-Code-768-InformationModifyItem-PSCH-ReconfRqst", "nbap.UL_Code_768_InformationModifyItem_PSCH_ReconfRqst",
+      { "UL-Code-768-InformationModifyItem-PSCH-ReconfRqst", "nbap.UL_Code_768_InformationModifyItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_PUSCHSets_DeleteList_PSCH_ReconfRqst_item,
-      { "PUSCHSets-DeleteItem-PSCH-ReconfRqst", "nbap.PUSCHSets_DeleteItem_PSCH_ReconfRqst",
+      { "PUSCHSets-DeleteItem-PSCH-ReconfRqst", "nbap.PUSCHSets_DeleteItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dL_HS_PDSCH_Timeslot_Information_PSCH_ReconfRqst,
@@ -67712,7 +67712,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_HS_PDSCH_Timeslot_Information_PSCH_ReconfRqst_item,
-      { "DL-HS-PDSCH-Timeslot-InformationItem-PSCH-ReconfRqst", "nbap.DL_HS_PDSCH_Timeslot_InformationItem_PSCH_ReconfRqst",
+      { "DL-HS-PDSCH-Timeslot-InformationItem-PSCH-ReconfRqst", "nbap.DL_HS_PDSCH_Timeslot_InformationItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dl_HS_PDSCH_Codelist_PSCH_ReconfRqst,
@@ -67724,7 +67724,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &nbap_TDD_ChannelisationCode_vals_ext, 0,
         NULL, HFILL }},
     { &hf_nbap_DL_HS_PDSCH_Timeslot_Information_768_PSCH_ReconfRqst_item,
-      { "DL-HS-PDSCH-Timeslot-InformationItem-768-PSCH-ReconfRqst", "nbap.DL_HS_PDSCH_Timeslot_InformationItem_768_PSCH_ReconfRqst",
+      { "DL-HS-PDSCH-Timeslot-InformationItem-768-PSCH-ReconfRqst", "nbap.DL_HS_PDSCH_Timeslot_InformationItem_768_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_dl_HS_PDSCH_Codelist_768_PSCH_ReconfRqst,
@@ -67736,7 +67736,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &nbap_TDD_ChannelisationCode768_vals_ext, 0,
         NULL, HFILL }},
     { &hf_nbap_MultipleFreq_DL_HS_PDSCH_Timeslot_Information_LCR_PSCH_ReconfRqst_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_SCCH_Information_PSCH_ReconfRqst,
@@ -67748,7 +67748,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HS_SCCH_Information_PSCH_ReconfRqst_item,
-      { "HS-SCCH-InformationItem-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationItem_PSCH_ReconfRqst",
+      { "HS-SCCH-InformationItem-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_SCCH_ID,
@@ -67760,27 +67760,27 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         "DL_Power", HFILL }},
     { &hf_nbap_hS_SICH_Information,
-      { "hS-SICH-Information", "nbap.hS_SICH_Information",
+      { "hS-SICH-Information", "nbap.hS_SICH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_SICH_Information_PSCH_ReconfRqst", HFILL }},
     { &hf_nbap_HS_SCCH_Information_LCR_PSCH_ReconfRqst_item,
-      { "HS-SCCH-InformationItem-LCR-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationItem_LCR_PSCH_ReconfRqst",
+      { "HS-SCCH-InformationItem-LCR-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationItem_LCR_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_SICH_Information_LCR,
-      { "hS-SICH-Information-LCR", "nbap.hS_SICH_Information_LCR",
+      { "hS-SICH-Information-LCR", "nbap.hS_SICH_Information_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_SICH_Information_LCR_PSCH_ReconfRqst", HFILL }},
     { &hf_nbap_HS_SCCH_Information_768_PSCH_ReconfRqst_item,
-      { "HS-SCCH-InformationItem-768-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationItem_768_PSCH_ReconfRqst",
+      { "HS-SCCH-InformationItem-768-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationItem_768_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_SICH_Information_768,
-      { "hS-SICH-Information-768", "nbap.hS_SICH_Information_768",
+      { "hS-SICH-Information-768", "nbap.hS_SICH_Information_768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_SICH_Information_768_PSCH_ReconfRqst", HFILL }},
     { &hf_nbap_HS_SCCH_InformationExt_LCR_PSCH_ReconfRqst_item,
-      { "HS-SCCH-InformationItem-LCR-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationItem_LCR_PSCH_ReconfRqst",
+      { "HS-SCCH-InformationItem-LCR-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationItem_LCR_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_SCCH_InformationModify_PSCH_ReconfRqst,
@@ -67792,35 +67792,35 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_SICH_Information_01,
-      { "hS-SICH-Information", "nbap.hS_SICH_Information",
+      { "hS-SICH-Information", "nbap.hS_SICH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_SICH_InformationModify_PSCH_ReconfRqst", HFILL }},
     { &hf_nbap_HS_SCCH_InformationModify_LCR_PSCH_ReconfRqst_item,
-      { "HS-SCCH-InformationModifyItem-LCR-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationModifyItem_LCR_PSCH_ReconfRqst",
+      { "HS-SCCH-InformationModifyItem-LCR-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationModifyItem_LCR_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_SICH_Information_LCR_01,
-      { "hS-SICH-Information-LCR", "nbap.hS_SICH_Information_LCR",
+      { "hS-SICH-Information-LCR", "nbap.hS_SICH_Information_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_SICH_InformationModify_LCR_PSCH_ReconfRqst", HFILL }},
     { &hf_nbap_HS_SCCH_InformationModifyExt_LCR_PSCH_ReconfRqst_item,
-      { "HS-SCCH-InformationModifyItem-LCR-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationModifyItem_LCR_PSCH_ReconfRqst",
+      { "HS-SCCH-InformationModifyItem-LCR-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationModifyItem_LCR_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HS_SCCH_InformationModify_768_PSCH_ReconfRqst_item,
-      { "HS-SCCH-InformationModifyItem-768-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationModifyItem_768_PSCH_ReconfRqst",
+      { "HS-SCCH-InformationModifyItem-768-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationModifyItem_768_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_SICH_Information_768_01,
-      { "hS-SICH-Information-768", "nbap.hS_SICH_Information_768",
+      { "hS-SICH-Information-768", "nbap.hS_SICH_Information_768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_SICH_InformationModify_768_PSCH_ReconfRqst", HFILL }},
     { &hf_nbap_HS_SCCH_InformationModify_PSCH_ReconfRqst_item,
-      { "HS-SCCH-InformationModifyItem-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationModifyItem_PSCH_ReconfRqst",
+      { "HS-SCCH-InformationModifyItem-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationModifyItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Delete_From_HS_SCCH_Resource_Pool_PSCH_ReconfRqst_item,
-      { "Delete-From-HS-SCCH-Resource-PoolItem-PSCH-ReconfRqst", "nbap.Delete_From_HS_SCCH_Resource_PoolItem_PSCH_ReconfRqst",
+      { "Delete-From-HS-SCCH-Resource-PoolItem-PSCH-ReconfRqst", "nbap.Delete_From_HS_SCCH_Resource_PoolItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_lTGI_Presence,
@@ -67844,7 +67844,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_AGCH_Information_PSCH_ReconfRqst_item,
-      { "E-AGCH-InformationItem-PSCH-ReconfRqst", "nbap.E_AGCH_InformationItem_PSCH_ReconfRqst",
+      { "E-AGCH-InformationItem-PSCH-ReconfRqst", "nbap.E_AGCH_InformationItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_AGCH_MaxPower,
@@ -67856,11 +67856,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_AGCH_InformationModify_PSCH_ReconfRqst_item,
-      { "E-AGCH-InformationModifyItem-PSCH-ReconfRqst", "nbap.E_AGCH_InformationModifyItem_PSCH_ReconfRqst",
+      { "E-AGCH-InformationModifyItem-PSCH-ReconfRqst", "nbap.E_AGCH_InformationModifyItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Delete_From_E_AGCH_Resource_Pool_PSCH_ReconfRqst_item,
-      { "Delete-From-E-AGCH-Resource-PoolItem-PSCH-ReconfRqst", "nbap.Delete_From_E_AGCH_Resource_PoolItem_PSCH_ReconfRqst",
+      { "Delete-From-E-AGCH-Resource-PoolItem-PSCH-ReconfRqst", "nbap.Delete_From_E_AGCH_Resource_PoolItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_HICH_MaxPower,
@@ -67872,7 +67872,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_AGCH_Information_768_PSCH_ReconfRqst_item,
-      { "E-AGCH-InformationItem-768-PSCH-ReconfRqst", "nbap.E_AGCH_InformationItem_768_PSCH_ReconfRqst",
+      { "E-AGCH-InformationItem-768-PSCH-ReconfRqst", "nbap.E_AGCH_InformationItem_768_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_AGCH_InformationModify_768_PSCH_ReconfRqst,
@@ -67880,7 +67880,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_AGCH_InformationModify_768_PSCH_ReconfRqst_item,
-      { "E-AGCH-InformationModifyItem-768-PSCH-ReconfRqst", "nbap.E_AGCH_InformationModifyItem_768_PSCH_ReconfRqst",
+      { "E-AGCH-InformationModifyItem-768-PSCH-ReconfRqst", "nbap.E_AGCH_InformationModifyItem_768_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_PUCH_Timeslot_InfoLCR,
@@ -67888,7 +67888,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_PUCH_Timeslot_InfoLCR_item,
-      { "E-PUCH-Timeslot-Item-InfoLCR", "nbap.E_PUCH_Timeslot_Item_InfoLCR",
+      { "E-PUCH-Timeslot-Item-InfoLCR", "nbap.E_PUCH_Timeslot_Item_InfoLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_PUCH_Codelist_LCR,
@@ -67904,7 +67904,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_AGCH_Information_LCR_PSCH_ReconfRqst_item,
-      { "E-AGCH-InformationItem-LCR-PSCH-ReconfRqst", "nbap.E_AGCH_InformationItem_LCR_PSCH_ReconfRqst",
+      { "E-AGCH-InformationItem-LCR-PSCH-ReconfRqst", "nbap.E_AGCH_InformationItem_LCR_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_AGCH_InformationModify_LCR_PSCH_ReconfRqst,
@@ -67912,7 +67912,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_AGCH_InformationModify_LCR_PSCH_ReconfRqst_item,
-      { "E-AGCH-InformationModifyItem-LCR-PSCH-ReconfRqst", "nbap.E_AGCH_InformationModifyItem_LCR_PSCH_ReconfRqst",
+      { "E-AGCH-InformationModifyItem-LCR-PSCH-ReconfRqst", "nbap.E_AGCH_InformationModifyItem_LCR_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_HICH_Information_LCR_PSCH_ReconfRqst,
@@ -67920,7 +67920,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_HICH_Information_LCR_PSCH_ReconfRqst_item,
-      { "E-HICH-InformationItem-LCR-PSCH-ReconfRqst", "nbap.E_HICH_InformationItem_LCR_PSCH_ReconfRqst",
+      { "E-HICH-InformationItem-LCR-PSCH-ReconfRqst", "nbap.E_HICH_InformationItem_LCR_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_HICH_Type,
@@ -67932,11 +67932,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_HICH_InformationModify_LCR_PSCH_ReconfRqst_item,
-      { "E-HICH-InformationModifyItem-LCR-PSCH-ReconfRqst", "nbap.E_HICH_InformationModifyItem_LCR_PSCH_ReconfRqst",
+      { "E-HICH-InformationModifyItem-LCR-PSCH-ReconfRqst", "nbap.E_HICH_InformationModifyItem_LCR_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Delete_From_E_HICH_Resource_Pool_PSCH_ReconfRqst_item,
-      { "Delete-From-E-HICH-Resource-PoolItem-PSCH-ReconfRqst", "nbap.Delete_From_E_HICH_Resource_PoolItem_PSCH_ReconfRqst",
+      { "Delete-From-E-HICH-Resource-PoolItem-PSCH-ReconfRqst", "nbap.Delete_From_E_HICH_Resource_PoolItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_eRUCCH_SYNC_UL_codes_bitmap,
@@ -67944,15 +67944,15 @@ void proto_register_nbap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_Delete_From_HS_SCCH_Resource_PoolExt_PSCH_ReconfRqst_item,
-      { "Delete-From-HS-SCCH-Resource-PoolItem-PSCH-ReconfRqst", "nbap.Delete_From_HS_SCCH_Resource_PoolItem_PSCH_ReconfRqst",
+      { "Delete-From-HS-SCCH-Resource-PoolItem-PSCH-ReconfRqst", "nbap.Delete_From_HS_SCCH_Resource_PoolItem_PSCH_ReconfRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_MultipleFreq_E_PUCH_Timeslot_InformationList_LCR_PSCH_ReconfRqst_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Max_RTWP_perUARFCN_Information_LCR_PSCH_ReconfRqst_item,
-      { "Max-RTWP-perUARFCN-Information-LCR-PSCH-ReconfRqst-Item", "nbap.Max_RTWP_perUARFCN_Information_LCR_PSCH_ReconfRqst_Item",
+      { "Max-RTWP-perUARFCN-Information-LCR-PSCH-ReconfRqst-Item", "nbap.Max_RTWP_perUARFCN_Information_LCR_PSCH_ReconfRqst_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_maximum_Target_ReceivedTotalWideBandPower_LCR,
@@ -67960,7 +67960,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_HICH_TimeOffset_ExtensionLCR_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_e_HICH_TimeOffsetLCR,
@@ -67968,15 +67968,15 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_generalCause_05,
-      { "generalCause", "nbap.generalCause",
+      { "generalCause", "nbap.generalCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GeneralCauseList_PSCH_ReconfFailure", HFILL }},
     { &hf_nbap_setSpecificCause,
-      { "setSpecificCause", "nbap.setSpecificCause",
+      { "setSpecificCause", "nbap.setSpecificCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SetSpecificCauseList_PSCH_ReconfFailureTDD", HFILL }},
     { &hf_nbap_extension_CauseLevel_PSCH_ReconfFailure,
-      { "extension-CauseLevel-PSCH-ReconfFailure", "nbap.extension_CauseLevel_PSCH_ReconfFailure",
+      { "extension-CauseLevel-PSCH-ReconfFailure", "nbap.extension_CauseLevel_PSCH_ReconfFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_unsuccessful_PDSCHSetList_PSCH_ReconfFailureTDD,
@@ -67988,23 +67988,23 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Unsuccessful_PDSCHSetList_PSCH_ReconfFailureTDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Unsuccessful_PUSCHSetList_PSCH_ReconfFailureTDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_UARFCNSpecificCauseList_PSCH_ReconfFailureTDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_HICH_TimeOffset_ReconfFailureTDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hSDSCH_Common_System_Information_ResponseLCR,
-      { "hSDSCH-Common-System-Information-ResponseLCR", "nbap.hSDSCH_Common_System_Information_ResponseLCR",
+      { "hSDSCH-Common-System-Information-ResponseLCR", "nbap.hSDSCH_Common_System_Information_ResponseLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hSDSCH_Paging_System_Information_ResponseLCR,
@@ -68012,19 +68012,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_common_EDCH_System_Information_ResponseLCR,
-      { "common-EDCH-System-Information-ResponseLCR", "nbap.common_EDCH_System_Information_ResponseLCR",
+      { "common-EDCH-System-Information-ResponseLCR", "nbap.common_EDCH_System_Information_ResponseLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_communicationContext,
-      { "communicationContext", "nbap.communicationContext",
+      { "communicationContext", "nbap.communicationContext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CommunicationContextList_Reset", HFILL }},
     { &hf_nbap_communicationControlPort,
-      { "communicationControlPort", "nbap.communicationControlPort",
+      { "communicationControlPort", "nbap.communicationControlPort_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CommunicationControlPortList_Reset", HFILL }},
     { &hf_nbap_nodeB,
-      { "nodeB", "nbap.nodeB",
+      { "nodeB", "nbap.nodeB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_communicationContextInfoList_Reset,
@@ -68032,7 +68032,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommunicationContextInfoList_Reset_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_communicationContextType_Reset,
@@ -68048,23 +68048,23 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CommunicationControlPortInfoList_Reset_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_cell_03,
-      { "cell", "nbap.cell",
+      { "cell", "nbap.cell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Cell_InfEx_Rqst", HFILL }},
     { &hf_nbap_cell_04,
-      { "cell", "nbap.cell",
+      { "cell", "nbap.cell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Cell_InfEx_Rsp", HFILL }},
     { &hf_nbap_requestedDataValue,
-      { "requestedDataValue", "nbap.requestedDataValue",
+      { "requestedDataValue", "nbap.requestedDataValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_cell_05,
-      { "cell", "nbap.cell",
+      { "cell", "nbap.cell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Cell_Inf_Rprt", HFILL }},
     { &hf_nbap_requestedDataValueInformation,
@@ -68096,7 +68096,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_SynchronisationReportType_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_synchronisationReportCharacteristics,
-      { "synchronisationReportCharacteristics", "nbap.synchronisationReportCharacteristics",
+      { "synchronisationReportCharacteristics", "nbap.synchronisationReportCharacteristics_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_sYNCDlCodeId,
@@ -68104,7 +68104,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellSyncBurstTransReconfInfo_CellSyncReconfRqstTDD_item,
-      { "CellSyncBurstTransInfoItem-CellSyncReconfRqstTDD", "nbap.CellSyncBurstTransInfoItem_CellSyncReconfRqstTDD",
+      { "CellSyncBurstTransInfoItem-CellSyncReconfRqstTDD", "nbap.CellSyncBurstTransInfoItem_CellSyncReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_syncFrameNumberToTransmit,
@@ -68116,19 +68116,19 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         "DL_Power", HFILL }},
     { &hf_nbap_cellSyncBurstMeasInfoList_CellSyncReconfRqstTDD,
-      { "cellSyncBurstMeasInfoList-CellSyncReconfRqstTDD", "nbap.cellSyncBurstMeasInfoList_CellSyncReconfRqstTDD",
+      { "cellSyncBurstMeasInfoList-CellSyncReconfRqstTDD", "nbap.cellSyncBurstMeasInfoList_CellSyncReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_synchronisationReportType_01,
-      { "synchronisationReportType", "nbap.synchronisationReportType",
+      { "synchronisationReportType", "nbap.synchronisationReportType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SynchronisationReportTypeIE", HFILL }},
     { &hf_nbap_synchronisationReportCharacteristics_01,
-      { "synchronisationReportCharacteristics", "nbap.synchronisationReportCharacteristics",
+      { "synchronisationReportCharacteristics", "nbap.synchronisationReportCharacteristics_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SynchronisationReportCharacteristicsIE", HFILL }},
     { &hf_nbap_CellSyncBurstMeasInfoListIE_CellSyncReconfRqstTDD_item,
-      { "CellSyncBurstMeasInfoItem-CellSyncReconfRqstTDD", "nbap.CellSyncBurstMeasInfoItem_CellSyncReconfRqstTDD",
+      { "CellSyncBurstMeasInfoItem-CellSyncReconfRqstTDD", "nbap.CellSyncBurstMeasInfoItem_CellSyncReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_syncFrameNrToReceive,
@@ -68140,11 +68140,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "CellSyncBurstInfoList_CellSyncReconfRqstTDD", HFILL }},
     { &hf_nbap_CellSyncBurstInfoList_CellSyncReconfRqstTDD_item,
-      { "CellSyncBurstInfoItem-CellSyncReconfRqstTDD", "nbap.CellSyncBurstInfoItem_CellSyncReconfRqstTDD",
+      { "CellSyncBurstInfoItem-CellSyncReconfRqstTDD", "nbap.CellSyncBurstInfoItem_CellSyncReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SYNCDlCodeIdTransReconfInfoLCR_CellSyncReconfRqstTDD_item,
-      { "SYNCDlCodeIdTransReconfItemLCR-CellSyncReconfRqstTDD", "nbap.SYNCDlCodeIdTransReconfItemLCR_CellSyncReconfRqstTDD",
+      { "SYNCDlCodeIdTransReconfItemLCR-CellSyncReconfRqstTDD", "nbap.SYNCDlCodeIdTransReconfItemLCR_CellSyncReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_syncFrameNumberforTransmit,
@@ -68156,7 +68156,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "SYNCDlCodeIdMeasInfoList_CellSyncReconfRqstTDD", HFILL }},
     { &hf_nbap_SYNCDlCodeIdMeasInfoList_CellSyncReconfRqstTDD_item,
-      { "SYNCDlCodeIdMeasInfoItem-CellSyncReconfRqstTDD", "nbap.SYNCDlCodeIdMeasInfoItem_CellSyncReconfRqstTDD",
+      { "SYNCDlCodeIdMeasInfoItem-CellSyncReconfRqstTDD", "nbap.SYNCDlCodeIdMeasInfoItem_CellSyncReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_sYNCDlCodeIdInfoLCR,
@@ -68164,7 +68164,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "SYNCDlCodeIdInfoListLCR_CellSyncReconfRqstTDD", HFILL }},
     { &hf_nbap_SYNCDlCodeIdInfoListLCR_CellSyncReconfRqstTDD_item,
-      { "SYNCDlCodeIdInfoItemLCR-CellSyncReconfRqstTDD", "nbap.SYNCDlCodeIdInfoItemLCR_CellSyncReconfRqstTDD",
+      { "SYNCDlCodeIdInfoItemLCR-CellSyncReconfRqstTDD", "nbap.SYNCDlCodeIdInfoItemLCR_CellSyncReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_propagationDelayCompensation,
@@ -68172,7 +68172,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_TimingAdjustmentValueLCR_vals), 0,
         "TimingAdjustmentValueLCR", HFILL }},
     { &hf_nbap_CellAdjustmentInfo_SyncAdjustmentRqstTDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_frameAdjustmentValue,
@@ -68188,11 +68188,11 @@ void proto_register_nbap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         "DL_Power", HFILL }},
     { &hf_nbap_generalCause_06,
-      { "generalCause", "nbap.generalCause",
+      { "generalCause", "nbap.generalCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GeneralCauseList_SyncAdjustmntFailureTDD", HFILL }},
     { &hf_nbap_cellSpecificCause,
-      { "cellSpecificCause", "nbap.cellSpecificCause",
+      { "cellSpecificCause", "nbap.cellSpecificCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellSpecificCauseList_SyncAdjustmntFailureTDD", HFILL }},
     { &hf_nbap_unsuccessful_cell_InformationRespList_SyncAdjustmntFailureTDD,
@@ -68200,31 +68200,31 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Unsuccessful_cell_InformationRespList_SyncAdjustmntFailureTDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_CellSyncInfo_CellSyncReprtTDD_item,
-      { "CellSyncInfoItemIE-CellSyncReprtTDD", "nbap.CellSyncInfoItemIE_CellSyncReprtTDD",
+      { "CellSyncInfoItemIE-CellSyncReprtTDD", "nbap.CellSyncInfoItemIE_CellSyncReprtTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_c_ID_CellSyncReprtTDD,
-      { "c-ID-CellSyncReprtTDD", "nbap.c_ID_CellSyncReprtTDD",
+      { "c-ID-CellSyncReprtTDD", "nbap.c_ID_CellSyncReprtTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "C_ID_IE_CellSyncReprtTDD", HFILL }},
     { &hf_nbap_syncReportType_CellSyncReprtTDD,
-      { "syncReportType-CellSyncReprtTDD", "nbap.syncReportType_CellSyncReprtTDD",
+      { "syncReportType-CellSyncReprtTDD", "nbap.syncReportType_CellSyncReprtTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SyncReportTypeIE_CellSyncReprtTDD", HFILL }},
     { &hf_nbap_intStdPhSyncInfo_CellSyncReprtTDD,
-      { "intStdPhSyncInfo-CellSyncReprtTDD", "nbap.intStdPhSyncInfo_CellSyncReprtTDD",
+      { "intStdPhSyncInfo-CellSyncReprtTDD", "nbap.intStdPhSyncInfo_CellSyncReprtTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntStdPhCellSyncInfo_CellSyncReprtTDD", HFILL }},
     { &hf_nbap_lateEntrantCell,
-      { "lateEntrantCell", "nbap.lateEntrantCell",
+      { "lateEntrantCell", "nbap.lateEntrantCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_frequencyAcquisition,
-      { "frequencyAcquisition", "nbap.frequencyAcquisition",
+      { "frequencyAcquisition", "nbap.frequencyAcquisition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_cellSyncBurstMeasuredInfo,
@@ -68232,7 +68232,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "CellSyncBurstMeasInfoList_CellSyncReprtTDD", HFILL }},
     { &hf_nbap_CellSyncBurstMeasInfoList_CellSyncReprtTDD_item,
-      { "CellSyncBurstMeasInfoItem-CellSyncReprtTDD", "nbap.CellSyncBurstMeasInfoItem_CellSyncReprtTDD",
+      { "CellSyncBurstMeasInfoItem-CellSyncReprtTDD", "nbap.CellSyncBurstMeasInfoItem_CellSyncReprtTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_cellSyncBurstInfo_CellSyncReprtTDD,
@@ -68244,11 +68244,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_CellSyncBurstInfo_CellSyncReprtTDD_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_cellSyncBurstAvailable,
-      { "cellSyncBurstAvailable", "nbap.cellSyncBurstAvailable",
+      { "cellSyncBurstAvailable", "nbap.cellSyncBurstAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellSyncBurstAvailable_CellSyncReprtTDD", HFILL }},
     { &hf_nbap_cellSyncBurstNotAvailable,
-      { "cellSyncBurstNotAvailable", "nbap.cellSyncBurstNotAvailable",
+      { "cellSyncBurstNotAvailable", "nbap.cellSyncBurstNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_cellSyncBurstSIR,
@@ -68256,7 +68256,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_SyncDLCodeIdsMeasInfoList_CellSyncReprtTDD_item,
-      { "SyncDLCodeIdsMeasInfoItem-CellSyncReprtTDD", "nbap.SyncDLCodeIdsMeasInfoItem_CellSyncReprtTDD",
+      { "SyncDLCodeIdsMeasInfoItem-CellSyncReprtTDD", "nbap.SyncDLCodeIdsMeasInfoItem_CellSyncReprtTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_syncDLCodeIdInfo_CellSyncReprtTDD,
@@ -68268,11 +68268,11 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_SyncDLCodeIdItem_CellSyncReprtTDD_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_syncDLCodeIdAvailable,
-      { "syncDLCodeIdAvailable", "nbap.syncDLCodeIdAvailable",
+      { "syncDLCodeIdAvailable", "nbap.syncDLCodeIdAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SyncDLCodeIdAvailable_CellSyncReprtTDD", HFILL }},
     { &hf_nbap_syncDLCodeIDNotAvailable,
-      { "syncDLCodeIDNotAvailable", "nbap.syncDLCodeIDNotAvailable",
+      { "syncDLCodeIDNotAvailable", "nbap.syncDLCodeIDNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_syncDLCodeIdTiming,
@@ -68284,27 +68284,27 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "CellSyncBurstSIR", HFILL }},
     { &hf_nbap_DCH_RearrangeList_Bearer_RearrangeInd_item,
-      { "DCH-RearrangeItem-Bearer-RearrangeInd", "nbap.DCH_RearrangeItem_Bearer_RearrangeInd",
+      { "DCH-RearrangeItem-Bearer-RearrangeInd", "nbap.DCH_RearrangeItem_Bearer_RearrangeInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_DSCH_RearrangeList_Bearer_RearrangeInd_item,
-      { "DSCH-RearrangeItem-Bearer-RearrangeInd", "nbap.DSCH_RearrangeItem_Bearer_RearrangeInd",
+      { "DSCH-RearrangeItem-Bearer-RearrangeInd", "nbap.DSCH_RearrangeItem_Bearer_RearrangeInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_USCH_RearrangeList_Bearer_RearrangeInd_item,
-      { "USCH-RearrangeItem-Bearer-RearrangeInd", "nbap.USCH_RearrangeItem_Bearer_RearrangeInd",
+      { "USCH-RearrangeItem-Bearer-RearrangeInd", "nbap.USCH_RearrangeItem_Bearer_RearrangeInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_HSDSCH_RearrangeList_Bearer_RearrangeInd_item,
-      { "HSDSCH-RearrangeItem-Bearer-RearrangeInd", "nbap.HSDSCH_RearrangeItem_Bearer_RearrangeInd",
+      { "HSDSCH-RearrangeItem-Bearer-RearrangeInd", "nbap.HSDSCH_RearrangeItem_Bearer_RearrangeInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_E_DCH_RearrangeList_Bearer_RearrangeInd_item,
-      { "E-DCH-RearrangeItem-Bearer-RearrangeInd", "nbap.E_DCH_RearrangeItem_Bearer_RearrangeInd",
+      { "E-DCH-RearrangeItem-Bearer-RearrangeInd", "nbap.E_DCH_RearrangeItem_Bearer_RearrangeInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_EDCH_Cell_Information_Bearer_Rearrangement_List_item,
-      { "Additional-EDCH-Cell-Information-Bearer-Rearrangement-ItemIEs", "nbap.Additional_EDCH_Cell_Information_Bearer_Rearrangement_ItemIEs",
+      { "Additional-EDCH-Cell-Information-Bearer-Rearrangement-ItemIEs", "nbap.Additional_EDCH_Cell_Information_Bearer_Rearrangement_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_transport_Bearer_Rearrangement_Indicator_for_Additional_EDCH_Separate_Mode,
@@ -68312,7 +68312,7 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_Transport_Bearer_Rearrangement_Indicator_for_Additional_EDCH_Separate_Mode_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_DelayedActivationInformationList_RL_ActivationCmdFDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_delayed_activation_update,
@@ -68320,39 +68320,39 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_DelayedActivationUpdate_vals), 0,
         "DelayedActivationUpdate", HFILL }},
     { &hf_nbap_DelayedActivationInformationList_RL_ActivationCmdTDD_item,
-      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_HS_Cell_Information_RL_Param_Upd_item,
-      { "Additional-HS-Cell-Information-RL-Param-Upd-ItemIEs", "nbap.Additional_HS_Cell_Information_RL_Param_Upd_ItemIEs",
+      { "Additional-HS-Cell-Information-RL-Param-Upd-ItemIEs", "nbap.Additional_HS_Cell_Information_RL_Param_Upd_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_hS_DSCH_FDD_Secondary_Serving_Update_Information,
-      { "hS-DSCH-FDD-Secondary-Serving-Update-Information", "nbap.hS_DSCH_FDD_Secondary_Serving_Update_Information",
+      { "hS-DSCH-FDD-Secondary-Serving-Update-Information", "nbap.hS_DSCH_FDD_Secondary_Serving_Update_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_Additional_EDCH_Cell_Information_RL_Param_Upd_item,
-      { "Additional-EDCH-Cell-Information-RL-Param-Upd-ItemIEs", "nbap.Additional_EDCH_Cell_Information_RL_Param_Upd_ItemIEs",
+      { "Additional-EDCH-Cell-Information-RL-Param-Upd-ItemIEs", "nbap.Additional_EDCH_Cell_Information_RL_Param_Upd_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_additional_EDCH_FDD_Update_Information,
-      { "additional-EDCH-FDD-Update-Information", "nbap.additional_EDCH_FDD_Update_Information",
+      { "additional-EDCH-FDD-Update-Information", "nbap.additional_EDCH_FDD_Update_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_initiatingMessage,
-      { "initiatingMessage", "nbap.initiatingMessage",
+      { "initiatingMessage", "nbap.initiatingMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_succesfulOutcome,
-      { "succesfulOutcome", "nbap.succesfulOutcome",
+      { "succesfulOutcome", "nbap.succesfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SuccessfulOutcome", HFILL }},
     { &hf_nbap_unsuccesfulOutcome,
-      { "unsuccesfulOutcome", "nbap.unsuccesfulOutcome",
+      { "unsuccesfulOutcome", "nbap.unsuccesfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UnsuccessfulOutcome", HFILL }},
     { &hf_nbap_outcome,
-      { "outcome", "nbap.outcome",
+      { "outcome", "nbap.outcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_nbap_messageDiscriminator,
@@ -68360,19 +68360,19 @@ void proto_register_nbap(void)
         FT_UINT32, BASE_DEC, VALS(nbap_MessageDiscriminator_vals), 0,
         NULL, HFILL }},
     { &hf_nbap_initiatingMessagevalue,
-      { "value", "nbap.value",
+      { "value", "nbap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InitiatingMessage_value", HFILL }},
     { &hf_nbap_successfulOutcome_value,
-      { "value", "nbap.value",
+      { "value", "nbap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SuccessfulOutcome_value", HFILL }},
     { &hf_nbap_unsuccessfulOutcome_value,
-      { "value", "nbap.value",
+      { "value", "nbap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UnsuccessfulOutcome_value", HFILL }},
     { &hf_nbap_outcome_value,
-      { "value", "nbap.value",
+      { "value", "nbap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Outcome_value", HFILL }},
     { &hf_nbap_PreambleSignatures_signature15,
diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c
index d9b7aff892..ead8860f08 100644
--- a/epan/dissectors/packet-ocsp.c
+++ b/epan/dissectors/packet-ocsp.c
@@ -705,7 +705,7 @@ void proto_register_ocsp(void) {
 /*--- Included file: packet-ocsp-hfarr.c ---*/
 #line 1 "../../asn1/ocsp/packet-ocsp-hfarr.c"
     { &hf_ocsp_BasicOCSPResponse_PDU,
-      { "BasicOCSPResponse", "ocsp.BasicOCSPResponse",
+      { "BasicOCSPResponse", "ocsp.BasicOCSPResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_ArchiveCutoff_PDU,
@@ -717,23 +717,23 @@ void proto_register_ocsp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_ServiceLocator_PDU,
-      { "ServiceLocator", "ocsp.ServiceLocator",
+      { "ServiceLocator", "ocsp.ServiceLocator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_CrlID_PDU,
-      { "CrlID", "ocsp.CrlID",
+      { "CrlID", "ocsp.CrlID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_NULL_PDU,
-      { "NULL", "ocsp.NULL",
+      { "NULL", "ocsp.NULL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_tbsRequest,
-      { "tbsRequest", "ocsp.tbsRequest",
+      { "tbsRequest", "ocsp.tbsRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_optionalSignature,
-      { "optionalSignature", "ocsp.optionalSignature",
+      { "optionalSignature", "ocsp.optionalSignature_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Signature", HFILL }},
     { &hf_ocsp_version,
@@ -749,7 +749,7 @@ void proto_register_ocsp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Request", HFILL }},
     { &hf_ocsp_requestList_item,
-      { "Request", "ocsp.Request",
+      { "Request", "ocsp.Request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_requestExtensions,
@@ -757,7 +757,7 @@ void proto_register_ocsp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Extensions", HFILL }},
     { &hf_ocsp_signatureAlgorithm,
-      { "signatureAlgorithm", "ocsp.signatureAlgorithm",
+      { "signatureAlgorithm", "ocsp.signatureAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_ocsp_signature,
@@ -769,11 +769,11 @@ void proto_register_ocsp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Certificate", HFILL }},
     { &hf_ocsp_certs_item,
-      { "Certificate", "ocsp.Certificate",
+      { "Certificate", "ocsp.Certificate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_reqCert,
-      { "reqCert", "ocsp.reqCert",
+      { "reqCert", "ocsp.reqCert_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertID", HFILL }},
     { &hf_ocsp_singleRequestExtensions,
@@ -781,7 +781,7 @@ void proto_register_ocsp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Extensions", HFILL }},
     { &hf_ocsp_hashAlgorithm,
-      { "hashAlgorithm", "ocsp.hashAlgorithm",
+      { "hashAlgorithm", "ocsp.hashAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_ocsp_issuerNameHash,
@@ -801,7 +801,7 @@ void proto_register_ocsp(void) {
         FT_UINT32, BASE_DEC, VALS(ocsp_OCSPResponseStatus_vals), 0,
         "OCSPResponseStatus", HFILL }},
     { &hf_ocsp_responseBytes,
-      { "responseBytes", "ocsp.responseBytes",
+      { "responseBytes", "ocsp.responseBytes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_responseType,
@@ -813,7 +813,7 @@ void proto_register_ocsp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_tbsResponseData,
-      { "tbsResponseData", "ocsp.tbsResponseData",
+      { "tbsResponseData", "ocsp.tbsResponseData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ResponseData", HFILL }},
     { &hf_ocsp_responderID,
@@ -829,7 +829,7 @@ void proto_register_ocsp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_SingleResponse", HFILL }},
     { &hf_ocsp_responses_item,
-      { "SingleResponse", "ocsp.SingleResponse",
+      { "SingleResponse", "ocsp.SingleResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_responseExtensions,
@@ -845,7 +845,7 @@ void proto_register_ocsp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "KeyHash", HFILL }},
     { &hf_ocsp_certID,
-      { "certID", "ocsp.certID",
+      { "certID", "ocsp.certID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_certStatus,
@@ -865,15 +865,15 @@ void proto_register_ocsp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Extensions", HFILL }},
     { &hf_ocsp_good,
-      { "good", "ocsp.good",
+      { "good", "ocsp.good_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ocsp_revoked,
-      { "revoked", "ocsp.revoked",
+      { "revoked", "ocsp.revoked_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RevokedInfo", HFILL }},
     { &hf_ocsp_unknown,
-      { "unknown", "ocsp.unknown",
+      { "unknown", "ocsp.unknown_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UnknownInfo", HFILL }},
     { &hf_ocsp_revocationTime,
diff --git a/epan/dissectors/packet-p1.c b/epan/dissectors/packet-p1.c
index 6969202cd7..e3bb442188 100644
--- a/epan/dissectors/packet-p1.c
+++ b/epan/dissectors/packet-p1.c
@@ -8444,7 +8444,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_InternalTraceInformationElement_PDU,
-      { "InternalTraceInformationElement", "p1.InternalTraceInformationElement",
+      { "InternalTraceInformationElement", "p1.InternalTraceInformationElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_TraceInformation_PDU,
@@ -8452,15 +8452,15 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_TraceInformationElement_PDU,
-      { "TraceInformationElement", "p1.TraceInformationElement",
+      { "TraceInformationElement", "p1.TraceInformationElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_MTSBindArgument_PDU,
-      { "MTSBindArgument", "p1.MTSBindArgument",
+      { "MTSBindArgument", "p1.MTSBindArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_MTSBindResult_PDU,
-      { "MTSBindResult", "p1.MTSBindResult",
+      { "MTSBindResult", "p1.MTSBindResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_PAR_mts_bind_error_PDU,
@@ -8468,51 +8468,51 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_PAR_mts_bind_error_vals), 0,
         NULL, HFILL }},
     { &hf_p1_MessageSubmissionArgument_PDU,
-      { "MessageSubmissionArgument", "p1.MessageSubmissionArgument",
+      { "MessageSubmissionArgument", "p1.MessageSubmissionArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_MessageSubmissionResult_PDU,
-      { "MessageSubmissionResult", "p1.MessageSubmissionResult",
+      { "MessageSubmissionResult", "p1.MessageSubmissionResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_ProbeSubmissionArgument_PDU,
-      { "ProbeSubmissionArgument", "p1.ProbeSubmissionArgument",
+      { "ProbeSubmissionArgument", "p1.ProbeSubmissionArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_ProbeSubmissionResult_PDU,
-      { "ProbeSubmissionResult", "p1.ProbeSubmissionResult",
+      { "ProbeSubmissionResult", "p1.ProbeSubmissionResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_CancelDeferredDeliveryArgument_PDU,
-      { "CancelDeferredDeliveryArgument", "p1.CancelDeferredDeliveryArgument",
+      { "CancelDeferredDeliveryArgument", "p1.CancelDeferredDeliveryArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_CancelDeferredDeliveryResult_PDU,
-      { "CancelDeferredDeliveryResult", "p1.CancelDeferredDeliveryResult",
+      { "CancelDeferredDeliveryResult", "p1.CancelDeferredDeliveryResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_SubmissionControlArgument_PDU,
-      { "SubmissionControlArgument", "p1.SubmissionControlArgument",
+      { "SubmissionControlArgument", "p1.SubmissionControlArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_SubmissionControlResult_PDU,
-      { "SubmissionControlResult", "p1.SubmissionControlResult",
+      { "SubmissionControlResult", "p1.SubmissionControlResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_PAR_submission_control_violated_PDU,
-      { "PAR-submission-control-violated", "p1.PAR_submission_control_violated",
+      { "PAR-submission-control-violated", "p1.PAR_submission_control_violated_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_PAR_element_of_service_not_subscribed_PDU,
-      { "PAR-element-of-service-not-subscribed", "p1.PAR_element_of_service_not_subscribed",
+      { "PAR-element-of-service-not-subscribed", "p1.PAR_element_of_service_not_subscribed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_PAR_deferred_delivery_cancellation_rejected_PDU,
-      { "PAR-deferred-delivery-cancellation-rejected", "p1.PAR_deferred_delivery_cancellation_rejected",
+      { "PAR-deferred-delivery-cancellation-rejected", "p1.PAR_deferred_delivery_cancellation_rejected_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_PAR_originator_invalid_PDU,
-      { "PAR-originator-invalid", "p1.PAR_originator_invalid",
+      { "PAR-originator-invalid", "p1.PAR_originator_invalid_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_ImproperlySpecifiedRecipients_PDU,
@@ -8520,11 +8520,11 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_PAR_message_submission_identifier_invalid_PDU,
-      { "PAR-message-submission-identifier-invalid", "p1.PAR_message_submission_identifier_invalid",
+      { "PAR-message-submission-identifier-invalid", "p1.PAR_message_submission_identifier_invalid_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_PAR_inconsistent_request_PDU,
-      { "PAR-inconsistent-request", "p1.PAR_inconsistent_request",
+      { "PAR-inconsistent-request", "p1.PAR_inconsistent_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_SecurityProblem_PDU,
@@ -8532,11 +8532,11 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_SecurityProblem_vals), 0,
         NULL, HFILL }},
     { &hf_p1_PAR_unsupported_critical_function_PDU,
-      { "PAR-unsupported-critical-function", "p1.PAR_unsupported_critical_function",
+      { "PAR-unsupported-critical-function", "p1.PAR_unsupported_critical_function_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_PAR_remote_bind_error_PDU,
-      { "PAR-remote-bind-error", "p1.PAR_remote_bind_error",
+      { "PAR-remote-bind-error", "p1.PAR_remote_bind_error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_MessageSubmissionTime_PDU,
@@ -8544,15 +8544,15 @@ void proto_register_p1(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_MessageDeliveryArgument_PDU,
-      { "MessageDeliveryArgument", "p1.MessageDeliveryArgument",
+      { "MessageDeliveryArgument", "p1.MessageDeliveryArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_MessageDeliveryResult_PDU,
-      { "MessageDeliveryResult", "p1.MessageDeliveryResult",
+      { "MessageDeliveryResult", "p1.MessageDeliveryResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_ReportDeliveryArgument_PDU,
-      { "ReportDeliveryArgument", "p1.ReportDeliveryArgument",
+      { "ReportDeliveryArgument", "p1.ReportDeliveryArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_ReportDeliveryResult_PDU,
@@ -8560,35 +8560,35 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_ReportDeliveryResult_vals), 0,
         NULL, HFILL }},
     { &hf_p1_DeliveryControlArgument_PDU,
-      { "DeliveryControlArgument", "p1.DeliveryControlArgument",
+      { "DeliveryControlArgument", "p1.DeliveryControlArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_DeliveryControlResult_PDU,
-      { "DeliveryControlResult", "p1.DeliveryControlResult",
+      { "DeliveryControlResult", "p1.DeliveryControlResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_PAR_delivery_control_violated_PDU,
-      { "PAR-delivery-control-violated", "p1.PAR_delivery_control_violated",
+      { "PAR-delivery-control-violated", "p1.PAR_delivery_control_violated_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_PAR_control_violates_registration_PDU,
-      { "PAR-control-violates-registration", "p1.PAR_control_violates_registration",
+      { "PAR-control-violates-registration", "p1.PAR_control_violates_registration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_RefusedOperation_PDU,
-      { "RefusedOperation", "p1.RefusedOperation",
+      { "RefusedOperation", "p1.RefusedOperation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_RecipientCertificate_PDU,
-      { "RecipientCertificate", "p1.RecipientCertificate",
+      { "RecipientCertificate", "p1.RecipientCertificate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_ProofOfDelivery_PDU,
-      { "ProofOfDelivery", "p1.ProofOfDelivery",
+      { "ProofOfDelivery", "p1.ProofOfDelivery_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_RegisterArgument_PDU,
-      { "RegisterArgument", "p1.RegisterArgument",
+      { "RegisterArgument", "p1.RegisterArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_RegisterResult_PDU,
@@ -8596,51 +8596,51 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_RegisterResult_vals), 0,
         NULL, HFILL }},
     { &hf_p1_ChangeCredentialsArgument_PDU,
-      { "ChangeCredentialsArgument", "p1.ChangeCredentialsArgument",
+      { "ChangeCredentialsArgument", "p1.ChangeCredentialsArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_RES_change_credentials_PDU,
-      { "RES-change-credentials", "p1.RES_change_credentials",
+      { "RES-change-credentials", "p1.RES_change_credentials_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_PAR_register_rejected_PDU,
-      { "PAR-register-rejected", "p1.PAR_register_rejected",
+      { "PAR-register-rejected", "p1.PAR_register_rejected_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_PAR_new_credentials_unacceptable_PDU,
-      { "PAR-new-credentials-unacceptable", "p1.PAR_new_credentials_unacceptable",
+      { "PAR-new-credentials-unacceptable", "p1.PAR_new_credentials_unacceptable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_PAR_old_credentials_incorrectly_specified_PDU,
-      { "PAR-old-credentials-incorrectly-specified", "p1.PAR_old_credentials_incorrectly_specified",
+      { "PAR-old-credentials-incorrectly-specified", "p1.PAR_old_credentials_incorrectly_specified_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_MessageSubmissionEnvelope_PDU,
-      { "MessageSubmissionEnvelope", "p1.MessageSubmissionEnvelope",
+      { "MessageSubmissionEnvelope", "p1.MessageSubmissionEnvelope_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_PerRecipientMessageSubmissionFields_PDU,
-      { "PerRecipientMessageSubmissionFields", "p1.PerRecipientMessageSubmissionFields",
+      { "PerRecipientMessageSubmissionFields", "p1.PerRecipientMessageSubmissionFields_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_ProbeSubmissionEnvelope_PDU,
-      { "ProbeSubmissionEnvelope", "p1.ProbeSubmissionEnvelope",
+      { "ProbeSubmissionEnvelope", "p1.ProbeSubmissionEnvelope_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_PerRecipientProbeSubmissionFields_PDU,
-      { "PerRecipientProbeSubmissionFields", "p1.PerRecipientProbeSubmissionFields",
+      { "PerRecipientProbeSubmissionFields", "p1.PerRecipientProbeSubmissionFields_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_MessageDeliveryEnvelope_PDU,
-      { "MessageDeliveryEnvelope", "p1.MessageDeliveryEnvelope",
+      { "MessageDeliveryEnvelope", "p1.MessageDeliveryEnvelope_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_ReportDeliveryEnvelope_PDU,
-      { "ReportDeliveryEnvelope", "p1.ReportDeliveryEnvelope",
+      { "ReportDeliveryEnvelope", "p1.ReportDeliveryEnvelope_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_PerRecipientReportDeliveryFields_PDU,
-      { "PerRecipientReportDeliveryFields", "p1.PerRecipientReportDeliveryFields",
+      { "PerRecipientReportDeliveryFields", "p1.PerRecipientReportDeliveryFields_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_ExtendedContentType_PDU,
@@ -8680,7 +8680,7 @@ void proto_register_p1(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_SubjectSubmissionIdentifier_PDU,
-      { "SubjectSubmissionIdentifier", "p1.SubjectSubmissionIdentifier",
+      { "SubjectSubmissionIdentifier", "p1.SubjectSubmissionIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_RecipientReassignmentProhibited_PDU,
@@ -8688,7 +8688,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_RecipientReassignmentProhibited_vals), 0,
         NULL, HFILL }},
     { &hf_p1_OriginatorRequestedAlternateRecipient_PDU,
-      { "OriginatorRequestedAlternateRecipient", "p1.OriginatorRequestedAlternateRecipient",
+      { "OriginatorRequestedAlternateRecipient", "p1.OriginatorRequestedAlternateRecipient_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_DLExpansionProhibited_PDU,
@@ -8732,7 +8732,7 @@ void proto_register_p1(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_OriginatorReturnAddress_PDU,
-      { "OriginatorReturnAddress", "p1.OriginatorReturnAddress",
+      { "OriginatorReturnAddress", "p1.OriginatorReturnAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_PhysicalDeliveryReportRequest_PDU,
@@ -8740,27 +8740,27 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_PhysicalDeliveryReportRequest_vals), 0,
         NULL, HFILL }},
     { &hf_p1_OriginatorCertificate_PDU,
-      { "OriginatorCertificate", "p1.OriginatorCertificate",
+      { "OriginatorCertificate", "p1.OriginatorCertificate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_MessageToken_PDU,
-      { "MessageToken", "p1.MessageToken",
+      { "MessageToken", "p1.MessageToken_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_ContentConfidentialityAlgorithmIdentifier_PDU,
-      { "ContentConfidentialityAlgorithmIdentifier", "p1.ContentConfidentialityAlgorithmIdentifier",
+      { "ContentConfidentialityAlgorithmIdentifier", "p1.ContentConfidentialityAlgorithmIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_ContentIntegrityCheck_PDU,
-      { "ContentIntegrityCheck", "p1.ContentIntegrityCheck",
+      { "ContentIntegrityCheck", "p1.ContentIntegrityCheck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_MessageOriginAuthenticationCheck_PDU,
-      { "MessageOriginAuthenticationCheck", "p1.MessageOriginAuthenticationCheck",
+      { "MessageOriginAuthenticationCheck", "p1.MessageOriginAuthenticationCheck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_p1_MessageSecurityLabel_PDU,
-      { "MessageSecurityLabel", "p1.MessageSecurityLabel",
+      { "MessageSecurityLabel", "p1.MessageSecurityLabel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_ProofOfSubmissionRequest_PDU,
@@ -8776,7 +8776,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_ContentCorrelator_vals), 0,
         NULL, HFILL }},
     { &hf_p1_ProbeOriginAuthenticationCheck_PDU,
-      { "ProbeOriginAuthenticationCheck", "p1.ProbeOriginAuthenticationCheck",
+      { "ProbeOriginAuthenticationCheck", "p1.ProbeOriginAuthenticationCheck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_RedirectionHistory_PDU,
@@ -8784,7 +8784,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_Redirection_PDU,
-      { "Redirection", "p1.Redirection",
+      { "Redirection", "p1.Redirection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_DLExpansionHistory_PDU,
@@ -8792,11 +8792,11 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_DLExpansion_PDU,
-      { "DLExpansion", "p1.DLExpansion",
+      { "DLExpansion", "p1.DLExpansion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_PhysicalForwardingAddress_PDU,
-      { "PhysicalForwardingAddress", "p1.PhysicalForwardingAddress",
+      { "PhysicalForwardingAddress", "p1.PhysicalForwardingAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_OriginatorAndDLExpansionHistory_PDU,
@@ -8804,27 +8804,27 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_ReportingDLName_PDU,
-      { "ReportingDLName", "p1.ReportingDLName",
+      { "ReportingDLName", "p1.ReportingDLName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_ReportingMTACertificate_PDU,
-      { "ReportingMTACertificate", "p1.ReportingMTACertificate",
+      { "ReportingMTACertificate", "p1.ReportingMTACertificate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_ReportOriginAuthenticationCheck_PDU,
-      { "ReportOriginAuthenticationCheck", "p1.ReportOriginAuthenticationCheck",
+      { "ReportOriginAuthenticationCheck", "p1.ReportOriginAuthenticationCheck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_OriginatingMTACertificate_PDU,
-      { "OriginatingMTACertificate", "p1.OriginatingMTACertificate",
+      { "OriginatingMTACertificate", "p1.OriginatingMTACertificate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_ProofOfSubmission_PDU,
-      { "ProofOfSubmission", "p1.ProofOfSubmission",
+      { "ProofOfSubmission", "p1.ProofOfSubmission_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_ReportingMTAName_PDU,
-      { "ReportingMTAName", "p1.ReportingMTAName",
+      { "ReportingMTAName", "p1.ReportingMTAName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_ExtendedCertificates_PDU,
@@ -8836,7 +8836,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_CertificateSelectors_PDU,
-      { "CertificateSelectors", "p1.CertificateSelectors",
+      { "CertificateSelectors", "p1.CertificateSelectors_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_Content_PDU,
@@ -8844,15 +8844,15 @@ void proto_register_p1(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_MTSIdentifier_PDU,
-      { "MTSIdentifier", "p1.MTSIdentifier",
+      { "MTSIdentifier", "p1.MTSIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_ORName_PDU,
-      { "ORName", "p1.ORName",
+      { "ORName", "p1.ORName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_ORAddress_PDU,
-      { "ORAddress", "p1.ORAddress",
+      { "ORAddress", "p1.ORAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_CommonName_PDU,
@@ -8864,7 +8864,7 @@ void proto_register_p1(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_UniversalCommonName_PDU,
-      { "UniversalCommonName", "p1.UniversalCommonName",
+      { "UniversalCommonName", "p1.UniversalCommonName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_TeletexOrganizationName_PDU,
@@ -8872,15 +8872,15 @@ void proto_register_p1(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_UniversalOrganizationName_PDU,
-      { "UniversalOrganizationName", "p1.UniversalOrganizationName",
+      { "UniversalOrganizationName", "p1.UniversalOrganizationName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_TeletexPersonalName_PDU,
-      { "TeletexPersonalName", "p1.TeletexPersonalName",
+      { "TeletexPersonalName", "p1.TeletexPersonalName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_UniversalPersonalName_PDU,
-      { "UniversalPersonalName", "p1.UniversalPersonalName",
+      { "UniversalPersonalName", "p1.UniversalPersonalName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_TeletexOrganizationalUnitNames_PDU,
@@ -8904,99 +8904,99 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_PostalCode_vals), 0,
         NULL, HFILL }},
     { &hf_p1_PhysicalDeliveryOfficeName_PDU,
-      { "PhysicalDeliveryOfficeName", "p1.PhysicalDeliveryOfficeName",
+      { "PhysicalDeliveryOfficeName", "p1.PhysicalDeliveryOfficeName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_UniversalPhysicalDeliveryOfficeName_PDU,
-      { "UniversalPhysicalDeliveryOfficeName", "p1.UniversalPhysicalDeliveryOfficeName",
+      { "UniversalPhysicalDeliveryOfficeName", "p1.UniversalPhysicalDeliveryOfficeName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_PhysicalDeliveryOfficeNumber_PDU,
-      { "PhysicalDeliveryOfficeNumber", "p1.PhysicalDeliveryOfficeNumber",
+      { "PhysicalDeliveryOfficeNumber", "p1.PhysicalDeliveryOfficeNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_UniversalPhysicalDeliveryOfficeNumber_PDU,
-      { "UniversalPhysicalDeliveryOfficeNumber", "p1.UniversalPhysicalDeliveryOfficeNumber",
+      { "UniversalPhysicalDeliveryOfficeNumber", "p1.UniversalPhysicalDeliveryOfficeNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_ExtensionORAddressComponents_PDU,
-      { "ExtensionORAddressComponents", "p1.ExtensionORAddressComponents",
+      { "ExtensionORAddressComponents", "p1.ExtensionORAddressComponents_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_UniversalExtensionORAddressComponents_PDU,
-      { "UniversalExtensionORAddressComponents", "p1.UniversalExtensionORAddressComponents",
+      { "UniversalExtensionORAddressComponents", "p1.UniversalExtensionORAddressComponents_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_PhysicalDeliveryPersonalName_PDU,
-      { "PhysicalDeliveryPersonalName", "p1.PhysicalDeliveryPersonalName",
+      { "PhysicalDeliveryPersonalName", "p1.PhysicalDeliveryPersonalName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_UniversalPhysicalDeliveryPersonalName_PDU,
-      { "UniversalPhysicalDeliveryPersonalName", "p1.UniversalPhysicalDeliveryPersonalName",
+      { "UniversalPhysicalDeliveryPersonalName", "p1.UniversalPhysicalDeliveryPersonalName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_PhysicalDeliveryOrganizationName_PDU,
-      { "PhysicalDeliveryOrganizationName", "p1.PhysicalDeliveryOrganizationName",
+      { "PhysicalDeliveryOrganizationName", "p1.PhysicalDeliveryOrganizationName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_UniversalPhysicalDeliveryOrganizationName_PDU,
-      { "UniversalPhysicalDeliveryOrganizationName", "p1.UniversalPhysicalDeliveryOrganizationName",
+      { "UniversalPhysicalDeliveryOrganizationName", "p1.UniversalPhysicalDeliveryOrganizationName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_ExtensionPhysicalDeliveryAddressComponents_PDU,
-      { "ExtensionPhysicalDeliveryAddressComponents", "p1.ExtensionPhysicalDeliveryAddressComponents",
+      { "ExtensionPhysicalDeliveryAddressComponents", "p1.ExtensionPhysicalDeliveryAddressComponents_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_UniversalExtensionPhysicalDeliveryAddressComponents_PDU,
-      { "UniversalExtensionPhysicalDeliveryAddressComponents", "p1.UniversalExtensionPhysicalDeliveryAddressComponents",
+      { "UniversalExtensionPhysicalDeliveryAddressComponents", "p1.UniversalExtensionPhysicalDeliveryAddressComponents_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_UnformattedPostalAddress_PDU,
-      { "UnformattedPostalAddress", "p1.UnformattedPostalAddress",
+      { "UnformattedPostalAddress", "p1.UnformattedPostalAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_UniversalUnformattedPostalAddress_PDU,
-      { "UniversalUnformattedPostalAddress", "p1.UniversalUnformattedPostalAddress",
+      { "UniversalUnformattedPostalAddress", "p1.UniversalUnformattedPostalAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_StreetAddress_PDU,
-      { "StreetAddress", "p1.StreetAddress",
+      { "StreetAddress", "p1.StreetAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_UniversalStreetAddress_PDU,
-      { "UniversalStreetAddress", "p1.UniversalStreetAddress",
+      { "UniversalStreetAddress", "p1.UniversalStreetAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_PostOfficeBoxAddress_PDU,
-      { "PostOfficeBoxAddress", "p1.PostOfficeBoxAddress",
+      { "PostOfficeBoxAddress", "p1.PostOfficeBoxAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_UniversalPostOfficeBoxAddress_PDU,
-      { "UniversalPostOfficeBoxAddress", "p1.UniversalPostOfficeBoxAddress",
+      { "UniversalPostOfficeBoxAddress", "p1.UniversalPostOfficeBoxAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_PosteRestanteAddress_PDU,
-      { "PosteRestanteAddress", "p1.PosteRestanteAddress",
+      { "PosteRestanteAddress", "p1.PosteRestanteAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_UniversalPosteRestanteAddress_PDU,
-      { "UniversalPosteRestanteAddress", "p1.UniversalPosteRestanteAddress",
+      { "UniversalPosteRestanteAddress", "p1.UniversalPosteRestanteAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_UniquePostalName_PDU,
-      { "UniquePostalName", "p1.UniquePostalName",
+      { "UniquePostalName", "p1.UniquePostalName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_UniversalUniquePostalName_PDU,
-      { "UniversalUniquePostalName", "p1.UniversalUniquePostalName",
+      { "UniversalUniquePostalName", "p1.UniversalUniquePostalName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_LocalPostalAttributes_PDU,
-      { "LocalPostalAttributes", "p1.LocalPostalAttributes",
+      { "LocalPostalAttributes", "p1.LocalPostalAttributes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_UniversalLocalPostalAttributes_PDU,
-      { "UniversalLocalPostalAttributes", "p1.UniversalLocalPostalAttributes",
+      { "UniversalLocalPostalAttributes", "p1.UniversalLocalPostalAttributes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_ExtendedNetworkAddress_PDU,
@@ -9020,11 +9020,11 @@ void proto_register_p1(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_MTANameAndOptionalGDI_PDU,
-      { "MTANameAndOptionalGDI", "p1.MTANameAndOptionalGDI",
+      { "MTANameAndOptionalGDI", "p1.MTANameAndOptionalGDI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_AsymmetricToken_PDU,
-      { "AsymmetricToken", "p1.AsymmetricToken",
+      { "AsymmetricToken", "p1.AsymmetricToken_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_BindTokenSignedData_PDU,
@@ -9032,15 +9032,15 @@ void proto_register_p1(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_MessageTokenSignedData_PDU,
-      { "MessageTokenSignedData", "p1.MessageTokenSignedData",
+      { "MessageTokenSignedData", "p1.MessageTokenSignedData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_MessageTokenEncryptedData_PDU,
-      { "MessageTokenEncryptedData", "p1.MessageTokenEncryptedData",
+      { "MessageTokenEncryptedData", "p1.MessageTokenEncryptedData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_BindTokenEncryptedData_PDU,
-      { "BindTokenEncryptedData", "p1.BindTokenEncryptedData",
+      { "BindTokenEncryptedData", "p1.BindTokenEncryptedData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_SecurityClassification_PDU,
@@ -9048,11 +9048,11 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_SecurityClassification_vals), 0,
         NULL, HFILL }},
     { &hf_p1_unauthenticated,
-      { "unauthenticated", "p1.unauthenticated",
+      { "unauthenticated", "p1.unauthenticated_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_authenticated_argument,
-      { "authenticated", "p1.authenticated",
+      { "authenticated", "p1.authenticated_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AuthenticatedArgument", HFILL }},
     { &hf_p1_authenticated_initiator_name,
@@ -9068,7 +9068,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SecurityContext", HFILL }},
     { &hf_p1_authenticated_result,
-      { "authenticated", "p1.authenticated",
+      { "authenticated", "p1.authenticated_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AuthenticatedResult", HFILL }},
     { &hf_p1_authenticated_responder_name,
@@ -9080,19 +9080,19 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_Credentials_vals), 0,
         "ResponderCredentials", HFILL }},
     { &hf_p1_message,
-      { "message", "p1.message",
+      { "message", "p1.message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_probe,
-      { "probe", "p1.probe",
+      { "probe", "p1.probe_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_report,
-      { "report", "p1.report",
+      { "report", "p1.report_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_message_envelope,
-      { "envelope", "p1.envelope",
+      { "envelope", "p1.envelope_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MessageTransferEnvelope", HFILL }},
     { &hf_p1_content,
@@ -9100,23 +9100,23 @@ void proto_register_p1(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_report_envelope,
-      { "envelope", "p1.envelope",
+      { "envelope", "p1.envelope_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReportTransferEnvelope", HFILL }},
     { &hf_p1_report_content,
-      { "content", "p1.content",
+      { "content", "p1.content_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReportTransferContent", HFILL }},
     { &hf_p1_message_identifier,
-      { "message-identifier", "p1.message_identifier",
+      { "message-identifier", "p1.message_identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MessageIdentifier", HFILL }},
     { &hf_p1_originator_name,
-      { "originator-name", "p1.originator_name",
+      { "originator-name", "p1.originator_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MTAOriginatorName", HFILL }},
     { &hf_p1_original_encoded_information_types,
-      { "original-encoded-information-types", "p1.original_encoded_information_types",
+      { "original-encoded-information-types", "p1.original_encoded_information_types_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OriginalEncodedInformationTypes", HFILL }},
     { &hf_p1_content_type,
@@ -9144,7 +9144,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_ub_transfers_OF_PerDomainBilateralInformation", HFILL }},
     { &hf_p1_per_domain_bilateral_information_item,
-      { "PerDomainBilateralInformation", "p1.PerDomainBilateralInformation",
+      { "PerDomainBilateralInformation", "p1.PerDomainBilateralInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_trace_information,
@@ -9156,11 +9156,11 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_ExtensionField", HFILL }},
     { &hf_p1_extensions_item,
-      { "ExtensionField", "p1.ExtensionField",
+      { "ExtensionField", "p1.ExtensionField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_recipient_name,
-      { "recipient-name", "p1.recipient_name",
+      { "recipient-name", "p1.recipient_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MTARecipientName", HFILL }},
     { &hf_p1_originally_specified_recipient_number,
@@ -9176,7 +9176,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_ExplicitConversion_vals), 0,
         "ExplicitConversion", HFILL }},
     { &hf_p1_probe_identifier,
-      { "probe-identifier", "p1.probe_identifier",
+      { "probe-identifier", "p1.probe_identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProbeIdentifier", HFILL }},
     { &hf_p1_content_length,
@@ -9184,15 +9184,15 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ContentLength", HFILL }},
     { &hf_p1_report_identifier,
-      { "report-identifier", "p1.report_identifier",
+      { "report-identifier", "p1.report_identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReportIdentifier", HFILL }},
     { &hf_p1_report_destination_name,
-      { "report-destination-name", "p1.report_destination_name",
+      { "report-destination-name", "p1.report_destination_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReportDestinationName", HFILL }},
     { &hf_p1_subject_identifier,
-      { "subject-identifier", "p1.subject_identifier",
+      { "subject-identifier", "p1.subject_identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SubjectIdentifier", HFILL }},
     { &hf_p1_subject_intermediate_trace_information,
@@ -9204,19 +9204,19 @@ void proto_register_p1(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Content", HFILL }},
     { &hf_p1_additional_information,
-      { "additional-information", "p1.additional_information",
+      { "additional-information", "p1.additional_information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AdditionalInformation", HFILL }},
     { &hf_p1_mta_actual_recipient_name,
-      { "actual-recipient-name", "p1.actual_recipient_name",
+      { "actual-recipient-name", "p1.actual_recipient_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MTAActualRecipientName", HFILL }},
     { &hf_p1_last_trace_information,
-      { "last-trace-information", "p1.last_trace_information",
+      { "last-trace-information", "p1.last_trace_information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LastTraceInformation", HFILL }},
     { &hf_p1_report_originally_intended_recipient_name,
-      { "originally-intended-recipient-name", "p1.originally_intended_recipient_name",
+      { "originally-intended-recipient-name", "p1.originally_intended_recipient_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OriginallyIntendedRecipientName", HFILL }},
     { &hf_p1_supplementary_information,
@@ -9236,7 +9236,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_AdministrationDomainName_U_vals), 0,
         "AdministrationDomainName", HFILL }},
     { &hf_p1_private_domain,
-      { "private-domain", "p1.private_domain",
+      { "private-domain", "p1.private_domain_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_private_domain_identifier,
@@ -9244,7 +9244,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_PrivateDomainIdentifier_vals), 0,
         "PrivateDomainIdentifier", HFILL }},
     { &hf_p1_bilateral_information,
-      { "bilateral-information", "p1.bilateral_information",
+      { "bilateral-information", "p1.bilateral_information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_arrival_time,
@@ -9252,7 +9252,7 @@ void proto_register_p1(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "ArrivalTime", HFILL }},
     { &hf_p1_converted_encoded_information_types,
-      { "converted-encoded-information-types", "p1.converted_encoded_information_types",
+      { "converted-encoded-information-types", "p1.converted_encoded_information_types_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ConvertedEncodedInformationTypes", HFILL }},
     { &hf_p1_trace_report_type,
@@ -9260,11 +9260,11 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_ReportType_vals), 0,
         "ReportType", HFILL }},
     { &hf_p1_InternalTraceInformation_item,
-      { "InternalTraceInformationElement", "p1.InternalTraceInformationElement",
+      { "InternalTraceInformationElement", "p1.InternalTraceInformationElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_global_domain_identifier,
-      { "global-domain-identifier", "p1.global_domain_identifier",
+      { "global-domain-identifier", "p1.global_domain_identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GlobalDomainIdentifier", HFILL }},
     { &hf_p1_mta_name,
@@ -9272,15 +9272,15 @@ void proto_register_p1(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "MTAName", HFILL }},
     { &hf_p1_mta_supplied_information,
-      { "mta-supplied-information", "p1.mta_supplied_information",
+      { "mta-supplied-information", "p1.mta_supplied_information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MTASuppliedInformation", HFILL }},
     { &hf_p1__untag_item,
-      { "TraceInformationElement", "p1.TraceInformationElement",
+      { "TraceInformationElement", "p1.TraceInformationElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_domain_supplied_information,
-      { "domain-supplied-information", "p1.domain_supplied_information",
+      { "domain-supplied-information", "p1.domain_supplied_information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DomainSuppliedInformation", HFILL }},
     { &hf_p1_deferred_time,
@@ -9296,7 +9296,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_ObjectName_vals), 0,
         "ObjectName", HFILL }},
     { &hf_p1_messages_waiting,
-      { "messages-waiting", "p1.messages_waiting",
+      { "messages-waiting", "p1.messages_waiting_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MessagesWaiting", HFILL }},
     { &hf_p1_responder_name,
@@ -9304,7 +9304,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_ObjectName_vals), 0,
         "ObjectName", HFILL }},
     { &hf_p1_user_agent,
-      { "user-agent", "p1.user_agent",
+      { "user-agent", "p1.user_agent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ORAddressAndOptionalDirectoryName", HFILL }},
     { &hf_p1_mTA,
@@ -9312,19 +9312,19 @@ void proto_register_p1(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "MTAName", HFILL }},
     { &hf_p1_message_store,
-      { "message-store", "p1.message_store",
+      { "message-store", "p1.message_store_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ORAddressAndOptionalDirectoryName", HFILL }},
     { &hf_p1_urgent,
-      { "urgent", "p1.urgent",
+      { "urgent", "p1.urgent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeliveryQueue", HFILL }},
     { &hf_p1_normal,
-      { "normal", "p1.normal",
+      { "normal", "p1.normal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeliveryQueue", HFILL }},
     { &hf_p1_non_urgent,
-      { "non-urgent", "p1.non_urgent",
+      { "non-urgent", "p1.non_urgent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeliveryQueue", HFILL }},
     { &hf_p1_messages,
@@ -9340,11 +9340,11 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_Password_vals), 0,
         "Password", HFILL }},
     { &hf_p1_strong,
-      { "strong", "p1.strong",
+      { "strong", "p1.strong_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "StrongCredentials", HFILL }},
     { &hf_p1_protected,
-      { "protected", "p1.protected",
+      { "protected", "p1.protected_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProtectedPassword", HFILL }},
     { &hf_p1_ia5_string,
@@ -9356,19 +9356,19 @@ void proto_register_p1(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_0_ub_password_length", HFILL }},
     { &hf_p1_bind_token,
-      { "bind-token", "p1.bind_token",
+      { "bind-token", "p1.bind_token_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Token", HFILL }},
     { &hf_p1_certificate,
-      { "certificate", "p1.certificate",
+      { "certificate", "p1.certificate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Certificates", HFILL }},
     { &hf_p1_certificate_selector,
-      { "certificate-selector", "p1.certificate_selector",
+      { "certificate-selector", "p1.certificate_selector_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertificateAssertion", HFILL }},
     { &hf_p1_signature,
-      { "signature", "p1.signature",
+      { "signature", "p1.signature_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_time1,
@@ -9388,7 +9388,7 @@ void proto_register_p1(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_p1_algorithmIdentifier,
-      { "algorithmIdentifier", "p1.algorithmIdentifier",
+      { "algorithmIdentifier", "p1.algorithmIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_encrypted,
@@ -9396,15 +9396,15 @@ void proto_register_p1(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_p1_SecurityContext_item,
-      { "SecurityLabel", "p1.SecurityLabel",
+      { "SecurityLabel", "p1.SecurityLabel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_message_submission_envelope,
-      { "envelope", "p1.envelope",
+      { "envelope", "p1.envelope_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MessageSubmissionEnvelope", HFILL }},
     { &hf_p1_message_submission_identifier,
-      { "message-submission-identifier", "p1.message_submission_identifier",
+      { "message-submission-identifier", "p1.message_submission_identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MessageSubmissionIdentifier", HFILL }},
     { &hf_p1_message_submission_time,
@@ -9412,7 +9412,7 @@ void proto_register_p1(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "MessageSubmissionTime", HFILL }},
     { &hf_p1_probe_submission_identifier,
-      { "probe-submission-identifier", "p1.probe_submission_identifier",
+      { "probe-submission-identifier", "p1.probe_submission_identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProbeSubmissionIdentifier", HFILL }},
     { &hf_p1_probe_submission_time,
@@ -9420,7 +9420,7 @@ void proto_register_p1(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "ProbeSubmissionTime", HFILL }},
     { &hf_p1_ImproperlySpecifiedRecipients_item,
-      { "RecipientName", "p1.RecipientName",
+      { "RecipientName", "p1.RecipientName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_waiting_operations,
@@ -9440,19 +9440,19 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_ContentType_vals), 0,
         NULL, HFILL }},
     { &hf_p1_waiting_encoded_information_types,
-      { "waiting-encoded-information-types", "p1.waiting_encoded_information_types",
+      { "waiting-encoded-information-types", "p1.waiting_encoded_information_types_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EncodedInformationTypes", HFILL }},
     { &hf_p1_recipient_certificate,
-      { "recipient-certificate", "p1.recipient_certificate",
+      { "recipient-certificate", "p1.recipient_certificate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RecipientCertificate", HFILL }},
     { &hf_p1_proof_of_delivery,
-      { "proof-of-delivery", "p1.proof_of_delivery",
+      { "proof-of-delivery", "p1.proof_of_delivery_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProofOfDelivery", HFILL }},
     { &hf_p1_empty_result,
-      { "empty-result", "p1.empty_result",
+      { "empty-result", "p1.empty_result_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_max_extensions,
@@ -9460,7 +9460,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_MAX_OF_ExtensionField", HFILL }},
     { &hf_p1_max_extensions_item,
-      { "ExtensionField", "p1.ExtensionField",
+      { "ExtensionField", "p1.ExtensionField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_restrict,
@@ -9484,7 +9484,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ContentTypes", HFILL }},
     { &hf_p1_permissible_encoded_information_types,
-      { "permissible-encoded-information-types", "p1.permissible_encoded_information_types",
+      { "permissible-encoded-information-types", "p1.permissible_encoded_information_types_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PermissibleEncodedInformationTypes", HFILL }},
     { &hf_p1_permissible_security_context,
@@ -9508,7 +9508,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_RefusalReason_vals), 0,
         "RefusalReason", HFILL }},
     { &hf_p1_user_name,
-      { "user-name", "p1.user_name",
+      { "user-name", "p1.user_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UserName", HFILL }},
     { &hf_p1_user_address,
@@ -9520,11 +9520,11 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_ub_deliverable_class_OF_DeliverableClass", HFILL }},
     { &hf_p1_deliverable_class_item,
-      { "DeliverableClass", "p1.DeliverableClass",
+      { "DeliverableClass", "p1.DeliverableClass_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_default_delivery_controls,
-      { "default-delivery-controls", "p1.default_delivery_controls",
+      { "default-delivery-controls", "p1.default_delivery_controls_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DefaultDeliveryControls", HFILL }},
     { &hf_p1_redirections,
@@ -9536,15 +9536,15 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RestrictedDelivery", HFILL }},
     { &hf_p1_retrieve_registrations,
-      { "retrieve-registrations", "p1.retrieve_registrations",
+      { "retrieve-registrations", "p1.retrieve_registrations_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RegistrationTypes", HFILL }},
     { &hf_p1_non_empty_result,
-      { "non-empty-result", "p1.non_empty_result",
+      { "non-empty-result", "p1.non_empty_result_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_registered_information,
-      { "registered-information", "p1.registered_information",
+      { "registered-information", "p1.registered_information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RegisterArgument", HFILL }},
     { &hf_p1_old_credentials,
@@ -9556,7 +9556,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_Credentials_vals), 0,
         "Credentials", HFILL }},
     { &hf_p1_x121,
-      { "x121", "p1.x121",
+      { "x121", "p1.x121_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_x121_address,
@@ -9568,11 +9568,11 @@ void proto_register_p1(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "PrintableString_SIZE_1_ub_tsap_id_length", HFILL }},
     { &hf_p1_presentation,
-      { "presentation", "p1.presentation",
+      { "presentation", "p1.presentation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PSAPAddress", HFILL }},
     { &hf_p1_Redirections_item,
-      { "RecipientRedirection", "p1.RecipientRedirection",
+      { "RecipientRedirection", "p1.RecipientRedirection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_redirection_classes,
@@ -9580,11 +9580,11 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_ub_redirection_classes_OF_RedirectionClass", HFILL }},
     { &hf_p1_redirection_classes_item,
-      { "RedirectionClass", "p1.RedirectionClass",
+      { "RedirectionClass", "p1.RedirectionClass_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_recipient_assigned_alternate_recipient,
-      { "recipient-assigned-alternate-recipient", "p1.recipient_assigned_alternate_recipient",
+      { "recipient-assigned-alternate-recipient", "p1.recipient_assigned_alternate_recipient_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RecipientAssignedAlternateRecipient", HFILL }},
     { &hf_p1_content_types,
@@ -9596,7 +9596,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ContentLength", HFILL }},
     { &hf_p1_encoded_information_types_constraints,
-      { "encoded-information-types-constraints", "p1.encoded_information_types_constraints",
+      { "encoded-information-types-constraints", "p1.encoded_information_types_constraints_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EncodedInformationTypesConstraints", HFILL }},
     { &hf_p1_security_labels,
@@ -9620,7 +9620,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Restriction", HFILL }},
     { &hf_p1_applies_only_to_item,
-      { "Restriction", "p1.Restriction",
+      { "Restriction", "p1.Restriction_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_unacceptable_eits,
@@ -9636,7 +9636,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ExtendedEncodedInformationTypes", HFILL }},
     { &hf_p1_RestrictedDelivery_item,
-      { "Restriction", "p1.Restriction",
+      { "Restriction", "p1.Restriction_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_permitted,
@@ -9652,11 +9652,11 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_ExactOrPattern_vals), 0,
         "ExactOrPattern", HFILL }},
     { &hf_p1_exact_match,
-      { "exact-match", "p1.exact_match",
+      { "exact-match", "p1.exact_match_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ORName", HFILL }},
     { &hf_p1_pattern_match,
-      { "pattern-match", "p1.pattern_match",
+      { "pattern-match", "p1.pattern_match_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ORName", HFILL }},
     { &hf_p1_standard_parameters,
@@ -9672,11 +9672,11 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_ExtensionType_vals), 0,
         "T_type_extensions_item", HFILL }},
     { &hf_p1_originator_name_01,
-      { "originator-name", "p1.originator_name",
+      { "originator-name", "p1.originator_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OriginatorName", HFILL }},
     { &hf_p1_submission_recipient_name,
-      { "recipient-name", "p1.recipient_name",
+      { "recipient-name", "p1.recipient_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RecipientName", HFILL }},
     { &hf_p1_originator_report_request,
@@ -9684,11 +9684,11 @@ void proto_register_p1(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OriginatorReportRequest", HFILL }},
     { &hf_p1_probe_recipient_name,
-      { "recipient-name", "p1.recipient_name",
+      { "recipient-name", "p1.recipient_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RecipientName", HFILL }},
     { &hf_p1_message_delivery_identifier,
-      { "message-delivery-identifier", "p1.message_delivery_identifier",
+      { "message-delivery-identifier", "p1.message_delivery_identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MessageDeliveryIdentifier", HFILL }},
     { &hf_p1_message_delivery_time,
@@ -9696,7 +9696,7 @@ void proto_register_p1(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "MessageDeliveryTime", HFILL }},
     { &hf_p1_other_fields,
-      { "other-fields", "p1.other_fields",
+      { "other-fields", "p1.other_fields_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OtherMessageDeliveryFields", HFILL }},
     { &hf_p1_delivered_content_type,
@@ -9704,7 +9704,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_DeliveredContentType_vals), 0,
         "DeliveredContentType", HFILL }},
     { &hf_p1_delivered_originator_name,
-      { "originator-name", "p1.originator_name",
+      { "originator-name", "p1.originator_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeliveredOriginatorName", HFILL }},
     { &hf_p1_delivery_flags,
@@ -9716,19 +9716,19 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OtherRecipientNames", HFILL }},
     { &hf_p1_this_recipient_name,
-      { "this-recipient-name", "p1.this_recipient_name",
+      { "this-recipient-name", "p1.this_recipient_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ThisRecipientName", HFILL }},
     { &hf_p1_originally_intended_recipient_name,
-      { "originally-intended-recipient-name", "p1.originally_intended_recipient_name",
+      { "originally-intended-recipient-name", "p1.originally_intended_recipient_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OriginallyIntendedRecipientName", HFILL }},
     { &hf_p1_subject_submission_identifier,
-      { "subject-submission-identifier", "p1.subject_submission_identifier",
+      { "subject-submission-identifier", "p1.subject_submission_identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SubjectSubmissionIdentifier", HFILL }},
     { &hf_p1_actual_recipient_name,
-      { "actual-recipient-name", "p1.actual_recipient_name",
+      { "actual-recipient-name", "p1.actual_recipient_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ActualRecipientName", HFILL }},
     { &hf_p1_delivery_report_type,
@@ -9736,11 +9736,11 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_ReportType_vals), 0,
         "ReportType", HFILL }},
     { &hf_p1_delivery,
-      { "delivery", "p1.delivery",
+      { "delivery", "p1.delivery_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeliveryReport", HFILL }},
     { &hf_p1_non_delivery,
-      { "non-delivery", "p1.non_delivery",
+      { "non-delivery", "p1.non_delivery_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonDeliveryReport", HFILL }},
     { &hf_p1_type_of_MTS_user,
@@ -9768,7 +9768,7 @@ void proto_register_p1(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "ExtendedContentType", HFILL }},
     { &hf_p1_OtherRecipientNames_item,
-      { "OtherRecipientName", "p1.OtherRecipientName",
+      { "OtherRecipientName", "p1.OtherRecipientName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_standard_extension,
@@ -9788,7 +9788,7 @@ void proto_register_p1(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_extension_value,
-      { "value", "p1.value",
+      { "value", "p1.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ExtensionValue", HFILL }},
     { &hf_p1_RequestedDeliveryMethod_item,
@@ -9804,11 +9804,11 @@ void proto_register_p1(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_p1_RedirectionHistory_item,
-      { "Redirection", "p1.Redirection",
+      { "Redirection", "p1.Redirection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_intended_recipient_name,
-      { "intended-recipient-name", "p1.intended_recipient_name",
+      { "intended-recipient-name", "p1.intended_recipient_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntendedRecipientName", HFILL }},
     { &hf_p1_redirection_reason,
@@ -9816,7 +9816,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_RedirectionReason_vals), 0,
         "RedirectionReason", HFILL }},
     { &hf_p1_intended_recipient,
-      { "intended-recipient", "p1.intended_recipient",
+      { "intended-recipient", "p1.intended_recipient_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ORAddressAndOptionalDirectoryName", HFILL }},
     { &hf_p1_redirection_time,
@@ -9824,11 +9824,11 @@ void proto_register_p1(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "Time", HFILL }},
     { &hf_p1_DLExpansionHistory_item,
-      { "DLExpansion", "p1.DLExpansion",
+      { "DLExpansion", "p1.DLExpansion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_dl,
-      { "dl", "p1.dl",
+      { "dl", "p1.dl_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ORAddressAndOptionalDirectoryName", HFILL }},
     { &hf_p1_dl_expansion_time,
@@ -9836,11 +9836,11 @@ void proto_register_p1(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "Time", HFILL }},
     { &hf_p1_OriginatorAndDLExpansionHistory_item,
-      { "OriginatorAndDLExpansion", "p1.OriginatorAndDLExpansion",
+      { "OriginatorAndDLExpansion", "p1.OriginatorAndDLExpansion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_originator_or_dl_name,
-      { "originator-or-dl-name", "p1.originator_or_dl_name",
+      { "originator-or-dl-name", "p1.originator_or_dl_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ORAddressAndOptionalDirectoryName", HFILL }},
     { &hf_p1_origination_or_expansion_time,
@@ -9852,15 +9852,15 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_T_report_type_vals), 0,
         "T_report_type", HFILL }},
     { &hf_p1_report_type_delivery,
-      { "delivery", "p1.delivery",
+      { "delivery", "p1.delivery_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PerRecipientDeliveryReportFields", HFILL }},
     { &hf_p1_non_delivery_report,
-      { "non-delivery", "p1.non_delivery",
+      { "non-delivery", "p1.non_delivery_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PerRecipientNonDeliveryReportFields", HFILL }},
     { &hf_p1_domain,
-      { "domain", "p1.domain",
+      { "domain", "p1.domain_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GlobalDomainIdentifier", HFILL }},
     { &hf_p1_mta_directory_name,
@@ -9876,27 +9876,27 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
         "Name", HFILL }},
     { &hf_p1_DLExemptedRecipients_item,
-      { "ORAddressAndOrDirectoryName", "p1.ORAddressAndOrDirectoryName",
+      { "ORAddressAndOrDirectoryName", "p1.ORAddressAndOrDirectoryName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_encryption_recipient,
-      { "encryption-recipient", "p1.encryption_recipient",
+      { "encryption-recipient", "p1.encryption_recipient_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertificateAssertion", HFILL }},
     { &hf_p1_encryption_originator,
-      { "encryption-originator", "p1.encryption_originator",
+      { "encryption-originator", "p1.encryption_originator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertificateAssertion", HFILL }},
     { &hf_p1_selectors_content_integrity_check,
-      { "content-integrity-check", "p1.content_integrity_check",
+      { "content-integrity-check", "p1.content_integrity_check_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertificateAssertion", HFILL }},
     { &hf_p1_token_signature,
-      { "token-signature", "p1.token_signature",
+      { "token-signature", "p1.token_signature_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertificateAssertion", HFILL }},
     { &hf_p1_message_origin_authentication,
-      { "message-origin-authentication", "p1.message_origin_authentication",
+      { "message-origin-authentication", "p1.message_origin_authentication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertificateAssertion", HFILL }},
     { &hf_p1_local_identifier,
@@ -9912,7 +9912,7 @@ void proto_register_p1(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "T_printable_private_domain_identifier", HFILL }},
     { &hf_p1_built_in_standard_attributes,
-      { "built-in-standard-attributes", "p1.built_in_standard_attributes",
+      { "built-in-standard-attributes", "p1.built_in_standard_attributes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "BuiltInStandardAttributes", HFILL }},
     { &hf_p1_built_in_domain_defined_attributes,
@@ -9944,7 +9944,7 @@ void proto_register_p1(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "NumericUserIdentifier", HFILL }},
     { &hf_p1_personal_name,
-      { "personal-name", "p1.personal_name",
+      { "personal-name", "p1.personal_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PersonalName", HFILL }},
     { &hf_p1_organizational_unit_names,
@@ -9996,7 +9996,7 @@ void proto_register_p1(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_BuiltInDomainDefinedAttributes_item,
-      { "BuiltInDomainDefinedAttribute", "p1.BuiltInDomainDefinedAttribute",
+      { "BuiltInDomainDefinedAttribute", "p1.BuiltInDomainDefinedAttribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_printable_type,
@@ -10008,7 +10008,7 @@ void proto_register_p1(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "T_printable_value", HFILL }},
     { &hf_p1_ExtensionAttributes_item,
-      { "ExtensionAttribute", "p1.ExtensionAttribute",
+      { "ExtensionAttribute", "p1.ExtensionAttribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_extension_attribute_type,
@@ -10016,7 +10016,7 @@ void proto_register_p1(void) {
         FT_INT32, BASE_DEC, VALS(p1_ExtensionAttributeType_vals), 0,
         "ExtensionAttributeType", HFILL }},
     { &hf_p1_extension_attribute_value,
-      { "extension-attribute-value", "p1.extension_attribute_value",
+      { "extension-attribute-value", "p1.extension_attribute_value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_teletex_surname,
@@ -10036,19 +10036,19 @@ void proto_register_p1(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "T_teletex_generation_qualifier", HFILL }},
     { &hf_p1_universal_surname,
-      { "surname", "p1.surname",
+      { "surname", "p1.surname_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UniversalOrBMPString", HFILL }},
     { &hf_p1_universal_given_name,
-      { "given-name", "p1.given_name",
+      { "given-name", "p1.given_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UniversalOrBMPString", HFILL }},
     { &hf_p1_universal_initials,
-      { "initials", "p1.initials",
+      { "initials", "p1.initials_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UniversalOrBMPString", HFILL }},
     { &hf_p1_universal_generation_qualifier,
-      { "generation-qualifier", "p1.generation_qualifier",
+      { "generation-qualifier", "p1.generation_qualifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UniversalOrBMPString", HFILL }},
     { &hf_p1_TeletexOrganizationalUnitNames_item,
@@ -10056,7 +10056,7 @@ void proto_register_p1(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_UniversalOrganizationalUnitNames_item,
-      { "UniversalOrganizationalUnitName", "p1.UniversalOrganizationalUnitName",
+      { "UniversalOrganizationalUnitName", "p1.UniversalOrganizationalUnitName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_character_encoding,
@@ -10112,7 +10112,7 @@ void proto_register_p1(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "TeletexString_SIZE_1_ub_pds_parameter_length", HFILL }},
     { &hf_p1_e163_4_address,
-      { "e163-4-address", "p1.e163_4_address",
+      { "e163-4-address", "p1.e163_4_address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_number,
@@ -10124,11 +10124,11 @@ void proto_register_p1(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "NumericString_SIZE_1_ub_e163_4_sub_address_length", HFILL }},
     { &hf_p1_psap_address,
-      { "psap-address", "p1.psap_address",
+      { "psap-address", "p1.psap_address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PresentationAddress", HFILL }},
     { &hf_p1_TeletexDomainDefinedAttributes_item,
-      { "TeletexDomainDefinedAttribute", "p1.TeletexDomainDefinedAttribute",
+      { "TeletexDomainDefinedAttribute", "p1.TeletexDomainDefinedAttribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_type,
@@ -10140,15 +10140,15 @@ void proto_register_p1(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "T_teletex_value", HFILL }},
     { &hf_p1_UniversalDomainDefinedAttributes_item,
-      { "UniversalDomainDefinedAttribute", "p1.UniversalDomainDefinedAttribute",
+      { "UniversalDomainDefinedAttribute", "p1.UniversalDomainDefinedAttribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_universal_type,
-      { "type", "p1.type",
+      { "type", "p1.type_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UniversalOrBMPString", HFILL }},
     { &hf_p1_universal_value,
-      { "value", "p1.value",
+      { "value", "p1.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UniversalOrBMPString", HFILL }},
     { &hf_p1_ExtendedEncodedInformationTypes_item,
@@ -10160,7 +10160,7 @@ void proto_register_p1(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "G3FacsimileNonBasicParameters", HFILL }},
     { &hf_p1_teletex,
-      { "teletex", "p1.teletex",
+      { "teletex", "p1.teletex_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TeletexNonBasicParameters", HFILL }},
     { &hf_p1_graphic_character_sets,
@@ -10188,11 +10188,11 @@ void proto_register_p1(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "TokenTypeIdentifier", HFILL }},
     { &hf_p1_token,
-      { "token", "p1.token",
+      { "token", "p1.token_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TokenTypeData", HFILL }},
     { &hf_p1_signature_algorithm_identifier,
-      { "signature-algorithm-identifier", "p1.signature_algorithm_identifier",
+      { "signature-algorithm-identifier", "p1.signature_algorithm_identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_p1_name,
@@ -10200,11 +10200,11 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, VALS(p1_T_name_vals), 0,
         NULL, HFILL }},
     { &hf_p1_token_recipient_name,
-      { "recipient-name", "p1.recipient_name",
+      { "recipient-name", "p1.recipient_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RecipientName", HFILL }},
     { &hf_p1_token_mta,
-      { "mta", "p1.mta",
+      { "mta", "p1.mta_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MTANameAndOptionalGDI", HFILL }},
     { &hf_p1_time,
@@ -10212,11 +10212,11 @@ void proto_register_p1(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_signed_data,
-      { "signed-data", "p1.signed_data",
+      { "signed-data", "p1.signed_data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TokenData", HFILL }},
     { &hf_p1_encryption_algorithm_identifier,
-      { "encryption-algorithm-identifier", "p1.encryption_algorithm_identifier",
+      { "encryption-algorithm-identifier", "p1.encryption_algorithm_identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_p1_encrypted_data,
@@ -10224,11 +10224,11 @@ void proto_register_p1(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_p1_asymmetric_token_data,
-      { "asymmetric-token-data", "p1.asymmetric_token_data",
+      { "asymmetric-token-data", "p1.asymmetric_token_data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AsymmetricTokenData", HFILL }},
     { &hf_p1_algorithm_identifier,
-      { "algorithm-identifier", "p1.algorithm_identifier",
+      { "algorithm-identifier", "p1.algorithm_identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_p1_token_data_type,
@@ -10236,19 +10236,19 @@ void proto_register_p1(void) {
         FT_INT32, BASE_DEC, VALS(p1_TokenDataType_vals), 0,
         "TokenDataType", HFILL }},
     { &hf_p1_value,
-      { "value", "p1.value",
+      { "value", "p1.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_content_confidentiality_algorithm_identifier,
-      { "content-confidentiality-algorithm-identifier", "p1.content_confidentiality_algorithm_identifier",
+      { "content-confidentiality-algorithm-identifier", "p1.content_confidentiality_algorithm_identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ContentConfidentialityAlgorithmIdentifier", HFILL }},
     { &hf_p1_content_integrity_check,
-      { "content-integrity-check", "p1.content_integrity_check",
+      { "content-integrity-check", "p1.content_integrity_check_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ContentIntegrityCheck", HFILL }},
     { &hf_p1_message_security_label,
-      { "message-security-label", "p1.message_security_label",
+      { "message-security-label", "p1.message_security_label_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MessageSecurityLabel", HFILL }},
     { &hf_p1_proof_of_delivery_request,
@@ -10284,7 +10284,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SecurityCategories", HFILL }},
     { &hf_p1_SecurityCategories_item,
-      { "SecurityCategory", "p1.SecurityCategory",
+      { "SecurityCategory", "p1.SecurityCategory_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_category_type,
@@ -10292,11 +10292,11 @@ void proto_register_p1(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "SecurityCategoryIdentifier", HFILL }},
     { &hf_p1_category_value,
-      { "value", "p1.value",
+      { "value", "p1.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CategoryValue", HFILL }},
     { &hf_p1_mta_originator_name,
-      { "originator-name", "p1.originator_name",
+      { "originator-name", "p1.originator_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MTAOriginatorName", HFILL }},
     { &hf_p1_per_recipient_message_fields,
@@ -10304,7 +10304,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientMessageTransferFields", HFILL }},
     { &hf_p1_per_recipient_message_fields_item,
-      { "PerRecipientMessageTransferFields", "p1.PerRecipientMessageTransferFields",
+      { "PerRecipientMessageTransferFields", "p1.PerRecipientMessageTransferFields_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_per_recipient_probe_transfer_fields,
@@ -10312,7 +10312,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeTransferFields", HFILL }},
     { &hf_p1_per_recipient_probe_transfer_fields_item,
-      { "PerRecipientProbeTransferFields", "p1.PerRecipientProbeTransferFields",
+      { "PerRecipientProbeTransferFields", "p1.PerRecipientProbeTransferFields_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_per_recipient_report_fields,
@@ -10320,7 +10320,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientReportTransferFields", HFILL }},
     { &hf_p1_per_recipient_report_fields_item,
-      { "PerRecipientReportTransferFields", "p1.PerRecipientReportTransferFields",
+      { "PerRecipientReportTransferFields", "p1.PerRecipientReportTransferFields_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_routing_action,
@@ -10336,7 +10336,7 @@ void proto_register_p1(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "MTAName", HFILL }},
     { &hf_p1_attempted_domain,
-      { "attempted-domain", "p1.attempted_domain",
+      { "attempted-domain", "p1.attempted_domain_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GlobalDomainIdentifier", HFILL }},
     { &hf_p1_per_recipient_report_delivery_fields,
@@ -10344,11 +10344,11 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientReportDeliveryFields", HFILL }},
     { &hf_p1_per_recipient_report_delivery_fields_item,
-      { "PerRecipientReportDeliveryFields", "p1.PerRecipientReportDeliveryFields",
+      { "PerRecipientReportDeliveryFields", "p1.PerRecipientReportDeliveryFields_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_mts_originator_name,
-      { "originator-name", "p1.originator_name",
+      { "originator-name", "p1.originator_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OriginatorName", HFILL }},
     { &hf_p1_per_recipient_message_submission_fields,
@@ -10356,7 +10356,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientMessageSubmissionFields", HFILL }},
     { &hf_p1_per_recipient_message_submission_fields_item,
-      { "PerRecipientMessageSubmissionFields", "p1.PerRecipientMessageSubmissionFields",
+      { "PerRecipientMessageSubmissionFields", "p1.PerRecipientMessageSubmissionFields_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_per_recipient_probe_submission_fields,
@@ -10364,7 +10364,7 @@ void proto_register_p1(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeSubmissionFields", HFILL }},
     { &hf_p1_per_recipient_probe_submission_fields_item,
-      { "PerRecipientProbeSubmissionFields", "p1.PerRecipientProbeSubmissionFields",
+      { "PerRecipientProbeSubmissionFields", "p1.PerRecipientProbeSubmissionFields_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p1_directory_name,
diff --git a/epan/dissectors/packet-p22.c b/epan/dissectors/packet-p22.c
index eeca99499e..dcb76d3d28 100644
--- a/epan/dissectors/packet-p22.c
+++ b/epan/dissectors/packet-p22.c
@@ -4549,47 +4549,47 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, VALS(p22_InformationObject_vals), 0,
         NULL, HFILL }},
     { &hf_p22_Heading_PDU,
-      { "Heading", "p22.Heading",
+      { "Heading", "p22.Heading_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_ORDescriptor_PDU,
-      { "ORDescriptor", "p22.ORDescriptor",
+      { "ORDescriptor", "p22.ORDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_ThisIPMField_PDU,
-      { "ThisIPMField", "p22.ThisIPMField",
+      { "ThisIPMField", "p22.ThisIPMField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_OriginatorField_PDU,
-      { "OriginatorField", "p22.OriginatorField",
+      { "OriginatorField", "p22.OriginatorField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_AuthorizingUsersSubfield_PDU,
-      { "AuthorizingUsersSubfield", "p22.AuthorizingUsersSubfield",
+      { "AuthorizingUsersSubfield", "p22.AuthorizingUsersSubfield_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_PrimaryRecipientsSubfield_PDU,
-      { "PrimaryRecipientsSubfield", "p22.PrimaryRecipientsSubfield",
+      { "PrimaryRecipientsSubfield", "p22.PrimaryRecipientsSubfield_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_CopyRecipientsSubfield_PDU,
-      { "CopyRecipientsSubfield", "p22.CopyRecipientsSubfield",
+      { "CopyRecipientsSubfield", "p22.CopyRecipientsSubfield_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_BlindCopyRecipientsSubfield_PDU,
-      { "BlindCopyRecipientsSubfield", "p22.BlindCopyRecipientsSubfield",
+      { "BlindCopyRecipientsSubfield", "p22.BlindCopyRecipientsSubfield_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_RepliedToIPMField_PDU,
-      { "RepliedToIPMField", "p22.RepliedToIPMField",
+      { "RepliedToIPMField", "p22.RepliedToIPMField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_ObsoletedIPMsSubfield_PDU,
-      { "ObsoletedIPMsSubfield", "p22.ObsoletedIPMsSubfield",
+      { "ObsoletedIPMsSubfield", "p22.ObsoletedIPMsSubfield_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_RelatedIPMsSubfield_PDU,
-      { "RelatedIPMsSubfield", "p22.RelatedIPMsSubfield",
+      { "RelatedIPMsSubfield", "p22.RelatedIPMsSubfield_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_SubjectField_PDU,
@@ -4605,7 +4605,7 @@ void proto_register_p22(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_ReplyRecipientsSubfield_PDU,
-      { "ReplyRecipientsSubfield", "p22.ReplyRecipientsSubfield",
+      { "ReplyRecipientsSubfield", "p22.ReplyRecipientsSubfield_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_ImportanceField_PDU,
@@ -4625,7 +4625,7 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_IA5TextParameters_PDU,
-      { "IA5TextParameters", "p22.IA5TextParameters",
+      { "IA5TextParameters", "p22.IA5TextParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_IA5TextData_PDU,
@@ -4633,7 +4633,7 @@ void proto_register_p22(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_G3FacsimileParameters_PDU,
-      { "G3FacsimileParameters", "p22.G3FacsimileParameters",
+      { "G3FacsimileParameters", "p22.G3FacsimileParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_G3FacsimileData_PDU,
@@ -4649,7 +4649,7 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_TeletexParameters_PDU,
-      { "TeletexParameters", "p22.TeletexParameters",
+      { "TeletexParameters", "p22.TeletexParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_TeletexData_PDU,
@@ -4657,7 +4657,7 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_VideotexParameters_PDU,
-      { "VideotexParameters", "p22.VideotexParameters",
+      { "VideotexParameters", "p22.VideotexParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_VideotexData_PDU,
@@ -4665,7 +4665,7 @@ void proto_register_p22(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_EncryptedParameters_PDU,
-      { "EncryptedParameters", "p22.EncryptedParameters",
+      { "EncryptedParameters", "p22.EncryptedParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_EncryptedData_PDU,
@@ -4673,11 +4673,11 @@ void proto_register_p22(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_MessageParameters_PDU,
-      { "MessageParameters", "p22.MessageParameters",
+      { "MessageParameters", "p22.MessageParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_MessageData_PDU,
-      { "MessageData", "p22.MessageData",
+      { "MessageData", "p22.MessageData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_BilaterallyDefinedBodyPart_PDU,
@@ -4685,23 +4685,23 @@ void proto_register_p22(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_IPN_PDU,
-      { "IPN", "p22.IPN",
+      { "IPN", "p22.IPN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_AbsenceAdvice_PDU,
-      { "AbsenceAdvice", "p22.AbsenceAdvice",
+      { "AbsenceAdvice", "p22.AbsenceAdvice_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_ChangeOfAddressAdvice_PDU,
-      { "ChangeOfAddressAdvice", "p22.ChangeOfAddressAdvice",
+      { "ChangeOfAddressAdvice", "p22.ChangeOfAddressAdvice_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_IPMAssemblyInstructions_PDU,
-      { "IPMAssemblyInstructions", "p22.IPMAssemblyInstructions",
+      { "IPMAssemblyInstructions", "p22.IPMAssemblyInstructions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_IncompleteCopy_PDU,
-      { "IncompleteCopy", "p22.IncompleteCopy",
+      { "IncompleteCopy", "p22.IncompleteCopy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_Languages_PDU,
@@ -4721,7 +4721,7 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_IPMSecurityLabel_PDU,
-      { "IPMSecurityLabel", "p22.IPMSecurityLabel",
+      { "IPMSecurityLabel", "p22.IPMSecurityLabel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_BodyPartSecurityLabel_PDU,
@@ -4737,11 +4737,11 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_CirculationMember_PDU,
-      { "CirculationMember", "p22.CirculationMember",
+      { "CirculationMember", "p22.CirculationMember_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_CirculationListIndicator_PDU,
-      { "CirculationListIndicator", "p22.CirculationListIndicator",
+      { "CirculationListIndicator", "p22.CirculationListIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_DistributionCodes_PDU,
@@ -4749,11 +4749,11 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_DistributionCode_PDU,
-      { "DistributionCode", "p22.DistributionCode",
+      { "DistributionCode", "p22.DistributionCode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_ExtendedSubject_PDU,
-      { "ExtendedSubject", "p22.ExtendedSubject",
+      { "ExtendedSubject", "p22.ExtendedSubject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_InformationCategories_PDU,
@@ -4761,7 +4761,7 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_InformationCategory_PDU,
-      { "InformationCategory", "p22.InformationCategory",
+      { "InformationCategory", "p22.InformationCategory_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_ManualHandlingInstructions_PDU,
@@ -4769,11 +4769,11 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_ManualHandlingInstruction_PDU,
-      { "ManualHandlingInstruction", "p22.ManualHandlingInstruction",
+      { "ManualHandlingInstruction", "p22.ManualHandlingInstruction_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_OriginatorsReference_PDU,
-      { "OriginatorsReference", "p22.OriginatorsReference",
+      { "OriginatorsReference", "p22.OriginatorsReference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_PrecedencePolicyIdentifier_PDU,
@@ -4793,7 +4793,7 @@ void proto_register_p22(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_FileTransferParameters_PDU,
-      { "FileTransferParameters", "p22.FileTransferParameters",
+      { "FileTransferParameters", "p22.FileTransferParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_FileTransferData_PDU,
@@ -4801,7 +4801,7 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_VoiceParameters_PDU,
-      { "VoiceParameters", "p22.VoiceParameters",
+      { "VoiceParameters", "p22.VoiceParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_VoiceData_PDU,
@@ -4809,7 +4809,7 @@ void proto_register_p22(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_ForwardedContentParameters_PDU,
-      { "ForwardedContentParameters", "p22.ForwardedContentParameters",
+      { "ForwardedContentParameters", "p22.ForwardedContentParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_IPMEntryType_PDU,
@@ -4821,7 +4821,7 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_BodyPartDescriptor_PDU,
-      { "BodyPartDescriptor", "p22.BodyPartDescriptor",
+      { "BodyPartDescriptor", "p22.BodyPartDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_BodyPartSignatureVerification_PDU,
@@ -4865,7 +4865,7 @@ void proto_register_p22(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_IpnSecurityResponse_PDU,
-      { "IpnSecurityResponse", "p22.IpnSecurityResponse",
+      { "IpnSecurityResponse", "p22.IpnSecurityResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_BodyPartTokens_PDU,
@@ -4877,15 +4877,15 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_ipm,
-      { "ipm", "p22.ipm",
+      { "ipm", "p22.ipm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_ipn,
-      { "ipn", "p22.ipn",
+      { "ipn", "p22.ipn_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_heading,
-      { "heading", "p22.heading",
+      { "heading", "p22.heading_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_body,
@@ -4897,15 +4897,15 @@ void proto_register_p22(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_value,
-      { "value", "p22.value",
+      { "value", "p22.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_this_IPM,
-      { "this-IPM", "p22.this_IPM",
+      { "this-IPM", "p22.this_IPM_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ThisIPMField", HFILL }},
     { &hf_p22_originator,
-      { "originator", "p22.originator",
+      { "originator", "p22.originator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OriginatorField", HFILL }},
     { &hf_p22_authorizing_users,
@@ -4925,7 +4925,7 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "BlindCopyRecipientsField", HFILL }},
     { &hf_p22_replied_to_IPM,
-      { "replied-to-IPM", "p22.replied_to_IPM",
+      { "replied-to-IPM", "p22.replied_to_IPM_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RepliedToIPMField", HFILL }},
     { &hf_p22_obsoleted_IPMs,
@@ -4969,7 +4969,7 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ExtensionsField", HFILL }},
     { &hf_p22_user,
-      { "user", "p22.user",
+      { "user", "p22.user_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ORName", HFILL }},
     { &hf_p22_user_relative_identifier,
@@ -4977,7 +4977,7 @@ void proto_register_p22(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "LocalIPMIdentifier", HFILL }},
     { &hf_p22_recipient,
-      { "recipient", "p22.recipient",
+      { "recipient", "p22.recipient_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ORDescriptor", HFILL }},
     { &hf_p22_notification_requests,
@@ -4993,7 +4993,7 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RecipientExtensionsField", HFILL }},
     { &hf_p22_formal_name,
-      { "formal-name", "p22.formal_name",
+      { "formal-name", "p22.formal_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ORName", HFILL }},
     { &hf_p22_free_form_name,
@@ -5005,39 +5005,39 @@ void proto_register_p22(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "TelephoneNumber", HFILL }},
     { &hf_p22_RecipientExtensionsField_item,
-      { "IPMSExtension", "p22.IPMSExtension",
+      { "IPMSExtension", "p22.IPMSExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_AuthorizingUsersField_item,
-      { "AuthorizingUsersSubfield", "p22.AuthorizingUsersSubfield",
+      { "AuthorizingUsersSubfield", "p22.AuthorizingUsersSubfield_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_PrimaryRecipientsField_item,
-      { "PrimaryRecipientsSubfield", "p22.PrimaryRecipientsSubfield",
+      { "PrimaryRecipientsSubfield", "p22.PrimaryRecipientsSubfield_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_CopyRecipientsField_item,
-      { "CopyRecipientsSubfield", "p22.CopyRecipientsSubfield",
+      { "CopyRecipientsSubfield", "p22.CopyRecipientsSubfield_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_BlindCopyRecipientsField_item,
-      { "BlindCopyRecipientsSubfield", "p22.BlindCopyRecipientsSubfield",
+      { "BlindCopyRecipientsSubfield", "p22.BlindCopyRecipientsSubfield_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_ObsoletedIPMsField_item,
-      { "ObsoletedIPMsSubfield", "p22.ObsoletedIPMsSubfield",
+      { "ObsoletedIPMsSubfield", "p22.ObsoletedIPMsSubfield_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_RelatedIPMsField_item,
-      { "RelatedIPMsSubfield", "p22.RelatedIPMsSubfield",
+      { "RelatedIPMsSubfield", "p22.RelatedIPMsSubfield_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_ReplyRecipientsField_item,
-      { "ReplyRecipientsSubfield", "p22.ReplyRecipientsSubfield",
+      { "ReplyRecipientsSubfield", "p22.ReplyRecipientsSubfield_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_ExtensionsField_item,
-      { "IPMSExtension", "p22.IPMSExtension",
+      { "IPMSExtension", "p22.IPMSExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_Body_item,
@@ -5049,11 +5049,11 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, VALS(p22_T_basic_vals), 0,
         NULL, HFILL }},
     { &hf_p22_ia5_text,
-      { "ia5-text", "p22.ia5_text",
+      { "ia5-text", "p22.ia5_text_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IA5TextBodyPart", HFILL }},
     { &hf_p22_g3_facsimile,
-      { "g3-facsimile", "p22.g3_facsimile",
+      { "g3-facsimile", "p22.g3_facsimile_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "G3FacsimileBodyPart", HFILL }},
     { &hf_p22_g4_class1,
@@ -5061,19 +5061,19 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "G4Class1BodyPart", HFILL }},
     { &hf_p22_teletex,
-      { "teletex", "p22.teletex",
+      { "teletex", "p22.teletex_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TeletexBodyPart", HFILL }},
     { &hf_p22_videotex,
-      { "videotex", "p22.videotex",
+      { "videotex", "p22.videotex_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "VideotexBodyPart", HFILL }},
     { &hf_p22_encrypted_bp,
-      { "encrypted", "p22.encrypted",
+      { "encrypted", "p22.encrypted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EncryptedBodyPart", HFILL }},
     { &hf_p22_message,
-      { "message", "p22.message",
+      { "message", "p22.message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MessageBodyPart", HFILL }},
     { &hf_p22_mixed_mode,
@@ -5085,23 +5085,23 @@ void proto_register_p22(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BilaterallyDefinedBodyPart", HFILL }},
     { &hf_p22_nationally_defined,
-      { "nationally-defined", "p22.nationally_defined",
+      { "nationally-defined", "p22.nationally_defined_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NationallyDefinedBodyPart", HFILL }},
     { &hf_p22_extended,
-      { "extended", "p22.extended",
+      { "extended", "p22.extended_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ExtendedBodyPart", HFILL }},
     { &hf_p22_extended_parameters,
-      { "parameters", "p22.parameters",
+      { "parameters", "p22.parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "INSTANCE_OF", HFILL }},
     { &hf_p22_extended_data,
-      { "data", "p22.data",
+      { "data", "p22.data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "INSTANCE_OF", HFILL }},
     { &hf_p22_ia5text_parameters,
-      { "parameters", "p22.parameters",
+      { "parameters", "p22.parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IA5TextParameters", HFILL }},
     { &hf_p22_ia5text_data,
@@ -5113,7 +5113,7 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, VALS(p22_Repertoire_vals), 0,
         NULL, HFILL }},
     { &hf_p22_g3facsimile_parameters,
-      { "parameters", "p22.parameters",
+      { "parameters", "p22.parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "G3FacsimileParameters", HFILL }},
     { &hf_p22_g3facsimile_data,
@@ -5133,15 +5133,15 @@ void proto_register_p22(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_p22_G4Class1BodyPart_item,
-      { "Interchange-Data-Element", "p22.Interchange_Data_Element",
+      { "Interchange-Data-Element", "p22.Interchange_Data_Element_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_MixedModeBodyPart_item,
-      { "Interchange-Data-Element", "p22.Interchange_Data_Element",
+      { "Interchange-Data-Element", "p22.Interchange_Data_Element_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_teletex_parameters,
-      { "parameters", "p22.parameters",
+      { "parameters", "p22.parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TeletexParameters", HFILL }},
     { &hf_p22_teletex_data,
@@ -5153,7 +5153,7 @@ void proto_register_p22(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_p22_teletex_non_basic_parameters,
-      { "non-basic-parameters", "p22.non_basic_parameters",
+      { "non-basic-parameters", "p22.non_basic_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TeletexNonBasicParameters", HFILL }},
     { &hf_p22_TeletexData_item,
@@ -5161,7 +5161,7 @@ void proto_register_p22(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "TeletexString", HFILL }},
     { &hf_p22_videotex_parameters,
-      { "parameters", "p22.parameters",
+      { "parameters", "p22.parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "VideotexParameters", HFILL }},
     { &hf_p22_videotex_data,
@@ -5173,7 +5173,7 @@ void proto_register_p22(void) {
         FT_INT32, BASE_DEC, VALS(p22_VideotexSyntax_vals), 0,
         "VideotexSyntax", HFILL }},
     { &hf_p22_encrypted_parameters,
-      { "parameters", "p22.parameters",
+      { "parameters", "p22.parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EncryptedParameters", HFILL }},
     { &hf_p22_encrypted_data,
@@ -5181,7 +5181,7 @@ void proto_register_p22(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "EncryptedData", HFILL }},
     { &hf_p22_algorithm_identifier,
-      { "algorithm-identifier", "p22.algorithm_identifier",
+      { "algorithm-identifier", "p22.algorithm_identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_p22_originator_certificates,
@@ -5189,11 +5189,11 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ExtendedCertificates", HFILL }},
     { &hf_p22_message_parameters,
-      { "parameters", "p22.parameters",
+      { "parameters", "p22.parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MessageParameters", HFILL }},
     { &hf_p22_message_data,
-      { "data", "p22.data",
+      { "data", "p22.data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MessageData", HFILL }},
     { &hf_p22_delivery_time,
@@ -5201,23 +5201,23 @@ void proto_register_p22(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "MessageDeliveryTime", HFILL }},
     { &hf_p22_delivery_envelope,
-      { "delivery-envelope", "p22.delivery_envelope",
+      { "delivery-envelope", "p22.delivery_envelope_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OtherMessageDeliveryFields", HFILL }},
     { &hf_p22_subject_ipm,
-      { "subject-ipm", "p22.subject_ipm",
+      { "subject-ipm", "p22.subject_ipm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SubjectIPMField", HFILL }},
     { &hf_p22_ipn_originator,
-      { "ipn-originator", "p22.ipn_originator",
+      { "ipn-originator", "p22.ipn_originator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IPNOriginatorField", HFILL }},
     { &hf_p22_ipm_intended_recipient,
-      { "ipm-intended-recipient", "p22.ipm_intended_recipient",
+      { "ipm-intended-recipient", "p22.ipm_intended_recipient_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IPMIntendedRecipientField", HFILL }},
     { &hf_p22_conversion_eits,
-      { "conversion-eits", "p22.conversion_eits",
+      { "conversion-eits", "p22.conversion_eits_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ConversionEITsField", HFILL }},
     { &hf_p22_notification_extensions,
@@ -5237,7 +5237,7 @@ void proto_register_p22(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "AutoForwardCommentField", HFILL }},
     { &hf_p22_returned_ipm,
-      { "returned-ipm", "p22.returned_ipm",
+      { "returned-ipm", "p22.returned_ipm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReturnedIPMField", HFILL }},
     { &hf_p22_nrn_extensions,
@@ -5261,19 +5261,19 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RNExtensionsField", HFILL }},
     { &hf_p22_NotificationExtensionsField_item,
-      { "IPMSExtension", "p22.IPMSExtension",
+      { "IPMSExtension", "p22.IPMSExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_NRNExtensionsField_item,
-      { "IPMSExtension", "p22.IPMSExtension",
+      { "IPMSExtension", "p22.IPMSExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_RNExtensionsField_item,
-      { "IPMSExtension", "p22.IPMSExtension",
+      { "IPMSExtension", "p22.IPMSExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_OtherNotificationTypeFields_item,
-      { "IPMSExtension", "p22.IPMSExtension",
+      { "IPMSExtension", "p22.IPMSExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_advice,
@@ -5285,7 +5285,7 @@ void proto_register_p22(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "Time", HFILL }},
     { &hf_p22_new_address,
-      { "new-address", "p22.new_address",
+      { "new-address", "p22.new_address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ORDescriptor", HFILL }},
     { &hf_p22_effective_from,
@@ -5313,7 +5313,7 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_MAX", HFILL }},
     { &hf_p22_stored_body_part,
-      { "stored-body-part", "p22.stored_body_part",
+      { "stored-body-part", "p22.stored_body_part_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_message_entry,
@@ -5329,19 +5329,19 @@ void proto_register_p22(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_BodyPartSignatures_item,
-      { "BodyPartSignatures item", "p22.BodyPartSignatures_item",
+      { "BodyPartSignatures item", "p22.BodyPartSignatures_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_body_part_signature,
-      { "body-part-signature", "p22.body_part_signature",
+      { "body-part-signature", "p22.body_part_signature_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "BodyPartSignature", HFILL }},
     { &hf_p22_originator_certificate_selector,
-      { "originator-certificate-selector", "p22.originator_certificate_selector",
+      { "originator-certificate-selector", "p22.originator_certificate_selector_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertificateAssertion", HFILL }},
     { &hf_p22_algorithmIdentifier,
-      { "algorithmIdentifier", "p22.algorithmIdentifier",
+      { "algorithmIdentifier", "p22.algorithmIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_encrypted,
@@ -5349,11 +5349,11 @@ void proto_register_p22(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_p22_content_security_label,
-      { "content-security-label", "p22.content_security_label",
+      { "content-security-label", "p22.content_security_label_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecurityLabel", HFILL }},
     { &hf_p22_heading_security_label,
-      { "heading-security-label", "p22.heading_security_label",
+      { "heading-security-label", "p22.heading_security_label_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecurityLabel", HFILL }},
     { &hf_p22_body_part_security_labels,
@@ -5365,19 +5365,19 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, VALS(p22_BodyPartSecurityLabel_vals), 0,
         NULL, HFILL }},
     { &hf_p22_body_part_unlabelled,
-      { "body-part-unlabelled", "p22.body_part_unlabelled",
+      { "body-part-unlabelled", "p22.body_part_unlabelled_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_body_part_security_label,
-      { "body-part-security-label", "p22.body_part_security_label",
+      { "body-part-security-label", "p22.body_part_security_label_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecurityLabel", HFILL }},
     { &hf_p22_CirculationList_item,
-      { "CirculationMember", "p22.CirculationMember",
+      { "CirculationMember", "p22.CirculationMember_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_circulation_recipient,
-      { "circulation-recipient", "p22.circulation_recipient",
+      { "circulation-recipient", "p22.circulation_recipient_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RecipientSpecifier", HFILL }},
     { &hf_p22_checked,
@@ -5385,7 +5385,7 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, VALS(p22_Checkmark_vals), 0,
         "Checkmark", HFILL }},
     { &hf_p22_simple,
-      { "simple", "p22.simple",
+      { "simple", "p22.simple_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_timestamped,
@@ -5393,11 +5393,11 @@ void proto_register_p22(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "CirculationTime", HFILL }},
     { &hf_p22_signed,
-      { "signed", "p22.signed",
+      { "signed", "p22.signed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CirculationSignature", HFILL }},
     { &hf_p22_circulation_signature_algorithm_identifier,
-      { "algorithm-identifier", "p22.algorithm_identifier",
+      { "algorithm-identifier", "p22.algorithm_identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CirculationSignatureAlgorithmIdentifier", HFILL }},
     { &hf_p22_timestamp,
@@ -5405,11 +5405,11 @@ void proto_register_p22(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "CirculationTime", HFILL }},
     { &hf_p22_circulation_signature_data,
-      { "circulation-signature-data", "p22.circulation_signature_data",
+      { "circulation-signature-data", "p22.circulation_signature_data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CirculationSignatureData", HFILL }},
     { &hf_p22_DistributionCodes_item,
-      { "DistributionCode", "p22.DistributionCode",
+      { "DistributionCode", "p22.DistributionCode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_oid_code,
@@ -5417,15 +5417,15 @@ void proto_register_p22(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_p22_alphanumeric_code,
-      { "alphanumeric-code", "p22.alphanumeric_code",
+      { "alphanumeric-code", "p22.alphanumeric_code_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlphaCode", HFILL }},
     { &hf_p22_or_descriptor,
-      { "or-descriptor", "p22.or_descriptor",
+      { "or-descriptor", "p22.or_descriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ORDescriptor", HFILL }},
     { &hf_p22_InformationCategories_item,
-      { "InformationCategory", "p22.InformationCategory",
+      { "InformationCategory", "p22.InformationCategory_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_reference,
@@ -5433,11 +5433,11 @@ void proto_register_p22(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_p22_description,
-      { "description", "p22.description",
+      { "description", "p22.description_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DescriptionString", HFILL }},
     { &hf_p22_ManualHandlingInstructions_item,
-      { "ManualHandlingInstruction", "p22.ManualHandlingInstruction",
+      { "ManualHandlingInstruction", "p22.ManualHandlingInstruction_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_GeneralTextParameters_item,
@@ -5453,23 +5453,23 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, VALS(p22_Contents_Type_Attribute_vals), 0,
         "ContentsTypeParameter", HFILL }},
     { &hf_p22_environment,
-      { "environment", "p22.environment",
+      { "environment", "p22.environment_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EnvironmentParameter", HFILL }},
     { &hf_p22_compression,
-      { "compression", "p22.compression",
+      { "compression", "p22.compression_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CompressionParameter", HFILL }},
     { &hf_p22_file_attributes,
-      { "file-attributes", "p22.file_attributes",
+      { "file-attributes", "p22.file_attributes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FileAttributes", HFILL }},
     { &hf_p22_FileTransferData_item,
-      { "FileTransferData item", "p22.FileTransferData_item",
+      { "FileTransferData item", "p22.FileTransferData_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EXTERNAL", HFILL }},
     { &hf_p22_RelatedStoredFile_item,
-      { "RelatedStoredFile item", "p22.RelatedStoredFile_item",
+      { "RelatedStoredFile item", "p22.RelatedStoredFile_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_file_identifier,
@@ -5481,11 +5481,11 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, VALS(p22_Relationship_vals), 0,
         NULL, HFILL }},
     { &hf_p22_pathname_and_version,
-      { "pathname-and-version", "p22.pathname_and_version",
+      { "pathname-and-version", "p22.pathname_and_version_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PathnameandVersion", HFILL }},
     { &hf_p22_cross_reference,
-      { "cross-reference", "p22.cross_reference",
+      { "cross-reference", "p22.cross_reference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CrossReference", HFILL }},
     { &hf_p22_pathname,
@@ -5501,7 +5501,7 @@ void proto_register_p22(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_p22_message_reference,
-      { "message-reference", "p22.message_reference",
+      { "message-reference", "p22.message_reference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MessageReference", HFILL }},
     { &hf_p22_body_part_reference,
@@ -5521,7 +5521,7 @@ void proto_register_p22(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "GraphicString", HFILL }},
     { &hf_p22_document_type,
-      { "document-type", "p22.document_type",
+      { "document-type", "p22.document_type_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_document_type", HFILL }},
     { &hf_p22_document_type_name,
@@ -5529,11 +5529,11 @@ void proto_register_p22(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_parameter,
-      { "parameter", "p22.parameter",
+      { "parameter", "p22.parameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_constraint_set_and_abstract_syntax,
-      { "constraint-set-and-abstract-syntax", "p22.constraint_set_and_abstract_syntax",
+      { "constraint-set-and-abstract-syntax", "p22.constraint_set_and_abstract_syntax_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_constraint_set_and_abstract_syntax", HFILL }},
     { &hf_p22_constraint_set_name,
@@ -5581,7 +5581,7 @@ void proto_register_p22(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_compression_algorithm_param,
-      { "compression-algorithm-param", "p22.compression_algorithm_param",
+      { "compression-algorithm-param", "p22.compression_algorithm_param_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_permitted_actions,
@@ -5661,7 +5661,7 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Pathname", HFILL }},
     { &hf_p22_no_value_available,
-      { "no-value-available", "p22.no_value_available",
+      { "no-value-available", "p22.no_value_available_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_account_actual_values,
@@ -5677,7 +5677,7 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_Access_Control_Element", HFILL }},
     { &hf_p22_actual_values_item,
-      { "Access-Control-Element", "p22.Access_Control_Element",
+      { "Access-Control-Element", "p22.Access_Control_Element_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_action_list,
@@ -5685,7 +5685,7 @@ void proto_register_p22(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Access_Request", HFILL }},
     { &hf_p22_concurrency_access,
-      { "concurrency-access", "p22.concurrency_access",
+      { "concurrency-access", "p22.concurrency_access_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_identity,
@@ -5693,11 +5693,11 @@ void proto_register_p22(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "User_Identity", HFILL }},
     { &hf_p22_passwords,
-      { "passwords", "p22.passwords",
+      { "passwords", "p22.passwords_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Access_Passwords", HFILL }},
     { &hf_p22_location,
-      { "location", "p22.location",
+      { "location", "p22.location_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Application_Entity_Title", HFILL }},
     { &hf_p22_read_password,
@@ -5773,23 +5773,23 @@ void proto_register_p22(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "IA5String", HFILL }},
     { &hf_p22_mts_identifier,
-      { "mts-identifier", "p22.mts_identifier",
+      { "mts-identifier", "p22.mts_identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MessageDeliveryIdentifier", HFILL }},
     { &hf_p22_submission_proof,
-      { "submission-proof", "p22.submission_proof",
+      { "submission-proof", "p22.submission_proof_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SubmissionProof", HFILL }},
     { &hf_p22_proof_of_submission,
-      { "proof-of-submission", "p22.proof_of_submission",
+      { "proof-of-submission", "p22.proof_of_submission_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProofOfSubmission", HFILL }},
     { &hf_p22_originating_MTA_certificate,
-      { "originating-MTA-certificate", "p22.originating_MTA_certificate",
+      { "originating-MTA-certificate", "p22.originating_MTA_certificate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OriginatingMTACertificate", HFILL }},
     { &hf_p22_message_submission_envelope,
-      { "message-submission-envelope", "p22.message_submission_envelope",
+      { "message-submission-envelope", "p22.message_submission_envelope_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MessageSubmissionEnvelope", HFILL }},
     { &hf_p22_IPMSynopsis_item,
@@ -5797,11 +5797,11 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, VALS(p22_BodyPartSynopsis_vals), 0,
         NULL, HFILL }},
     { &hf_p22_message_synopsis,
-      { "message", "p22.message",
+      { "message", "p22.message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MessageBodyPartSynopsis", HFILL }},
     { &hf_p22_non_message,
-      { "non-message", "p22.non_message",
+      { "non-message", "p22.non_message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonMessageBodyPartSynopsis", HFILL }},
     { &hf_p22_number,
@@ -5817,7 +5817,7 @@ void proto_register_p22(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_p22_bp_parameters,
-      { "parameters", "p22.parameters",
+      { "parameters", "p22.parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "INSTANCE_OF", HFILL }},
     { &hf_p22_size,
@@ -5845,7 +5845,7 @@ void proto_register_p22(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_p22_BodyPartSignatureVerification_item,
-      { "BodyPartSignatureVerification item", "p22.BodyPartSignatureVerification_item",
+      { "BodyPartSignatureVerification item", "p22.BodyPartSignatureVerification_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_body_part_sequence_number,
@@ -5865,11 +5865,11 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_absent,
-      { "absent", "p22.absent",
+      { "absent", "p22.absent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_no_reply_received,
-      { "no-reply-received", "p22.no_reply_received",
+      { "no-reply-received", "p22.no_reply_received_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_received_replies,
@@ -5881,7 +5881,7 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_no_ipn_received,
-      { "no-ipn-received", "p22.no_ipn_received",
+      { "no-ipn-received", "p22.no_ipn_received_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_ipns_received,
@@ -5901,19 +5901,19 @@ void proto_register_p22(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OriginalContent", HFILL }},
     { &hf_p22_original_security_arguments,
-      { "original-security-arguments", "p22.original_security_arguments",
+      { "original-security-arguments", "p22.original_security_arguments_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_original_content_integrity_check,
-      { "original-content-integrity-check", "p22.original_content_integrity_check",
+      { "original-content-integrity-check", "p22.original_content_integrity_check_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OriginalContentIntegrityCheck", HFILL }},
     { &hf_p22_original_message_origin_authentication_check,
-      { "original-message-origin-authentication-check", "p22.original_message_origin_authentication_check",
+      { "original-message-origin-authentication-check", "p22.original_message_origin_authentication_check_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OriginalMessageOriginAuthenticationCheck", HFILL }},
     { &hf_p22_original_message_token,
-      { "original-message-token", "p22.original_message_token",
+      { "original-message-token", "p22.original_message_token_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OriginalMessageToken", HFILL }},
     { &hf_p22_security_diagnostic_code,
@@ -5921,7 +5921,7 @@ void proto_register_p22(void) {
         FT_INT32, BASE_DEC, VALS(p22_SecurityDiagnosticCode_vals), 0,
         "SecurityDiagnosticCode", HFILL }},
     { &hf_p22_BodyPartTokens_item,
-      { "BodyPartTokens item", "p22.BodyPartTokens_item",
+      { "BodyPartTokens item", "p22.BodyPartTokens_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_body_part_choice,
@@ -5929,7 +5929,7 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, VALS(p22_T_body_part_choice_vals), 0,
         "T_body_part_choice", HFILL }},
     { &hf_p22_encryption_token,
-      { "encryption-token", "p22.encryption_token",
+      { "encryption-token", "p22.encryption_token_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EncryptionToken", HFILL }},
     { &hf_p22_message_or_content_body_part,
@@ -5937,7 +5937,7 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "BodyPartTokens", HFILL }},
     { &hf_p22_encryption_algorithm_identifier,
-      { "encryption-algorithm-identifier", "p22.encryption_algorithm_identifier",
+      { "encryption-algorithm-identifier", "p22.encryption_algorithm_identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_p22_encrypted_key,
@@ -5945,15 +5945,15 @@ void proto_register_p22(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_p22_recipient_certificate_selector,
-      { "recipient-certificate-selector", "p22.recipient_certificate_selector",
+      { "recipient-certificate-selector", "p22.recipient_certificate_selector_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertificateAssertion", HFILL }},
     { &hf_p22_recipient_certificate,
-      { "recipient-certificate", "p22.recipient_certificate",
+      { "recipient-certificate", "p22.recipient_certificate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Certificates", HFILL }},
     { &hf_p22_ForwardedContentToken_item,
-      { "ForwardedContentToken item", "p22.ForwardedContentToken_item",
+      { "ForwardedContentToken item", "p22.ForwardedContentToken_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p22_body_part_token_choice,
@@ -5961,7 +5961,7 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, VALS(p22_T_body_part_token_choice_vals), 0,
         "T_body_part_token_choice", HFILL }},
     { &hf_p22_forwarding_token,
-      { "forwarding-token", "p22.forwarding_token",
+      { "forwarding-token", "p22.forwarding_token_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MessageToken", HFILL }},
     { &hf_p22_forwarded_content_token,
@@ -5973,11 +5973,11 @@ void proto_register_p22(void) {
         FT_UINT32, BASE_DEC, VALS(p22_T_choice_vals), 0,
         NULL, HFILL }},
     { &hf_p22_non_receipt_fields,
-      { "non-receipt-fields", "p22.non_receipt_fields",
+      { "non-receipt-fields", "p22.non_receipt_fields_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonReceiptFields", HFILL }},
     { &hf_p22_receipt_fields,
-      { "receipt-fields", "p22.receipt_fields",
+      { "receipt-fields", "p22.receipt_fields_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReceiptFields", HFILL }},
     { &hf_p22_other_notification_type_fields,
diff --git a/epan/dissectors/packet-p7.c b/epan/dissectors/packet-p7.c
index f239dccda0..ac71df685b 100644
--- a/epan/dissectors/packet-p7.c
+++ b/epan/dissectors/packet-p7.c
@@ -4185,7 +4185,7 @@ void proto_register_p7(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_AutoActionError_PDU,
-      { "AutoActionError", "p7.AutoActionError",
+      { "AutoActionError", "p7.AutoActionError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_EntryType_PDU,
@@ -4205,11 +4205,11 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_MSBindArgument_PDU,
-      { "MSBindArgument", "p7.MSBindArgument",
+      { "MSBindArgument", "p7.MSBindArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_MSBindResult_PDU,
-      { "MSBindResult", "p7.MSBindResult",
+      { "MSBindResult", "p7.MSBindResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_MS_EIT_PDU,
@@ -4229,35 +4229,35 @@ void proto_register_p7(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_OriginatorToken_PDU,
-      { "OriginatorToken", "p7.OriginatorToken",
+      { "OriginatorToken", "p7.OriginatorToken_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_SummarizeArgument_PDU,
-      { "SummarizeArgument", "p7.SummarizeArgument",
+      { "SummarizeArgument", "p7.SummarizeArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_SummarizeResult_PDU,
-      { "SummarizeResult", "p7.SummarizeResult",
+      { "SummarizeResult", "p7.SummarizeResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_ListArgument_PDU,
-      { "ListArgument", "p7.ListArgument",
+      { "ListArgument", "p7.ListArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_ListResult_PDU,
-      { "ListResult", "p7.ListResult",
+      { "ListResult", "p7.ListResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_FetchArgument_PDU,
-      { "FetchArgument", "p7.FetchArgument",
+      { "FetchArgument", "p7.FetchArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_FetchResult_PDU,
-      { "FetchResult", "p7.FetchResult",
+      { "FetchResult", "p7.FetchResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_DeleteArgument_PDU,
-      { "DeleteArgument", "p7.DeleteArgument",
+      { "DeleteArgument", "p7.DeleteArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_DeleteResult_PDU,
@@ -4265,7 +4265,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, VALS(p7_DeleteResult_vals), 0,
         NULL, HFILL }},
     { &hf_p7_Register_MSArgument_PDU,
-      { "Register-MSArgument", "p7.Register_MSArgument",
+      { "Register-MSArgument", "p7.Register_MSArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_Register_MSResult_PDU,
@@ -4273,27 +4273,27 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, VALS(p7_Register_MSResult_vals), 0,
         NULL, HFILL }},
     { &hf_p7_ProtectedChangeCredentials_PDU,
-      { "ProtectedChangeCredentials", "p7.ProtectedChangeCredentials",
+      { "ProtectedChangeCredentials", "p7.ProtectedChangeCredentials_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_AlertArgument_PDU,
-      { "AlertArgument", "p7.AlertArgument",
+      { "AlertArgument", "p7.AlertArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_AlertResult_PDU,
-      { "AlertResult", "p7.AlertResult",
+      { "AlertResult", "p7.AlertResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_ModifyArgument_PDU,
-      { "ModifyArgument", "p7.ModifyArgument",
+      { "ModifyArgument", "p7.ModifyArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_ModifyResult_PDU,
-      { "ModifyResult", "p7.ModifyResult",
+      { "ModifyResult", "p7.ModifyResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_MSMessageSubmissionArgument_PDU,
-      { "MSMessageSubmissionArgument", "p7.MSMessageSubmissionArgument",
+      { "MSMessageSubmissionArgument", "p7.MSMessageSubmissionArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_MSMessageSubmissionResult_PDU,
@@ -4301,47 +4301,47 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, VALS(p7_MSMessageSubmissionResult_vals), 0,
         NULL, HFILL }},
     { &hf_p7_MSProbeSubmissionArgument_PDU,
-      { "MSProbeSubmissionArgument", "p7.MSProbeSubmissionArgument",
+      { "MSProbeSubmissionArgument", "p7.MSProbeSubmissionArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_MSProbeSubmissionResult_PDU,
-      { "MSProbeSubmissionResult", "p7.MSProbeSubmissionResult",
+      { "MSProbeSubmissionResult", "p7.MSProbeSubmissionResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_PAR_attribute_error_PDU,
-      { "PAR-attribute-error", "p7.PAR_attribute_error",
+      { "PAR-attribute-error", "p7.PAR_attribute_error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_PAR_auto_action_request_error_PDU,
-      { "PAR-auto-action-request-error", "p7.PAR_auto_action_request_error",
+      { "PAR-auto-action-request-error", "p7.PAR_auto_action_request_error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_PAR_delete_error_PDU,
-      { "PAR-delete-error", "p7.PAR_delete_error",
+      { "PAR-delete-error", "p7.PAR_delete_error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_PAR_fetch_restriction_error_PDU,
-      { "PAR-fetch-restriction-error", "p7.PAR_fetch_restriction_error",
+      { "PAR-fetch-restriction-error", "p7.PAR_fetch_restriction_error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_PAR_invalid_parameters_error_PDU,
-      { "PAR-invalid-parameters-error", "p7.PAR_invalid_parameters_error",
+      { "PAR-invalid-parameters-error", "p7.PAR_invalid_parameters_error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_PAR_range_error_PDU,
-      { "PAR-range-error", "p7.PAR_range_error",
+      { "PAR-range-error", "p7.PAR_range_error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_PAR_sequence_number_error_PDU,
-      { "PAR-sequence-number-error", "p7.PAR_sequence_number_error",
+      { "PAR-sequence-number-error", "p7.PAR_sequence_number_error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_ServiceErrorParameter_PDU,
-      { "ServiceErrorParameter", "p7.ServiceErrorParameter",
+      { "ServiceErrorParameter", "p7.ServiceErrorParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_MessageGroupErrorParameter_PDU,
-      { "MessageGroupErrorParameter", "p7.MessageGroupErrorParameter",
+      { "MessageGroupErrorParameter", "p7.MessageGroupErrorParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_MSExtensionErrorParameter_PDU,
@@ -4349,15 +4349,15 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, VALS(p7_MSExtensionErrorParameter_vals), 0,
         NULL, HFILL }},
     { &hf_p7_PAR_register_ms_error_PDU,
-      { "PAR-register-ms-error", "p7.PAR_register_ms_error",
+      { "PAR-register-ms-error", "p7.PAR_register_ms_error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_ModifyErrorParameter_PDU,
-      { "ModifyErrorParameter", "p7.ModifyErrorParameter",
+      { "ModifyErrorParameter", "p7.ModifyErrorParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_EntryClassErrorParameter_PDU,
-      { "EntryClassErrorParameter", "p7.EntryClassErrorParameter",
+      { "EntryClassErrorParameter", "p7.EntryClassErrorParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_ReportLocation_PDU,
@@ -4365,7 +4365,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, VALS(p7_ReportLocation_vals), 0,
         NULL, HFILL }},
     { &hf_p7_PerRecipientReport_PDU,
-      { "PerRecipientReport", "p7.PerRecipientReport",
+      { "PerRecipientReport", "p7.PerRecipientReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_ReportSummary_PDU,
@@ -4385,7 +4385,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, VALS(p7_SubmissionError_vals), 0,
         NULL, HFILL }},
     { &hf_p7_SignatureVerificationStatus_PDU,
-      { "SignatureVerificationStatus", "p7.SignatureVerificationStatus",
+      { "SignatureVerificationStatus", "p7.SignatureVerificationStatus_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_StoragePeriod_PDU,
@@ -4409,7 +4409,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "AttributeValues", HFILL }},
     { &hf_p7_attribute_values_item,
-      { "attribute-values item", "p7.attribute_values_item",
+      { "attribute-values item", "p7.attribute_values_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeItem", HFILL }},
     { &hf_p7_auto_action_type,
@@ -4421,19 +4421,19 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_ub_per_auto_action", HFILL }},
     { &hf_p7_registration_parameter,
-      { "registration-parameter", "p7.registration_parameter",
+      { "registration-parameter", "p7.registration_parameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_error_code,
-      { "error-code", "p7.error_code",
+      { "error-code", "p7.error_code_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_error_parameter,
-      { "error-parameter", "p7.error_parameter",
+      { "error-parameter", "p7.error_parameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_MSExtensions_item,
-      { "MSExtensionItem", "p7.MSExtensionItem",
+      { "MSExtensionItem", "p7.MSExtensionItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_MessageGroupName_item,
@@ -4441,7 +4441,7 @@ void proto_register_p7(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_initiator_name,
-      { "initiator-name", "p7.initiator_name",
+      { "initiator-name", "p7.initiator_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_initiator_credentials,
@@ -4453,7 +4453,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SecurityContext", HFILL }},
     { &hf_p7_fetch_restrictions,
-      { "fetch-restrictions", "p7.fetch_restrictions",
+      { "fetch-restrictions", "p7.fetch_restrictions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Restrictions", HFILL }},
     { &hf_p7_ms_configuration_request,
@@ -4569,7 +4569,7 @@ void proto_register_p7(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_p7_indication_only,
-      { "indication-only", "p7.indication_only",
+      { "indication-only", "p7.indication_only_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_auto_action_log_entry,
@@ -4581,7 +4581,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, VALS(p7_BindProblem_vals), 0,
         "BindProblem", HFILL }},
     { &hf_p7_qualified_error,
-      { "qualified-error", "p7.qualified_error",
+      { "qualified-error", "p7.qualified_error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_bind_problem,
@@ -4601,11 +4601,11 @@ void proto_register_p7(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_p7_sequence_number_range,
-      { "sequence-number-range", "p7.sequence_number_range",
+      { "sequence-number-range", "p7.sequence_number_range_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NumberRange", HFILL }},
     { &hf_p7_creation_time_range,
-      { "creation-time-range", "p7.creation_time_range",
+      { "creation-time-range", "p7.creation_time_range_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TimeRange", HFILL }},
     { &hf_p7_from_number,
@@ -4649,11 +4649,11 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, VALS(p7_Filter_vals), 0,
         "Filter", HFILL }},
     { &hf_p7_equality,
-      { "equality", "p7.equality",
+      { "equality", "p7.equality_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeValueAssertion", HFILL }},
     { &hf_p7_substrings,
-      { "substrings", "p7.substrings",
+      { "substrings", "p7.substrings_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_type,
@@ -4669,23 +4669,23 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, VALS(p7_T_strings_item_vals), 0,
         NULL, HFILL }},
     { &hf_p7_initial,
-      { "initial", "p7.initial",
+      { "initial", "p7.initial_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_any,
-      { "any", "p7.any",
+      { "any", "p7.any_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_final,
-      { "final", "p7.final",
+      { "final", "p7.final_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_greater_or_equal,
-      { "greater-or-equal", "p7.greater_or_equal",
+      { "greater-or-equal", "p7.greater_or_equal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeValueAssertion", HFILL }},
     { &hf_p7_less_or_equal,
-      { "less-or-equal", "p7.less_or_equal",
+      { "less-or-equal", "p7.less_or_equal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeValueAssertion", HFILL }},
     { &hf_p7_present,
@@ -4693,11 +4693,11 @@ void proto_register_p7(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "AttributeType", HFILL }},
     { &hf_p7_approximate_match,
-      { "approximate-match", "p7.approximate_match",
+      { "approximate-match", "p7.approximate_match_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeValueAssertion", HFILL }},
     { &hf_p7_other_match,
-      { "other-match", "p7.other_match",
+      { "other-match", "p7.other_match_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MatchingRuleAssertion", HFILL }},
     { &hf_p7_matching_rule,
@@ -4705,11 +4705,11 @@ void proto_register_p7(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_p7_match_value,
-      { "match-value", "p7.match_value",
+      { "match-value", "p7.match_value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_attribute_value,
-      { "attribute-value", "p7.attribute_value",
+      { "attribute-value", "p7.attribute_value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_child_entries,
@@ -4733,7 +4733,7 @@ void proto_register_p7(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OverrideRestrictions", HFILL }},
     { &hf_p7_EntryInformationSelection_item,
-      { "AttributeSelection", "p7.AttributeSelection",
+      { "AttributeSelection", "p7.AttributeSelection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_from,
@@ -4753,7 +4753,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_ub_per_entry_OF_Attribute", HFILL }},
     { &hf_p7_attributes_item,
-      { "Attribute", "p7.Attribute",
+      { "Attribute", "p7.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_value_count_exceeded,
@@ -4761,7 +4761,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_ub_per_entry_OF_AttributeValueCount", HFILL }},
     { &hf_p7_value_count_exceeded_item,
-      { "AttributeValueCount", "p7.AttributeValueCount",
+      { "AttributeValueCount", "p7.AttributeValueCount_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_total,
@@ -4801,7 +4801,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, VALS(p7_EntryClass_vals), 0,
         "EntryClass", HFILL }},
     { &hf_p7_selector,
-      { "selector", "p7.selector",
+      { "selector", "p7.selector_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_summary_requests,
@@ -4825,7 +4825,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_span,
-      { "span", "p7.span",
+      { "span", "p7.span_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_summaries,
@@ -4833,7 +4833,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_ub_summaries_OF_Summary", HFILL }},
     { &hf_p7_summaries_item,
-      { "Summary", "p7.Summary",
+      { "Summary", "p7.Summary_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_summarize_result_extensions,
@@ -4857,11 +4857,11 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_summary_present", HFILL }},
     { &hf_p7_summary_present_item,
-      { "present item", "p7.present_item",
+      { "present item", "p7.present_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_summary_present_item", HFILL }},
     { &hf_p7_value,
-      { "value", "p7.value",
+      { "value", "p7.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SummaryPresentItemValue", HFILL }},
     { &hf_p7_summary_count,
@@ -4881,7 +4881,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_ub_messages_OF_EntryInformation", HFILL }},
     { &hf_p7_requested_item,
-      { "EntryInformation", "p7.EntryInformation",
+      { "EntryInformation", "p7.EntryInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_list_result_extensions,
@@ -4893,7 +4893,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, VALS(p7_T_item_vals), 0,
         NULL, HFILL }},
     { &hf_p7_search,
-      { "search", "p7.search",
+      { "search", "p7.search_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Selector", HFILL }},
     { &hf_p7_precise,
@@ -4905,7 +4905,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MSExtensions", HFILL }},
     { &hf_p7_entry_information,
-      { "entry-information", "p7.entry_information",
+      { "entry-information", "p7.entry_information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EntryInformation", HFILL }},
     { &hf_p7_list,
@@ -4937,11 +4937,11 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MSExtensions", HFILL }},
     { &hf_p7_delete_result_88,
-      { "delete-result-88", "p7.delete_result_88",
+      { "delete-result-88", "p7.delete_result_88_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_delete_result_94,
-      { "delete-result-94", "p7.delete_result_94",
+      { "delete-result-94", "p7.delete_result_94_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_delete_result_94", HFILL }},
     { &hf_p7_entries_deleted_94,
@@ -4961,7 +4961,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_ub_auto_registrations_OF_AutoActionRegistration", HFILL }},
     { &hf_p7_auto_action_registrations_item,
-      { "AutoActionRegistration", "p7.AutoActionRegistration",
+      { "AutoActionRegistration", "p7.AutoActionRegistration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_auto_action_deregistrations,
@@ -4969,7 +4969,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_ub_auto_registrations_OF_AutoActionDeregistration", HFILL }},
     { &hf_p7_auto_action_deregistrations_item,
-      { "AutoActionDeregistration", "p7.AutoActionDeregistration",
+      { "AutoActionDeregistration", "p7.AutoActionDeregistration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_list_attribute_defaults,
@@ -4989,7 +4989,7 @@ void proto_register_p7(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_change_credentials,
-      { "change-credentials", "p7.change_credentials",
+      { "change-credentials", "p7.change_credentials_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_register_old_credentials,
@@ -5005,7 +5005,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_ub_labels_and_redirections_OF_SecurityLabel", HFILL }},
     { &hf_p7_user_security_labels_item,
-      { "SecurityLabel", "p7.SecurityLabel",
+      { "SecurityLabel", "p7.SecurityLabel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_ua_registrations,
@@ -5013,11 +5013,11 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_ub_ua_registrations_OF_UARegistration", HFILL }},
     { &hf_p7_ua_registrations_item,
-      { "UARegistration", "p7.UARegistration",
+      { "UARegistration", "p7.UARegistration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_submission_defaults,
-      { "submission-defaults", "p7.submission_defaults",
+      { "submission-defaults", "p7.submission_defaults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MSSubmissionOptions", HFILL }},
     { &hf_p7_message_group_registrations,
@@ -5025,7 +5025,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MessageGroupRegistrations", HFILL }},
     { &hf_p7_registration_status_request,
-      { "registration-status-request", "p7.registration_status_request",
+      { "registration-status-request", "p7.registration_status_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RegistrationTypes", HFILL }},
     { &hf_p7_register_ms_extensions,
@@ -5049,7 +5049,7 @@ void proto_register_p7(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_ua_submission_defaults,
-      { "ua-submission-defaults", "p7.ua_submission_defaults",
+      { "ua-submission-defaults", "p7.ua_submission_defaults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MSSubmissionOptions", HFILL }},
     { &hf_p7_content_specific_defaults,
@@ -5061,7 +5061,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, VALS(p7_MessageGroupRegistrations_item_vals), 0,
         NULL, HFILL }},
     { &hf_p7_register_group,
-      { "register-group", "p7.register_group",
+      { "register-group", "p7.register_group_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MessageGroupNameAndDescriptor", HFILL }},
     { &hf_p7_deregister_group,
@@ -5069,7 +5069,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MessageGroupName", HFILL }},
     { &hf_p7_change_descriptors,
-      { "change-descriptors", "p7.change_descriptors",
+      { "change-descriptors", "p7.change_descriptors_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MessageGroupNameAndDescriptor", HFILL }},
     { &hf_p7_message_group_name,
@@ -5089,11 +5089,11 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_extended_registrations_item,
-      { "extended-registrations item", "p7.extended_registrations_item",
+      { "extended-registrations item", "p7.extended_registrations_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_restrict_message_groups,
-      { "restrict-message-groups", "p7.restrict_message_groups",
+      { "restrict-message-groups", "p7.restrict_message_groups_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MessageGroupsRestriction", HFILL }},
     { &hf_p7_parent_group,
@@ -5121,11 +5121,11 @@ void proto_register_p7(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_p7_no_status_information,
-      { "no-status-information", "p7.no_status_information",
+      { "no-status-information", "p7.no_status_information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_registered_information,
-      { "registered-information", "p7.registered_information",
+      { "registered-information", "p7.registered_information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_registered_list_attribute_defaults,
@@ -5149,7 +5149,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_ub_message_groups_OF_MessageGroupNameAndDescriptor", HFILL }},
     { &hf_p7_registered_message_group_registrations_item,
-      { "MessageGroupNameAndDescriptor", "p7.MessageGroupNameAndDescriptor",
+      { "MessageGroupNameAndDescriptor", "p7.MessageGroupNameAndDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_register_ms_result_extensions,
@@ -5161,7 +5161,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_ub_auto_actions", HFILL }},
     { &hf_p7_new_entry,
-      { "new-entry", "p7.new_entry",
+      { "new-entry", "p7.new_entry_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EntryInformation", HFILL }},
     { &hf_p7_entries,
@@ -5181,7 +5181,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_ub_modifications_OF_EntryModification", HFILL }},
     { &hf_p7_modifications_item,
-      { "EntryModification", "p7.EntryModification",
+      { "EntryModification", "p7.EntryModification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_modify_extensions,
@@ -5197,7 +5197,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, VALS(p7_T_modification_vals), 0,
         NULL, HFILL }},
     { &hf_p7_add_attribute,
-      { "add-attribute", "p7.add_attribute",
+      { "add-attribute", "p7.add_attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Attribute", HFILL }},
     { &hf_p7_remove_attribute,
@@ -5205,11 +5205,11 @@ void proto_register_p7(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "AttributeType", HFILL }},
     { &hf_p7_add_values,
-      { "add-values", "p7.add_values",
+      { "add-values", "p7.add_values_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OrderedAttribute", HFILL }},
     { &hf_p7_remove_values,
-      { "remove-values", "p7.remove_values",
+      { "remove-values", "p7.remove_values_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OrderedAttribute", HFILL }},
     { &hf_p7_ordered_attribute_values,
@@ -5217,11 +5217,11 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OrderedAttributeValues", HFILL }},
     { &hf_p7_ordered_attribute_values_item,
-      { "attribute-values item", "p7.attribute_values_item",
+      { "attribute-values item", "p7.attribute_values_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OrderedAttributeItem", HFILL }},
     { &hf_p7_ordered_attribute_value,
-      { "value", "p7.value",
+      { "value", "p7.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OrderedAttributeValue", HFILL }},
     { &hf_p7_ordered_position,
@@ -5241,7 +5241,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MSExtensions", HFILL }},
     { &hf_p7_envelope,
-      { "envelope", "p7.envelope",
+      { "envelope", "p7.envelope_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MessageSubmissionEnvelope", HFILL }},
     { &hf_p7_content,
@@ -5249,15 +5249,15 @@ void proto_register_p7(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_submission_options,
-      { "submission-options", "p7.submission_options",
+      { "submission-options", "p7.submission_options_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MSSubmissionOptions", HFILL }},
     { &hf_p7_mts_result,
-      { "mts-result", "p7.mts_result",
+      { "mts-result", "p7.mts_result_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_message_submission_identifier,
-      { "message-submission-identifier", "p7.message_submission_identifier",
+      { "message-submission-identifier", "p7.message_submission_identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MessageSubmissionIdentifier", HFILL }},
     { &hf_p7_message_submission_time,
@@ -5273,23 +5273,23 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_ExtensionField", HFILL }},
     { &hf_p7_extensions_item,
-      { "ExtensionField", "p7.ExtensionField",
+      { "ExtensionField", "p7.ExtensionField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_ms_message_result,
-      { "ms-message-result", "p7.ms_message_result",
+      { "ms-message-result", "p7.ms_message_result_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CommonSubmissionResults", HFILL }},
     { &hf_p7_store_draft_result,
-      { "store-draft-result", "p7.store_draft_result",
+      { "store-draft-result", "p7.store_draft_result_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CommonSubmissionResults", HFILL }},
     { &hf_p7_originator_name,
-      { "originator-name", "p7.originator_name",
+      { "originator-name", "p7.originator_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OriginatorName", HFILL }},
     { &hf_p7_original_encoded_information_types,
-      { "original-encoded-information-types", "p7.original_encoded_information_types",
+      { "original-encoded-information-types", "p7.original_encoded_information_types_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OriginalEncodedInformationTypes", HFILL }},
     { &hf_p7_content_type,
@@ -5309,11 +5309,11 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_PerRecipientProbeSubmissionFields", HFILL }},
     { &hf_p7_per_recipient_fields_item,
-      { "PerRecipientProbeSubmissionFields", "p7.PerRecipientProbeSubmissionFields",
+      { "PerRecipientProbeSubmissionFields", "p7.PerRecipientProbeSubmissionFields_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_probe_submission_identifier,
-      { "probe-submission-identifier", "p7.probe_submission_identifier",
+      { "probe-submission-identifier", "p7.probe_submission_identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProbeSubmissionIdentifier", HFILL }},
     { &hf_p7_probe_submission_time,
@@ -5321,7 +5321,7 @@ void proto_register_p7(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "ProbeSubmissionTime", HFILL }},
     { &hf_p7_ms_probe_result,
-      { "ms-probe-result", "p7.ms_probe_result",
+      { "ms-probe-result", "p7.ms_probe_result_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CommonSubmissionResults", HFILL }},
     { &hf_p7_attribute_problems,
@@ -5329,7 +5329,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "AttributeProblems", HFILL }},
     { &hf_p7_attribute_problem_item,
-      { "problems item", "p7.problems_item",
+      { "problems item", "p7.problems_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeProblemItem", HFILL }},
     { &hf_p7_attribute_problem,
@@ -5337,7 +5337,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, VALS(p7_AttributeProblem_vals), 0,
         "AttributeProblem", HFILL }},
     { &hf_p7_attr_value,
-      { "value", "p7.value",
+      { "value", "p7.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_attr_value", HFILL }},
     { &hf_p7_auto_action_request_problems,
@@ -5345,7 +5345,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "AutoActionRequestProblems", HFILL }},
     { &hf_p7_auto_action_request_problem_item,
-      { "problems item", "p7.problems_item",
+      { "problems item", "p7.problems_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AutoActionRequestProblemItem", HFILL }},
     { &hf_p7_auto_action_request_problem,
@@ -5357,7 +5357,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DeleteProblems", HFILL }},
     { &hf_p7_delete_problem_item,
-      { "problems item", "p7.problems_item",
+      { "problems item", "p7.problems_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeleteProblemItem", HFILL }},
     { &hf_p7_delete_problem,
@@ -5377,7 +5377,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "FetchRestrictionProblems", HFILL }},
     { &hf_p7_fetch_restriction_problem_item,
-      { "problems item", "p7.problems_item",
+      { "problems item", "p7.problems_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FetchRestrictionProblemItem", HFILL }},
     { &hf_p7_fetch_restriction_problem,
@@ -5409,7 +5409,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SequenceNumberProblems", HFILL }},
     { &hf_p7_sequence_number_problem_item,
-      { "problems item", "p7.problems_item",
+      { "problems item", "p7.problems_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SequenceNumberProblemItem", HFILL }},
     { &hf_p7_sequence_number_problem,
@@ -5429,7 +5429,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MessageGroupName", HFILL }},
     { &hf_p7_ms_extension_problem,
-      { "ms-extension-problem", "p7.ms_extension_problem",
+      { "ms-extension-problem", "p7.ms_extension_problem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MSExtensionItem", HFILL }},
     { &hf_p7_unknown_ms_extension,
@@ -5441,7 +5441,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, VALS(p7_RegistrationProblem_vals), 0,
         "RegistrationProblem", HFILL }},
     { &hf_p7_registration_type,
-      { "registration-type", "p7.registration_type",
+      { "registration-type", "p7.registration_type_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RegistrationTypes", HFILL }},
     { &hf_p7_failing_entry,
@@ -5461,7 +5461,7 @@ void proto_register_p7(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "T_entry_class_problem", HFILL }},
     { &hf_p7_no_correlated_reports,
-      { "no-correlated-reports", "p7.no_correlated_reports",
+      { "no-correlated-reports", "p7.no_correlated_reports_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_location,
@@ -5469,7 +5469,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_PerRecipientReport", HFILL }},
     { &hf_p7_location_item,
-      { "PerRecipientReport", "p7.PerRecipientReport",
+      { "PerRecipientReport", "p7.PerRecipientReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_report_entry,
@@ -5481,11 +5481,11 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_ub_recipients", HFILL }},
     { &hf_p7_submission_control_violated,
-      { "submission-control-violated", "p7.submission_control_violated",
+      { "submission-control-violated", "p7.submission_control_violated_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_originator_invalid,
-      { "originator-invalid", "p7.originator_invalid",
+      { "originator-invalid", "p7.originator_invalid_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_recipient_improperly_specified,
@@ -5493,11 +5493,11 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ImproperlySpecifiedRecipients", HFILL }},
     { &hf_p7_element_of_service_not_subscribed,
-      { "element-of-service-not-subscribed", "p7.element_of_service_not_subscribed",
+      { "element-of-service-not-subscribed", "p7.element_of_service_not_subscribed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_inconsistent_request,
-      { "inconsistent-request", "p7.inconsistent_request",
+      { "inconsistent-request", "p7.inconsistent_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_security_error,
@@ -5505,19 +5505,19 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, VALS(p1_SecurityProblem_vals), 0,
         "SecurityProblem", HFILL }},
     { &hf_p7_unsupported_critical_function,
-      { "unsupported-critical-function", "p7.unsupported_critical_function",
+      { "unsupported-critical-function", "p7.unsupported_critical_function_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_remote_bind_error,
-      { "remote-bind-error", "p7.remote_bind_error",
+      { "remote-bind-error", "p7.remote_bind_error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_service_error,
-      { "service-error", "p7.service_error",
+      { "service-error", "p7.service_error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ServiceErrorParameter", HFILL }},
     { &hf_p7_message_group_error,
-      { "message-group-error", "p7.message_group_error",
+      { "message-group-error", "p7.message_group_error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MessageGroupErrorParameter", HFILL }},
     { &hf_p7_ms_extension_error,
@@ -5525,7 +5525,7 @@ void proto_register_p7(void) {
         FT_UINT32, BASE_DEC, VALS(p7_MSExtensionErrorParameter_vals), 0,
         "MSExtensionErrorParameter", HFILL }},
     { &hf_p7_entry_class_error,
-      { "entry-class-error", "p7.entry_class_error",
+      { "entry-class-error", "p7.entry_class_error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EntryClassErrorParameter", HFILL }},
     { &hf_p7_content_integrity_check,
@@ -5553,15 +5553,15 @@ void proto_register_p7(void) {
         FT_INT32, BASE_DEC, VALS(p7_SignatureStatus_vals), 0,
         "SignatureStatus", HFILL }},
     { &hf_p7_rtorq_apdu,
-      { "rtorq-apdu", "p7.rtorq_apdu",
+      { "rtorq-apdu", "p7.rtorq_apdu_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RTORQapdu", HFILL }},
     { &hf_p7_rtoac_apdu,
-      { "rtoac-apdu", "p7.rtoac_apdu",
+      { "rtoac-apdu", "p7.rtoac_apdu_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RTOACapdu", HFILL }},
     { &hf_p7_rtorj_apdu,
-      { "rtorj-apdu", "p7.rtorj_apdu",
+      { "rtorj-apdu", "p7.rtorj_apdu_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RTORJapdu", HFILL }},
     { &hf_p7_rttp_apdu,
@@ -5573,7 +5573,7 @@ void proto_register_p7(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "RTTRapdu", HFILL }},
     { &hf_p7_rtab_apdu,
-      { "rtab-apdu", "p7.rtab_apdu",
+      { "rtab-apdu", "p7.rtab_apdu_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RTABapdu", HFILL }},
     { &hf_p7_abortReason,
@@ -5585,7 +5585,7 @@ void proto_register_p7(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_p7_userdataAB,
-      { "userdataAB", "p7.userdataAB",
+      { "userdataAB", "p7.userdataAB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p7_OverrideRestrictions_override_content_types_restriction,
diff --git a/epan/dissectors/packet-p772.c b/epan/dissectors/packet-p772.c
index 1b1e48df9f..6c308ccf1c 100644
--- a/epan/dissectors/packet-p772.c
+++ b/epan/dissectors/packet-p772.c
@@ -1277,7 +1277,7 @@ void proto_register_p772(void) {
         FT_UINT32, BASE_DEC, VALS(p22_InformationObject_vals), 0,
         NULL, HFILL }},
     { &hf_p772_Acp127NotificationResponse_PDU,
-      { "Acp127NotificationResponse", "p772.Acp127NotificationResponse",
+      { "Acp127NotificationResponse", "p772.Acp127NotificationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p772_ExemptedAddressSeq_PDU,
@@ -1289,7 +1289,7 @@ void proto_register_p772(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p772_DistributionCodes_PDU,
-      { "DistributionCodes", "p772.DistributionCodes",
+      { "DistributionCodes", "p772.DistributionCodes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p772_HandlingInstructions_PDU,
@@ -1317,7 +1317,7 @@ void proto_register_p772(void) {
         FT_INT32, BASE_DEC, VALS(p772_CopyPrecedence_vals), 0,
         NULL, HFILL }},
     { &hf_p772_MessageType_PDU,
-      { "MessageType", "p772.MessageType",
+      { "MessageType", "p772.MessageType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p772_AddressListDesignatorSeq_PDU,
@@ -1341,7 +1341,7 @@ void proto_register_p772(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p772_SecurityInformationLabels_PDU,
-      { "SecurityInformationLabels", "p772.SecurityInformationLabels",
+      { "SecurityInformationLabels", "p772.SecurityInformationLabels_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p772_PriorityLevelQualifier_PDU,
@@ -1365,7 +1365,7 @@ void proto_register_p772(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p772_ForwardedEncryptedParameters_PDU,
-      { "ForwardedEncryptedParameters", "p772.ForwardedEncryptedParameters",
+      { "ForwardedEncryptedParameters", "p772.ForwardedEncryptedParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p772_ForwardedEncryptedData_PDU,
@@ -1373,11 +1373,11 @@ void proto_register_p772(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p772_MMMessageParameters_PDU,
-      { "MMMessageParameters", "p772.MMMessageParameters",
+      { "MMMessageParameters", "p772.MMMessageParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p772_MMMessageData_PDU,
-      { "MMMessageData", "p772.MMMessageData",
+      { "MMMessageData", "p772.MMMessageData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p772_ACP127DataParameters_PDU,
@@ -1393,11 +1393,11 @@ void proto_register_p772(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p772_mm,
-      { "mm", "p772.mm",
+      { "mm", "p772.mm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IPM", HFILL }},
     { &hf_p772_mn,
-      { "mn", "p772.mn",
+      { "mn", "p772.mn_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IPN", HFILL }},
     { &hf_p772_acp127_notification_type,
@@ -1421,11 +1421,11 @@ void proto_register_p772(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "Acp127SuppInfo", HFILL }},
     { &hf_p772_AddressListIndicator_item,
-      { "AddressListDesignator", "p772.AddressListDesignator",
+      { "AddressListDesignator", "p772.AddressListDesignator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p772_ExemptedAddressSeq_item,
-      { "ExemptedAddress", "p772.ExemptedAddress",
+      { "ExemptedAddress", "p772.ExemptedAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p772_sics,
@@ -1441,7 +1441,7 @@ void proto_register_p772(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_DistributionExtensionField", HFILL }},
     { &hf_p772_dist_Extensions_item,
-      { "DistributionExtensionField", "p772.DistributionExtensionField",
+      { "DistributionExtensionField", "p772.DistributionExtensionField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p772_dist_type,
@@ -1449,7 +1449,7 @@ void proto_register_p772(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_p772_dist_value,
-      { "dist-value", "p772.dist_value",
+      { "dist-value", "p772.dist_value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_dist_value", HFILL }},
     { &hf_p772_HandlingInstructions_item,
@@ -1469,7 +1469,7 @@ void proto_register_p772(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "MessageIdentifier", HFILL }},
     { &hf_p772_AddressListDesignatorSeq_item,
-      { "AddressListDesignator", "p772.AddressListDesignator",
+      { "AddressListDesignator", "p772.AddressListDesignator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p772_address_list_type,
@@ -1477,7 +1477,7 @@ void proto_register_p772(void) {
         FT_INT32, BASE_DEC, VALS(p772_AddressListType_vals), 0,
         "AddressListType", HFILL }},
     { &hf_p772_listName,
-      { "listName", "p772.listName",
+      { "listName", "p772.listName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ORDescriptor", HFILL }},
     { &hf_p772_notificationRequest,
@@ -1489,7 +1489,7 @@ void proto_register_p772(void) {
         FT_INT32, BASE_DEC, VALS(p772_AddressListRequest_vals), 0,
         "AddressListRequest", HFILL }},
     { &hf_p772_OtherRecipientDesignatorSeq_item,
-      { "OtherRecipientDesignator", "p772.OtherRecipientDesignator",
+      { "OtherRecipientDesignator", "p772.OtherRecipientDesignator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p772_other_recipient_type,
@@ -1501,7 +1501,7 @@ void proto_register_p772(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "MilitaryString", HFILL }},
     { &hf_p772_PilotInformationSeq_item,
-      { "PilotInformation", "p772.PilotInformation",
+      { "PilotInformation", "p772.PilotInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p772_pilotPrecedence,
@@ -1513,11 +1513,11 @@ void proto_register_p772(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ORDescriptor", HFILL }},
     { &hf_p772_pilotRecipient_item,
-      { "ORDescriptor", "p772.ORDescriptor",
+      { "ORDescriptor", "p772.ORDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p772_pilotSecurity,
-      { "pilotSecurity", "p772.pilotSecurity",
+      { "pilotSecurity", "p772.pilotSecurity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecurityLabel", HFILL }},
     { &hf_p772_pilotHandling,
@@ -1529,11 +1529,11 @@ void proto_register_p772(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p772_content_security_label,
-      { "content-security-label", "p772.content_security_label",
+      { "content-security-label", "p772.content_security_label_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecurityLabel", HFILL }},
     { &hf_p772_heading_security_label,
-      { "heading-security-label", "p772.heading_security_label",
+      { "heading-security-label", "p772.heading_security_label_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecurityLabel", HFILL }},
     { &hf_p772_body_part_security_labels,
@@ -1541,11 +1541,11 @@ void proto_register_p772(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_BodyPartSecurityLabel", HFILL }},
     { &hf_p772_body_part_security_labels_item,
-      { "BodyPartSecurityLabel", "p772.BodyPartSecurityLabel",
+      { "BodyPartSecurityLabel", "p772.BodyPartSecurityLabel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_p772_body_part_security_label,
-      { "body-part-security-label", "p772.body_part_security_label",
+      { "body-part-security-label", "p772.body_part_security_label_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecurityLabel", HFILL }},
     { &hf_p772_body_part_sequence_number,
@@ -1569,7 +1569,7 @@ void proto_register_p772(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "MessageDeliveryTime", HFILL }},
     { &hf_p772_delivery_envelope,
-      { "delivery-envelope", "p772.delivery_envelope",
+      { "delivery-envelope", "p772.delivery_envelope_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OtherMessageDeliveryFields", HFILL }},
     { &hf_p772_Acp127NotificationType_acp127_nn,
diff --git a/epan/dissectors/packet-pcap.c b/epan/dissectors/packet-pcap.c
index 6825386484..423c97f616 100644
--- a/epan/dissectors/packet-pcap.c
+++ b/epan/dissectors/packet-pcap.c
@@ -13758,7 +13758,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_RoundTripTimeInfoWithType1_PDU,
-      { "RoundTripTimeInfoWithType1", "pcap.RoundTripTimeInfoWithType1",
+      { "RoundTripTimeInfoWithType1", "pcap.RoundTripTimeInfoWithType1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ExtendedTimingAdvanceLCR_PDU,
@@ -13766,19 +13766,19 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_RxTimingDeviation768Info_PDU,
-      { "RxTimingDeviation768Info", "pcap.RxTimingDeviation768Info",
+      { "RxTimingDeviation768Info", "pcap.RxTimingDeviation768Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_RxTimingDeviation384extInfo_PDU,
-      { "RxTimingDeviation384extInfo", "pcap.RxTimingDeviation384extInfo",
+      { "RxTimingDeviation384extInfo", "pcap.RxTimingDeviation384extInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_AddMeasurementInfo_PDU,
-      { "AddMeasurementInfo", "pcap.AddMeasurementInfo",
+      { "AddMeasurementInfo", "pcap.AddMeasurementInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_AngleOfArrivalLCR_PDU,
-      { "AngleOfArrivalLCR", "pcap.AngleOfArrivalLCR",
+      { "AngleOfArrivalLCR", "pcap.AngleOfArrivalLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_CellId_IRATMeasuredResultsSets_PDU,
@@ -13786,11 +13786,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_CellIDPositioning_PDU,
-      { "CellIDPositioning", "pcap.CellIDPositioning",
+      { "CellIDPositioning", "pcap.CellIDPositioning_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_RequestedCellIDGERANMeasurements_PDU,
-      { "RequestedCellIDGERANMeasurements", "pcap.RequestedCellIDGERANMeasurements",
+      { "RequestedCellIDGERANMeasurements", "pcap.RequestedCellIDGERANMeasurements_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ClientType_PDU,
@@ -13798,11 +13798,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_ClientType_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_CriticalityDiagnostics_PDU,
-      { "CriticalityDiagnostics", "pcap.CriticalityDiagnostics",
+      { "CriticalityDiagnostics", "pcap.CriticalityDiagnostics_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_DGNSS_ValidityPeriod_PDU,
-      { "DGNSS-ValidityPeriod", "pcap.DGNSS_ValidityPeriod",
+      { "DGNSS-ValidityPeriod", "pcap.DGNSS_ValidityPeriod_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_IMEI_PDU,
@@ -13818,19 +13818,19 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_UE_PositionEstimate_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_UE_PositionEstimateInfo_PDU,
-      { "UE-PositionEstimateInfo", "pcap.UE_PositionEstimateInfo",
+      { "UE-PositionEstimateInfo", "pcap.UE_PositionEstimateInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GANSS_Reference_Time_Only_PDU,
-      { "GANSS-Reference-Time-Only", "pcap.GANSS_Reference_Time_Only",
+      { "GANSS-Reference-Time-Only", "pcap.GANSS_Reference_Time_Only_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_PositionDataUEbased_PDU,
-      { "PositionDataUEbased", "pcap.PositionDataUEbased",
+      { "PositionDataUEbased", "pcap.PositionDataUEbased_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_PositionData_PDU,
-      { "PositionData", "pcap.PositionData",
+      { "PositionData", "pcap.PositionData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GANSS_PositioningDataSet_PDU,
@@ -13838,15 +13838,15 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_AzimuthAndElevationLSB_PDU,
-      { "AzimuthAndElevationLSB", "pcap.AzimuthAndElevationLSB",
+      { "AzimuthAndElevationLSB", "pcap.AzimuthAndElevationLSB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GANSS_Additional_Ionospheric_Model_PDU,
-      { "GANSS-Additional-Ionospheric-Model", "pcap.GANSS_Additional_Ionospheric_Model",
+      { "GANSS-Additional-Ionospheric-Model", "pcap.GANSS_Additional_Ionospheric_Model_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GANSS_Additional_Navigation_Models_PDU,
-      { "GANSS-Additional-Navigation-Models", "pcap.GANSS_Additional_Navigation_Models",
+      { "GANSS-Additional-Navigation-Models", "pcap.GANSS_Additional_Navigation_Models_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GANSS_Additional_Time_Models_PDU,
@@ -13858,23 +13858,23 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_GANSS_Additional_UTC_Models_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_GANSS_ALM_ECEFsbasAlmanacSet_PDU,
-      { "GANSS-ALM-ECEFsbasAlmanacSet", "pcap.GANSS_ALM_ECEFsbasAlmanacSet",
+      { "GANSS-ALM-ECEFsbasAlmanacSet", "pcap.GANSS_ALM_ECEFsbasAlmanacSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GANSS_ALM_GlonassAlmanacSet_PDU,
-      { "GANSS-ALM-GlonassAlmanacSet", "pcap.GANSS_ALM_GlonassAlmanacSet",
+      { "GANSS-ALM-GlonassAlmanacSet", "pcap.GANSS_ALM_GlonassAlmanacSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GANSS_ALM_MidiAlmanacSet_PDU,
-      { "GANSS-ALM-MidiAlmanacSet", "pcap.GANSS_ALM_MidiAlmanacSet",
+      { "GANSS-ALM-MidiAlmanacSet", "pcap.GANSS_ALM_MidiAlmanacSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GANSS_ALM_NAVKeplerianSet_PDU,
-      { "GANSS-ALM-NAVKeplerianSet", "pcap.GANSS_ALM_NAVKeplerianSet",
+      { "GANSS-ALM-NAVKeplerianSet", "pcap.GANSS_ALM_NAVKeplerianSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GANSS_ALM_ReducedKeplerianSet_PDU,
-      { "GANSS-ALM-ReducedKeplerianSet", "pcap.GANSS_ALM_ReducedKeplerianSet",
+      { "GANSS-ALM-ReducedKeplerianSet", "pcap.GANSS_ALM_ReducedKeplerianSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GANSS_Auxiliary_Information_PDU,
@@ -13882,11 +13882,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_GANSS_Auxiliary_Information_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_GANSS_CommonAssistanceData_PDU,
-      { "GANSS-CommonAssistanceData", "pcap.GANSS_CommonAssistanceData",
+      { "GANSS-CommonAssistanceData", "pcap.GANSS_CommonAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GANSS_Earth_Orientation_Parameters_PDU,
-      { "GANSS-Earth-Orientation-Parameters", "pcap.GANSS_Earth_Orientation_Parameters",
+      { "GANSS-Earth-Orientation-Parameters", "pcap.GANSS_Earth_Orientation_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GANSS_GenericAssistanceDataList_PDU,
@@ -13894,11 +13894,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GanssCodePhaseAmbiguityExt_PDU,
-      { "GanssCodePhaseAmbiguityExt", "pcap.GanssCodePhaseAmbiguityExt",
+      { "GanssCodePhaseAmbiguityExt", "pcap.GanssCodePhaseAmbiguityExt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GanssIntegerCodePhaseExt_PDU,
-      { "GanssIntegerCodePhaseExt", "pcap.GanssIntegerCodePhaseExt",
+      { "GanssIntegerCodePhaseExt", "pcap.GanssIntegerCodePhaseExt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GANSS_MeasuredResultsList_PDU,
@@ -13914,7 +13914,7 @@ void proto_register_pcap(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GANSS_UTRAN_TRU_PDU,
-      { "GANSS-UTRAN-TRU", "pcap.GANSS_UTRAN_TRU",
+      { "GANSS-UTRAN-TRU", "pcap.GANSS_UTRAN_TRU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_CompleteAlmanacProvided_PDU,
@@ -13926,7 +13926,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GPS_ReferenceLocation_PDU,
-      { "GPS-ReferenceLocation", "pcap.GPS_ReferenceLocation",
+      { "GPS-ReferenceLocation", "pcap.GPS_ReferenceLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GPS_Week_Cycle_PDU,
@@ -13938,7 +13938,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &pcap_UTRAN_GPS_DriftRate_vals_ext, 0,
         NULL, HFILL }},
     { &hf_pcap_GPSReferenceTimeUncertainty_PDU,
-      { "GPSReferenceTimeUncertainty", "pcap.GPSReferenceTimeUncertainty",
+      { "GPSReferenceTimeUncertainty", "pcap.GPSReferenceTimeUncertainty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GPS_UTRAN_TRU_PDU,
@@ -13946,15 +13946,15 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_GPS_UTRAN_TRU_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_AdditionalGPSAssistDataRequired_PDU,
-      { "AdditionalGPSAssistDataRequired", "pcap.AdditionalGPSAssistDataRequired",
+      { "AdditionalGPSAssistDataRequired", "pcap.AdditionalGPSAssistDataRequired_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_AdditionalGanssAssistDataRequired_PDU,
-      { "AdditionalGanssAssistDataRequired", "pcap.AdditionalGanssAssistDataRequired",
+      { "AdditionalGanssAssistDataRequired", "pcap.AdditionalGanssAssistDataRequired_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GANSSReq_AddIonosphericModel_PDU,
-      { "GANSSReq-AddIonosphericModel", "pcap.GANSSReq_AddIonosphericModel",
+      { "GANSSReq-AddIonosphericModel", "pcap.GANSSReq_AddIonosphericModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GANSSReq_EarthOrientPara_PDU,
@@ -13974,7 +13974,7 @@ void proto_register_pcap(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GANSS_AddADchoices_PDU,
-      { "GANSS-AddADchoices", "pcap.GANSS_AddADchoices",
+      { "GANSS-AddADchoices", "pcap.GANSS_AddADchoices_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_InformationExchangeID_PDU,
@@ -13982,7 +13982,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_InformationReportCharacteristics_PDU,
-      { "InformationReportCharacteristics", "pcap.InformationReportCharacteristics",
+      { "InformationReportCharacteristics", "pcap.InformationReportCharacteristics_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_InformationType_PDU,
@@ -13990,11 +13990,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_InformationType_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_GANSS_AddIonoModelReq_PDU,
-      { "GANSS-AddIonoModelReq", "pcap.GANSS_AddIonoModelReq",
+      { "GANSS-AddIonoModelReq", "pcap.GANSS_AddIonoModelReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GANSS_EarthOrientParaReq_PDU,
-      { "GANSS-EarthOrientParaReq", "pcap.GANSS_EarthOrientParaReq",
+      { "GANSS-EarthOrientParaReq", "pcap.GANSS_EarthOrientParaReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GANSS_SBAS_ID_PDU,
@@ -14002,15 +14002,15 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_GANSS_SBAS_ID_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_MeasInstructionsUsed_PDU,
-      { "MeasInstructionsUsed", "pcap.MeasInstructionsUsed",
+      { "MeasInstructionsUsed", "pcap.MeasInstructionsUsed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_OTDOA_MeasurementGroup_PDU,
-      { "OTDOA-MeasurementGroup", "pcap.OTDOA_MeasurementGroup",
+      { "OTDOA-MeasurementGroup", "pcap.OTDOA_MeasurementGroup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_OTDOA_ReferenceCellInfoSAS_centric_PDU,
-      { "OTDOA-ReferenceCellInfoSAS-centric", "pcap.OTDOA_ReferenceCellInfoSAS_centric",
+      { "OTDOA-ReferenceCellInfoSAS-centric", "pcap.OTDOA_ReferenceCellInfoSAS_centric_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_OTDOA_MeasuredResultsSets_PDU,
@@ -14018,11 +14018,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_OTDOA_AddMeasuredResultsInfo_PDU,
-      { "OTDOA-AddMeasuredResultsInfo", "pcap.OTDOA_AddMeasuredResultsInfo",
+      { "OTDOA-AddMeasuredResultsInfo", "pcap.OTDOA_AddMeasuredResultsInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_UC_ID_PDU,
-      { "UC-ID", "pcap.UC_ID",
+      { "UC-ID", "pcap.UC_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_Extended_RNC_ID_PDU,
@@ -14030,15 +14030,15 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_AdditionalMeasurementInforLCR_PDU,
-      { "AdditionalMeasurementInforLCR", "pcap.AdditionalMeasurementInforLCR",
+      { "AdditionalMeasurementInforLCR", "pcap.AdditionalMeasurementInforLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_PeriodicPosCalcInfo_PDU,
-      { "PeriodicPosCalcInfo", "pcap.PeriodicPosCalcInfo",
+      { "PeriodicPosCalcInfo", "pcap.PeriodicPosCalcInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_PeriodicLocationInfo_PDU,
-      { "PeriodicLocationInfo", "pcap.PeriodicLocationInfo",
+      { "PeriodicLocationInfo", "pcap.PeriodicLocationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_PeriodicTerminationCause_PDU,
@@ -14046,7 +14046,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_PeriodicTerminationCause_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_PositioningMethod_PDU,
-      { "PositioningMethod", "pcap.PositioningMethod",
+      { "PositioningMethod", "pcap.PositioningMethod_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GNSS_PositioningMethod_PDU,
@@ -14058,11 +14058,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_PositioningPriority_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_RRCstateChange_PDU,
-      { "RRCstateChange", "pcap.RRCstateChange",
+      { "RRCstateChange", "pcap.RRCstateChange_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_RequestType_PDU,
-      { "RequestType", "pcap.RequestType",
+      { "RequestType", "pcap.RequestType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ResponseTime_PDU,
@@ -14074,7 +14074,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_UE_PositioningCapability_PDU,
-      { "UE-PositioningCapability", "pcap.UE_PositioningCapability",
+      { "UE-PositioningCapability", "pcap.UE_PositioningCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_NetworkAssistedGANSSSupport_PDU,
@@ -14082,11 +14082,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GANSS_SBAS_IDs_PDU,
-      { "GANSS-SBAS-IDs", "pcap.GANSS_SBAS_IDs",
+      { "GANSS-SBAS-IDs", "pcap.GANSS_SBAS_IDs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GANSS_Signal_IDs_PDU,
-      { "GANSS-Signal-IDs", "pcap.GANSS_Signal_IDs",
+      { "GANSS-Signal-IDs", "pcap.GANSS_Signal_IDs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_SupportGANSSNonNativeADchoices_PDU,
@@ -14094,7 +14094,7 @@ void proto_register_pcap(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_UTDOAPositioning_PDU,
-      { "UTDOAPositioning", "pcap.UTDOAPositioning",
+      { "UTDOAPositioning", "pcap.UTDOAPositioning_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_EnvironmentCharacterisation_PDU,
@@ -14102,11 +14102,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_EnvironmentCharacterisation_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_GPSPositioning_PDU,
-      { "GPSPositioning", "pcap.GPSPositioning",
+      { "GPSPositioning", "pcap.GPSPositioning_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GANSSPositioning_PDU,
-      { "GANSSPositioning", "pcap.GANSSPositioning",
+      { "GANSSPositioning", "pcap.GANSSPositioning_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GANSScarrierPhaseRequested_PDU,
@@ -14118,7 +14118,7 @@ void proto_register_pcap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_OTDOAAssistanceData_PDU,
-      { "OTDOAAssistanceData", "pcap.OTDOAAssistanceData",
+      { "OTDOAAssistanceData", "pcap.OTDOAAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_VerticalAccuracyCode_PDU,
@@ -14126,7 +14126,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_UTDOA_Group_PDU,
-      { "UTDOA-Group", "pcap.UTDOA_Group",
+      { "UTDOA-Group", "pcap.UTDOA_Group_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_Positioning_ResponseTime_PDU,
@@ -14146,27 +14146,27 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_VelocityEstimate_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_UTRAN_GPSReferenceTime_PDU,
-      { "UTRAN-GPSReferenceTime", "pcap.UTRAN_GPSReferenceTime",
+      { "UTRAN-GPSReferenceTime", "pcap.UTRAN_GPSReferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_UTRAN_GANSSReferenceTimeResult_PDU,
-      { "UTRAN-GANSSReferenceTimeResult", "pcap.UTRAN_GANSSReferenceTimeResult",
+      { "UTRAN-GANSSReferenceTimeResult", "pcap.UTRAN_GANSSReferenceTimeResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_PositionCalculationRequest_PDU,
-      { "PositionCalculationRequest", "pcap.PositionCalculationRequest",
+      { "PositionCalculationRequest", "pcap.PositionCalculationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_PositionCalculationResponse_PDU,
-      { "PositionCalculationResponse", "pcap.PositionCalculationResponse",
+      { "PositionCalculationResponse", "pcap.PositionCalculationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_PositionCalculationFailure_PDU,
-      { "PositionCalculationFailure", "pcap.PositionCalculationFailure",
+      { "PositionCalculationFailure", "pcap.PositionCalculationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_InformationExchangeInitiationRequest_PDU,
-      { "InformationExchangeInitiationRequest", "pcap.InformationExchangeInitiationRequest",
+      { "InformationExchangeInitiationRequest", "pcap.InformationExchangeInitiationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_InformationExchangeObjectType_InfEx_Rqst_PDU,
@@ -14174,11 +14174,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_InformationExchangeObjectType_InfEx_Rqst_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_UC_ID_InfEx_Rqst_PDU,
-      { "UC-ID-InfEx-Rqst", "pcap.UC_ID_InfEx_Rqst",
+      { "UC-ID-InfEx-Rqst", "pcap.UC_ID_InfEx_Rqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_InformationExchangeInitiationResponse_PDU,
-      { "InformationExchangeInitiationResponse", "pcap.InformationExchangeInitiationResponse",
+      { "InformationExchangeInitiationResponse", "pcap.InformationExchangeInitiationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_InformationExchangeObjectType_InfEx_Rsp_PDU,
@@ -14186,35 +14186,35 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_InformationExchangeObjectType_InfEx_Rsp_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_InformationExchangeInitiationFailure_PDU,
-      { "InformationExchangeInitiationFailure", "pcap.InformationExchangeInitiationFailure",
+      { "InformationExchangeInitiationFailure", "pcap.InformationExchangeInitiationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_PositionInitiationRequest_PDU,
-      { "PositionInitiationRequest", "pcap.PositionInitiationRequest",
+      { "PositionInitiationRequest", "pcap.PositionInitiationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_PositionInitiationResponse_PDU,
-      { "PositionInitiationResponse", "pcap.PositionInitiationResponse",
+      { "PositionInitiationResponse", "pcap.PositionInitiationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_PositionInitiationFailure_PDU,
-      { "PositionInitiationFailure", "pcap.PositionInitiationFailure",
+      { "PositionInitiationFailure", "pcap.PositionInitiationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_PositionActivationRequest_PDU,
-      { "PositionActivationRequest", "pcap.PositionActivationRequest",
+      { "PositionActivationRequest", "pcap.PositionActivationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_PositionActivationResponse_PDU,
-      { "PositionActivationResponse", "pcap.PositionActivationResponse",
+      { "PositionActivationResponse", "pcap.PositionActivationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_PositionActivationFailure_PDU,
-      { "PositionActivationFailure", "pcap.PositionActivationFailure",
+      { "PositionActivationFailure", "pcap.PositionActivationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_InformationReport_PDU,
-      { "InformationReport", "pcap.InformationReport",
+      { "InformationReport", "pcap.InformationReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_InformationExchangeObjectType_InfEx_Rprt_PDU,
@@ -14222,39 +14222,39 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_InformationExchangeObjectType_InfEx_Rprt_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_InformationExchangeTerminationRequest_PDU,
-      { "InformationExchangeTerminationRequest", "pcap.InformationExchangeTerminationRequest",
+      { "InformationExchangeTerminationRequest", "pcap.InformationExchangeTerminationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_InformationExchangeFailureIndication_PDU,
-      { "InformationExchangeFailureIndication", "pcap.InformationExchangeFailureIndication",
+      { "InformationExchangeFailureIndication", "pcap.InformationExchangeFailureIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ErrorIndication_PDU,
-      { "ErrorIndication", "pcap.ErrorIndication",
+      { "ErrorIndication", "pcap.ErrorIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_PositionParameterModification_PDU,
-      { "PositionParameterModification", "pcap.PositionParameterModification",
+      { "PositionParameterModification", "pcap.PositionParameterModification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_PrivateMessage_PDU,
-      { "PrivateMessage", "pcap.PrivateMessage",
+      { "PrivateMessage", "pcap.PrivateMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_Abort_PDU,
-      { "Abort", "pcap.Abort",
+      { "Abort", "pcap.Abort_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_PositionPeriodicReport_PDU,
-      { "PositionPeriodicReport", "pcap.PositionPeriodicReport",
+      { "PositionPeriodicReport", "pcap.PositionPeriodicReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_PositionPeriodicResult_PDU,
-      { "PositionPeriodicResult", "pcap.PositionPeriodicResult",
+      { "PositionPeriodicResult", "pcap.PositionPeriodicResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_PositionPeriodicTermination_PDU,
-      { "PositionPeriodicTermination", "pcap.PositionPeriodicTermination",
+      { "PositionPeriodicTermination", "pcap.PositionPeriodicTermination_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_PCAP_PDU_PDU,
@@ -14278,7 +14278,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_32767", HFILL }},
     { &hf_pcap_ProtocolIE_Container_item,
-      { "ProtocolIE-Field", "pcap.ProtocolIE_Field",
+      { "ProtocolIE-Field", "pcap.ProtocolIE_Field_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_id,
@@ -14290,11 +14290,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_Criticality_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_ie_field_value,
-      { "value", "pcap.value",
+      { "value", "pcap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ie_field_value", HFILL }},
     { &hf_pcap_ProtocolExtensionContainer_item,
-      { "ProtocolExtensionField", "pcap.ProtocolExtensionField",
+      { "ProtocolExtensionField", "pcap.ProtocolExtensionField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ext_id,
@@ -14302,11 +14302,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &pcap_ProtocolIE_ID_vals_ext, 0,
         "ProtocolIE_ID", HFILL }},
     { &hf_pcap_extensionValue,
-      { "extensionValue", "pcap.extensionValue",
+      { "extensionValue", "pcap.extensionValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_PrivateIE_Container_item,
-      { "PrivateIE-Field", "pcap.PrivateIE_Field",
+      { "PrivateIE-Field", "pcap.PrivateIE_Field_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_private_id,
@@ -14314,11 +14314,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_PrivateIE_ID_vals), 0,
         "PrivateIE_ID", HFILL }},
     { &hf_pcap_private_value,
-      { "value", "pcap.value",
+      { "value", "pcap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_private_value", HFILL }},
     { &hf_pcap_gpsAlmanacAndSatelliteHealth,
-      { "gpsAlmanacAndSatelliteHealth", "pcap.gpsAlmanacAndSatelliteHealth",
+      { "gpsAlmanacAndSatelliteHealth", "pcap.gpsAlmanacAndSatelliteHealth_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GPS_AlmanacAndSatelliteHealth", HFILL }},
     { &hf_pcap_satMask,
@@ -14354,15 +14354,15 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_CellId_MeasuredResultsInfoList_item,
-      { "CellId-MeasuredResultsInfo", "pcap.CellId_MeasuredResultsInfo",
+      { "CellId-MeasuredResultsInfo", "pcap.CellId_MeasuredResultsInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_uC_ID,
-      { "uC-ID", "pcap.uC_ID",
+      { "uC-ID", "pcap.uC_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_uTRANAccessPointPositionAltitude,
-      { "uTRANAccessPointPositionAltitude", "pcap.uTRANAccessPointPositionAltitude",
+      { "uTRANAccessPointPositionAltitude", "pcap.uTRANAccessPointPositionAltitude_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ue_PositionEstimate,
@@ -14370,15 +14370,15 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_UE_PositionEstimate_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_roundTripTimeInfo,
-      { "roundTripTimeInfo", "pcap.roundTripTimeInfo",
+      { "roundTripTimeInfo", "pcap.roundTripTimeInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_rxTimingDeviationInfo,
-      { "rxTimingDeviationInfo", "pcap.rxTimingDeviationInfo",
+      { "rxTimingDeviationInfo", "pcap.rxTimingDeviationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_rxTimingDeviationLCRInfo,
-      { "rxTimingDeviationLCRInfo", "pcap.rxTimingDeviationLCRInfo",
+      { "rxTimingDeviationLCRInfo", "pcap.rxTimingDeviationLCRInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_pathloss,
@@ -14390,7 +14390,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ue_PositioningMeasQuality,
-      { "ue-PositioningMeasQuality", "pcap.ue_PositioningMeasQuality",
+      { "ue-PositioningMeasQuality", "pcap.ue_PositioningMeasQuality_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_roundTripTime,
@@ -14418,11 +14418,11 @@ void proto_register_pcap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_5", HFILL }},
     { &hf_pcap_geographicalCoordinates,
-      { "geographicalCoordinates", "pcap.geographicalCoordinates",
+      { "geographicalCoordinates", "pcap.geographicalCoordinates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ga_AltitudeAndDirection,
-      { "ga-AltitudeAndDirection", "pcap.ga_AltitudeAndDirection",
+      { "ga-AltitudeAndDirection", "pcap.ga_AltitudeAndDirection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_rxTimingDeviation,
@@ -14474,7 +14474,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_AOA_LCR_Accuracy_Class_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_CellId_IRATMeasuredResultsSets_item,
-      { "CellId-IRATMeasuredResultsInfoList", "pcap.CellId_IRATMeasuredResultsInfoList",
+      { "CellId-IRATMeasuredResultsInfoList", "pcap.CellId_IRATMeasuredResultsInfoList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_gERAN_MeasuredResultsInfoList,
@@ -14486,15 +14486,15 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ProtocolExtensionContainer", HFILL }},
     { &hf_pcap_GERAN_MeasuredResultsInfoList_item,
-      { "GERAN-MeasuredResultsInfo", "pcap.GERAN_MeasuredResultsInfo",
+      { "GERAN-MeasuredResultsInfo", "pcap.GERAN_MeasuredResultsInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_gERANCellID,
-      { "gERANCellID", "pcap.gERANCellID",
+      { "gERANCellID", "pcap.gERANCellID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GERANCellGlobalID", HFILL }},
     { &hf_pcap_gERANPhysicalCellID,
-      { "gERANPhysicalCellID", "pcap.gERANPhysicalCellID",
+      { "gERANPhysicalCellID", "pcap.gERANPhysicalCellID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_gSM_RSSI,
@@ -14514,7 +14514,7 @@ void proto_register_pcap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_bsic,
-      { "bsic", "pcap.bsic",
+      { "bsic", "pcap.bsic_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GSM_BSIC", HFILL }},
     { &hf_pcap_arfcn,
@@ -14534,7 +14534,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_RequestedCellIDMeasurements_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_fdd,
-      { "fdd", "pcap.fdd",
+      { "fdd", "pcap.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_roundTripTimeInfoWanted,
@@ -14558,7 +14558,7 @@ void proto_register_pcap(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_pcap_tdd,
-      { "tdd", "pcap.tdd",
+      { "tdd", "pcap.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_rxTimingDeviationInfoWanted,
@@ -14610,7 +14610,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CriticalityDiagnostics_IE_List", HFILL }},
     { &hf_pcap_CriticalityDiagnostics_IE_List_item,
-      { "CriticalityDiagnostics-IE-List item", "pcap.CriticalityDiagnostics_IE_List_item",
+      { "CriticalityDiagnostics-IE-List item", "pcap.CriticalityDiagnostics_IE_List_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_iECriticality,
@@ -14646,7 +14646,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_DGPS_CorrectionSatInfoList_item,
-      { "DGPS-CorrectionSatInfo", "pcap.DGPS_CorrectionSatInfo",
+      { "DGPS-CorrectionSatInfo", "pcap.DGPS_CorrectionSatInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_satID,
@@ -14678,11 +14678,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_UDREValidityTime_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_point,
-      { "point", "pcap.point",
+      { "point", "pcap.point_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_Point", HFILL }},
     { &hf_pcap_pointWithUnCertainty,
-      { "pointWithUnCertainty", "pcap.pointWithUnCertainty",
+      { "pointWithUnCertainty", "pcap.pointWithUnCertainty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_PointWithUnCertainty", HFILL }},
     { &hf_pcap_polygon,
@@ -14690,19 +14690,19 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GA_Polygon", HFILL }},
     { &hf_pcap_pointWithUncertaintyEllipse,
-      { "pointWithUncertaintyEllipse", "pcap.pointWithUncertaintyEllipse",
+      { "pointWithUncertaintyEllipse", "pcap.pointWithUncertaintyEllipse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_PointWithUnCertaintyEllipse", HFILL }},
     { &hf_pcap_pointWithAltitude,
-      { "pointWithAltitude", "pcap.pointWithAltitude",
+      { "pointWithAltitude", "pcap.pointWithAltitude_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_PointWithAltitude", HFILL }},
     { &hf_pcap_pointWithAltitudeAndUncertaintyEllipsoid,
-      { "pointWithAltitudeAndUncertaintyEllipsoid", "pcap.pointWithAltitudeAndUncertaintyEllipsoid",
+      { "pointWithAltitudeAndUncertaintyEllipsoid", "pcap.pointWithAltitudeAndUncertaintyEllipsoid_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_PointWithAltitudeAndUncertaintyEllipsoid", HFILL }},
     { &hf_pcap_ellipsoidArc,
-      { "ellipsoidArc", "pcap.ellipsoidArc",
+      { "ellipsoidArc", "pcap.ellipsoidArc_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_EllipsoidArc", HFILL }},
     { &hf_pcap_latitudeSign,
@@ -14746,11 +14746,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_100", HFILL }},
     { &hf_pcap_altitudeAndDirection,
-      { "altitudeAndDirection", "pcap.altitudeAndDirection",
+      { "altitudeAndDirection", "pcap.altitudeAndDirection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_AltitudeAndDirection", HFILL }},
     { &hf_pcap_uncertaintyEllipse,
-      { "uncertaintyEllipse", "pcap.uncertaintyEllipse",
+      { "uncertaintyEllipse", "pcap.uncertaintyEllipse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_UncertaintyEllipse", HFILL }},
     { &hf_pcap_uncertaintyAltitude,
@@ -14762,7 +14762,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_127", HFILL }},
     { &hf_pcap_GA_Polygon_item,
-      { "GA-Polygon item", "pcap.GA_Polygon_item",
+      { "GA-Polygon item", "pcap.GA_Polygon_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_uncertaintySemi_major,
@@ -14786,7 +14786,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_UE_PositionEstimate_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_utran_GPSReferenceTimeResult,
-      { "utran-GPSReferenceTimeResult", "pcap.utran_GPSReferenceTimeResult",
+      { "utran-GPSReferenceTimeResult", "pcap.utran_GPSReferenceTimeResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_gps_ReferenceTimeOnly,
@@ -14794,11 +14794,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_604799999_", HFILL }},
     { &hf_pcap_cell_Timing,
-      { "cell-Timing", "pcap.cell_Timing",
+      { "cell-Timing", "pcap.cell_Timing_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_extension_ReferenceTimeChoice,
-      { "extension-ReferenceTimeChoice", "pcap.extension_ReferenceTimeChoice",
+      { "extension-ReferenceTimeChoice", "pcap.extension_ReferenceTimeChoice_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_sfn,
@@ -14810,7 +14810,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_3599999", HFILL }},
     { &hf_pcap_ganssTimeID,
-      { "ganssTimeID", "pcap.ganssTimeID",
+      { "ganssTimeID", "pcap.ganssTimeID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSSID", HFILL }},
     { &hf_pcap_positionData,
@@ -14842,7 +14842,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "AcquisitionSatInfoList", HFILL }},
     { &hf_pcap_AcquisitionSatInfoList_item,
-      { "AcquisitionSatInfo", "pcap.AcquisitionSatInfo",
+      { "AcquisitionSatInfo", "pcap.AcquisitionSatInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_doppler0thOrder,
@@ -14850,7 +14850,7 @@ void proto_register_pcap(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M2048_2047", HFILL }},
     { &hf_pcap_extraDopplerInfo,
-      { "extraDopplerInfo", "pcap.extraDopplerInfo",
+      { "extraDopplerInfo", "pcap.extraDopplerInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_codePhase,
@@ -14870,7 +14870,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &pcap_CodePhaseSearchWindow_vals_ext, 0,
         NULL, HFILL }},
     { &hf_pcap_azimuthAndElevation,
-      { "azimuthAndElevation", "pcap.azimuthAndElevation",
+      { "azimuthAndElevation", "pcap.azimuthAndElevation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_doppler1stOrder,
@@ -14898,7 +14898,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_15", HFILL }},
     { &hf_pcap_AuxInfoGANSS_ID1_item,
-      { "AuxInfoGANSS-ID1-element", "pcap.AuxInfoGANSS_ID1_element",
+      { "AuxInfoGANSS-ID1-element", "pcap.AuxInfoGANSS_ID1_element_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_svID,
@@ -14914,7 +14914,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ProtocolExtensionContainer", HFILL }},
     { &hf_pcap_AuxInfoGANSS_ID3_item,
-      { "AuxInfoGANSS-ID3-element", "pcap.AuxInfoGANSS_ID3_element",
+      { "AuxInfoGANSS-ID3-element", "pcap.AuxInfoGANSS_ID3_element_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_channelNumber,
@@ -14998,11 +14998,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_DGANSS_Information_item,
-      { "DGANSS-InformationItem", "pcap.DGANSS_InformationItem",
+      { "DGANSS-InformationItem", "pcap.DGANSS_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_gANSS_SignalId,
-      { "gANSS-SignalId", "pcap.gANSS_SignalId",
+      { "gANSS-SignalId", "pcap.gANSS_SignalId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_gANSS_StatusHealth,
@@ -15014,7 +15014,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_DGANSS_SignalInformation_item,
-      { "DGANSS-SignalInformationItem", "pcap.DGANSS_SignalInformationItem",
+      { "DGANSS-SignalInformationItem", "pcap.DGANSS_SignalInformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_satId,
@@ -15034,35 +15034,35 @@ void proto_register_pcap(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M127_127", HFILL }},
     { &hf_pcap_navClockModel,
-      { "navClockModel", "pcap.navClockModel",
+      { "navClockModel", "pcap.navClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_cnavClockModel,
-      { "cnavClockModel", "pcap.cnavClockModel",
+      { "cnavClockModel", "pcap.cnavClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_glonassClockModel,
-      { "glonassClockModel", "pcap.glonassClockModel",
+      { "glonassClockModel", "pcap.glonassClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_sbasClockModel,
-      { "sbasClockModel", "pcap.sbasClockModel",
+      { "sbasClockModel", "pcap.sbasClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_navKeplerianSet,
-      { "navKeplerianSet", "pcap.navKeplerianSet",
+      { "navKeplerianSet", "pcap.navKeplerianSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NavModel_NAVKeplerianSet", HFILL }},
     { &hf_pcap_cnavKeplerianSet,
-      { "cnavKeplerianSet", "pcap.cnavKeplerianSet",
+      { "cnavKeplerianSet", "pcap.cnavKeplerianSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NavModel_CNAVKeplerianSet", HFILL }},
     { &hf_pcap_glonassECEF,
-      { "glonassECEF", "pcap.glonassECEF",
+      { "glonassECEF", "pcap.glonassECEF_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NavModel_GLONASSecef", HFILL }},
     { &hf_pcap_sbasECEF,
-      { "sbasECEF", "pcap.sbasECEF",
+      { "sbasECEF", "pcap.sbasECEF_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NavModel_SBASecef", HFILL }},
     { &hf_pcap_dataID,
@@ -15070,7 +15070,7 @@ void proto_register_pcap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_2", HFILL }},
     { &hf_pcap_alpha_beta_parameters,
-      { "alpha-beta-parameters", "pcap.alpha_beta_parameters",
+      { "alpha-beta-parameters", "pcap.alpha_beta_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GPS_Ionospheric_Model", HFILL }},
     { &hf_pcap_non_broadcastIndication,
@@ -15082,19 +15082,19 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Ganss_Sat_Info_AddNavList", HFILL }},
     { &hf_pcap_GANSS_Additional_Time_Models_item,
-      { "GANSS-Time-Model", "pcap.GANSS_Time_Model",
+      { "GANSS-Time-Model", "pcap.GANSS_Time_Model_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_utcModel1,
-      { "utcModel1", "pcap.utcModel1",
+      { "utcModel1", "pcap.utcModel1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTCmodelSet1", HFILL }},
     { &hf_pcap_utcModel2,
-      { "utcModel2", "pcap.utcModel2",
+      { "utcModel2", "pcap.utcModel2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTCmodelSet2", HFILL }},
     { &hf_pcap_utcModel3,
-      { "utcModel3", "pcap.utcModel3",
+      { "utcModel3", "pcap.utcModel3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTCmodelSet3", HFILL }},
     { &hf_pcap_sat_info_SBASecefList,
@@ -15130,11 +15130,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_GANSS_AlmanacModel_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_gANSS_keplerianParameters,
-      { "gANSS-keplerianParameters", "pcap.gANSS_keplerianParameters",
+      { "gANSS-keplerianParameters", "pcap.gANSS_keplerianParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_KeplerianParametersAlm", HFILL }},
     { &hf_pcap_extension_GANSS_AlmanacModel,
-      { "extension-GANSS-AlmanacModel", "pcap.extension_GANSS_AlmanacModel",
+      { "extension-GANSS-AlmanacModel", "pcap.extension_GANSS_AlmanacModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganssID1,
@@ -15150,19 +15150,19 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_75", HFILL }},
     { &hf_pcap_GANSS_Clock_Model_item,
-      { "GANSS-SatelliteClockModelItem", "pcap.GANSS_SatelliteClockModelItem",
+      { "GANSS-SatelliteClockModelItem", "pcap.GANSS_SatelliteClockModelItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganss_Reference_Time,
-      { "ganss-Reference-Time", "pcap.ganss_Reference_Time",
+      { "ganss-Reference-Time", "pcap.ganss_Reference_Time_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganss_Ionospheric_Model,
-      { "ganss-Ionospheric-Model", "pcap.ganss_Ionospheric_Model",
+      { "ganss-Ionospheric-Model", "pcap.ganss_Ionospheric_Model_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganss_Reference_Location,
-      { "ganss-Reference-Location", "pcap.ganss_Reference_Location",
+      { "ganss-Reference-Location", "pcap.ganss_Reference_Location_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganssTod,
@@ -15174,7 +15174,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GANSS_DataBitAssistanceList", HFILL }},
     { &hf_pcap_GANSS_DataBitAssistanceList_item,
-      { "GANSS-DataBitAssistanceItem", "pcap.GANSS_DataBitAssistanceItem",
+      { "GANSS-DataBitAssistanceItem", "pcap.GANSS_DataBitAssistanceItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_dataBitAssistanceSgnList,
@@ -15182,11 +15182,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GANSS_DataBitAssistanceSgnList", HFILL }},
     { &hf_pcap_GANSS_DataBitAssistanceSgnList_item,
-      { "GANSS-DataBitAssistanceSgnItem", "pcap.GANSS_DataBitAssistanceSgnItem",
+      { "GANSS-DataBitAssistanceSgnItem", "pcap.GANSS_DataBitAssistanceSgnItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganss_SignalId,
-      { "ganss-SignalId", "pcap.ganss_SignalId",
+      { "ganss-SignalId", "pcap.ganss_SignalId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganssDataBits,
@@ -15230,11 +15230,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_T_dopplerUncertainty_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_GANSS_GenericAssistanceDataList_item,
-      { "GANSSGenericAssistanceData", "pcap.GANSSGenericAssistanceData",
+      { "GANSSGenericAssistanceData", "pcap.GANSSGenericAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganssId,
-      { "ganssId", "pcap.ganssId",
+      { "ganssId", "pcap.ganssId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganss_Real_Time_Integrity,
@@ -15242,35 +15242,35 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganss_DataBitAssistance,
-      { "ganss-DataBitAssistance", "pcap.ganss_DataBitAssistance",
+      { "ganss-DataBitAssistance", "pcap.ganss_DataBitAssistance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_Data_Bit_Assistance", HFILL }},
     { &hf_pcap_dganss_Corrections,
-      { "dganss-Corrections", "pcap.dganss_Corrections",
+      { "dganss-Corrections", "pcap.dganss_Corrections_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganss_AlmanacAndSatelliteHealth,
-      { "ganss-AlmanacAndSatelliteHealth", "pcap.ganss_AlmanacAndSatelliteHealth",
+      { "ganss-AlmanacAndSatelliteHealth", "pcap.ganss_AlmanacAndSatelliteHealth_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganss_ReferenceMeasurementInfo,
-      { "ganss-ReferenceMeasurementInfo", "pcap.ganss_ReferenceMeasurementInfo",
+      { "ganss-ReferenceMeasurementInfo", "pcap.ganss_ReferenceMeasurementInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganss_UTC_Model,
-      { "ganss-UTC-Model", "pcap.ganss_UTC_Model",
+      { "ganss-UTC-Model", "pcap.ganss_UTC_Model_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganss_Time_Model,
-      { "ganss-Time-Model", "pcap.ganss_Time_Model",
+      { "ganss-Time-Model", "pcap.ganss_Time_Model_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganss_Navigation_Model,
-      { "ganss-Navigation-Model", "pcap.ganss_Navigation_Model",
+      { "ganss-Navigation-Model", "pcap.ganss_Navigation_Model_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GANSS_GenericMeasurementInfo_item,
-      { "GANSS-GenericMeasurementInfo item", "pcap.GANSS_GenericMeasurementInfo_item",
+      { "GANSS-GenericMeasurementInfo item", "pcap.GANSS_GenericMeasurementInfo_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganssMeasurementSignalList,
@@ -15282,11 +15282,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_7", HFILL }},
     { &hf_pcap_GANSSMeasurementSignalList_item,
-      { "GANSSMeasurementSignalList item", "pcap.GANSSMeasurementSignalList_item",
+      { "GANSSMeasurementSignalList item", "pcap.GANSSMeasurementSignalList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganssSignalId,
-      { "ganssSignalId", "pcap.ganssSignalId",
+      { "ganssSignalId", "pcap.ganssSignalId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_SignalID", HFILL }},
     { &hf_pcap_ganssCodePhaseAmbiguity,
@@ -15314,7 +15314,7 @@ void proto_register_pcap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_12", HFILL }},
     { &hf_pcap_gANSS_IonosphereRegionalStormFlags,
-      { "gANSS-IonosphereRegionalStormFlags", "pcap.gANSS_IonosphereRegionalStormFlags",
+      { "gANSS-IonosphereRegionalStormFlags", "pcap.gANSS_IonosphereRegionalStormFlags_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_storm_flag_one,
@@ -15410,7 +15410,7 @@ void proto_register_pcap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_GANSS_MeasurementParameters_item,
-      { "GANSS-MeasurementParametersItem", "pcap.GANSS_MeasurementParametersItem",
+      { "GANSS-MeasurementParametersItem", "pcap.GANSS_MeasurementParametersItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_cToNzero,
@@ -15450,7 +15450,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_64_127", HFILL }},
     { &hf_pcap_GANSS_MeasuredResultsList_item,
-      { "GANSS-MeasuredResults", "pcap.GANSS_MeasuredResults",
+      { "GANSS-MeasuredResults", "pcap.GANSS_MeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_referenceTime,
@@ -15458,11 +15458,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_T_referenceTime_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_utranReferenceTime,
-      { "utranReferenceTime", "pcap.utranReferenceTime",
+      { "utranReferenceTime", "pcap.utranReferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTRAN_GANSSReferenceTimeUL", HFILL }},
     { &hf_pcap_ganssReferenceTimeOnly,
-      { "ganssReferenceTimeOnly", "pcap.ganssReferenceTimeOnly",
+      { "ganssReferenceTimeOnly", "pcap.ganssReferenceTimeOnly_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_ReferenceTimeOnly", HFILL }},
     { &hf_pcap_ganssGenericMeasurementInfo,
@@ -15478,11 +15478,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GANSS_Sat_Info_Nav", HFILL }},
     { &hf_pcap_gANSS_keplerianParameters_01,
-      { "gANSS-keplerianParameters", "pcap.gANSS_keplerianParameters",
+      { "gANSS-keplerianParameters", "pcap.gANSS_keplerianParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_KeplerianParametersOrb", HFILL }},
     { &hf_pcap_GANSS_Real_Time_Integrity_item,
-      { "GANSS-RealTimeInformationItem", "pcap.GANSS_RealTimeInformationItem",
+      { "GANSS-RealTimeInformationItem", "pcap.GANSS_RealTimeInformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_bad_ganss_satId,
@@ -15510,11 +15510,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_127", HFILL }},
     { &hf_pcap_ganssTimeId,
-      { "ganssTimeId", "pcap.ganssTimeId",
+      { "ganssTimeId", "pcap.ganssTimeId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSSID", HFILL }},
     { &hf_pcap_utran_ganssreferenceTime,
-      { "utran-ganssreferenceTime", "pcap.utran_ganssreferenceTime",
+      { "utran-ganssreferenceTime", "pcap.utran_ganssreferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTRAN_GANSSReferenceTimeDL", HFILL }},
     { &hf_pcap_tutran_ganss_driftRate,
@@ -15526,7 +15526,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_3599999", HFILL }},
     { &hf_pcap_gANSS_timeId,
-      { "gANSS-timeId", "pcap.gANSS_timeId",
+      { "gANSS-timeId", "pcap.gANSS_timeId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSSID", HFILL }},
     { &hf_pcap_gANSS_TimeUncertainty,
@@ -15558,7 +15558,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_3", HFILL }},
     { &hf_pcap_GANSS_SatelliteInformation_item,
-      { "GANSS-SatelliteInformationItem", "pcap.GANSS_SatelliteInformationItem",
+      { "GANSS-SatelliteInformationItem", "pcap.GANSS_SatelliteInformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganssSatId,
@@ -15570,7 +15570,7 @@ void proto_register_pcap(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M2048_2047", HFILL }},
     { &hf_pcap_extraDoppler,
-      { "extraDoppler", "pcap.extraDoppler",
+      { "extraDoppler", "pcap.extraDoppler_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_ExtraDoppler", HFILL }},
     { &hf_pcap_codePhase_01,
@@ -15586,11 +15586,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_31", HFILL }},
     { &hf_pcap_azimuthAndElevation_01,
-      { "azimuthAndElevation", "pcap.azimuthAndElevation",
+      { "azimuthAndElevation", "pcap.azimuthAndElevation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_AzimuthAndElevation", HFILL }},
     { &hf_pcap_GANSS_SatelliteInformationKP_item,
-      { "GANSS-SatelliteInformationKPItem", "pcap.GANSS_SatelliteInformationKPItem",
+      { "GANSS-SatelliteInformationKPItem", "pcap.GANSS_SatelliteInformationKPItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganss_e_alm,
@@ -15634,7 +15634,7 @@ void proto_register_pcap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_11", HFILL }},
     { &hf_pcap_GANSS_SAT_Info_Almanac_GLOkpList_item,
-      { "GANSS-SAT-Info-Almanac-GLOkp", "pcap.GANSS_SAT_Info_Almanac_GLOkp",
+      { "GANSS-SAT-Info-Almanac-GLOkp", "pcap.GANSS_SAT_Info_Almanac_GLOkp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_gloAlmNA,
@@ -15690,7 +15690,7 @@ void proto_register_pcap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_2", HFILL }},
     { &hf_pcap_GANSS_SAT_Info_Almanac_MIDIkpList_item,
-      { "GANSS-SAT-Info-Almanac-MIDIkp", "pcap.GANSS_SAT_Info_Almanac_MIDIkp",
+      { "GANSS-SAT-Info-Almanac-MIDIkp", "pcap.GANSS_SAT_Info_Almanac_MIDIkp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_midiAlmE,
@@ -15742,7 +15742,7 @@ void proto_register_pcap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_1", HFILL }},
     { &hf_pcap_GANSS_SAT_Info_Almanac_NAVkpList_item,
-      { "GANSS-SAT-Info-Almanac-NAVkp", "pcap.GANSS_SAT_Info_Almanac_NAVkp",
+      { "GANSS-SAT-Info-Almanac-NAVkp", "pcap.GANSS_SAT_Info_Almanac_NAVkp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_navAlmE,
@@ -15786,7 +15786,7 @@ void proto_register_pcap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_11", HFILL }},
     { &hf_pcap_GANSS_SAT_Info_Almanac_REDkpList_item,
-      { "GANSS-SAT-Info-Almanac-REDkp", "pcap.GANSS_SAT_Info_Almanac_REDkp",
+      { "GANSS-SAT-Info-Almanac-REDkp", "pcap.GANSS_SAT_Info_Almanac_REDkp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_redAlmDeltaA,
@@ -15814,7 +15814,7 @@ void proto_register_pcap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_1", HFILL }},
     { &hf_pcap_GANSS_SAT_Info_Almanac_SBASecefList_item,
-      { "GANSS-SAT-Info-Almanac-SBASecef", "pcap.GANSS_SAT_Info_Almanac_SBASecef",
+      { "GANSS-SAT-Info-Almanac-SBASecef", "pcap.GANSS_SAT_Info_Almanac_SBASecef_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_sbasAlmDataID,
@@ -15854,7 +15854,7 @@ void proto_register_pcap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_11", HFILL }},
     { &hf_pcap_Ganss_Sat_Info_AddNavList_item,
-      { "Ganss-Sat-Info-AddNavList item", "pcap.Ganss_Sat_Info_AddNavList_item",
+      { "Ganss-Sat-Info-AddNavList item", "pcap.Ganss_Sat_Info_AddNavList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_svHealth,
@@ -15874,7 +15874,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_GANSS_AddOrbitModels_vals), 0,
         "GANSS_AddOrbitModels", HFILL }},
     { &hf_pcap_GANSS_Sat_Info_Nav_item,
-      { "GANSS-Sat-Info-Nav item", "pcap.GANSS_Sat_Info_Nav_item",
+      { "GANSS-Sat-Info-Nav item", "pcap.GANSS_Sat_Info_Nav_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_svHealth_01,
@@ -16282,7 +16282,7 @@ void proto_register_pcap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_32", HFILL }},
     { &hf_pcap_deltaUT1_01,
-      { "deltaUT1", "pcap.deltaUT1",
+      { "deltaUT1", "pcap.deltaUT1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_kp,
@@ -16326,7 +16326,7 @@ void proto_register_pcap(void) {
         FT_UINT64, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_gANSS_TimeId,
-      { "gANSS-TimeId", "pcap.gANSS_TimeId",
+      { "gANSS-TimeId", "pcap.gANSS_TimeId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSSID", HFILL }},
     { &hf_pcap_wn_a,
@@ -16342,7 +16342,7 @@ void proto_register_pcap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_364", HFILL }},
     { &hf_pcap_AlmanacSatInfoList_item,
-      { "AlmanacSatInfo", "pcap.AlmanacSatInfo",
+      { "AlmanacSatInfo", "pcap.AlmanacSatInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_e,
@@ -16410,7 +16410,7 @@ void proto_register_pcap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_1", HFILL }},
     { &hf_pcap_sf1Revd,
-      { "sf1Revd", "pcap.sf1Revd",
+      { "sf1Revd", "pcap.sf1Revd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SubFrame1Reserved", HFILL }},
     { &hf_pcap_t_GD,
@@ -16554,7 +16554,7 @@ void proto_register_pcap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_MeasuredResultsList_item,
-      { "GPS-MeasuredResults", "pcap.GPS_MeasuredResults",
+      { "GPS-MeasuredResults", "pcap.GPS_MeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_gps_MeasurementParamList,
@@ -16562,7 +16562,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GPS_MeasurementParamList_item,
-      { "GPS-MeasurementParam", "pcap.GPS_MeasurementParam",
+      { "GPS-MeasurementParam", "pcap.GPS_MeasurementParam_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_satelliteID,
@@ -16594,7 +16594,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_63", HFILL }},
     { &hf_pcap_GPS_NavigationModel_item,
-      { "NavigationModelSatInfo", "pcap.NavigationModelSatInfo",
+      { "NavigationModelSatInfo", "pcap.NavigationModelSatInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_satelliteStatus,
@@ -16602,7 +16602,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_SatelliteStatus_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_gps_clockAndEphemerisParms,
-      { "gps-clockAndEphemerisParms", "pcap.gps_clockAndEphemerisParms",
+      { "gps-clockAndEphemerisParms", "pcap.gps_clockAndEphemerisParms_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GPS_ClockAndEphemerisParameters", HFILL }},
     { &hf_pcap_badSatellites,
@@ -16610,7 +16610,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "BadSatList", HFILL }},
     { &hf_pcap_noBadSatellites,
-      { "noBadSatellites", "pcap.noBadSatellites",
+      { "noBadSatellites", "pcap.noBadSatellites_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_BadSatList_item,
@@ -16626,7 +16626,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_GPS_TOW_AssistList_item,
-      { "GPS-TOW-Assist", "pcap.GPS_TOW_Assist",
+      { "GPS-TOW-Assist", "pcap.GPS_TOW_Assist_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_tlm_Message,
@@ -16718,7 +16718,7 @@ void proto_register_pcap(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_pcap_navModelAddDataRequest,
-      { "navModelAddDataRequest", "pcap.navModelAddDataRequest",
+      { "navModelAddDataRequest", "pcap.navModelAddDataRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NavModelAdditionalData", HFILL }},
     { &hf_pcap_ganssReferenceTime,
@@ -16742,7 +16742,7 @@ void proto_register_pcap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_2", HFILL }},
     { &hf_pcap_GanssRequestedGenericAssistanceDataList_item,
-      { "GanssReqGenericData", "pcap.GanssReqGenericData",
+      { "GanssReqGenericData", "pcap.GanssReqGenericData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganssRealTimeIntegrity,
@@ -16770,7 +16770,7 @@ void proto_register_pcap(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_pcap_ganssDataBits_01,
-      { "ganssDataBits", "pcap.ganssDataBits",
+      { "ganssDataBits", "pcap.ganssDataBits_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganssUTCModel,
@@ -16778,7 +16778,7 @@ void proto_register_pcap(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_pcap_ganssNavigationModelAdditionalData,
-      { "ganssNavigationModelAdditionalData", "pcap.ganssNavigationModelAdditionalData",
+      { "ganssNavigationModelAdditionalData", "pcap.ganssNavigationModelAdditionalData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NavigationModelGANSS", HFILL }},
     { &hf_pcap_orbitModelID,
@@ -16798,7 +16798,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_7", HFILL }},
     { &hf_pcap_dataBitAssistancelist_01,
-      { "dataBitAssistancelist", "pcap.dataBitAssistancelist",
+      { "dataBitAssistancelist", "pcap.dataBitAssistancelist_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReqDataBitAssistanceList", HFILL }},
     { &hf_pcap_ganssSignalID_01,
@@ -16846,47 +16846,47 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &pcap_ExplicitInformation_vals_ext, 0,
         NULL, HFILL }},
     { &hf_pcap_almanacAndSatelliteHealth,
-      { "almanacAndSatelliteHealth", "pcap.almanacAndSatelliteHealth",
+      { "almanacAndSatelliteHealth", "pcap.almanacAndSatelliteHealth_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_utcModel,
-      { "utcModel", "pcap.utcModel",
+      { "utcModel", "pcap.utcModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ionosphericModel,
-      { "ionosphericModel", "pcap.ionosphericModel",
+      { "ionosphericModel", "pcap.ionosphericModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_navigationModel,
-      { "navigationModel", "pcap.navigationModel",
+      { "navigationModel", "pcap.navigationModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_dgpsCorrections,
-      { "dgpsCorrections", "pcap.dgpsCorrections",
+      { "dgpsCorrections", "pcap.dgpsCorrections_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_referenceTime_01,
-      { "referenceTime", "pcap.referenceTime",
+      { "referenceTime", "pcap.referenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_acquisitionAssistance,
-      { "acquisitionAssistance", "pcap.acquisitionAssistance",
+      { "acquisitionAssistance", "pcap.acquisitionAssistance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_realTimeIntegrity,
-      { "realTimeIntegrity", "pcap.realTimeIntegrity",
+      { "realTimeIntegrity", "pcap.realTimeIntegrity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_almanacAndSatelliteHealthSIB,
-      { "almanacAndSatelliteHealthSIB", "pcap.almanacAndSatelliteHealthSIB",
+      { "almanacAndSatelliteHealthSIB", "pcap.almanacAndSatelliteHealthSIB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlmanacAndSatelliteHealthSIB_InfoType", HFILL }},
     { &hf_pcap_referenceLocation,
-      { "referenceLocation", "pcap.referenceLocation",
+      { "referenceLocation", "pcap.referenceLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganss_Common_DataReq,
-      { "ganss-Common-DataReq", "pcap.ganss_Common_DataReq",
+      { "ganss-Common-DataReq", "pcap.ganss_Common_DataReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSSCommonDataReq", HFILL }},
     { &hf_pcap_ganss_Generic_DataList,
@@ -16918,55 +16918,55 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_T_eopReq_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_GANSSGenericDataList_item,
-      { "GANSSGenericDataReq", "pcap.GANSSGenericDataReq",
+      { "GANSSGenericDataReq", "pcap.GANSSGenericDataReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganssID,
-      { "ganssID", "pcap.ganssID",
+      { "ganssID", "pcap.ganssID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganss_realTimeIntegrity,
-      { "ganss-realTimeIntegrity", "pcap.ganss_realTimeIntegrity",
+      { "ganss-realTimeIntegrity", "pcap.ganss_realTimeIntegrity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ganss_realTimeIntegrityReq", HFILL }},
     { &hf_pcap_ganss_dataBitAssistance,
-      { "ganss-dataBitAssistance", "pcap.ganss_dataBitAssistance",
+      { "ganss-dataBitAssistance", "pcap.ganss_dataBitAssistance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GanssDataBits", HFILL }},
     { &hf_pcap_dganssCorrections,
-      { "dganssCorrections", "pcap.dganssCorrections",
+      { "dganssCorrections", "pcap.dganssCorrections_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DganssCorrectionsReq", HFILL }},
     { &hf_pcap_ganss_almanacAndSatelliteHealth,
-      { "ganss-almanacAndSatelliteHealth", "pcap.ganss_almanacAndSatelliteHealth",
+      { "ganss-almanacAndSatelliteHealth", "pcap.ganss_almanacAndSatelliteHealth_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ganss_almanacAndSatelliteHealthReq", HFILL }},
     { &hf_pcap_ganss_referenceMeasurementInfo,
-      { "ganss-referenceMeasurementInfo", "pcap.ganss_referenceMeasurementInfo",
+      { "ganss-referenceMeasurementInfo", "pcap.ganss_referenceMeasurementInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ganss_referenceMeasurementInfoReq", HFILL }},
     { &hf_pcap_ganss_utcModel,
-      { "ganss-utcModel", "pcap.ganss_utcModel",
+      { "ganss-utcModel", "pcap.ganss_utcModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ganss_utcModelReq", HFILL }},
     { &hf_pcap_ganss_TimeModel_Gnss_Gnss,
-      { "ganss-TimeModel-Gnss-Gnss", "pcap.ganss_TimeModel_Gnss_Gnss",
+      { "ganss-TimeModel-Gnss-Gnss", "pcap.ganss_TimeModel_Gnss_Gnss_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_navigationModel_01,
-      { "navigationModel", "pcap.navigationModel",
+      { "navigationModel", "pcap.navigationModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NavigationModelGANSS", HFILL }},
     { &hf_pcap_ganss_AddNavModelsReq,
-      { "ganss-AddNavModelsReq", "pcap.ganss_AddNavModelsReq",
+      { "ganss-AddNavModelsReq", "pcap.ganss_AddNavModelsReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AddNavigationModelsGANSS", HFILL }},
     { &hf_pcap_ganss_AddUtcModelsReq,
-      { "ganss-AddUtcModelsReq", "pcap.ganss_AddUtcModelsReq",
+      { "ganss-AddUtcModelsReq", "pcap.ganss_AddUtcModelsReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganss_AuxInfoReq,
-      { "ganss-AuxInfoReq", "pcap.ganss_AuxInfoReq",
+      { "ganss-AuxInfoReq", "pcap.ganss_AuxInfoReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganss_SBAS_ID,
@@ -16990,7 +16990,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "AddSatelliteRelatedDataListGANSS", HFILL }},
     { &hf_pcap_AddSatelliteRelatedDataListGANSS_item,
-      { "AddSatelliteRelatedDataGANSS", "pcap.AddSatelliteRelatedDataGANSS",
+      { "AddSatelliteRelatedDataGANSS", "pcap.AddSatelliteRelatedDataGANSS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganssTimeModelGnssGnssExt,
@@ -17002,7 +17002,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_TransmissionTOWIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_navModelAdditionalData,
-      { "navModelAdditionalData", "pcap.navModelAdditionalData",
+      { "navModelAdditionalData", "pcap.navModelAdditionalData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_gps_TOE,
@@ -17018,7 +17018,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SatelliteRelatedDataList", HFILL }},
     { &hf_pcap_SatelliteRelatedDataList_item,
-      { "SatelliteRelatedData", "pcap.SatelliteRelatedData",
+      { "SatelliteRelatedData", "pcap.SatelliteRelatedData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_satRelatedDataListGANSS,
@@ -17026,11 +17026,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SatelliteRelatedDataListGANSS", HFILL }},
     { &hf_pcap_SatelliteRelatedDataListGANSS_item,
-      { "SatelliteRelatedDataGANSS", "pcap.SatelliteRelatedDataGANSS",
+      { "SatelliteRelatedDataGANSS", "pcap.SatelliteRelatedDataGANSS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_MessageStructure_item,
-      { "MessageStructure item", "pcap.MessageStructure_item",
+      { "MessageStructure item", "pcap.MessageStructure_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_repetitionNumber_01,
@@ -17038,7 +17038,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MessageStructureRepetition", HFILL }},
     { &hf_pcap_measurementValidity,
-      { "measurementValidity", "pcap.measurementValidity",
+      { "measurementValidity", "pcap.measurementValidity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ue_State,
@@ -17046,7 +17046,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_T_ue_State_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_otdoa_ReferenceCellInfo,
-      { "otdoa-ReferenceCellInfo", "pcap.otdoa_ReferenceCellInfo",
+      { "otdoa-ReferenceCellInfo", "pcap.otdoa_ReferenceCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_otdoa_NeighbourCellInfoList,
@@ -17058,11 +17058,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_tUTRANGPSMeasurementValueInfo,
-      { "tUTRANGPSMeasurementValueInfo", "pcap.tUTRANGPSMeasurementValueInfo",
+      { "tUTRANGPSMeasurementValueInfo", "pcap.tUTRANGPSMeasurementValueInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_OTDOA_NeighbourCellInfoList_item,
-      { "OTDOA-NeighbourCellInfo", "pcap.OTDOA_NeighbourCellInfo",
+      { "OTDOA-NeighbourCellInfo", "pcap.OTDOA_NeighbourCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_relativeTimingDifferenceInfo,
@@ -17074,11 +17074,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_OTDOA_MeasuredResultsInfoList_item,
-      { "OTDOA-MeasuredResultsInfo", "pcap.OTDOA_MeasuredResultsInfo",
+      { "OTDOA-MeasuredResultsInfo", "pcap.OTDOA_MeasuredResultsInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ue_SFNSFNTimeDifferenceType2Info,
-      { "ue-SFNSFNTimeDifferenceType2Info", "pcap.ue_SFNSFNTimeDifferenceType2Info",
+      { "ue-SFNSFNTimeDifferenceType2Info", "pcap.ue_SFNSFNTimeDifferenceType2Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_primaryCPICH_Info,
@@ -17102,11 +17102,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_65535", HFILL }},
     { &hf_pcap_sFNSFNMeasurementValueInfo,
-      { "sFNSFNMeasurementValueInfo", "pcap.sFNSFNMeasurementValueInfo",
+      { "sFNSFNMeasurementValueInfo", "pcap.sFNSFNMeasurementValueInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_tUTRANGANSSMeasurementValueInfo,
-      { "tUTRANGANSSMeasurementValueInfo", "pcap.tUTRANGANSSMeasurementValueInfo",
+      { "tUTRANGANSSMeasurementValueInfo", "pcap.tUTRANGANSSMeasurementValueInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_sFNSFNValue,
@@ -17130,7 +17130,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_tUTRANGPS,
-      { "tUTRANGPS", "pcap.tUTRANGPS",
+      { "tUTRANGPS", "pcap.tUTRANGPS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_tUTRANGPSQuality,
@@ -17154,7 +17154,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_4294967295", HFILL }},
     { &hf_pcap_tUTRANGANSS,
-      { "tUTRANGANSS", "pcap.tUTRANGANSS",
+      { "tUTRANGANSS", "pcap.tUTRANGANSS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_tUTRANGANSSQuality,
@@ -17174,7 +17174,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_angleOfArrivalLCR,
-      { "angleOfArrivalLCR", "pcap.angleOfArrivalLCR",
+      { "angleOfArrivalLCR", "pcap.angleOfArrivalLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_referenceNumber,
@@ -17206,11 +17206,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_T_new_ue_State_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_gps_UTC_Model,
-      { "gps-UTC-Model", "pcap.gps_UTC_Model",
+      { "gps-UTC-Model", "pcap.gps_UTC_Model_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_gps_Ionospheric_Model,
-      { "gps-Ionospheric-Model", "pcap.gps_Ionospheric_Model",
+      { "gps-Ionospheric-Model", "pcap.gps_Ionospheric_Model_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_gps_NavigationModel,
@@ -17218,15 +17218,15 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_dgpsCorrections_01,
-      { "dgpsCorrections", "pcap.dgpsCorrections",
+      { "dgpsCorrections", "pcap.dgpsCorrections_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_referenceTime_02,
-      { "referenceTime", "pcap.referenceTime",
+      { "referenceTime", "pcap.referenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GPS_ReferenceTime", HFILL }},
     { &hf_pcap_gps_AcquisitionAssistance,
-      { "gps-AcquisitionAssistance", "pcap.gps_AcquisitionAssistance",
+      { "gps-AcquisitionAssistance", "pcap.gps_AcquisitionAssistance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_gps_RealTime_Integrity,
@@ -17234,7 +17234,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_GPS_RealTimeIntegrity_vals), 0,
         "GPS_RealTimeIntegrity", HFILL }},
     { &hf_pcap_almanacAndSatelliteHealthSIB_01,
-      { "almanacAndSatelliteHealthSIB", "pcap.almanacAndSatelliteHealthSIB",
+      { "almanacAndSatelliteHealthSIB", "pcap.almanacAndSatelliteHealthSIB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_gps_Transmission_TOW,
@@ -17242,15 +17242,15 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_informationAvailable,
-      { "informationAvailable", "pcap.informationAvailable",
+      { "informationAvailable", "pcap.informationAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_informationNotAvailable,
-      { "informationNotAvailable", "pcap.informationNotAvailable",
+      { "informationNotAvailable", "pcap.informationNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_requestedDataValue,
-      { "requestedDataValue", "pcap.requestedDataValue",
+      { "requestedDataValue", "pcap.requestedDataValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_event,
@@ -17298,7 +17298,7 @@ void proto_register_pcap(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_pcap_NetworkAssistedGANSSSupport_item,
-      { "NetworkAssistedGANSSSupport item", "pcap.NetworkAssistedGANSSSupport_item",
+      { "NetworkAssistedGANSSSupport item", "pcap.NetworkAssistedGANSSSupport_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganssMode,
@@ -17306,7 +17306,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_T_ganssMode_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_ganssSignalID_02,
-      { "ganssSignalID", "pcap.ganssSignalID",
+      { "ganssSignalID", "pcap.ganssSignalID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_SignalID", HFILL }},
     { &hf_pcap_supportGANSSTimingOfCellFrame,
@@ -17334,7 +17334,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_gpsPositioningInstructions,
-      { "gpsPositioningInstructions", "pcap.gpsPositioningInstructions",
+      { "gpsPositioningInstructions", "pcap.gpsPositioningInstructions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_horizontalAccuracyCode,
@@ -17354,7 +17354,7 @@ void proto_register_pcap(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_pcap_ganssPositioningInstructions,
-      { "ganssPositioningInstructions", "pcap.ganssPositioningInstructions",
+      { "ganssPositioningInstructions", "pcap.ganssPositioningInstructions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_PositioningInstructions", HFILL }},
     { &hf_pcap_ganssTimingOfCellWanted,
@@ -17366,11 +17366,11 @@ void proto_register_pcap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_uE_Positioning_OTDOA_AssistanceData,
-      { "uE-Positioning-OTDOA-AssistanceData", "pcap.uE_Positioning_OTDOA_AssistanceData",
+      { "uE-Positioning-OTDOA-AssistanceData", "pcap.uE_Positioning_OTDOA_AssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ue_positioning_OTDOA_ReferenceCellInfo,
-      { "ue-positioning-OTDOA-ReferenceCellInfo", "pcap.ue_positioning_OTDOA_ReferenceCellInfo",
+      { "ue-positioning-OTDOA-ReferenceCellInfo", "pcap.ue_positioning_OTDOA_ReferenceCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ue_positioning_OTDOA_NeighbourCellList,
@@ -17386,11 +17386,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_T_modeSpecificInfo_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_fdd_01,
-      { "fdd", "pcap.fdd",
+      { "fdd", "pcap.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_01", HFILL }},
     { &hf_pcap_tdd_01,
-      { "tdd", "pcap.tdd",
+      { "tdd", "pcap.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_01", HFILL }},
     { &hf_pcap_cellParameterID,
@@ -17398,7 +17398,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_frequencyInfo,
-      { "frequencyInfo", "pcap.frequencyInfo",
+      { "frequencyInfo", "pcap.frequencyInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_positioningMode,
@@ -17406,7 +17406,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_T_positioningMode_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_ueBased,
-      { "ueBased", "pcap.ueBased",
+      { "ueBased", "pcap.ueBased_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_cellPosition,
@@ -17418,19 +17418,19 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_32766", HFILL }},
     { &hf_pcap_ueAssisted,
-      { "ueAssisted", "pcap.ueAssisted",
+      { "ueAssisted", "pcap.ueAssisted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ue_positioning_IPDL_Paremeters,
-      { "ue-positioning-IPDL-Paremeters", "pcap.ue_positioning_IPDL_Paremeters",
+      { "ue-positioning-IPDL-Paremeters", "pcap.ue_positioning_IPDL_Paremeters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_IPDL_Parameters", HFILL }},
     { &hf_pcap_ellipsoidPoint,
-      { "ellipsoidPoint", "pcap.ellipsoidPoint",
+      { "ellipsoidPoint", "pcap.ellipsoidPoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GeographicalCoordinates", HFILL }},
     { &hf_pcap_ellipsoidPointWithAltitude,
-      { "ellipsoidPointWithAltitude", "pcap.ellipsoidPointWithAltitude",
+      { "ellipsoidPointWithAltitude", "pcap.ellipsoidPointWithAltitude_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_PointWithAltitude", HFILL }},
     { &hf_pcap_modeSpecificInfo_01,
@@ -17438,7 +17438,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_T_modeSpecificInfo_01_vals), 0,
         "T_modeSpecificInfo_01", HFILL }},
     { &hf_pcap_fdd_02,
-      { "fdd", "pcap.fdd",
+      { "fdd", "pcap.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_02", HFILL }},
     { &hf_pcap_ip_Spacing,
@@ -17458,11 +17458,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_63", HFILL }},
     { &hf_pcap_tdd_02,
-      { "tdd", "pcap.tdd",
+      { "tdd", "pcap.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_02", HFILL }},
     { &hf_pcap_burstModeParameters,
-      { "burstModeParameters", "pcap.burstModeParameters",
+      { "burstModeParameters", "pcap.burstModeParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_burstStart,
@@ -17478,7 +17478,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_16", HFILL }},
     { &hf_pcap_UE_Positioning_OTDOA_NeighbourCellList_item,
-      { "UE-Positioning-OTDOA-NeighbourCellInfo", "pcap.UE_Positioning_OTDOA_NeighbourCellInfo",
+      { "UE-Positioning-OTDOA-NeighbourCellInfo", "pcap.UE_Positioning_OTDOA_NeighbourCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_modeSpecificInfo_02,
@@ -17486,15 +17486,15 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_T_modeSpecificInfo_02_vals), 0,
         "T_modeSpecificInfo_02", HFILL }},
     { &hf_pcap_fdd_03,
-      { "fdd", "pcap.fdd",
+      { "fdd", "pcap.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_03", HFILL }},
     { &hf_pcap_tdd_03,
-      { "tdd", "pcap.tdd",
+      { "tdd", "pcap.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_03", HFILL }},
     { &hf_pcap_sfn_SFN_RelTimeDifference,
-      { "sfn-SFN-RelTimeDifference", "pcap.sfn_SFN_RelTimeDifference",
+      { "sfn-SFN-RelTimeDifference", "pcap.sfn_SFN_RelTimeDifference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SFN_SFN_RelTimeDifference1", HFILL }},
     { &hf_pcap_sfn_Offset_Validity,
@@ -17514,7 +17514,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_T_positioningMode_01_vals), 0,
         "T_positioningMode_01", HFILL }},
     { &hf_pcap_ueBased_01,
-      { "ueBased", "pcap.ueBased",
+      { "ueBased", "pcap.ueBased_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueBased_01", HFILL }},
     { &hf_pcap_relativeNorth,
@@ -17534,7 +17534,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "FineSFNSFN", HFILL }},
     { &hf_pcap_ueAssisted_01,
-      { "ueAssisted", "pcap.ueAssisted",
+      { "ueAssisted", "pcap.ueAssisted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueAssisted_01", HFILL }},
     { &hf_pcap_sfn_Offset,
@@ -17554,11 +17554,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_T_modeSpecificInfo_03_vals), 0,
         "T_modeSpecificInfo_03", HFILL }},
     { &hf_pcap_fdd_04,
-      { "fdd", "pcap.fdd",
+      { "fdd", "pcap.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FrequencyInfoFDD", HFILL }},
     { &hf_pcap_tdd_04,
-      { "tdd", "pcap.tdd",
+      { "tdd", "pcap.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FrequencyInfoTDD", HFILL }},
     { &hf_pcap_uarfcn_UL,
@@ -17574,11 +17574,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_uTDOA_CELLDCH,
-      { "uTDOA-CELLDCH", "pcap.uTDOA_CELLDCH",
+      { "uTDOA-CELLDCH", "pcap.uTDOA_CELLDCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_uTDOA_CELLFACH,
-      { "uTDOA-CELLFACH", "pcap.uTDOA_CELLFACH",
+      { "uTDOA-CELLFACH", "pcap.uTDOA_CELLFACH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_uL_DPCHInfo,
@@ -17586,19 +17586,19 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_UL_DPCHInfo_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_compressedModeAssistanceData,
-      { "compressedModeAssistanceData", "pcap.compressedModeAssistanceData",
+      { "compressedModeAssistanceData", "pcap.compressedModeAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Compressed_Mode_Assistance_Data", HFILL }},
     { &hf_pcap_dCH_Information,
-      { "dCH-Information", "pcap.dCH_Information",
+      { "dCH-Information", "pcap.dCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_e_DPCH_Information,
-      { "e-DPCH-Information", "pcap.e_DPCH_Information",
+      { "e-DPCH-Information", "pcap.e_DPCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_fdd_05,
-      { "fdd", "pcap.fdd",
+      { "fdd", "pcap.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_04", HFILL }},
     { &hf_pcap_scramblingCodeType,
@@ -17618,7 +17618,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_tdd_05,
-      { "tdd", "pcap.tdd",
+      { "tdd", "pcap.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_04", HFILL }},
     { &hf_pcap_tFCI_Coding,
@@ -17654,11 +17654,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_dl_information,
-      { "dl-information", "pcap.dl_information",
+      { "dl-information", "pcap.dl_information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_InformationFDD", HFILL }},
     { &hf_pcap_ul_information,
-      { "ul-information", "pcap.ul_information",
+      { "ul-information", "pcap.ul_information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_InformationFDD", HFILL }},
     { &hf_pcap_primaryScramblingCode,
@@ -17674,7 +17674,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Transmission_Gap_Pattern_Sequence_Information", HFILL }},
     { &hf_pcap_activePatternSequenceInfo,
-      { "activePatternSequenceInfo", "pcap.activePatternSequenceInfo",
+      { "activePatternSequenceInfo", "pcap.activePatternSequenceInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Active_Pattern_Sequence_Information", HFILL }},
     { &hf_pcap_cFN,
@@ -17682,7 +17682,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_Transmission_Gap_Pattern_Sequence_Information_item,
-      { "Transmission-Gap-Pattern-Sequence-Information item", "pcap.Transmission_Gap_Pattern_Sequence_Information_item",
+      { "Transmission-Gap-Pattern-Sequence-Information item", "pcap.Transmission_Gap_Pattern_Sequence_Information_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_tGPSID,
@@ -17722,7 +17722,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Transmission_Gap_Pattern_Sequence_Status_List", HFILL }},
     { &hf_pcap_Transmission_Gap_Pattern_Sequence_Status_List_item,
-      { "Transmission-Gap-Pattern-Sequence-Status-List item", "pcap.Transmission_Gap_Pattern_Sequence_Status_List_item",
+      { "Transmission-Gap-Pattern-Sequence-Status-List item", "pcap.Transmission_Gap_Pattern_Sequence_Status_List_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_tGPRC,
@@ -17742,7 +17742,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TrChInfoList", HFILL }},
     { &hf_pcap_TrChInfoList_item,
-      { "UL-TrCHInfo", "pcap.UL_TrCHInfo",
+      { "UL-TrCHInfo", "pcap.UL_TrCHInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_uL_TrCHtype,
@@ -17750,7 +17750,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_UL_TrCHType_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_tfs,
-      { "tfs", "pcap.tfs",
+      { "tfs", "pcap.tfs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportFormatSet", HFILL }},
     { &hf_pcap_maxSet_E_DPDCHs,
@@ -17762,7 +17762,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PuncturingLimit", HFILL }},
     { &hf_pcap_e_TFCS_Information,
-      { "e-TFCS-Information", "pcap.e_TFCS_Information",
+      { "e-TFCS-Information", "pcap.e_TFCS_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_e_TTI,
@@ -17782,7 +17782,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_Reference_E_TFCI_Information_item,
-      { "Reference-E-TFCI-Information-Item", "pcap.Reference_E_TFCI_Information_Item",
+      { "Reference-E-TFCI-Information-Item", "pcap.Reference_E_TFCI_Information_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_reference_E_TFCI,
@@ -17802,7 +17802,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_63", HFILL }},
     { &hf_pcap_UL_Timeslot_Information_item,
-      { "UL-Timeslot-InformationItem", "pcap.UL_Timeslot_InformationItem",
+      { "UL-Timeslot-InformationItem", "pcap.UL_Timeslot_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_timeSlot,
@@ -17822,7 +17822,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TDD_UL_Code_Information", HFILL }},
     { &hf_pcap_type1,
-      { "type1", "pcap.type1",
+      { "type1", "pcap.type1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_midambleConfigurationBurstType1And3,
@@ -17834,11 +17834,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_T_midambleAllocationMode_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_defaultMidamble,
-      { "defaultMidamble", "pcap.defaultMidamble",
+      { "defaultMidamble", "pcap.defaultMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_commonMidamble,
-      { "commonMidamble", "pcap.commonMidamble",
+      { "commonMidamble", "pcap.commonMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ueSpecificMidamble,
@@ -17846,7 +17846,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MidambleShiftLong", HFILL }},
     { &hf_pcap_type2,
-      { "type2", "pcap.type2",
+      { "type2", "pcap.type2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_midambleConfigurationBurstType2,
@@ -17862,7 +17862,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MidambleShiftShort", HFILL }},
     { &hf_pcap_type3,
-      { "type3", "pcap.type3",
+      { "type3", "pcap.type3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_midambleAllocationMode_02,
@@ -17870,7 +17870,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_T_midambleAllocationMode_02_vals), 0,
         "T_midambleAllocationMode_02", HFILL }},
     { &hf_pcap_TDD_UL_Code_Information_item,
-      { "TDD-UL-Code-InformationItem", "pcap.TDD_UL_Code_InformationItem",
+      { "TDD-UL-Code-InformationItem", "pcap.TDD_UL_Code_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_tdd_ChannelisationCode,
@@ -17886,11 +17886,11 @@ void proto_register_pcap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "C_RNTI", HFILL }},
     { &hf_pcap_uschParameters,
-      { "uschParameters", "pcap.uschParameters",
+      { "uschParameters", "pcap.uschParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_PRACHparameters_item,
-      { "PRACH-ChannelInfo", "pcap.PRACH_ChannelInfo",
+      { "PRACH-ChannelInfo", "pcap.PRACH_ChannelInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_pRACH_Info,
@@ -17898,11 +17898,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_PRACH_Info_vals), 0,
         NULL, HFILL }},
     { &hf_pcap_tFS,
-      { "tFS", "pcap.tFS",
+      { "tFS", "pcap.tFS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportFormatSet", HFILL }},
     { &hf_pcap_fdd_06,
-      { "fdd", "pcap.fdd",
+      { "fdd", "pcap.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_05", HFILL }},
     { &hf_pcap_availableSignatures,
@@ -17926,7 +17926,7 @@ void proto_register_pcap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_tdd_06,
-      { "tdd", "pcap.tdd",
+      { "tdd", "pcap.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_05", HFILL }},
     { &hf_pcap_maxPRACH_MidambleShifts,
@@ -17942,11 +17942,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TransportFormatSet_DynamicPartList", HFILL }},
     { &hf_pcap_semi_staticPart,
-      { "semi-staticPart", "pcap.semi_staticPart",
+      { "semi-staticPart", "pcap.semi_staticPart_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportFormatSet_Semi_staticPart", HFILL }},
     { &hf_pcap_TransportFormatSet_DynamicPartList_item,
-      { "TransportFormatSet-DynamicPartList item", "pcap.TransportFormatSet_DynamicPartList_item",
+      { "TransportFormatSet-DynamicPartList item", "pcap.TransportFormatSet_DynamicPartList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_rlc_Size,
@@ -17958,7 +17958,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxNrOfTFs_OF_TbsTTIInfo", HFILL }},
     { &hf_pcap_numberOfTbsTTIList_item,
-      { "TbsTTIInfo", "pcap.TbsTTIInfo",
+      { "TbsTTIInfo", "pcap.TbsTTIInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_tTIInfo,
@@ -18054,27 +18054,27 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_horizontalVelocity,
-      { "horizontalVelocity", "pcap.horizontalVelocity",
+      { "horizontalVelocity", "pcap.horizontalVelocity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_horizontalWithVerticalVelocity,
-      { "horizontalWithVerticalVelocity", "pcap.horizontalWithVerticalVelocity",
+      { "horizontalWithVerticalVelocity", "pcap.horizontalWithVerticalVelocity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_horizontalVelocityWithUncertainty,
-      { "horizontalVelocityWithUncertainty", "pcap.horizontalVelocityWithUncertainty",
+      { "horizontalVelocityWithUncertainty", "pcap.horizontalVelocityWithUncertainty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_horizontalWithVerticalVelocityAndUncertainty,
-      { "horizontalWithVerticalVelocityAndUncertainty", "pcap.horizontalWithVerticalVelocityAndUncertainty",
+      { "horizontalWithVerticalVelocityAndUncertainty", "pcap.horizontalWithVerticalVelocityAndUncertainty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_horizontalSpeedAndBearing,
-      { "horizontalSpeedAndBearing", "pcap.horizontalSpeedAndBearing",
+      { "horizontalSpeedAndBearing", "pcap.horizontalSpeedAndBearing_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_verticalVelocity,
-      { "verticalVelocity", "pcap.verticalVelocity",
+      { "verticalVelocity", "pcap.verticalVelocity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_uncertaintySpeed,
@@ -18118,7 +18118,7 @@ void proto_register_pcap(void) {
         FT_UINT64, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_ganss_Time_ID,
-      { "ganss-Time-ID", "pcap.ganss_Time_ID",
+      { "ganss-Time-ID", "pcap.ganss_Time_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSSID", HFILL }},
     { &hf_pcap_protocolIEs,
@@ -18130,11 +18130,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ProtocolExtensionContainer", HFILL }},
     { &hf_pcap_referencePosition,
-      { "referencePosition", "pcap.referencePosition",
+      { "referencePosition", "pcap.referencePosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RefPosition_InfEx_Rqst", HFILL }},
     { &hf_pcap_extension_InformationExchangeObjectType_InfEx_Rqst,
-      { "extension-InformationExchangeObjectType-InfEx-Rqst", "pcap.extension_InformationExchangeObjectType_InfEx_Rqst",
+      { "extension-InformationExchangeObjectType-InfEx-Rqst", "pcap.extension_InformationExchangeObjectType_InfEx_Rqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_referencePositionEstimate,
@@ -18142,15 +18142,15 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_UE_PositionEstimate_vals), 0,
         "UE_PositionEstimate", HFILL }},
     { &hf_pcap_referenceUC_ID,
-      { "referenceUC-ID", "pcap.referenceUC_ID",
+      { "referenceUC-ID", "pcap.referenceUC_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UC_ID", HFILL }},
     { &hf_pcap_referencePosition_01,
-      { "referencePosition", "pcap.referencePosition",
+      { "referencePosition", "pcap.referencePosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RefPosition_InfEx_Rsp", HFILL }},
     { &hf_pcap_referencePosition_02,
-      { "referencePosition", "pcap.referencePosition",
+      { "referencePosition", "pcap.referencePosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RefPosition_InfEx_Rprt", HFILL }},
     { &hf_pcap_requestedDataValueInformation,
@@ -18162,35 +18162,35 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PrivateIE_Container", HFILL }},
     { &hf_pcap_initiatingMessage,
-      { "initiatingMessage", "pcap.initiatingMessage",
+      { "initiatingMessage", "pcap.initiatingMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_successfulOutcome,
-      { "successfulOutcome", "pcap.successfulOutcome",
+      { "successfulOutcome", "pcap.successfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_unsuccessfulOutcome,
-      { "unsuccessfulOutcome", "pcap.unsuccessfulOutcome",
+      { "unsuccessfulOutcome", "pcap.unsuccessfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_outcome,
-      { "outcome", "pcap.outcome",
+      { "outcome", "pcap.outcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pcap_initiatingMessagevalue,
-      { "value", "pcap.value",
+      { "value", "pcap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InitiatingMessage_value", HFILL }},
     { &hf_pcap_successfulOutcome_value,
-      { "value", "pcap.value",
+      { "value", "pcap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SuccessfulOutcome_value", HFILL }},
     { &hf_pcap_unsuccessfulOutcome_value,
-      { "value", "pcap.value",
+      { "value", "pcap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UnsuccessfulOutcome_value", HFILL }},
     { &hf_pcap_outcome_value,
-      { "value", "pcap.value",
+      { "value", "pcap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Outcome_value", HFILL }},
     { &hf_pcap_AvailableSignatures_signature15,
diff --git a/epan/dissectors/packet-pkcs1.c b/epan/dissectors/packet-pkcs1.c
index 408aa7b647..bb594fd768 100644
--- a/epan/dissectors/packet-pkcs1.c
+++ b/epan/dissectors/packet-pkcs1.c
@@ -383,11 +383,11 @@ void proto_register_pkcs1(void) {
 /*--- Included file: packet-pkcs1-hfarr.c ---*/
 #line 1 "../../asn1/pkcs1/packet-pkcs1-hfarr.c"
     { &hf_pkcs1_DSA_Params_PDU,
-      { "DSA-Params", "pkcs1.DSA_Params",
+      { "DSA-Params", "pkcs1.DSA_Params_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs1_DomainParameters_PDU,
-      { "DomainParameters", "pkcs1.DomainParameters",
+      { "DomainParameters", "pkcs1.DomainParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs1_KEA_Params_Id_PDU,
@@ -395,11 +395,11 @@ void proto_register_pkcs1(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs1_HashAlgorithm_PDU,
-      { "HashAlgorithm", "pkcs1.HashAlgorithm",
+      { "HashAlgorithm", "pkcs1.HashAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs1_RSASSA_PSS_params_PDU,
-      { "RSASSA-PSS-params", "pkcs1.RSASSA_PSS_params",
+      { "RSASSA-PSS-params", "pkcs1.RSASSA_PSS_params_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs1_ECParameters_PDU,
@@ -443,7 +443,7 @@ void proto_register_pkcs1(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_pkcs1_digestAlgorithm,
-      { "digestAlgorithm", "pkcs1.digestAlgorithm",
+      { "digestAlgorithm", "pkcs1.digestAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DigestAlgorithmIdentifier", HFILL }},
     { &hf_pkcs1_digest,
@@ -467,7 +467,7 @@ void proto_register_pkcs1(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_pkcs1_validationParams,
-      { "validationParams", "pkcs1.validationParams",
+      { "validationParams", "pkcs1.validationParams_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs1_seed,
@@ -479,11 +479,11 @@ void proto_register_pkcs1(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_pkcs1_hashAlgorithm,
-      { "hashAlgorithm", "pkcs1.hashAlgorithm",
+      { "hashAlgorithm", "pkcs1.hashAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs1_maskGenAlgorithm,
-      { "maskGenAlgorithm", "pkcs1.maskGenAlgorithm",
+      { "maskGenAlgorithm", "pkcs1.maskGenAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs1_saltLength,
diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c
index 1f8d5dca86..c6111f240c 100644
--- a/epan/dissectors/packet-pkcs12.c
+++ b/epan/dissectors/packet-pkcs12.c
@@ -1198,7 +1198,7 @@ void proto_register_pkcs12(void) {
 /*--- Included file: packet-pkcs12-hfarr.c ---*/
 #line 1 "../../asn1/pkcs12/packet-pkcs12-hfarr.c"
     { &hf_pkcs12_PFX_PDU,
-      { "PFX", "pkcs12.PFX",
+      { "PFX", "pkcs12.PFX_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_AuthenticatedSafe_PDU,
@@ -1210,47 +1210,47 @@ void proto_register_pkcs12(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_KeyBag_PDU,
-      { "KeyBag", "pkcs12.KeyBag",
+      { "KeyBag", "pkcs12.KeyBag_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_PKCS8ShroudedKeyBag_PDU,
-      { "PKCS8ShroudedKeyBag", "pkcs12.PKCS8ShroudedKeyBag",
+      { "PKCS8ShroudedKeyBag", "pkcs12.PKCS8ShroudedKeyBag_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_CertBag_PDU,
-      { "CertBag", "pkcs12.CertBag",
+      { "CertBag", "pkcs12.CertBag_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_CRLBag_PDU,
-      { "CRLBag", "pkcs12.CRLBag",
+      { "CRLBag", "pkcs12.CRLBag_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_SecretBag_PDU,
-      { "SecretBag", "pkcs12.SecretBag",
+      { "SecretBag", "pkcs12.SecretBag_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_PrivateKeyInfo_PDU,
-      { "PrivateKeyInfo", "pkcs12.PrivateKeyInfo",
+      { "PrivateKeyInfo", "pkcs12.PrivateKeyInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_EncryptedPrivateKeyInfo_PDU,
-      { "EncryptedPrivateKeyInfo", "pkcs12.EncryptedPrivateKeyInfo",
+      { "EncryptedPrivateKeyInfo", "pkcs12.EncryptedPrivateKeyInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_PBEParameter_PDU,
-      { "PBEParameter", "pkcs12.PBEParameter",
+      { "PBEParameter", "pkcs12.PBEParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_PBKDF2Params_PDU,
-      { "PBKDF2Params", "pkcs12.PBKDF2Params",
+      { "PBKDF2Params", "pkcs12.PBKDF2Params_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_PBES2Params_PDU,
-      { "PBES2Params", "pkcs12.PBES2Params",
+      { "PBES2Params", "pkcs12.PBES2Params_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_PBMAC1Params_PDU,
-      { "PBMAC1Params", "pkcs12.PBMAC1Params",
+      { "PBMAC1Params", "pkcs12.PBMAC1Params_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_version,
@@ -1258,15 +1258,15 @@ void proto_register_pkcs12(void) {
         FT_UINT32, BASE_DEC, VALS(pkcs12_T_version_vals), 0,
         NULL, HFILL }},
     { &hf_pkcs12_authSafe,
-      { "authSafe", "pkcs12.authSafe",
+      { "authSafe", "pkcs12.authSafe_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ContentInfo", HFILL }},
     { &hf_pkcs12_macData,
-      { "macData", "pkcs12.macData",
+      { "macData", "pkcs12.macData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_mac,
-      { "mac", "pkcs12.mac",
+      { "mac", "pkcs12.mac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DigestInfo", HFILL }},
     { &hf_pkcs12_macSalt,
@@ -1278,7 +1278,7 @@ void proto_register_pkcs12(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_pkcs12_digestAlgorithm,
-      { "digestAlgorithm", "pkcs12.digestAlgorithm",
+      { "digestAlgorithm", "pkcs12.digestAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DigestAlgorithmIdentifier", HFILL }},
     { &hf_pkcs12_digest,
@@ -1286,11 +1286,11 @@ void proto_register_pkcs12(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_AuthenticatedSafe_item,
-      { "ContentInfo", "pkcs12.ContentInfo",
+      { "ContentInfo", "pkcs12.ContentInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_SafeContents_item,
-      { "SafeBag", "pkcs12.SafeBag",
+      { "SafeBag", "pkcs12.SafeBag_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_bagId,
@@ -1298,7 +1298,7 @@ void proto_register_pkcs12(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_bagValue,
-      { "bagValue", "pkcs12.bagValue",
+      { "bagValue", "pkcs12.bagValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_bagAttributes,
@@ -1306,7 +1306,7 @@ void proto_register_pkcs12(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_PKCS12Attribute", HFILL }},
     { &hf_pkcs12_bagAttributes_item,
-      { "PKCS12Attribute", "pkcs12.PKCS12Attribute",
+      { "PKCS12Attribute", "pkcs12.PKCS12Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_certId,
@@ -1314,7 +1314,7 @@ void proto_register_pkcs12(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_certValue,
-      { "certValue", "pkcs12.certValue",
+      { "certValue", "pkcs12.certValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_crlId,
@@ -1322,7 +1322,7 @@ void proto_register_pkcs12(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_crlValue,
-      { "crlValue", "pkcs12.crlValue",
+      { "crlValue", "pkcs12.crlValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_secretTypeId,
@@ -1330,7 +1330,7 @@ void proto_register_pkcs12(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_secretValue,
-      { "secretValue", "pkcs12.secretValue",
+      { "secretValue", "pkcs12.secretValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_attrId,
@@ -1342,7 +1342,7 @@ void proto_register_pkcs12(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_attrValues_item,
-      { "attrValues item", "pkcs12.attrValues_item",
+      { "attrValues item", "pkcs12.attrValues_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_privateKeyVersion,
@@ -1350,7 +1350,7 @@ void proto_register_pkcs12(void) {
         FT_UINT32, BASE_DEC, VALS(pkcs12_Version_vals), 0,
         NULL, HFILL }},
     { &hf_pkcs12_privateKeyAlgorithm,
-      { "privateKeyAlgorithm", "pkcs12.privateKeyAlgorithm",
+      { "privateKeyAlgorithm", "pkcs12.privateKeyAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_pkcs12_privateKey,
@@ -1362,11 +1362,11 @@ void proto_register_pkcs12(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_Attributes_item,
-      { "Attribute", "pkcs12.Attribute",
+      { "Attribute", "pkcs12.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkcs12_encryptionAlgorithm,
-      { "encryptionAlgorithm", "pkcs12.encryptionAlgorithm",
+      { "encryptionAlgorithm", "pkcs12.encryptionAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_pkcs12_encryptedData,
@@ -1390,7 +1390,7 @@ void proto_register_pkcs12(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_pkcs12_otherSource,
-      { "otherSource", "pkcs12.otherSource",
+      { "otherSource", "pkcs12.otherSource_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_pkcs12_keyLength,
@@ -1398,19 +1398,19 @@ void proto_register_pkcs12(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_MAX", HFILL }},
     { &hf_pkcs12_prf,
-      { "prf", "pkcs12.prf",
+      { "prf", "pkcs12.prf_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_pkcs12_keyDerivationFunc,
-      { "keyDerivationFunc", "pkcs12.keyDerivationFunc",
+      { "keyDerivationFunc", "pkcs12.keyDerivationFunc_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_pkcs12_encryptionScheme,
-      { "encryptionScheme", "pkcs12.encryptionScheme",
+      { "encryptionScheme", "pkcs12.encryptionScheme_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_pkcs12_messageAuthScheme,
-      { "messageAuthScheme", "pkcs12.messageAuthScheme",
+      { "messageAuthScheme", "pkcs12.messageAuthScheme_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
 
diff --git a/epan/dissectors/packet-pkinit.c b/epan/dissectors/packet-pkinit.c
index ebc7136925..8dae56b1e3 100644
--- a/epan/dissectors/packet-pkinit.c
+++ b/epan/dissectors/packet-pkinit.c
@@ -354,19 +354,19 @@ void proto_register_pkinit(void) {
 /*--- Included file: packet-pkinit-hfarr.c ---*/
 #line 1 "../../asn1/pkinit/packet-pkinit-hfarr.c"
     { &hf_pkinit_AuthPack_PDU,
-      { "AuthPack", "pkinit.AuthPack",
+      { "AuthPack", "pkinit.AuthPack_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkinit_KRB5PrincipalName_PDU,
-      { "KRB5PrincipalName", "pkinit.KRB5PrincipalName",
+      { "KRB5PrincipalName", "pkinit.KRB5PrincipalName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkinit_KDCDHKeyInfo_PDU,
-      { "KDCDHKeyInfo", "pkinit.KDCDHKeyInfo",
+      { "KDCDHKeyInfo", "pkinit.KDCDHKeyInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkinit_signedAuthPack,
-      { "signedAuthPack", "pkinit.signedAuthPack",
+      { "signedAuthPack", "pkinit.signedAuthPack_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ContentInfo", HFILL }},
     { &hf_pkinit_trustedCertifiers,
@@ -378,7 +378,7 @@ void proto_register_pkinit(void) {
         FT_UINT32, BASE_DEC, VALS(pkinit_TrustedCA_vals), 0,
         NULL, HFILL }},
     { &hf_pkinit_kdcCert,
-      { "kdcCert", "pkinit.kdcCert",
+      { "kdcCert", "pkinit.kdcCert_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IssuerAndSerialNumber", HFILL }},
     { &hf_pkinit_caName,
@@ -386,15 +386,15 @@ void proto_register_pkinit(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Name", HFILL }},
     { &hf_pkinit_issuerAndSerial,
-      { "issuerAndSerial", "pkinit.issuerAndSerial",
+      { "issuerAndSerial", "pkinit.issuerAndSerial_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IssuerAndSerialNumber", HFILL }},
     { &hf_pkinit_pkAuthenticator,
-      { "pkAuthenticator", "pkinit.pkAuthenticator",
+      { "pkAuthenticator", "pkinit.pkAuthenticator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkinit_clientPublicValue,
-      { "clientPublicValue", "pkinit.clientPublicValue",
+      { "clientPublicValue", "pkinit.clientPublicValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SubjectPublicKeyInfo", HFILL }},
     { &hf_pkinit_supportedCMSTypes,
@@ -402,7 +402,7 @@ void proto_register_pkinit(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_AlgorithmIdentifier", HFILL }},
     { &hf_pkinit_supportedCMSTypes_item,
-      { "AlgorithmIdentifier", "pkinit.AlgorithmIdentifier",
+      { "AlgorithmIdentifier", "pkinit.AlgorithmIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkinit_cusec,
@@ -410,7 +410,7 @@ void proto_register_pkinit(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_pkinit_ctime,
-      { "ctime", "pkinit.ctime",
+      { "ctime", "pkinit.ctime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "KerberosTime", HFILL }},
     { &hf_pkinit_paNonce,
@@ -418,23 +418,23 @@ void proto_register_pkinit(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_4294967295", HFILL }},
     { &hf_pkinit_paChecksum,
-      { "paChecksum", "pkinit.paChecksum",
+      { "paChecksum", "pkinit.paChecksum_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Checksum", HFILL }},
     { &hf_pkinit_realm,
-      { "realm", "pkinit.realm",
+      { "realm", "pkinit.realm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkinit_principalName,
-      { "principalName", "pkinit.principalName",
+      { "principalName", "pkinit.principalName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkinit_dhSignedData,
-      { "dhSignedData", "pkinit.dhSignedData",
+      { "dhSignedData", "pkinit.dhSignedData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ContentInfo", HFILL }},
     { &hf_pkinit_encKeyPack,
-      { "encKeyPack", "pkinit.encKeyPack",
+      { "encKeyPack", "pkinit.encKeyPack_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ContentInfo", HFILL }},
     { &hf_pkinit_subjectPublicKey,
@@ -446,7 +446,7 @@ void proto_register_pkinit(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_pkinit_dhKeyExpiration,
-      { "dhKeyExpiration", "pkinit.dhKeyExpiration",
+      { "dhKeyExpiration", "pkinit.dhKeyExpiration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "KerberosTime", HFILL }},
 
diff --git a/epan/dissectors/packet-pkix1explicit.c b/epan/dissectors/packet-pkix1explicit.c
index 4e3cf17e95..e94f2be87c 100644
--- a/epan/dissectors/packet-pkix1explicit.c
+++ b/epan/dissectors/packet-pkix1explicit.c
@@ -832,7 +832,7 @@ void proto_register_pkix1explicit(void) {
 /*--- Included file: packet-pkix1explicit-hfarr.c ---*/
 #line 1 "../../asn1/pkix1explicit/packet-pkix1explicit-hfarr.c"
     { &hf_pkix1explicit_DomainParameters_PDU,
-      { "DomainParameters", "pkix1explicit.DomainParameters",
+      { "DomainParameters", "pkix1explicit.DomainParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkix1explicit_DirectoryString_PDU,
@@ -844,7 +844,7 @@ void proto_register_pkix1explicit(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pkix1explicit_ASIdentifiers_PDU,
-      { "ASIdentifiers", "pkix1explicit.ASIdentifiers",
+      { "ASIdentifiers", "pkix1explicit.ASIdentifiers_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkix1explicit_utcTime,
@@ -856,7 +856,7 @@ void proto_register_pkix1explicit(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "GeneralizedTime", HFILL }},
     { &hf_pkix1explicit_Extensions_item,
-      { "Extension", "pkix1explicit.Extension",
+      { "Extension", "pkix1explicit.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkix1explicit_extnId,
@@ -888,7 +888,7 @@ void proto_register_pkix1explicit(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_pkix1explicit_validationParms,
-      { "validationParms", "pkix1explicit.validationParms",
+      { "validationParms", "pkix1explicit.validationParms_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkix1explicit_seed,
@@ -908,11 +908,11 @@ void proto_register_pkix1explicit(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pkix1explicit_values_item,
-      { "values item", "pkix1explicit.values_item",
+      { "values item", "pkix1explicit.values_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkix1explicit_value,
-      { "value", "pkix1explicit.value",
+      { "value", "pkix1explicit.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkix1explicit_RDNSequence_item,
@@ -920,7 +920,7 @@ void proto_register_pkix1explicit(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pkix1explicit_RelativeDistinguishedName_item,
-      { "AttributeTypeAndValue", "pkix1explicit.AttributeTypeAndValue",
+      { "AttributeTypeAndValue", "pkix1explicit.AttributeTypeAndValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkix1explicit_type_01,
@@ -932,7 +932,7 @@ void proto_register_pkix1explicit(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "TeletexString", HFILL }},
     { &hf_pkix1explicit_IPAddrBlocks_item,
-      { "IPAddressFamily", "pkix1explicit.IPAddressFamily",
+      { "IPAddressFamily", "pkix1explicit.IPAddressFamily_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkix1explicit_addressFamily,
@@ -944,7 +944,7 @@ void proto_register_pkix1explicit(void) {
         FT_UINT32, BASE_DEC, VALS(pkix1explicit_IPAddressChoice_vals), 0,
         NULL, HFILL }},
     { &hf_pkix1explicit_inherit,
-      { "inherit", "pkix1explicit.inherit",
+      { "inherit", "pkix1explicit.inherit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkix1explicit_addressesOrRanges,
@@ -960,7 +960,7 @@ void proto_register_pkix1explicit(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "IPAddress", HFILL }},
     { &hf_pkix1explicit_addressRange,
-      { "addressRange", "pkix1explicit.addressRange",
+      { "addressRange", "pkix1explicit.addressRange_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IPAddressRange", HFILL }},
     { &hf_pkix1explicit_min,
@@ -992,7 +992,7 @@ void proto_register_pkix1explicit(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "ASId", HFILL }},
     { &hf_pkix1explicit_range,
-      { "range", "pkix1explicit.range",
+      { "range", "pkix1explicit.range_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ASRange", HFILL }},
     { &hf_pkix1explicit_min_01,
diff --git a/epan/dissectors/packet-pkix1implicit.c b/epan/dissectors/packet-pkix1implicit.c
index b359d18381..1dcfef7a34 100644
--- a/epan/dissectors/packet-pkix1implicit.c
+++ b/epan/dissectors/packet-pkix1implicit.c
@@ -311,7 +311,7 @@ void proto_register_pkix1implicit(void) {
 /*--- Included file: packet-pkix1implicit-hfarr.c ---*/
 #line 1 "../../asn1/pkix1implicit/packet-pkix1implicit-hfarr.c"
     { &hf_pkix1implicit_Dummy_PDU,
-      { "Dummy", "pkix1implicit.Dummy",
+      { "Dummy", "pkix1implicit.Dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkix1implicit_AuthorityInfoAccessSyntax_PDU,
@@ -319,11 +319,11 @@ void proto_register_pkix1implicit(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pkix1implicit_UserNotice_PDU,
-      { "UserNotice", "pkix1implicit.UserNotice",
+      { "UserNotice", "pkix1implicit.UserNotice_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkix1implicit_AuthorityInfoAccessSyntax_item,
-      { "AccessDescription", "pkix1implicit.AccessDescription",
+      { "AccessDescription", "pkix1implicit.AccessDescription_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkix1implicit_accessMethod,
@@ -335,7 +335,7 @@ void proto_register_pkix1implicit(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GeneralName", HFILL }},
     { &hf_pkix1implicit_noticeRef,
-      { "noticeRef", "pkix1implicit.noticeRef",
+      { "noticeRef", "pkix1implicit.noticeRef_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NoticeReference", HFILL }},
     { &hf_pkix1implicit_explicitText,
diff --git a/epan/dissectors/packet-pkixac.c b/epan/dissectors/packet-pkixac.c
index 6d9ce1ca2e..b512ab53d5 100644
--- a/epan/dissectors/packet-pkixac.c
+++ b/epan/dissectors/packet-pkixac.c
@@ -597,27 +597,27 @@ void proto_register_pkixac(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixac_IetfAttrSyntax_PDU,
-      { "IetfAttrSyntax", "pkixac.IetfAttrSyntax",
+      { "IetfAttrSyntax", "pkixac.IetfAttrSyntax_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixac_SvceAuthInfo_PDU,
-      { "SvceAuthInfo", "pkixac.SvceAuthInfo",
+      { "SvceAuthInfo", "pkixac.SvceAuthInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixac_RoleSyntax_PDU,
-      { "RoleSyntax", "pkixac.RoleSyntax",
+      { "RoleSyntax", "pkixac.RoleSyntax_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixac_Clearance_PDU,
-      { "Clearance", "pkixac.Clearance",
+      { "Clearance", "pkixac.Clearance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixac_RFC3281Clearance_PDU,
-      { "RFC3281Clearance", "pkixac.RFC3281Clearance",
+      { "RFC3281Clearance", "pkixac.RFC3281Clearance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixac_AAControls_PDU,
-      { "AAControls", "pkixac.AAControls",
+      { "AAControls", "pkixac.AAControls_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixac_ProxyInfo_PDU,
@@ -633,7 +633,7 @@ void proto_register_pkixac(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_pkixac_digestAlgorithm,
-      { "digestAlgorithm", "pkixac.digestAlgorithm",
+      { "digestAlgorithm", "pkixac.digestAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_pkixac_objectDigest,
@@ -665,15 +665,15 @@ void proto_register_pkixac(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GeneralName", HFILL }},
     { &hf_pkixac_targetCert,
-      { "targetCert", "pkixac.targetCert",
+      { "targetCert", "pkixac.targetCert_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixac_targetCertificate,
-      { "targetCertificate", "pkixac.targetCertificate",
+      { "targetCertificate", "pkixac.targetCertificate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IssuerSerial", HFILL }},
     { &hf_pkixac_certDigestInfo,
-      { "certDigestInfo", "pkixac.certDigestInfo",
+      { "certDigestInfo", "pkixac.certDigestInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ObjectDigestInfo", HFILL }},
     { &hf_pkixac_policyAuthority,
@@ -733,7 +733,7 @@ void proto_register_pkixac(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_SecurityCategory", HFILL }},
     { &hf_pkixac_securityCategories_item,
-      { "SecurityCategory", "pkixac.SecurityCategory",
+      { "SecurityCategory", "pkixac.SecurityCategory_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixac_type,
@@ -741,7 +741,7 @@ void proto_register_pkixac(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixac_value,
-      { "value", "pkixac.value",
+      { "value", "pkixac.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixac_pathLenConstraint,
diff --git a/epan/dissectors/packet-pkixproxy.c b/epan/dissectors/packet-pkixproxy.c
index 136fab2a44..4a913d5d5d 100644
--- a/epan/dissectors/packet-pkixproxy.c
+++ b/epan/dissectors/packet-pkixproxy.c
@@ -153,7 +153,7 @@ void proto_register_pkixproxy(void) {
 /*--- Included file: packet-pkixproxy-hfarr.c ---*/
 #line 1 "../../asn1/pkixproxy/packet-pkixproxy-hfarr.c"
     { &hf_pkixproxy_ProxyCertInfoExtension_PDU,
-      { "ProxyCertInfoExtension", "pkixproxy.ProxyCertInfoExtension",
+      { "ProxyCertInfoExtension", "pkixproxy.ProxyCertInfoExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixproxy_pCPathLenConstraint,
@@ -161,7 +161,7 @@ void proto_register_pkixproxy(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "ProxyCertPathLengthConstraint", HFILL }},
     { &hf_pkixproxy_proxyPolicy,
-      { "proxyPolicy", "pkixproxy.proxyPolicy",
+      { "proxyPolicy", "pkixproxy.proxyPolicy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixproxy_policyLanguage,
diff --git a/epan/dissectors/packet-pkixqualified.c b/epan/dissectors/packet-pkixqualified.c
index b56a0c2058..a8a84ec3a1 100644
--- a/epan/dissectors/packet-pkixqualified.c
+++ b/epan/dissectors/packet-pkixqualified.c
@@ -383,7 +383,7 @@ void proto_register_pkixqualified(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixqualified_SemanticsInformation_PDU,
-      { "SemanticsInformation", "pkixqualified.SemanticsInformation",
+      { "SemanticsInformation", "pkixqualified.SemanticsInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixqualified_XmppAddr_PDU,
@@ -391,7 +391,7 @@ void proto_register_pkixqualified(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixqualified_BiometricSyntax_item,
-      { "BiometricData", "pkixqualified.BiometricData",
+      { "BiometricData", "pkixqualified.BiometricData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixqualified_typeOfBiometricData,
@@ -399,7 +399,7 @@ void proto_register_pkixqualified(void) {
         FT_UINT32, BASE_DEC, VALS(pkixqualified_TypeOfBiometricData_vals), 0,
         NULL, HFILL }},
     { &hf_pkixqualified_hashAlgorithm,
-      { "hashAlgorithm", "pkixqualified.hashAlgorithm",
+      { "hashAlgorithm", "pkixqualified.hashAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_pkixqualified_biometricDataHash,
@@ -419,7 +419,7 @@ void proto_register_pkixqualified(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_pkixqualified_QCStatements_item,
-      { "QCStatement", "pkixqualified.QCStatement",
+      { "QCStatement", "pkixqualified.QCStatement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixqualified_statementId,
@@ -427,7 +427,7 @@ void proto_register_pkixqualified(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixqualified_statementInfo,
-      { "statementInfo", "pkixqualified.statementInfo",
+      { "statementInfo", "pkixqualified.statementInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixqualified_semanticsIdentifier,
diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c
index d63464b65b..187b6973fa 100644
--- a/epan/dissectors/packet-pkixtsp.c
+++ b/epan/dissectors/packet-pkixtsp.c
@@ -414,7 +414,7 @@ void proto_register_pkixtsp(void) {
 /*--- Included file: packet-pkixtsp-hfarr.c ---*/
 #line 1 "../../asn1/pkixtsp/packet-pkixtsp-hfarr.c"
     { &hf_pkixtsp_TSTInfo_PDU,
-      { "TSTInfo", "pkixtsp.TSTInfo",
+      { "TSTInfo", "pkixtsp.TSTInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixtsp_version,
@@ -422,7 +422,7 @@ void proto_register_pkixtsp(void) {
         FT_INT32, BASE_DEC, VALS(pkixtsp_T_version_vals), 0,
         NULL, HFILL }},
     { &hf_pkixtsp_messageImprint,
-      { "messageImprint", "pkixtsp.messageImprint",
+      { "messageImprint", "pkixtsp.messageImprint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixtsp_reqPolicy,
@@ -442,7 +442,7 @@ void proto_register_pkixtsp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixtsp_hashAlgorithm,
-      { "hashAlgorithm", "pkixtsp.hashAlgorithm",
+      { "hashAlgorithm", "pkixtsp.hashAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_pkixtsp_hashedMessage,
@@ -450,11 +450,11 @@ void proto_register_pkixtsp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_pkixtsp_status,
-      { "status", "pkixtsp.status",
+      { "status", "pkixtsp.status_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PKIStatusInfo", HFILL }},
     { &hf_pkixtsp_timeStampToken,
-      { "timeStampToken", "pkixtsp.timeStampToken",
+      { "timeStampToken", "pkixtsp.timeStampToken_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixtsp_pki_status,
@@ -482,7 +482,7 @@ void proto_register_pkixtsp(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "GeneralizedTime", HFILL }},
     { &hf_pkixtsp_accuracy,
-      { "accuracy", "pkixtsp.accuracy",
+      { "accuracy", "pkixtsp.accuracy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pkixtsp_ordering,
diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c
index d95aaa1f12..ec1cbbb5da 100644
--- a/epan/dissectors/packet-pres.c
+++ b/epan/dissectors/packet-pres.c
@@ -1532,19 +1532,19 @@ void proto_register_pres(void) {
 /*--- Included file: packet-pres-hfarr.c ---*/
 #line 1 "../../asn1/pres/packet-pres-hfarr.c"
     { &hf_pres_UD_type_PDU,
-      { "UD-type", "pres.UD_type",
+      { "UD-type", "pres.UD_type_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_mode_selector,
-      { "mode-selector", "pres.mode_selector",
+      { "mode-selector", "pres.mode_selector_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_x410_mode_parameters,
-      { "x410-mode-parameters", "pres.x410_mode_parameters",
+      { "x410-mode-parameters", "pres.x410_mode_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RTORQapdu", HFILL }},
     { &hf_pres_normal_mode_parameters,
-      { "normal-mode-parameters", "pres.normal_mode_parameters",
+      { "normal-mode-parameters", "pres.normal_mode_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_protocol_version,
@@ -1564,7 +1564,7 @@ void proto_register_pres(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_default_context_name,
-      { "default-context-name", "pres.default_context_name",
+      { "default-context-name", "pres.default_context_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_presentation_requirements,
@@ -1584,7 +1584,7 @@ void proto_register_pres(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "Presentation_context_identifier", HFILL }},
     { &hf_pres_extensions,
-      { "extensions", "pres.extensions",
+      { "extensions", "pres.extensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_user_data,
@@ -1592,11 +1592,11 @@ void proto_register_pres(void) {
         FT_UINT32, BASE_DEC, VALS(pres_User_data_vals), 0,
         NULL, HFILL }},
     { &hf_pres_cPR_PPDU_x400_mode_parameters,
-      { "x410-mode-parameters", "pres.x410_mode_parameters",
+      { "x410-mode-parameters", "pres.x410_mode_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RTOACapdu", HFILL }},
     { &hf_pres_cPU_PPDU_normal_mode_parameters,
-      { "normal-mode-parameters", "pres.normal_mode_parameters",
+      { "normal-mode-parameters", "pres.normal_mode_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_CPA_PPDU_normal_mode_parameters", HFILL }},
     { &hf_pres_responding_presentation_selector,
@@ -1612,11 +1612,11 @@ void proto_register_pres(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "Presentation_context_identifier", HFILL }},
     { &hf_pres_cPU_PPDU_x400_mode_parameters,
-      { "x400-mode-parameters", "pres.x400_mode_parameters",
+      { "x400-mode-parameters", "pres.x400_mode_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RTORJapdu", HFILL }},
     { &hf_pres_cPR_PPDU_normal_mode_parameters,
-      { "normal-mode-parameters", "pres.normal_mode_parameters",
+      { "normal-mode-parameters", "pres.normal_mode_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_CPR_PPDU_normal_mode_parameters", HFILL }},
     { &hf_pres_default_context_result,
@@ -1632,15 +1632,15 @@ void proto_register_pres(void) {
         FT_UINT32, BASE_DEC, VALS(pres_ARU_PPDU_vals), 0,
         NULL, HFILL }},
     { &hf_pres_arp_ppdu,
-      { "arp-ppdu", "pres.arp_ppdu",
+      { "arp-ppdu", "pres.arp_ppdu_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_aRU_PPDU_x400_mode_parameters,
-      { "x400-mode-parameters", "pres.x400_mode_parameters",
+      { "x400-mode-parameters", "pres.x400_mode_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RTABapdu", HFILL }},
     { &hf_pres_aRU_PPDU_normal_mode_parameters,
-      { "normal-mode-parameters", "pres.normal_mode_parameters",
+      { "normal-mode-parameters", "pres.normal_mode_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ARU_PPDU_normal_mode_parameters", HFILL }},
     { &hf_pres_presentation_context_identifier_list,
@@ -1656,11 +1656,11 @@ void proto_register_pres(void) {
         FT_INT32, BASE_DEC, VALS(pres_Event_identifier_vals), 0,
         NULL, HFILL }},
     { &hf_pres_acPPDU,
-      { "acPPDU", "pres.acPPDU",
+      { "acPPDU", "pres.acPPDU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AC_PPDU", HFILL }},
     { &hf_pres_acaPPDU,
-      { "acaPPDU", "pres.acaPPDU",
+      { "acaPPDU", "pres.acaPPDU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ACA_PPDU", HFILL }},
     { &hf_pres_ttdPPDU,
@@ -1684,7 +1684,7 @@ void proto_register_pres(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_Context_list_item,
-      { "Context-list item", "pres.Context_list_item",
+      { "Context-list item", "pres.Context_list_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_presentation_context_identifier,
@@ -1720,11 +1720,11 @@ void proto_register_pres(void) {
         FT_INT32, BASE_DEC, VALS(pres_Presentation_context_deletion_result_list_item_vals), 0,
         NULL, HFILL }},
     { &hf_pres_Presentation_context_identifier_list_item,
-      { "Presentation-context-identifier-list item", "pres.Presentation_context_identifier_list_item",
+      { "Presentation-context-identifier-list item", "pres.Presentation_context_identifier_list_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_Result_list_item,
-      { "Result-list item", "pres.Result_list_item",
+      { "Result-list item", "pres.Result_list_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_result,
@@ -1744,7 +1744,7 @@ void proto_register_pres(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_Fully_encoded_data_item,
-      { "PDV-list", "pres.PDV_list",
+      { "PDV-list", "pres.PDV_list_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_presentation_data_values,
@@ -1752,7 +1752,7 @@ void proto_register_pres(void) {
         FT_UINT32, BASE_DEC, VALS(pres_T_presentation_data_values_vals), 0,
         NULL, HFILL }},
     { &hf_pres_single_ASN1_type,
-      { "single-ASN1-type", "pres.single_ASN1_type",
+      { "single-ASN1-type", "pres.single_ASN1_type_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_octet_aligned,
diff --git a/epan/dissectors/packet-q932-ros.c b/epan/dissectors/packet-q932-ros.c
index 23c5b30586..3652b7894f 100644
--- a/epan/dissectors/packet-q932-ros.c
+++ b/epan/dissectors/packet-q932-ros.c
@@ -704,19 +704,19 @@ void proto_register_q932_ros(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_q932_ros_invoke,
-      { "invoke", "q932.ros.invoke",
+      { "invoke", "q932.ros.invoke_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_q932_ros_returnResult,
-      { "returnResult", "q932.ros.returnResult",
+      { "returnResult", "q932.ros.returnResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_q932_ros_returnError,
-      { "returnError", "q932.ros.returnError",
+      { "returnError", "q932.ros.returnError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_q932_ros_reject,
-      { "reject", "q932.ros.reject",
+      { "reject", "q932.ros.reject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_q932_ros_invokeId,
@@ -732,7 +732,7 @@ void proto_register_q932_ros(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "T_linkedIdPresent", HFILL }},
     { &hf_q932_ros_absent,
-      { "absent", "q932.ros.absent",
+      { "absent", "q932.ros.absent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_q932_ros_opcode,
@@ -744,7 +744,7 @@ void proto_register_q932_ros(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "InvokeArgument", HFILL }},
     { &hf_q932_ros_result,
-      { "result", "q932.ros.result",
+      { "result", "q932.ros.result_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_q932_ros_resultArgument,
diff --git a/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c
index 183befe344..9b1387f130 100644
--- a/epan/dissectors/packet-q932.c
+++ b/epan/dissectors/packet-q932.c
@@ -817,7 +817,7 @@ void proto_register_q932(void) {
 /*--- Included file: packet-q932-hfarr.c ---*/
 #line 1 "../../asn1/q932/packet-q932-hfarr.c"
     { &hf_q932_NetworkFacilityExtension_PDU,
-      { "NetworkFacilityExtension", "q932.NetworkFacilityExtension",
+      { "NetworkFacilityExtension", "q932.NetworkFacilityExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_q932_NetworkProtocolProfile_PDU,
@@ -829,39 +829,39 @@ void proto_register_q932(void) {
         FT_UINT32, BASE_DEC, VALS(q932_InterpretationComponent_U_vals), 0,
         NULL, HFILL }},
     { &hf_q932_presentationAlIowedAddress,
-      { "presentationAlIowedAddress", "q932.presentationAlIowedAddress",
+      { "presentationAlIowedAddress", "q932.presentationAlIowedAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AddressScreened", HFILL }},
     { &hf_q932_presentationRestricted,
-      { "presentationRestricted", "q932.presentationRestricted",
+      { "presentationRestricted", "q932.presentationRestricted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_q932_numberNotAvailableDueTolnterworking,
-      { "numberNotAvailableDueTolnterworking", "q932.numberNotAvailableDueTolnterworking",
+      { "numberNotAvailableDueTolnterworking", "q932.numberNotAvailableDueTolnterworking_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_q932_presentationRestrictedAddressScreened,
-      { "presentationRestrictedAddress", "q932.presentationRestrictedAddress",
+      { "presentationRestrictedAddress", "q932.presentationRestrictedAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AddressScreened", HFILL }},
     { &hf_q932_presentationAllowedAddress,
-      { "presentationAllowedAddress", "q932.presentationAllowedAddress",
+      { "presentationAllowedAddress", "q932.presentationAllowedAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Address", HFILL }},
     { &hf_q932_presentationRestrictedAddress,
-      { "presentationRestrictedAddress", "q932.presentationRestrictedAddress",
+      { "presentationRestrictedAddress", "q932.presentationRestrictedAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Address", HFILL }},
     { &hf_q932_presentationAllowedNumberScreened,
-      { "presentationAllowedNumber", "q932.presentationAllowedNumber",
+      { "presentationAllowedNumber", "q932.presentationAllowedNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NumberScreened", HFILL }},
     { &hf_q932_numberNotAvailableDueToInterworking,
-      { "numberNotAvailableDueToInterworking", "q932.numberNotAvailableDueToInterworking",
+      { "numberNotAvailableDueToInterworking", "q932.numberNotAvailableDueToInterworking_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_q932_presentationRestrictedNumberScreened,
-      { "presentationRestrictedNumber", "q932.presentationRestrictedNumber",
+      { "presentationRestrictedNumber", "q932.presentationRestrictedNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NumberScreened", HFILL }},
     { &hf_q932_presentationAllowedNumber,
@@ -893,7 +893,7 @@ void proto_register_q932(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "NumberDigits", HFILL }},
     { &hf_q932_publicPartyNumber,
-      { "publicPartyNumber", "q932.publicPartyNumber",
+      { "publicPartyNumber", "q932.publicPartyNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_q932_nsapEncodedNumber,
@@ -909,7 +909,7 @@ void proto_register_q932(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "NumberDigits", HFILL }},
     { &hf_q932_privatePartyNumber,
-      { "privatePartyNumber", "q932.privatePartyNumber",
+      { "privatePartyNumber", "q932.privatePartyNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_q932_nationalStandardPartyNumber,
@@ -933,7 +933,7 @@ void proto_register_q932(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "NumberDigits", HFILL }},
     { &hf_q932_userSpecifiedSubaddress,
-      { "userSpecifiedSubaddress", "q932.userSpecifiedSubaddress",
+      { "userSpecifiedSubaddress", "q932.userSpecifiedSubaddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_q932_nSAPSubaddress,
diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c
index c16d54d559..8c11bdf9e6 100644
--- a/epan/dissectors/packet-qsig.c
+++ b/epan/dissectors/packet-qsig.c
@@ -12668,39 +12668,39 @@ void proto_register_qsig(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_extensionArgument,
-      { "extensionArgument", "qsig.extensionArgument",
+      { "extensionArgument", "qsig.extensionArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_presentationAllowedAddressS,
-      { "presentationAllowedAddressS", "qsig.presentationAllowedAddressS",
+      { "presentationAllowedAddressS", "qsig.presentationAllowedAddressS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AddressScreened", HFILL }},
     { &hf_qsig_presentationRestricted,
-      { "presentationRestricted", "qsig.presentationRestricted",
+      { "presentationRestricted", "qsig.presentationRestricted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_numberNotAvailableDueToInterworking,
-      { "numberNotAvailableDueToInterworking", "qsig.numberNotAvailableDueToInterworking",
+      { "numberNotAvailableDueToInterworking", "qsig.numberNotAvailableDueToInterworking_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_presentationRestrictedAddressS,
-      { "presentationRestrictedAddressS", "qsig.presentationRestrictedAddressS",
+      { "presentationRestrictedAddressS", "qsig.presentationRestrictedAddressS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AddressScreened", HFILL }},
     { &hf_qsig_presentationAllowedAddressU,
-      { "presentationAllowedAddressU", "qsig.presentationAllowedAddressU",
+      { "presentationAllowedAddressU", "qsig.presentationAllowedAddressU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Address", HFILL }},
     { &hf_qsig_presentationRestrictedAddressU,
-      { "presentationRestrictedAddressU", "qsig.presentationRestrictedAddressU",
+      { "presentationRestrictedAddressU", "qsig.presentationRestrictedAddressU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Address", HFILL }},
     { &hf_qsig_presentationAllowedAddressNS,
-      { "presentationAllowedAddressNS", "qsig.presentationAllowedAddressNS",
+      { "presentationAllowedAddressNS", "qsig.presentationAllowedAddressNS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NumberScreened", HFILL }},
     { &hf_qsig_presentationRestrictedAddressNS,
-      { "presentationRestrictedAddressNS", "qsig.presentationRestrictedAddressNS",
+      { "presentationRestrictedAddressNS", "qsig.presentationRestrictedAddressNS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NumberScreened", HFILL }},
     { &hf_qsig_presentationAllowedAddressNU,
@@ -12728,7 +12728,7 @@ void proto_register_qsig(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "NumberDigits", HFILL }},
     { &hf_qsig_publicPartyNumber,
-      { "publicPartyNumber", "qsig.publicPartyNumber",
+      { "publicPartyNumber", "qsig.publicPartyNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_dataPartyNumber,
@@ -12740,7 +12740,7 @@ void proto_register_qsig(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "NumberDigits", HFILL }},
     { &hf_qsig_privatePartyNumber,
-      { "privatePartyNumber", "qsig.privatePartyNumber",
+      { "privatePartyNumber", "qsig.privatePartyNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_nationalStandardPartyNumber,
@@ -12764,7 +12764,7 @@ void proto_register_qsig(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "NumberDigits", HFILL }},
     { &hf_qsig_userSpecifiedSubaddress,
-      { "userSpecifiedSubaddress", "qsig.userSpecifiedSubaddress",
+      { "userSpecifiedSubaddress", "qsig.userSpecifiedSubaddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_nSAPSubaddress,
@@ -12791,7 +12791,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_na_Name_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_na_nameSequence,
-      { "nameSequence", "qsig.na.nameSequence",
+      { "nameSequence", "qsig.na.nameSequence_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_na_extensionNA,
@@ -12799,7 +12799,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_na_NameExtension_vals), 0,
         "NameExtension", HFILL }},
     { &hf_qsig_na_single,
-      { "single", "qsig.na.single",
+      { "single", "qsig.na.single_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Extension", HFILL }},
     { &hf_qsig_na_multiple,
@@ -12807,7 +12807,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_na_multiple_item,
-      { "Extension", "qsig.na.Extension",
+      { "Extension", "qsig.na.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_na_namePresentationAllowed,
@@ -12819,7 +12819,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_na_NamePresentationRestricted_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_na_nameNotAvailable,
-      { "nameNotAvailable", "qsig.na.nameNotAvailable",
+      { "nameNotAvailable", "qsig.na.nameNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_na_namePresentationAllowedSimple,
@@ -12827,7 +12827,7 @@ void proto_register_qsig(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "NameData", HFILL }},
     { &hf_qsig_na_namePresentationAllowedExtended,
-      { "namePresentationAllowedExtended", "qsig.na.namePresentationAllowedExtended",
+      { "namePresentationAllowedExtended", "qsig.na.namePresentationAllowedExtended_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NameSet", HFILL }},
     { &hf_qsig_na_namePresentationRestrictedSimple,
@@ -12835,11 +12835,11 @@ void proto_register_qsig(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "NameData", HFILL }},
     { &hf_qsig_na_namePresentationRestrictedExtended,
-      { "namePresentationRestrictedExtended", "qsig.na.namePresentationRestrictedExtended",
+      { "namePresentationRestrictedExtended", "qsig.na.namePresentationRestrictedExtended_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NameSet", HFILL }},
     { &hf_qsig_na_namePresentationRestrictedNull,
-      { "namePresentationRestrictedNull", "qsig.na.namePresentationRestrictedNull",
+      { "namePresentationRestrictedNull", "qsig.na.namePresentationRestrictedNull_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_na_nameData,
@@ -12854,7 +12854,7 @@ void proto_register_qsig(void) {
 /* --- Module Call-Diversion-Operations-asn1-97 --- --- ---                   */
 
     { &hf_qsig_cf_qsig_cf_ARG_activateDiversionQ_PDU,
-      { "ARG-activateDiversionQ", "qsig.cf.ARG_activateDiversionQ",
+      { "ARG-activateDiversionQ", "qsig.cf.ARG_activateDiversionQ_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cf_qsig_cf_RES_activateDiversionQ_PDU,
@@ -12862,7 +12862,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_cf_RES_activateDiversionQ_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_cf_qsig_cf_ARG_deactivateDiversionQ_PDU,
-      { "ARG-deactivateDiversionQ", "qsig.cf.ARG_deactivateDiversionQ",
+      { "ARG-deactivateDiversionQ", "qsig.cf.ARG_deactivateDiversionQ_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cf_qsig_cf_RES_deactivateDiversionQ_PDU,
@@ -12870,7 +12870,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_cf_RES_deactivateDiversionQ_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_cf_qsig_cf_ARG_interrogateDiversionQ_PDU,
-      { "ARG-interrogateDiversionQ", "qsig.cf.ARG_interrogateDiversionQ",
+      { "ARG-interrogateDiversionQ", "qsig.cf.ARG_interrogateDiversionQ_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cf_qsig_cf_IntResultList_PDU,
@@ -12878,7 +12878,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cf_qsig_cf_ARG_checkRestriction_PDU,
-      { "ARG-checkRestriction", "qsig.cf.ARG_checkRestriction",
+      { "ARG-checkRestriction", "qsig.cf.ARG_checkRestriction_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cf_qsig_cf_RES_checkRestriction_PDU,
@@ -12886,7 +12886,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_cf_RES_checkRestriction_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_cf_qsig_cf_ARG_callRerouteing_PDU,
-      { "ARG-callRerouteing", "qsig.cf.ARG_callRerouteing",
+      { "ARG-callRerouteing", "qsig.cf.ARG_callRerouteing_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cf_qsig_cf_RES_callRerouteing_PDU,
@@ -12894,15 +12894,15 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_cf_RES_callRerouteing_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_cf_qsig_cf_ARG_divertingLegInformation1_PDU,
-      { "ARG-divertingLegInformation1", "qsig.cf.ARG_divertingLegInformation1",
+      { "ARG-divertingLegInformation1", "qsig.cf.ARG_divertingLegInformation1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cf_qsig_cf_ARG_divertingLegInformation2_PDU,
-      { "ARG-divertingLegInformation2", "qsig.cf.ARG_divertingLegInformation2",
+      { "ARG-divertingLegInformation2", "qsig.cf.ARG_divertingLegInformation2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cf_qsig_cf_ARG_divertingLegInformation3_PDU,
-      { "ARG-divertingLegInformation3", "qsig.cf.ARG_divertingLegInformation3",
+      { "ARG-divertingLegInformation3", "qsig.cf.ARG_divertingLegInformation3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cf_qsig_cf_ARG_cfnrDivertedLegFailed_PDU,
@@ -12910,7 +12910,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_cf_ARG_cfnrDivertedLegFailed_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_cf_qsig_cf_Extension_PDU,
-      { "Extension", "qsig.cf.Extension",
+      { "Extension", "qsig.cf.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cf_procedure,
@@ -12922,7 +12922,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_cf_BasicService_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_cf_divertedToAddress,
-      { "divertedToAddress", "qsig.cf.divertedToAddress",
+      { "divertedToAddress", "qsig.cf.divertedToAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Address", HFILL }},
     { &hf_qsig_cf_servedUserNr,
@@ -12938,7 +12938,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_cf_ADExtension_vals), 0,
         "ADExtension", HFILL }},
     { &hf_qsig_cf_single,
-      { "single", "qsig.cf.single",
+      { "single", "qsig.cf.single_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Extension", HFILL }},
     { &hf_qsig_cf_multiple,
@@ -12946,11 +12946,11 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_cf_multiple_item,
-      { "Extension", "qsig.cf.Extension",
+      { "Extension", "qsig.cf.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cf_null,
-      { "null", "qsig.cf.null",
+      { "null", "qsig.cf.null_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cf_deactivatingUserNr,
@@ -12986,7 +12986,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_cf_DiversionReason_vals), 0,
         "DiversionReason", HFILL }},
     { &hf_qsig_cf_calledAddress,
-      { "calledAddress", "qsig.cf.calledAddress",
+      { "calledAddress", "qsig.cf.calledAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Address", HFILL }},
     { &hf_qsig_cf_diversionCounter,
@@ -13070,7 +13070,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_cf_DLI3Extension_vals), 0,
         "DLI3Extension", HFILL }},
     { &hf_qsig_cf_IntResultList_item,
-      { "IntResult", "qsig.cf.IntResult",
+      { "IntResult", "qsig.cf.IntResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cf_remoteEnabled,
@@ -13089,11 +13089,11 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_pr_DummyArg_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_pr_qsig_pr_PRProposeArg_PDU,
-      { "PRProposeArg", "qsig.pr.PRProposeArg",
+      { "PRProposeArg", "qsig.pr.PRProposeArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pr_qsig_pr_PRSetupArg_PDU,
-      { "PRSetupArg", "qsig.pr.PRSetupArg",
+      { "PRSetupArg", "qsig.pr.PRSetupArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pr_qsig_pr_DummyResult_PDU,
@@ -13101,11 +13101,11 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_pr_DummyResult_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_pr_qsig_pr_PRRetainArg_PDU,
-      { "PRRetainArg", "qsig.pr.PRRetainArg",
+      { "PRRetainArg", "qsig.pr.PRRetainArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pr_qsig_pr_Extension_PDU,
-      { "Extension", "qsig.pr.Extension",
+      { "Extension", "qsig.pr.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pr_callIdentity,
@@ -13121,7 +13121,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_pr_PRPExtension_vals), 0,
         "PRPExtension", HFILL }},
     { &hf_qsig_pr_single,
-      { "single", "qsig.pr.single",
+      { "single", "qsig.pr.single_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Extension", HFILL }},
     { &hf_qsig_pr_multiple,
@@ -13129,7 +13129,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_pr_multiple_item,
-      { "Extension", "qsig.pr.Extension",
+      { "Extension", "qsig.pr.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pr_extensionPRS,
@@ -13141,7 +13141,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_pr_PRRExtension_vals), 0,
         "PRRExtension", HFILL }},
     { &hf_qsig_pr_null,
-      { "null", "qsig.pr.null",
+      { "null", "qsig.pr.null_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
@@ -13152,11 +13152,11 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_ct_DummyArg_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_ct_qsig_ct_CTIdentifyRes_PDU,
-      { "CTIdentifyRes", "qsig.ct.CTIdentifyRes",
+      { "CTIdentifyRes", "qsig.ct.CTIdentifyRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ct_qsig_ct_CTInitiateArg_PDU,
-      { "CTInitiateArg", "qsig.ct.CTInitiateArg",
+      { "CTInitiateArg", "qsig.ct.CTInitiateArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ct_qsig_ct_DummyRes_PDU,
@@ -13164,35 +13164,35 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_ct_DummyRes_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_ct_qsig_ct_CTSetupArg_PDU,
-      { "CTSetupArg", "qsig.ct.CTSetupArg",
+      { "CTSetupArg", "qsig.ct.CTSetupArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ct_qsig_ct_CTActiveArg_PDU,
-      { "CTActiveArg", "qsig.ct.CTActiveArg",
+      { "CTActiveArg", "qsig.ct.CTActiveArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ct_qsig_ct_CTCompleteArg_PDU,
-      { "CTCompleteArg", "qsig.ct.CTCompleteArg",
+      { "CTCompleteArg", "qsig.ct.CTCompleteArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ct_qsig_ct_CTUpdateArg_PDU,
-      { "CTUpdateArg", "qsig.ct.CTUpdateArg",
+      { "CTUpdateArg", "qsig.ct.CTUpdateArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ct_qsig_ct_SubaddressTransferArg_PDU,
-      { "SubaddressTransferArg", "qsig.ct.SubaddressTransferArg",
+      { "SubaddressTransferArg", "qsig.ct.SubaddressTransferArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ct_qsig_ct_Extension_PDU,
-      { "Extension", "qsig.ct.Extension",
+      { "Extension", "qsig.ct.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ct_null,
-      { "null", "qsig.ct.null",
+      { "null", "qsig.ct.null_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ct_single,
-      { "single", "qsig.ct.single",
+      { "single", "qsig.ct.single_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Extension", HFILL }},
     { &hf_qsig_ct_multiple,
@@ -13200,7 +13200,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_ct_multiple_item,
-      { "Extension", "qsig.ct.Extension",
+      { "Extension", "qsig.ct.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ct_callIdentity,
@@ -13275,11 +13275,11 @@ void proto_register_qsig(void) {
 /* --- Module SS-CC-Operations-asn1-97 --- --- ---                            */
 
     { &hf_qsig_cc_qsig_cc_CcRequestArg_PDU,
-      { "CcRequestArg", "qsig.cc.CcRequestArg",
+      { "CcRequestArg", "qsig.cc.CcRequestArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cc_qsig_cc_CcRequestRes_PDU,
-      { "CcRequestRes", "qsig.cc.CcRequestRes",
+      { "CcRequestRes", "qsig.cc.CcRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cc_qsig_cc_CcOptionalArg_PDU,
@@ -13291,7 +13291,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_cc_CcExtension_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_cc_qsig_cc_Extension_PDU,
-      { "Extension", "qsig.cc.Extension",
+      { "Extension", "qsig.cc.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cc_numberA,
@@ -13335,7 +13335,7 @@ void proto_register_qsig(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_qsig_cc_fullArg,
-      { "fullArg", "qsig.cc.fullArg",
+      { "fullArg", "qsig.cc.fullArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cc_numberA_01,
@@ -13347,11 +13347,11 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_cc_CcExtension_vals), 0,
         "CcExtension", HFILL }},
     { &hf_qsig_cc_none,
-      { "none", "qsig.cc.none",
+      { "none", "qsig.cc.none_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cc_single,
-      { "single", "qsig.cc.single",
+      { "single", "qsig.cc.single_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Extension", HFILL }},
     { &hf_qsig_cc_multiple,
@@ -13359,7 +13359,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_cc_multiple_item,
-      { "Extension", "qsig.cc.Extension",
+      { "Extension", "qsig.cc.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
@@ -13382,7 +13382,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_co_DummyRes_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_co_qsig_co_Extension_PDU,
-      { "Extension", "qsig.co.Extension",
+      { "Extension", "qsig.co.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_co_serviceList,
@@ -13390,19 +13390,19 @@ void proto_register_qsig(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_co_extendedServiceList,
-      { "extendedServiceList", "qsig.co.extendedServiceList",
+      { "extendedServiceList", "qsig.co.extendedServiceList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_co_extension,
-      { "extension", "qsig.co.extension",
+      { "extension", "qsig.co.extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_co_extendedServiceList_01,
-      { "extendedServiceList", "qsig.co.extendedServiceList",
+      { "extendedServiceList", "qsig.co.extendedServiceList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_extendedServiceList_01", HFILL }},
     { &hf_qsig_co_null,
-      { "null", "qsig.co.null",
+      { "null", "qsig.co.null_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_co_sequenceOfExtn,
@@ -13410,7 +13410,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_co_sequenceOfExtn_item,
-      { "Extension", "qsig.co.Extension",
+      { "Extension", "qsig.co.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_co_ServiceList_callOffer,
@@ -13421,15 +13421,15 @@ void proto_register_qsig(void) {
 /* --- Module Do-Not-Disturb-Operations-asn1-97 --- --- ---                   */
 
     { &hf_qsig_dnd_qsig_dnd_DNDActivateArg_PDU,
-      { "DNDActivateArg", "qsig.dnd.DNDActivateArg",
+      { "DNDActivateArg", "qsig.dnd.DNDActivateArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_dnd_qsig_dnd_DNDActivateRes_PDU,
-      { "DNDActivateRes", "qsig.dnd.DNDActivateRes",
+      { "DNDActivateRes", "qsig.dnd.DNDActivateRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_dnd_qsig_dnd_DNDDeactivateArg_PDU,
-      { "DNDDeactivateArg", "qsig.dnd.DNDDeactivateArg",
+      { "DNDDeactivateArg", "qsig.dnd.DNDDeactivateArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_dnd_qsig_dnd_DummyRes_PDU,
@@ -13437,15 +13437,15 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_dnd_DummyRes_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_dnd_qsig_dnd_DNDInterrogateArg_PDU,
-      { "DNDInterrogateArg", "qsig.dnd.DNDInterrogateArg",
+      { "DNDInterrogateArg", "qsig.dnd.DNDInterrogateArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_dnd_qsig_dnd_DNDInterrogateRes_PDU,
-      { "DNDInterrogateRes", "qsig.dnd.DNDInterrogateRes",
+      { "DNDInterrogateRes", "qsig.dnd.DNDInterrogateRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_dnd_qsig_dnd_DNDOverrideArg_PDU,
-      { "DNDOverrideArg", "qsig.dnd.DNDOverrideArg",
+      { "DNDOverrideArg", "qsig.dnd.DNDOverrideArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_dnd_qsig_dnd_PathRetainArg_PDU,
@@ -13461,15 +13461,15 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_dnd_DummyArg_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_dnd_qsig_dnd_Extension_PDU,
-      { "Extension", "qsig.dnd.Extension",
+      { "Extension", "qsig.dnd.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_dnd_null,
-      { "null", "qsig.dnd.null",
+      { "null", "qsig.dnd.null_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_dnd_extension,
-      { "extension", "qsig.dnd.extension",
+      { "extension", "qsig.dnd.extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_dnd_sequenceOfExtn,
@@ -13477,7 +13477,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_dnd_sequenceOfExtn_item,
-      { "Extension", "qsig.dnd.Extension",
+      { "Extension", "qsig.dnd.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_dnd_basicService,
@@ -13497,7 +13497,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_dnd_status_item,
-      { "status item", "qsig.dnd.status_item",
+      { "status item", "qsig.dnd.status_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_dnd_dndProtectionLevel,
@@ -13521,7 +13521,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_status_01", HFILL }},
     { &hf_qsig_dnd_status_item_01,
-      { "status item", "qsig.dnd.status_item",
+      { "status item", "qsig.dnd.status_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_status_item_01", HFILL }},
     { &hf_qsig_dnd_resultExtension_01,
@@ -13541,11 +13541,11 @@ void proto_register_qsig(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_dnd_extendedServiceList,
-      { "extendedServiceList", "qsig.dnd.extendedServiceList",
+      { "extendedServiceList", "qsig.dnd.extendedServiceList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_dnd_extendedServiceList_01,
-      { "extendedServiceList", "qsig.dnd.extendedServiceList",
+      { "extendedServiceList", "qsig.dnd.extendedServiceList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_extendedServiceList_01", HFILL }},
     { &hf_qsig_dnd_ServiceList_dndo_low,
@@ -13572,11 +13572,11 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_ci_ServiceAvailableArg_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_ci_qsig_ci_CIRequestArg_PDU,
-      { "CIRequestArg", "qsig.ci.CIRequestArg",
+      { "CIRequestArg", "qsig.ci.CIRequestArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ci_qsig_ci_CIRequestRes_PDU,
-      { "CIRequestRes", "qsig.ci.CIRequestRes",
+      { "CIRequestRes", "qsig.ci.CIRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ci_qsig_ci_DummyArg_PDU,
@@ -13584,7 +13584,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_ci_DummyArg_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_ci_qsig_ci_CIGetCIPLRes_PDU,
-      { "CIGetCIPLRes", "qsig.ci.CIGetCIPLRes",
+      { "CIGetCIPLRes", "qsig.ci.CIGetCIPLRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ci_qsig_ci_DummyRes_PDU,
@@ -13592,7 +13592,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_ci_DummyRes_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_ci_qsig_ci_Extension_PDU,
-      { "Extension", "qsig.ci.Extension",
+      { "Extension", "qsig.ci.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ci_serviceList,
@@ -13600,19 +13600,19 @@ void proto_register_qsig(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ci_extendedServiceList,
-      { "extendedServiceList", "qsig.ci.extendedServiceList",
+      { "extendedServiceList", "qsig.ci.extendedServiceList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ci_extension,
-      { "extension", "qsig.ci.extension",
+      { "extension", "qsig.ci.extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ci_extendedServiceList_01,
-      { "extendedServiceList", "qsig.ci.extendedServiceList",
+      { "extendedServiceList", "qsig.ci.extendedServiceList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_extendedServiceList_01", HFILL }},
     { &hf_qsig_ci_null,
-      { "null", "qsig.ci.null",
+      { "null", "qsig.ci.null_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ci_sequenceOfExtn,
@@ -13620,7 +13620,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_ci_sequenceOfExtn_item,
-      { "Extension", "qsig.ci.Extension",
+      { "Extension", "qsig.ci.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ci_ciCapabilityLevel,
@@ -13663,23 +13663,23 @@ void proto_register_qsig(void) {
 /* --- Module SS-AOC-Operations-asn1-97 --- --- ---                           */
 
     { &hf_qsig_aoc_qsig_aoc_AocRateArg_PDU,
-      { "AocRateArg", "qsig.aoc.AocRateArg",
+      { "AocRateArg", "qsig.aoc.AocRateArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_qsig_aoc_AocInterimArg_PDU,
-      { "AocInterimArg", "qsig.aoc.AocInterimArg",
+      { "AocInterimArg", "qsig.aoc.AocInterimArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_qsig_aoc_AocFinalArg_PDU,
-      { "AocFinalArg", "qsig.aoc.AocFinalArg",
+      { "AocFinalArg", "qsig.aoc.AocFinalArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_qsig_aoc_ChargeRequestArg_PDU,
-      { "ChargeRequestArg", "qsig.aoc.ChargeRequestArg",
+      { "ChargeRequestArg", "qsig.aoc.ChargeRequestArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_qsig_aoc_ChargeRequestRes_PDU,
-      { "ChargeRequestRes", "qsig.aoc.ChargeRequestRes",
+      { "ChargeRequestRes", "qsig.aoc.ChargeRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_qsig_aoc_DummyArg_PDU,
@@ -13687,19 +13687,19 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_aoc_DummyArg_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_qsig_aoc_AocCompleteArg_PDU,
-      { "AocCompleteArg", "qsig.aoc.AocCompleteArg",
+      { "AocCompleteArg", "qsig.aoc.AocCompleteArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_qsig_aoc_AocCompleteRes_PDU,
-      { "AocCompleteRes", "qsig.aoc.AocCompleteRes",
+      { "AocCompleteRes", "qsig.aoc.AocCompleteRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_qsig_aoc_AocDivChargeReqArg_PDU,
-      { "AocDivChargeReqArg", "qsig.aoc.AocDivChargeReqArg",
+      { "AocDivChargeReqArg", "qsig.aoc.AocDivChargeReqArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_qsig_aoc_Extension_PDU,
-      { "Extension", "qsig.aoc.Extension",
+      { "Extension", "qsig.aoc.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_aocRate,
@@ -13707,7 +13707,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_aoc_T_aocRate_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_chargeNotAvailable,
-      { "chargeNotAvailable", "qsig.aoc.chargeNotAvailable",
+      { "chargeNotAvailable", "qsig.aoc.chargeNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_aocSCurrencyInfoList,
@@ -13719,7 +13719,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_aoc_T_rateArgExtension_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_extension,
-      { "extension", "qsig.aoc.extension",
+      { "extension", "qsig.aoc.extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_multipleExtension,
@@ -13727,7 +13727,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_aoc_multipleExtension_item,
-      { "Extension", "qsig.aoc.Extension",
+      { "Extension", "qsig.aoc.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_interimCharge,
@@ -13735,15 +13735,15 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_aoc_T_interimCharge_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_freeOfCharge,
-      { "freeOfCharge", "qsig.aoc.freeOfCharge",
+      { "freeOfCharge", "qsig.aoc.freeOfCharge_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_specificCurrency,
-      { "specificCurrency", "qsig.aoc.specificCurrency",
+      { "specificCurrency", "qsig.aoc.specificCurrency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_recordedCurrency,
-      { "recordedCurrency", "qsig.aoc.recordedCurrency",
+      { "recordedCurrency", "qsig.aoc.recordedCurrency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_interimBillingId,
@@ -13759,7 +13759,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_aoc_T_finalCharge_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_specificCurrency_01,
-      { "specificCurrency", "qsig.aoc.specificCurrency",
+      { "specificCurrency", "qsig.aoc.specificCurrency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_specificCurrency_01", HFILL }},
     { &hf_qsig_aoc_finalBillingId,
@@ -13775,7 +13775,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_aoc_T_finalArgExtension_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_AOCSCurrencyInfoList_item,
-      { "AOCSCurrencyInfo", "qsig.aoc.AOCSCurrencyInfo",
+      { "AOCSCurrencyInfo", "qsig.aoc.AOCSCurrencyInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_chargedItem,
@@ -13787,15 +13787,15 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_aoc_T_rateType_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_durationCurrency,
-      { "durationCurrency", "qsig.aoc.durationCurrency",
+      { "durationCurrency", "qsig.aoc.durationCurrency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_flatRateCurrency,
-      { "flatRateCurrency", "qsig.aoc.flatRateCurrency",
+      { "flatRateCurrency", "qsig.aoc.flatRateCurrency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_volumeRateCurrency,
-      { "volumeRateCurrency", "qsig.aoc.volumeRateCurrency",
+      { "volumeRateCurrency", "qsig.aoc.volumeRateCurrency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_specialChargingCode,
@@ -13803,11 +13803,11 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_currencyInfoNotAvailable,
-      { "currencyInfoNotAvailable", "qsig.aoc.currencyInfoNotAvailable",
+      { "currencyInfoNotAvailable", "qsig.aoc.currencyInfoNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_freeOfChargefromBeginning,
-      { "freeOfChargefromBeginning", "qsig.aoc.freeOfChargefromBeginning",
+      { "freeOfChargefromBeginning", "qsig.aoc.freeOfChargefromBeginning_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_dCurrency,
@@ -13815,7 +13815,7 @@ void proto_register_qsig(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "Currency", HFILL }},
     { &hf_qsig_aoc_dAmount,
-      { "dAmount", "qsig.aoc.dAmount",
+      { "dAmount", "qsig.aoc.dAmount_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Amount", HFILL }},
     { &hf_qsig_aoc_dChargingType,
@@ -13823,11 +13823,11 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_aoc_ChargingType_vals), 0,
         "ChargingType", HFILL }},
     { &hf_qsig_aoc_dTime,
-      { "dTime", "qsig.aoc.dTime",
+      { "dTime", "qsig.aoc.dTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Time", HFILL }},
     { &hf_qsig_aoc_dGranularity,
-      { "dGranularity", "qsig.aoc.dGranularity",
+      { "dGranularity", "qsig.aoc.dGranularity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Time", HFILL }},
     { &hf_qsig_aoc_fRCurrency,
@@ -13835,7 +13835,7 @@ void proto_register_qsig(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "Currency", HFILL }},
     { &hf_qsig_aoc_fRAmount,
-      { "fRAmount", "qsig.aoc.fRAmount",
+      { "fRAmount", "qsig.aoc.fRAmount_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Amount", HFILL }},
     { &hf_qsig_aoc_vRCurrency,
@@ -13843,7 +13843,7 @@ void proto_register_qsig(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "Currency", HFILL }},
     { &hf_qsig_aoc_vRAmount,
-      { "vRAmount", "qsig.aoc.vRAmount",
+      { "vRAmount", "qsig.aoc.vRAmount_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Amount", HFILL }},
     { &hf_qsig_aoc_vRVolumeUnit,
@@ -13855,7 +13855,7 @@ void proto_register_qsig(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "Currency", HFILL }},
     { &hf_qsig_aoc_rAmount,
-      { "rAmount", "qsig.aoc.rAmount",
+      { "rAmount", "qsig.aoc.rAmount_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Amount", HFILL }},
     { &hf_qsig_aoc_currencyAmount,
@@ -13903,7 +13903,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_aoc_T_chargeReqResExtension_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_none,
-      { "none", "qsig.aoc.none",
+      { "none", "qsig.aoc.none_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_aoc_chargedUser,
@@ -13938,11 +13938,11 @@ void proto_register_qsig(void) {
 /* --- Module Recall-Operations-asn1-97 --- --- ---                           */
 
     { &hf_qsig_re_qsig_re_ReAlertingArg_PDU,
-      { "ReAlertingArg", "qsig.re.ReAlertingArg",
+      { "ReAlertingArg", "qsig.re.ReAlertingArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_re_qsig_re_ReAnswerArg_PDU,
-      { "ReAnswerArg", "qsig.re.ReAnswerArg",
+      { "ReAnswerArg", "qsig.re.ReAnswerArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_re_alertedNumber,
@@ -13958,7 +13958,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_re_T_argumentExtension_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_re_extension,
-      { "extension", "qsig.re.extension",
+      { "extension", "qsig.re.extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_re_multipleExtension,
@@ -13966,7 +13966,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_re_multipleExtension_item,
-      { "Extension", "qsig.re.Extension",
+      { "Extension", "qsig.re.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_re_connectedNumber,
@@ -13989,19 +13989,19 @@ void proto_register_qsig(void) {
 /* --- Module Synchronization-Operations-asn1-97 --- --- ---                  */
 
     { &hf_qsig_sync_qsig_sync_SynchronizationReqArg_PDU,
-      { "SynchronizationReqArg", "qsig.sync.SynchronizationReqArg",
+      { "SynchronizationReqArg", "qsig.sync.SynchronizationReqArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sync_qsig_sync_SynchronizationReqRes_PDU,
-      { "SynchronizationReqRes", "qsig.sync.SynchronizationReqRes",
+      { "SynchronizationReqRes", "qsig.sync.SynchronizationReqRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sync_qsig_sync_SynchronizationInfoArg_PDU,
-      { "SynchronizationInfoArg", "qsig.sync.SynchronizationInfoArg",
+      { "SynchronizationInfoArg", "qsig.sync.SynchronizationInfoArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sync_qsig_sync_Extension_PDU,
-      { "Extension", "qsig.sync.Extension",
+      { "Extension", "qsig.sync.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sync_action,
@@ -14021,7 +14021,7 @@ void proto_register_qsig(void) {
         FT_INT32, BASE_DEC, VALS(qsig_sync_T_stateinfo_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_sync_extension,
-      { "extension", "qsig.sync.extension",
+      { "extension", "qsig.sync.extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sync_sequOfExtn,
@@ -14029,22 +14029,22 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_sync_sequOfExtn_item,
-      { "Extension", "qsig.sync.Extension",
+      { "Extension", "qsig.sync.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
 /* --- Module Call-Interception-Operations-asn1-97 --- --- ---                */
 
     { &hf_qsig_cint_qsig_cint_CintInformation1Arg_PDU,
-      { "CintInformation1Arg", "qsig.cint.CintInformation1Arg",
+      { "CintInformation1Arg", "qsig.cint.CintInformation1Arg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cint_qsig_cint_CintInformation2Arg_PDU,
-      { "CintInformation2Arg", "qsig.cint.CintInformation2Arg",
+      { "CintInformation2Arg", "qsig.cint.CintInformation2Arg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cint_qsig_cint_CintCondArg_PDU,
-      { "CintCondArg", "qsig.cint.CintCondArg",
+      { "CintCondArg", "qsig.cint.CintCondArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cint_qsig_cint_CintExtension_PDU,
@@ -14084,11 +14084,11 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_cint_Condition_vals), 0,
         "Condition", HFILL }},
     { &hf_qsig_cint_none,
-      { "none", "qsig.cint.none",
+      { "none", "qsig.cint.none_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cint_single,
-      { "single", "qsig.cint.single",
+      { "single", "qsig.cint.single_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Extension", HFILL }},
     { &hf_qsig_cint_multiple,
@@ -14096,7 +14096,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_cint_multiple_item,
-      { "Extension", "qsig.cint.Extension",
+      { "Extension", "qsig.cint.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
@@ -14107,7 +14107,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_cmn_DummyArg_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_cmn_qsig_cmn_CmnArg_PDU,
-      { "CmnArg", "qsig.cmn.CmnArg",
+      { "CmnArg", "qsig.cmn.CmnArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cmn_featureIdentifier,
@@ -14123,7 +14123,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_3", HFILL }},
     { &hf_qsig_cmn_equipmentIdentity,
-      { "equipmentIdentity", "qsig.cmn.equipmentIdentity",
+      { "equipmentIdentity", "qsig.cmn.equipmentIdentity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EquipmentId", HFILL }},
     { &hf_qsig_cmn_partyCategory,
@@ -14135,7 +14135,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_cmn_T_extension_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_cmn_single,
-      { "single", "qsig.cmn.single",
+      { "single", "qsig.cmn.single_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Extension", HFILL }},
     { &hf_qsig_cmn_multiple,
@@ -14143,11 +14143,11 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_cmn_multiple_item,
-      { "Extension", "qsig.cmn.Extension",
+      { "Extension", "qsig.cmn.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cmn_null,
-      { "null", "qsig.cmn.null",
+      { "null", "qsig.cmn.null_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cmn_nodeId,
@@ -14238,11 +14238,11 @@ void proto_register_qsig(void) {
 /* --- Module Call-Interruption-Operations-asn1-97 --- --- ---                */
 
     { &hf_qsig_cpi_qsig_cpi_CPIRequestArg_PDU,
-      { "CPIRequestArg", "qsig.cpi.CPIRequestArg",
+      { "CPIRequestArg", "qsig.cpi.CPIRequestArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cpi_qsig_cpi_CPIPRequestArg_PDU,
-      { "CPIPRequestArg", "qsig.cpi.CPIPRequestArg",
+      { "CPIPRequestArg", "qsig.cpi.CPIPRequestArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cpi_cpiCapabilityLevel,
@@ -14254,7 +14254,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_cpi_T_argumentExtension_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_cpi_extension,
-      { "extension", "qsig.cpi.extension",
+      { "extension", "qsig.cpi.extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cpi_sequenceOfExtn,
@@ -14262,7 +14262,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_cpi_sequenceOfExtn_item,
-      { "Extension", "qsig.cpi.Extension",
+      { "Extension", "qsig.cpi.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cpi_cpiProtectionLevel,
@@ -14277,15 +14277,15 @@ void proto_register_qsig(void) {
 /* --- Module PUM-Registration-Operations-asn1-97 --- --- ---                 */
 
     { &hf_qsig_pumr_qsig_pumr_PumRegistrArg_PDU,
-      { "PumRegistrArg", "qsig.pumr.PumRegistrArg",
+      { "PumRegistrArg", "qsig.pumr.PumRegistrArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pumr_qsig_pumr_PumRegistrRes_PDU,
-      { "PumRegistrRes", "qsig.pumr.PumRegistrRes",
+      { "PumRegistrRes", "qsig.pumr.PumRegistrRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pumr_qsig_pumr_PumDelRegArg_PDU,
-      { "PumDelRegArg", "qsig.pumr.PumDelRegArg",
+      { "PumDelRegArg", "qsig.pumr.PumDelRegArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pumr_qsig_pumr_DummyRes_PDU,
@@ -14293,11 +14293,11 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_pumr_DummyRes_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_pumr_qsig_pumr_PumDe_regArg_PDU,
-      { "PumDe-regArg", "qsig.pumr.PumDe_regArg",
+      { "PumDe-regArg", "qsig.pumr.PumDe_regArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pumr_qsig_pumr_PumInterrogArg_PDU,
-      { "PumInterrogArg", "qsig.pumr.PumInterrogArg",
+      { "PumInterrogArg", "qsig.pumr.PumInterrogArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pumr_qsig_pumr_PumInterrogRes_PDU,
@@ -14305,7 +14305,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pumr_qsig_pumr_Extension_PDU,
-      { "Extension", "qsig.pumr.Extension",
+      { "Extension", "qsig.pumr.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pumr_pumRUserId,
@@ -14337,7 +14337,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_pumr_ServiceOption_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_pumr_sessionParams,
-      { "sessionParams", "qsig.pumr.sessionParams",
+      { "sessionParams", "qsig.pumr.sessionParams_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pumr_userPin,
@@ -14357,11 +14357,11 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_pumr_PumrExtension_vals), 0,
         "PumrExtension", HFILL }},
     { &hf_qsig_pumr_null,
-      { "null", "qsig.pumr.null",
+      { "null", "qsig.pumr.null_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pumr_extension,
-      { "extension", "qsig.pumr.extension",
+      { "extension", "qsig.pumr.extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pumr_sequOfExtn,
@@ -14369,7 +14369,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_pumr_sequOfExtn_item,
-      { "Extension", "qsig.pumr.Extension",
+      { "Extension", "qsig.pumr.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pumr_pumXUserId,
@@ -14397,11 +14397,11 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_pumr_T_userPin_02_vals), 0,
         "T_userPin_02", HFILL }},
     { &hf_qsig_pumr_PumInterrogRes_item,
-      { "PumInterrogRes item", "qsig.pumr.PumInterrogRes_item",
+      { "PumInterrogRes item", "qsig.pumr.PumInterrogRes_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pumr_interrogParams,
-      { "interrogParams", "qsig.pumr.interrogParams",
+      { "interrogParams", "qsig.pumr.interrogParams_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SessionParams", HFILL }},
     { &hf_qsig_pumr_durationOfSession,
@@ -14416,7 +14416,7 @@ void proto_register_qsig(void) {
 /* --- Module Private-User-Mobility-Call-Handling-Operations-asn1-97 --- --- --- */
 
     { &hf_qsig_pumch_qsig_pumch_EnquiryArg_PDU,
-      { "EnquiryArg", "qsig.pumch.EnquiryArg",
+      { "EnquiryArg", "qsig.pumch.EnquiryArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pumch_qsig_pumch_EnquiryRes_PDU,
@@ -14424,7 +14424,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_pumch_EnquiryRes_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_pumch_qsig_pumch_DivertArg_PDU,
-      { "DivertArg", "qsig.pumch.DivertArg",
+      { "DivertArg", "qsig.pumch.DivertArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pumch_qsig_pumch_DummyRes_PDU,
@@ -14432,15 +14432,15 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_pumch_DummyRes_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_pumch_qsig_pumch_InformArg_PDU,
-      { "InformArg", "qsig.pumch.InformArg",
+      { "InformArg", "qsig.pumch.InformArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pumch_qsig_pumch_PumoArg_PDU,
-      { "PumoArg", "qsig.pumch.PumoArg",
+      { "PumoArg", "qsig.pumch.PumoArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pumch_qsig_pumch_Extension_PDU,
-      { "Extension", "qsig.pumch.Extension",
+      { "Extension", "qsig.pumch.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pumch_pisnNumber,
@@ -14480,15 +14480,15 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_PartySubaddress_vals), 0,
         "PartySubaddress", HFILL }},
     { &hf_qsig_pumch_currLocation,
-      { "currLocation", "qsig.pumch.currLocation",
+      { "currLocation", "qsig.pumch.currLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pumch_cfuActivated,
-      { "cfuActivated", "qsig.pumch.cfuActivated",
+      { "cfuActivated", "qsig.pumch.cfuActivated_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pumch_divToAddress,
-      { "divToAddress", "qsig.pumch.divToAddress",
+      { "divToAddress", "qsig.pumch.divToAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Address", HFILL }},
     { &hf_qsig_pumch_divOptions,
@@ -14500,11 +14500,11 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_na_Name_vals), 0,
         "Name", HFILL }},
     { &hf_qsig_pumch_null,
-      { "null", "qsig.pumch.null",
+      { "null", "qsig.pumch.null_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pumch_extension,
-      { "extension", "qsig.pumch.extension",
+      { "extension", "qsig.pumch.extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pumch_sequOfExtn,
@@ -14512,7 +14512,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_pumch_sequOfExtn_item,
-      { "Extension", "qsig.pumch.Extension",
+      { "Extension", "qsig.pumch.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pumch_alternativeId,
@@ -14520,7 +14520,7 @@ void proto_register_qsig(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pumch_both,
-      { "both", "qsig.pumch.both",
+      { "both", "qsig.pumch.both_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pumch_destinationNumber,
@@ -14528,7 +14528,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_PartyNumber_vals), 0,
         "PartyNumber", HFILL }},
     { &hf_qsig_pumch_sendingComplete,
-      { "sendingComplete", "qsig.pumch.sendingComplete",
+      { "sendingComplete", "qsig.pumch.sendingComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_pumch_pumoaextension,
@@ -14536,7 +14536,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_pumch_T_pumoaextension_vals), 0,
         "T_pumoaextension", HFILL }},
     { &hf_qsig_pumch_single,
-      { "single", "qsig.pumch.single",
+      { "single", "qsig.pumch.single_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Extension", HFILL }},
     { &hf_qsig_pumch_multiple,
@@ -14544,14 +14544,14 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_pumch_multiple_item,
-      { "Extension", "qsig.pumch.Extension",
+      { "Extension", "qsig.pumch.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
 /* --- Module Single-Step-Call-Transfer-Operations-asn1-97 --- --- ---        */
 
     { &hf_qsig_ssct_qsig_ssct_SSCTInitiateArg_PDU,
-      { "SSCTInitiateArg", "qsig.ssct.SSCTInitiateArg",
+      { "SSCTInitiateArg", "qsig.ssct.SSCTInitiateArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ssct_qsig_ssct_DummyRes_PDU,
@@ -14559,7 +14559,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_ssct_DummyRes_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_ssct_qsig_ssct_SSCTSetupArg_PDU,
-      { "SSCTSetupArg", "qsig.ssct.SSCTSetupArg",
+      { "SSCTSetupArg", "qsig.ssct.SSCTSetupArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ssct_qsig_ssct_DummyArg_PDU,
@@ -14567,19 +14567,19 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_ssct_DummyArg_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_ssct_qsig_ssct_SSCTDigitInfoArg_PDU,
-      { "SSCTDigitInfoArg", "qsig.ssct.SSCTDigitInfoArg",
+      { "SSCTDigitInfoArg", "qsig.ssct.SSCTDigitInfoArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ssct_qsig_ssct_Extension_PDU,
-      { "Extension", "qsig.ssct.Extension",
+      { "Extension", "qsig.ssct.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ssct_null,
-      { "null", "qsig.ssct.null",
+      { "null", "qsig.ssct.null_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ssct_single,
-      { "single", "qsig.ssct.single",
+      { "single", "qsig.ssct.single_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Extension", HFILL }},
     { &hf_qsig_ssct_multiple,
@@ -14587,7 +14587,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_ssct_multiple_item,
-      { "Extension", "qsig.ssct.Extension",
+      { "Extension", "qsig.ssct.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ssct_rerouteingNumber,
@@ -14627,7 +14627,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_PartyNumber_vals), 0,
         "PartyNumber", HFILL }},
     { &hf_qsig_ssct_sendingComplete,
-      { "sendingComplete", "qsig.ssct.sendingComplete",
+      { "sendingComplete", "qsig.ssct.sendingComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_ssct_argumentExtensionSSCTD,
@@ -14638,7 +14638,7 @@ void proto_register_qsig(void) {
 /* --- Module WTM-Location-Registration-Operations-asn1-97 --- --- ---        */
 
     { &hf_qsig_wtmlr_qsig_wtmlr_LocUpdArg_PDU,
-      { "LocUpdArg", "qsig.wtmlr.LocUpdArg",
+      { "LocUpdArg", "qsig.wtmlr.LocUpdArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmlr_qsig_wtmlr_DummyRes_PDU,
@@ -14646,39 +14646,39 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_wtmlr_DummyRes_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_wtmlr_qsig_wtmlr_LocDelArg_PDU,
-      { "LocDelArg", "qsig.wtmlr.LocDelArg",
+      { "LocDelArg", "qsig.wtmlr.LocDelArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmlr_qsig_wtmlr_LocDeRegArg_PDU,
-      { "LocDeRegArg", "qsig.wtmlr.LocDeRegArg",
+      { "LocDeRegArg", "qsig.wtmlr.LocDeRegArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmlr_qsig_wtmlr_PisnEnqArg_PDU,
-      { "PisnEnqArg", "qsig.wtmlr.PisnEnqArg",
+      { "PisnEnqArg", "qsig.wtmlr.PisnEnqArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmlr_qsig_wtmlr_PisnEnqRes_PDU,
-      { "PisnEnqRes", "qsig.wtmlr.PisnEnqRes",
+      { "PisnEnqRes", "qsig.wtmlr.PisnEnqRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmlr_qsig_wtmlr_GetRRCInfArg_PDU,
-      { "GetRRCInfArg", "qsig.wtmlr.GetRRCInfArg",
+      { "GetRRCInfArg", "qsig.wtmlr.GetRRCInfArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmlr_qsig_wtmlr_GetRRCInfRes_PDU,
-      { "GetRRCInfRes", "qsig.wtmlr.GetRRCInfRes",
+      { "GetRRCInfRes", "qsig.wtmlr.GetRRCInfRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmlr_qsig_wtmlr_LocInfoCheckArg_PDU,
-      { "LocInfoCheckArg", "qsig.wtmlr.LocInfoCheckArg",
+      { "LocInfoCheckArg", "qsig.wtmlr.LocInfoCheckArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmlr_qsig_wtmlr_LocInfoCheckRes_PDU,
-      { "LocInfoCheckRes", "qsig.wtmlr.LocInfoCheckRes",
+      { "LocInfoCheckRes", "qsig.wtmlr.LocInfoCheckRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmlr_qsig_wtmlr_Extension_PDU,
-      { "Extension", "qsig.wtmlr.Extension",
+      { "Extension", "qsig.wtmlr.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmlr_wtmUserId,
@@ -14698,11 +14698,11 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_wtmlr_LrExtension_vals), 0,
         "LrExtension", HFILL }},
     { &hf_qsig_wtmlr_null,
-      { "null", "qsig.wtmlr.null",
+      { "null", "qsig.wtmlr.null_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmlr_extension,
-      { "extension", "qsig.wtmlr.extension",
+      { "extension", "qsig.wtmlr.extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmlr_sequOfExtn,
@@ -14710,7 +14710,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_wtmlr_sequOfExtn_item,
-      { "Extension", "qsig.wtmlr.Extension",
+      { "Extension", "qsig.wtmlr.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmlr_alternativeId,
@@ -14737,7 +14737,7 @@ void proto_register_qsig(void) {
 /* --- Module Wireless-Terminal-Call-Handling-Operations-asn1-97 --- --- ---  */
 
     { &hf_qsig_wtmch_qsig_wtmch_EnquiryArg_PDU,
-      { "EnquiryArg", "qsig.wtmch.EnquiryArg",
+      { "EnquiryArg", "qsig.wtmch.EnquiryArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmch_qsig_wtmch_EnquiryRes_PDU,
@@ -14745,7 +14745,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_wtmch_EnquiryRes_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_wtmch_qsig_wtmch_DivertArg_PDU,
-      { "DivertArg", "qsig.wtmch.DivertArg",
+      { "DivertArg", "qsig.wtmch.DivertArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmch_qsig_wtmch_DummyRes_PDU,
@@ -14753,15 +14753,15 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_wtmch_DummyRes_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_wtmch_qsig_wtmch_InformArg_PDU,
-      { "InformArg", "qsig.wtmch.InformArg",
+      { "InformArg", "qsig.wtmch.InformArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmch_qsig_wtmch_WtmoArg_PDU,
-      { "WtmoArg", "qsig.wtmch.WtmoArg",
+      { "WtmoArg", "qsig.wtmch.WtmoArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmch_qsig_wtmch_Extension_PDU,
-      { "Extension", "qsig.wtmch.Extension",
+      { "Extension", "qsig.wtmch.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmch_pisnNumber,
@@ -14801,15 +14801,15 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_PartySubaddress_vals), 0,
         "PartySubaddress", HFILL }},
     { &hf_qsig_wtmch_currLocation,
-      { "currLocation", "qsig.wtmch.currLocation",
+      { "currLocation", "qsig.wtmch.currLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmch_cfuActivated,
-      { "cfuActivated", "qsig.wtmch.cfuActivated",
+      { "cfuActivated", "qsig.wtmch.cfuActivated_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmch_divToAddress,
-      { "divToAddress", "qsig.wtmch.divToAddress",
+      { "divToAddress", "qsig.wtmch.divToAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Address", HFILL }},
     { &hf_qsig_wtmch_divOptions,
@@ -14821,11 +14821,11 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_na_Name_vals), 0,
         "Name", HFILL }},
     { &hf_qsig_wtmch_null,
-      { "null", "qsig.wtmch.null",
+      { "null", "qsig.wtmch.null_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmch_extension,
-      { "extension", "qsig.wtmch.extension",
+      { "extension", "qsig.wtmch.extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmch_sequOfExtn,
@@ -14833,7 +14833,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_wtmch_sequOfExtn_item,
-      { "Extension", "qsig.wtmch.Extension",
+      { "Extension", "qsig.wtmch.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmch_alternativeId,
@@ -14841,7 +14841,7 @@ void proto_register_qsig(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmch_both,
-      { "both", "qsig.wtmch.both",
+      { "both", "qsig.wtmch.both_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmch_destinationNumber,
@@ -14849,7 +14849,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_PartyNumber_vals), 0,
         "PartyNumber", HFILL }},
     { &hf_qsig_wtmch_sendingComplete,
-      { "sendingComplete", "qsig.wtmch.sendingComplete",
+      { "sendingComplete", "qsig.wtmch.sendingComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmch_wtmoaextension,
@@ -14857,7 +14857,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_wtmch_T_wtmoaextension_vals), 0,
         "T_wtmoaextension", HFILL }},
     { &hf_qsig_wtmch_single,
-      { "single", "qsig.wtmch.single",
+      { "single", "qsig.wtmch.single_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Extension", HFILL }},
     { &hf_qsig_wtmch_multiple,
@@ -14865,42 +14865,42 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_wtmch_multiple_item,
-      { "Extension", "qsig.wtmch.Extension",
+      { "Extension", "qsig.wtmch.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
 /* --- Module WTM-Authentication-Operations-asn1-97 --- --- ---               */
 
     { &hf_qsig_wtmau_qsig_wtmau_AuthWtmArg_PDU,
-      { "AuthWtmArg", "qsig.wtmau.AuthWtmArg",
+      { "AuthWtmArg", "qsig.wtmau.AuthWtmArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmau_qsig_wtmau_AuthWtmRes_PDU,
-      { "AuthWtmRes", "qsig.wtmau.AuthWtmRes",
+      { "AuthWtmRes", "qsig.wtmau.AuthWtmRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmau_qsig_wtmau_WtatParamArg_PDU,
-      { "WtatParamArg", "qsig.wtmau.WtatParamArg",
+      { "WtatParamArg", "qsig.wtmau.WtatParamArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmau_qsig_wtmau_WtatParamRes_PDU,
-      { "WtatParamRes", "qsig.wtmau.WtatParamRes",
+      { "WtatParamRes", "qsig.wtmau.WtatParamRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmau_qsig_wtmau_WtanParamArg_PDU,
-      { "WtanParamArg", "qsig.wtmau.WtanParamArg",
+      { "WtanParamArg", "qsig.wtmau.WtanParamArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmau_qsig_wtmau_WtanParamRes_PDU,
-      { "WtanParamRes", "qsig.wtmau.WtanParamRes",
+      { "WtanParamRes", "qsig.wtmau.WtanParamRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmau_qsig_wtmau_ARG_transferAuthParam_PDU,
-      { "ARG-transferAuthParam", "qsig.wtmau.ARG_transferAuthParam",
+      { "ARG-transferAuthParam", "qsig.wtmau.ARG_transferAuthParam_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmau_qsig_wtmau_Extension_PDU,
-      { "Extension", "qsig.wtmau.Extension",
+      { "Extension", "qsig.wtmau.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmau_wtmUserId,
@@ -14920,7 +14920,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_wtmau_T_autWtmResValue_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_wtmau_canCompute,
-      { "canCompute", "qsig.wtmau.canCompute",
+      { "canCompute", "qsig.wtmau.canCompute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmau_authChallenge,
@@ -14928,11 +14928,11 @@ void proto_register_qsig(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmau_wtatParamInfo,
-      { "wtatParamInfo", "qsig.wtmau.wtatParamInfo",
+      { "wtatParamInfo", "qsig.wtmau.wtatParamInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmau_authAlgorithm,
-      { "authAlgorithm", "qsig.wtmau.authAlgorithm",
+      { "authAlgorithm", "qsig.wtmau.authAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmau_pisnNumber,
@@ -14952,7 +14952,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_wtmau_T_wtatParamInfoChoice_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_wtmau_authSessionKeyInfo,
-      { "authSessionKeyInfo", "qsig.wtmau.authSessionKeyInfo",
+      { "authSessionKeyInfo", "qsig.wtmau.authSessionKeyInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmau_authKey,
@@ -14964,7 +14964,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_8", HFILL }},
     { &hf_qsig_wtmau_calcWtanInfo,
-      { "calcWtanInfo", "qsig.wtmau.calcWtanInfo",
+      { "calcWtanInfo", "qsig.wtmau.calcWtanInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmau_authSessionKey,
@@ -14976,7 +14976,7 @@ void proto_register_qsig(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmau_CalcWtatInfo_item,
-      { "CalcWtatInfoUnit", "qsig.wtmau.CalcWtatInfoUnit",
+      { "CalcWtatInfoUnit", "qsig.wtmau.CalcWtatInfoUnit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmau_authResponse,
@@ -14988,7 +14988,7 @@ void proto_register_qsig(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmau_extension,
-      { "extension", "qsig.wtmau.extension",
+      { "extension", "qsig.wtmau.extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmau_sequOfExtn,
@@ -14996,7 +14996,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_wtmau_sequOfExtn_item,
-      { "Extension", "qsig.wtmau.Extension",
+      { "Extension", "qsig.wtmau.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_wtmau_authAlg,
@@ -15004,22 +15004,22 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_wtmau_DefinedIDs_vals), 0,
         "DefinedIDs", HFILL }},
     { &hf_qsig_wtmau_param,
-      { "param", "qsig.wtmau.param",
+      { "param", "qsig.wtmau.param_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
 /* --- Module SS-SD-Operations-asn1-97 --- --- ---                            */
 
     { &hf_qsig_sd_qsig_sd_DisplayArg_PDU,
-      { "DisplayArg", "qsig.sd.DisplayArg",
+      { "DisplayArg", "qsig.sd.DisplayArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sd_qsig_sd_KeypadArg_PDU,
-      { "KeypadArg", "qsig.sd.KeypadArg",
+      { "KeypadArg", "qsig.sd.KeypadArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sd_qsig_sd_Extension_PDU,
-      { "Extension", "qsig.sd.Extension",
+      { "Extension", "qsig.sd.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sd_displayString,
@@ -15043,7 +15043,7 @@ void proto_register_qsig(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BMPStringNormal", HFILL }},
     { &hf_qsig_sd_extension,
-      { "extension", "qsig.sd.extension",
+      { "extension", "qsig.sd.extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sd_multipleExtension,
@@ -15051,30 +15051,30 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_sd_multipleExtension_item,
-      { "Extension", "qsig.sd.Extension",
+      { "Extension", "qsig.sd.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
 /* --- Module Call-Identification-and-Call-Linkage-Operations-asn1-97 --- --- --- */
 
     { &hf_qsig_cidl_qsig_cidl_CallIdentificationAssignArg_PDU,
-      { "CallIdentificationAssignArg", "qsig.cidl.CallIdentificationAssignArg",
+      { "CallIdentificationAssignArg", "qsig.cidl.CallIdentificationAssignArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cidl_qsig_cidl_CallIdentificationUpdateArg_PDU,
-      { "CallIdentificationUpdateArg", "qsig.cidl.CallIdentificationUpdateArg",
+      { "CallIdentificationUpdateArg", "qsig.cidl.CallIdentificationUpdateArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cidl_globalCallID,
-      { "globalCallID", "qsig.cidl.globalCallID",
+      { "globalCallID", "qsig.cidl.globalCallID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CallIdentificationData", HFILL }},
     { &hf_qsig_cidl_threadID,
-      { "threadID", "qsig.cidl.threadID",
+      { "threadID", "qsig.cidl.threadID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CallIdentificationData", HFILL }},
     { &hf_qsig_cidl_legID,
-      { "legID", "qsig.cidl.legID",
+      { "legID", "qsig.cidl.legID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CallIdentificationData", HFILL }},
     { &hf_qsig_cidl_extensiont,
@@ -15102,7 +15102,7 @@ void proto_register_qsig(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cidl_extension,
-      { "extension", "qsig.cidl.extension",
+      { "extension", "qsig.cidl.extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_cidl_sequenceOfExt,
@@ -15110,46 +15110,46 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_cidl_sequenceOfExt_item,
-      { "Extension", "qsig.cidl.Extension",
+      { "Extension", "qsig.cidl.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
 /* --- Module Short-Message-Service-Operations-asn1-97 --- --- ---            */
 
     { &hf_qsig_sms_qsig_sms_SmsSubmitArg_PDU,
-      { "SmsSubmitArg", "qsig.sms.SmsSubmitArg",
+      { "SmsSubmitArg", "qsig.sms.SmsSubmitArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_qsig_sms_SmsSubmitRes_PDU,
-      { "SmsSubmitRes", "qsig.sms.SmsSubmitRes",
+      { "SmsSubmitRes", "qsig.sms.SmsSubmitRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_qsig_sms_SmsDeliverArg_PDU,
-      { "SmsDeliverArg", "qsig.sms.SmsDeliverArg",
+      { "SmsDeliverArg", "qsig.sms.SmsDeliverArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_qsig_sms_SmsDeliverRes_PDU,
-      { "SmsDeliverRes", "qsig.sms.SmsDeliverRes",
+      { "SmsDeliverRes", "qsig.sms.SmsDeliverRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_qsig_sms_SmsStatusReportArg_PDU,
-      { "SmsStatusReportArg", "qsig.sms.SmsStatusReportArg",
+      { "SmsStatusReportArg", "qsig.sms.SmsStatusReportArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_qsig_sms_SmsStatusReportRes_PDU,
-      { "SmsStatusReportRes", "qsig.sms.SmsStatusReportRes",
+      { "SmsStatusReportRes", "qsig.sms.SmsStatusReportRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_qsig_sms_SmsCommandArg_PDU,
-      { "SmsCommandArg", "qsig.sms.SmsCommandArg",
+      { "SmsCommandArg", "qsig.sms.SmsCommandArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_qsig_sms_SmsCommandRes_PDU,
-      { "SmsCommandRes", "qsig.sms.SmsCommandRes",
+      { "SmsCommandRes", "qsig.sms.SmsCommandRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_qsig_sms_ScAlertArg_PDU,
-      { "ScAlertArg", "qsig.sms.ScAlertArg",
+      { "ScAlertArg", "qsig.sms.ScAlertArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_qsig_sms_DummyRes_PDU,
@@ -15157,19 +15157,19 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_sms_DummyRes_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_sms_qsig_sms_PAR_smsDeliverError_PDU,
-      { "PAR-smsDeliverError", "qsig.sms.PAR_smsDeliverError",
+      { "PAR-smsDeliverError", "qsig.sms.PAR_smsDeliverError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_qsig_sms_PAR_smsSubmitError_PDU,
-      { "PAR-smsSubmitError", "qsig.sms.PAR_smsSubmitError",
+      { "PAR-smsSubmitError", "qsig.sms.PAR_smsSubmitError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_qsig_sms_PAR_smsStatusReportError_PDU,
-      { "PAR-smsStatusReportError", "qsig.sms.PAR_smsStatusReportError",
+      { "PAR-smsStatusReportError", "qsig.sms.PAR_smsStatusReportError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_qsig_sms_PAR_smsCommandError_PDU,
-      { "PAR-smsCommandError", "qsig.sms.PAR_smsCommandError",
+      { "PAR-smsCommandError", "qsig.sms.PAR_smsCommandError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_qsig_sms_SmsExtension_PDU,
@@ -15189,11 +15189,11 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_smSubmitParameter,
-      { "smSubmitParameter", "qsig.sms.smSubmitParameter",
+      { "smSubmitParameter", "qsig.sms.smSubmitParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_userData,
-      { "userData", "qsig.sms.userData",
+      { "userData", "qsig.sms.userData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_smsExtension,
@@ -15213,7 +15213,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_na_Name_vals), 0,
         "Name", HFILL }},
     { &hf_qsig_sms_smDeliverParameter,
-      { "smDeliverParameter", "qsig.sms.smDeliverParameter",
+      { "smDeliverParameter", "qsig.sms.smDeliverParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_smsDeliverResponseChoice,
@@ -15269,7 +15269,7 @@ void proto_register_qsig(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_qsig_sms_null,
-      { "null", "qsig.sms.null",
+      { "null", "qsig.sms.null_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_validityPeriod,
@@ -15289,11 +15289,11 @@ void proto_register_qsig(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_qsig_sms_resChoiceSeq,
-      { "resChoiceSeq", "qsig.sms.resChoiceSeq",
+      { "resChoiceSeq", "qsig.sms.resChoiceSeq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_single,
-      { "single", "qsig.sms.single",
+      { "single", "qsig.sms.single_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Extension", HFILL }},
     { &hf_qsig_sms_multiple,
@@ -15301,7 +15301,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_sms_multiple_item,
-      { "Extension", "qsig.sms.Extension",
+      { "Extension", "qsig.sms.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_validityPeriodRel,
@@ -15313,7 +15313,7 @@ void proto_register_qsig(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_validityPeriodEnh,
-      { "validityPeriodEnh", "qsig.sms.validityPeriodEnh",
+      { "validityPeriodEnh", "qsig.sms.validityPeriodEnh_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_singleShotSM,
@@ -15345,7 +15345,7 @@ void proto_register_qsig(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_qsig_sms_shortMessageText,
-      { "shortMessageText", "qsig.sms.shortMessageText",
+      { "shortMessageText", "qsig.sms.shortMessageText_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_shortMessageTextType,
@@ -15365,19 +15365,19 @@ void proto_register_qsig(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_concatenated8BitSMHeader,
-      { "concatenated8BitSMHeader", "qsig.sms.concatenated8BitSMHeader",
+      { "concatenated8BitSMHeader", "qsig.sms.concatenated8BitSMHeader_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_concatenated16BitSMHeader,
-      { "concatenated16BitSMHeader", "qsig.sms.concatenated16BitSMHeader",
+      { "concatenated16BitSMHeader", "qsig.sms.concatenated16BitSMHeader_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_applicationPort8BitHeader,
-      { "applicationPort8BitHeader", "qsig.sms.applicationPort8BitHeader",
+      { "applicationPort8BitHeader", "qsig.sms.applicationPort8BitHeader_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_applicationPort16BitHeader,
-      { "applicationPort16BitHeader", "qsig.sms.applicationPort16BitHeader",
+      { "applicationPort16BitHeader", "qsig.sms.applicationPort16BitHeader_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_dataHeaderSourceIndicator,
@@ -15389,7 +15389,7 @@ void proto_register_qsig(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_genericUserValue,
-      { "genericUserValue", "qsig.sms.genericUserValue",
+      { "genericUserValue", "qsig.sms.genericUserValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_sms_concatenated8BitSMReferenceNumber,
@@ -15476,23 +15476,23 @@ void proto_register_qsig(void) {
 /* --- Module SS-MCR-Operations-asn97 --- --- ---                             */
 
     { &hf_qsig_mcr_qsig_mcr_MCRequestArg_PDU,
-      { "MCRequestArg", "qsig.mcr.MCRequestArg",
+      { "MCRequestArg", "qsig.mcr.MCRequestArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcr_qsig_mcr_MCRequestResult_PDU,
-      { "MCRequestResult", "qsig.mcr.MCRequestResult",
+      { "MCRequestResult", "qsig.mcr.MCRequestResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcr_qsig_mcr_MCInformArg_PDU,
-      { "MCInformArg", "qsig.mcr.MCInformArg",
+      { "MCInformArg", "qsig.mcr.MCInformArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcr_qsig_mcr_MCAlertingArg_PDU,
-      { "MCAlertingArg", "qsig.mcr.MCAlertingArg",
+      { "MCAlertingArg", "qsig.mcr.MCAlertingArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcr_qsig_mcr_Extension_PDU,
-      { "Extension", "qsig.mcr.Extension",
+      { "Extension", "qsig.mcr.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcr_callType,
@@ -15516,7 +15516,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_PresentedAddressUnscreened_vals), 0,
         "PresentedAddressUnscreened", HFILL }},
     { &hf_qsig_mcr_correlation,
-      { "correlation", "qsig.mcr.correlation",
+      { "correlation", "qsig.mcr.correlation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcr_extensions,
@@ -15528,7 +15528,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_cf_BasicService_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_mcr_cisc,
-      { "cisc", "qsig.mcr.cisc",
+      { "cisc", "qsig.mcr.cisc_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcr_correlationData,
@@ -15540,11 +15540,11 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_mcr_CorrelationReason_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_mcr_none,
-      { "none", "qsig.mcr.none",
+      { "none", "qsig.mcr.none_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcr_single,
-      { "single", "qsig.mcr.single",
+      { "single", "qsig.mcr.single_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Extension", HFILL }},
     { &hf_qsig_mcr_multiple,
@@ -15552,14 +15552,14 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_mcr_multiple_item,
-      { "Extension", "qsig.mcr.Extension",
+      { "Extension", "qsig.mcr.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
 /* --- Module SS-MCM-Operations-asn1-97 --- --- ---                           */
 
     { &hf_qsig_mcm_qsig_mcm_MCMNewMsgArg_PDU,
-      { "MCMNewMsgArg", "qsig.mcm.MCMNewMsgArg",
+      { "MCMNewMsgArg", "qsig.mcm.MCMNewMsgArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcm_qsig_mcm_MCMDummyRes_PDU,
@@ -15567,15 +15567,15 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_mcm_MCMExtensions_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_mcm_qsig_mcm_MCMNoNewMsgArg_PDU,
-      { "MCMNoNewMsgArg", "qsig.mcm.MCMNoNewMsgArg",
+      { "MCMNoNewMsgArg", "qsig.mcm.MCMNoNewMsgArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcm_qsig_mcm_MCMUpdateArg_PDU,
-      { "MCMUpdateArg", "qsig.mcm.MCMUpdateArg",
+      { "MCMUpdateArg", "qsig.mcm.MCMUpdateArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcm_qsig_mcm_MCMUpdateReqArg_PDU,
-      { "MCMUpdateReqArg", "qsig.mcm.MCMUpdateReqArg",
+      { "MCMUpdateReqArg", "qsig.mcm.MCMUpdateReqArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcm_qsig_mcm_MCMUpdateReqRes_PDU,
@@ -15583,27 +15583,27 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcm_qsig_mcm_MCMServiceArg_PDU,
-      { "MCMServiceArg", "qsig.mcm.MCMServiceArg",
+      { "MCMServiceArg", "qsig.mcm.MCMServiceArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcm_qsig_mcm_MCMInterrogateArg_PDU,
-      { "MCMInterrogateArg", "qsig.mcm.MCMInterrogateArg",
+      { "MCMInterrogateArg", "qsig.mcm.MCMInterrogateArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcm_qsig_mcm_MCMInterrogateRes_PDU,
-      { "MCMInterrogateRes", "qsig.mcm.MCMInterrogateRes",
+      { "MCMInterrogateRes", "qsig.mcm.MCMInterrogateRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcm_qsig_mcm_MCMailboxFullArg_PDU,
-      { "MCMailboxFullArg", "qsig.mcm.MCMailboxFullArg",
+      { "MCMailboxFullArg", "qsig.mcm.MCMailboxFullArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcm_qsig_mcm_Extension_PDU,
-      { "Extension", "qsig.mcm.Extension",
+      { "Extension", "qsig.mcm.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcm_partyInfo,
-      { "partyInfo", "qsig.mcm.partyInfo",
+      { "partyInfo", "qsig.mcm.partyInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcm_mailboxFullFor,
@@ -15615,7 +15615,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_mcm_MCMExtensions_vals), 0,
         "MCMExtensions", HFILL }},
     { &hf_qsig_mcm_MailboxFullFor_item,
-      { "MailboxFullPar", "qsig.mcm.MailboxFullPar",
+      { "MailboxFullPar", "qsig.mcm.MailboxFullPar_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcm_messageType,
@@ -15635,7 +15635,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_MCMServiceInfo", HFILL }},
     { &hf_qsig_mcm_activateMCM_item,
-      { "MCMServiceInfo", "qsig.mcm.MCMServiceInfo",
+      { "MCMServiceInfo", "qsig.mcm.MCMServiceInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcm_deactivateMCM,
@@ -15647,7 +15647,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_mcm_MessageType_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_mcm_setToDefaultValues,
-      { "setToDefaultValues", "qsig.mcm.setToDefaultValues",
+      { "setToDefaultValues", "qsig.mcm.setToDefaultValues_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcm_mCMModeNew,
@@ -15671,7 +15671,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_MCMServiceInfo", HFILL }},
     { &hf_qsig_mcm_interrogateResult_item,
-      { "MCMServiceInfo", "qsig.mcm.MCMServiceInfo",
+      { "MCMServiceInfo", "qsig.mcm.MCMServiceInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcm_servedUserNr,
@@ -15707,7 +15707,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_mcm_MCMNewArgumentExt_vals), 0,
         "MCMNewArgumentExt", HFILL }},
     { &hf_qsig_mcm_extension,
-      { "extension", "qsig.mcm.extension",
+      { "extension", "qsig.mcm.extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcm_multipleExtension,
@@ -15715,7 +15715,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_mcm_multipleExtension_item,
-      { "Extension", "qsig.mcm.Extension",
+      { "Extension", "qsig.mcm.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcm_argumentExtMCMNoNew,
@@ -15735,7 +15735,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_mcm_MCMUpdArgArgumentExt_vals), 0,
         "MCMUpdArgArgumentExt", HFILL }},
     { &hf_qsig_mcm_MCMUpdateReqRes_item,
-      { "MCMUpdateReqResElt", "qsig.mcm.MCMUpdateReqResElt",
+      { "MCMUpdateReqResElt", "qsig.mcm.MCMUpdateReqResElt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcm_argumentExtMCMUpdRes,
@@ -15755,7 +15755,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_mcm_MessageInfo_vals), 0,
         "MessageInfo", HFILL }},
     { &hf_qsig_mcm_allMsgInfo,
-      { "allMsgInfo", "qsig.mcm.allMsgInfo",
+      { "allMsgInfo", "qsig.mcm.allMsgInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcm_newMsgInfo,
@@ -15771,15 +15771,15 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcm_compressedInfo,
-      { "compressedInfo", "qsig.mcm.compressedInfo",
+      { "compressedInfo", "qsig.mcm.compressedInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcm_noMsgsOfMsgType,
-      { "noMsgsOfMsgType", "qsig.mcm.noMsgsOfMsgType",
+      { "noMsgsOfMsgType", "qsig.mcm.noMsgsOfMsgType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcm_CompleteInfo_item,
-      { "AddressHeader", "qsig.mcm.AddressHeader",
+      { "AddressHeader", "qsig.mcm.AddressHeader_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mcm_originatorNr,
@@ -15815,14 +15815,14 @@ void proto_register_qsig(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "NumericString_SIZE_1_10", HFILL }},
     { &hf_qsig_mcm_none,
-      { "none", "qsig.mcm.none",
+      { "none", "qsig.mcm.none_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
 /* --- Module SS-MID-Operations-asn1-97 --- --- ---                           */
 
     { &hf_qsig_mid_qsig_mid_MIDMailboxAuthArg_PDU,
-      { "MIDMailboxAuthArg", "qsig.mid.MIDMailboxAuthArg",
+      { "MIDMailboxAuthArg", "qsig.mid.MIDMailboxAuthArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mid_qsig_mid_MIDDummyRes_PDU,
@@ -15830,15 +15830,15 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, VALS(qsig_mid_MIDExtensions_vals), 0,
         NULL, HFILL }},
     { &hf_qsig_mid_qsig_mid_MIDMailboxIDArg_PDU,
-      { "MIDMailboxIDArg", "qsig.mid.MIDMailboxIDArg",
+      { "MIDMailboxIDArg", "qsig.mid.MIDMailboxIDArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mid_qsig_mid_Extension_PDU,
-      { "Extension", "qsig.mid.Extension",
+      { "Extension", "qsig.mid.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mid_partyInfo,
-      { "partyInfo", "qsig.mid.partyInfo",
+      { "partyInfo", "qsig.mid.partyInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mid_servedUserName,
@@ -15878,11 +15878,11 @@ void proto_register_qsig(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "UTF8String", HFILL }},
     { &hf_qsig_mid_none,
-      { "none", "qsig.mid.none",
+      { "none", "qsig.mid.none_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mid_extension,
-      { "extension", "qsig.mid.extension",
+      { "extension", "qsig.mid.extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_qsig_mid_multipleExtension,
@@ -15890,7 +15890,7 @@ void proto_register_qsig(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Extension", HFILL }},
     { &hf_qsig_mid_multipleExtension_item,
-      { "Extension", "qsig.mid.Extension",
+      { "Extension", "qsig.mid.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c
index 695ef41839..c64d363919 100644
--- a/epan/dissectors/packet-ranap.c
+++ b/epan/dissectors/packet-ranap.c
@@ -13252,23 +13252,23 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_AccuracyFulfilmentIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_Alt_RAB_Parameters_PDU,
-      { "Alt-RAB-Parameters", "ranap.Alt_RAB_Parameters",
+      { "Alt-RAB-Parameters", "ranap.Alt_RAB_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_Alt_RAB_Parameter_ExtendedGuaranteedBitrateInf_PDU,
-      { "Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf", "ranap.Alt_RAB_Parameter_ExtendedGuaranteedBitrateInf",
+      { "Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf", "ranap.Alt_RAB_Parameter_ExtendedGuaranteedBitrateInf_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_Alt_RAB_Parameter_SupportedGuaranteedBitrateInf_PDU,
-      { "Alt-RAB-Parameter-SupportedGuaranteedBitrateInf", "ranap.Alt_RAB_Parameter_SupportedGuaranteedBitrateInf",
+      { "Alt-RAB-Parameter-SupportedGuaranteedBitrateInf", "ranap.Alt_RAB_Parameter_SupportedGuaranteedBitrateInf_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_Alt_RAB_Parameter_ExtendedMaxBitrateInf_PDU,
-      { "Alt-RAB-Parameter-ExtendedMaxBitrateInf", "ranap.Alt_RAB_Parameter_ExtendedMaxBitrateInf",
+      { "Alt-RAB-Parameter-ExtendedMaxBitrateInf", "ranap.Alt_RAB_Parameter_ExtendedMaxBitrateInf_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_Alt_RAB_Parameter_SupportedMaxBitrateInf_PDU,
-      { "Alt-RAB-Parameter-SupportedMaxBitrateInf", "ranap.Alt_RAB_Parameter_SupportedMaxBitrateInf",
+      { "Alt-RAB-Parameter-SupportedMaxBitrateInf", "ranap.Alt_RAB_Parameter_SupportedMaxBitrateInf_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_AlternativeRABConfigurationRequest_PDU,
@@ -13284,7 +13284,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_AreaIdentity_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_Ass_RAB_Parameters_PDU,
-      { "Ass-RAB-Parameters", "ranap.Ass_RAB_Parameters",
+      { "Ass-RAB-Parameters", "ranap.Ass_RAB_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_Ass_RAB_Parameter_ExtendedGuaranteedBitrateList_PDU,
@@ -13296,7 +13296,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_BroadcastAssistanceDataDecipheringKeys_PDU,
-      { "BroadcastAssistanceDataDecipheringKeys", "ranap.BroadcastAssistanceDataDecipheringKeys",
+      { "BroadcastAssistanceDataDecipheringKeys", "ranap.BroadcastAssistanceDataDecipheringKeys_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_Cause_PDU,
@@ -13308,7 +13308,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_Cell_Access_Mode_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_CellLoadInformationGroup_PDU,
-      { "CellLoadInformationGroup", "ranap.CellLoadInformationGroup",
+      { "CellLoadInformationGroup", "ranap.CellLoadInformationGroup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_ClientType_PDU,
@@ -13316,7 +13316,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_ClientType_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_CriticalityDiagnostics_PDU,
-      { "CriticalityDiagnostics", "ranap.CriticalityDiagnostics",
+      { "CriticalityDiagnostics", "ranap.CriticalityDiagnostics_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_MessageStructure_PDU,
@@ -13364,7 +13364,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_CSG_Membership_Status_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_DeltaRAListofIdleModeUEs_PDU,
-      { "DeltaRAListofIdleModeUEs", "ranap.DeltaRAListofIdleModeUEs",
+      { "DeltaRAListofIdleModeUEs", "ranap.DeltaRAListofIdleModeUEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_DRX_CycleLengthCoefficient_PDU,
@@ -13376,7 +13376,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_EncryptionInformation_PDU,
-      { "EncryptionInformation", "ranap.EncryptionInformation",
+      { "EncryptionInformation", "ranap.EncryptionInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_EncryptionKey_PDU,
@@ -13412,11 +13412,11 @@ void proto_register_ranap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_GlobalCN_ID_PDU,
-      { "GlobalCN-ID", "ranap.GlobalCN_ID",
+      { "GlobalCN-ID", "ranap.GlobalCN_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_GlobalRNC_ID_PDU,
-      { "GlobalRNC-ID", "ranap.GlobalRNC_ID",
+      { "GlobalRNC-ID", "ranap.GlobalRNC_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_HigherBitratesThan16MbpsFlag_PDU,
@@ -13456,7 +13456,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_InformationTransferType_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_IntegrityProtectionInformation_PDU,
-      { "IntegrityProtectionInformation", "ranap.IntegrityProtectionInformation",
+      { "IntegrityProtectionInformation", "ranap.IntegrityProtectionInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_IntegrityProtectionKey_PDU,
@@ -13468,7 +13468,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_InterSystemInformationTransferType_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_ranap_InterSystemInformation_TransparentContainer_PDU,
-      { "InterSystemInformation-TransparentContainer", "ranap.InterSystemInformation_TransparentContainer",
+      { "InterSystemInformation-TransparentContainer", "ranap.InterSystemInformation_TransparentContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_IPMulticastAddress_PDU,
@@ -13488,15 +13488,15 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_KeyStatus_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_LAI_PDU,
-      { "LAI", "ranap.LAI",
+      { "LAI", "ranap.LAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_LastKnownServiceArea_PDU,
-      { "LastKnownServiceArea", "ranap.LastKnownServiceArea",
+      { "LastKnownServiceArea", "ranap.LastKnownServiceArea_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_LocationRelatedDataRequestType_PDU,
-      { "LocationRelatedDataRequestType", "ranap.LocationRelatedDataRequestType",
+      { "LocationRelatedDataRequestType", "ranap.LocationRelatedDataRequestType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_LocationRelatedDataRequestTypeSpecificToGERANIuMode_PDU,
@@ -13548,7 +13548,7 @@ void proto_register_ranap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_MDT_Configuration_PDU,
-      { "MDT-Configuration", "ranap.MDT_Configuration",
+      { "MDT-Configuration", "ranap.MDT_Configuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_MSISDN_PDU,
@@ -13576,7 +13576,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_Offload_RAB_Parameters_PDU,
-      { "Offload-RAB-Parameters", "ranap.Offload_RAB_Parameters",
+      { "Offload-RAB-Parameters", "ranap.Offload_RAB_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_OldBSS_ToNewBSS_Information_PDU,
@@ -13604,7 +13604,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_PeriodicLocationInfo_PDU,
-      { "PeriodicLocationInfo", "ranap.PeriodicLocationInfo",
+      { "PeriodicLocationInfo", "ranap.PeriodicLocationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_PermanentNAS_UE_ID_PDU,
@@ -13620,7 +13620,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_PositioningPriority_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_PositionData_PDU,
-      { "PositionData", "ranap.PositionData",
+      { "PositionData", "ranap.PositionData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_PositionDataSpecificToGERANIuMode_PDU,
@@ -13648,7 +13648,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_Parameters_PDU,
-      { "RAB-Parameters", "ranap.RAB_Parameters",
+      { "RAB-Parameters", "ranap.RAB_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RABParametersList_PDU,
@@ -13672,7 +13672,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_RAT_Type_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_RedirectAttemptFlag_PDU,
-      { "RedirectAttemptFlag", "ranap.RedirectAttemptFlag",
+      { "RedirectAttemptFlag", "ranap.RedirectAttemptFlag_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RedirectionCompleted_PDU,
@@ -13700,7 +13700,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RequestType_PDU,
-      { "RequestType", "ranap.RequestType",
+      { "RequestType", "ranap.RequestType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_ResponseTime_PDU,
@@ -13708,7 +13708,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_ResponseTime_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_RNSAPRelocationParameters_PDU,
-      { "RNSAPRelocationParameters", "ranap.RNSAPRelocationParameters",
+      { "RNSAPRelocationParameters", "ranap.RNSAPRelocationParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RRC_Container_PDU,
@@ -13716,7 +13716,7 @@ void proto_register_ranap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_SAI_PDU,
-      { "SAI", "ranap.SAI",
+      { "SAI", "ranap.SAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_SAPI_PDU,
@@ -13732,7 +13732,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_SignallingIndication_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_SNA_Access_Information_PDU,
-      { "SNA-Access-Information", "ranap.SNA_Access_Information",
+      { "SNA-Access-Information", "ranap.SNA_Access_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_Source_ToTarget_TransparentContainer_PDU,
@@ -13752,11 +13752,11 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_SourceID_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_ranap_SourceRNC_ToTargetRNC_TransparentContainer_PDU,
-      { "SourceRNC-ToTargetRNC-TransparentContainer", "ranap.SourceRNC_ToTargetRNC_TransparentContainer",
+      { "SourceRNC-ToTargetRNC-TransparentContainer", "ranap.SourceRNC_ToTargetRNC_TransparentContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_IRAT_Measurement_Configuration_PDU,
-      { "IRAT-Measurement-Configuration", "ranap.IRAT_Measurement_Configuration",
+      { "IRAT-Measurement-Configuration", "ranap.IRAT_Measurement_Configuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_SubscriberProfileIDforRFP_PDU,
@@ -13776,7 +13776,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_SRVCC_HO_Indication_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_SRVCC_Information_PDU,
-      { "SRVCC-Information", "ranap.SRVCC_Information",
+      { "SRVCC-Information", "ranap.SRVCC_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_SRVCC_Operation_Possible_PDU,
@@ -13796,11 +13796,11 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_TargetID_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_ranap_TargetRNC_ID_PDU,
-      { "TargetRNC-ID", "ranap.TargetRNC_ID",
+      { "TargetRNC-ID", "ranap.TargetRNC_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_ranap_TargetRNC_ToSourceRNC_TransparentContainer_PDU,
-      { "TargetRNC-ToSourceRNC-TransparentContainer", "ranap.TargetRNC_ToSourceRNC_TransparentContainer",
+      { "TargetRNC-ToSourceRNC-TransparentContainer", "ranap.TargetRNC_ToSourceRNC_TransparentContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_TemporaryUE_ID_PDU,
@@ -13812,15 +13812,15 @@ void proto_register_ranap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_TMGI_PDU,
-      { "TMGI", "ranap.TMGI",
+      { "TMGI", "ranap.TMGI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_TracePropagationParameters_PDU,
-      { "TracePropagationParameters", "ranap.TracePropagationParameters",
+      { "TracePropagationParameters", "ranap.TracePropagationParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_TraceRecordingSessionInformation_PDU,
-      { "TraceRecordingSessionInformation", "ranap.TraceRecordingSessionInformation",
+      { "TraceRecordingSessionInformation", "ranap.TraceRecordingSessionInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_TraceReference_PDU,
@@ -13844,7 +13844,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_TypeOfError_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_UE_AggregateMaximumBitRate_PDU,
-      { "UE-AggregateMaximumBitRate", "ranap.UE_AggregateMaximumBitRate",
+      { "UE-AggregateMaximumBitRate", "ranap.UE_AggregateMaximumBitRate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_UE_History_Information_PDU,
@@ -13856,7 +13856,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_UE_ID_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_UESBI_Iu_PDU,
-      { "UESBI-Iu", "ranap.UESBI_Iu",
+      { "UESBI-Iu", "ranap.UESBI_Iu_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_VelocityEstimate_PDU,
@@ -13868,11 +13868,11 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_Iu_ReleaseCommand_PDU,
-      { "Iu-ReleaseCommand", "ranap.Iu_ReleaseCommand",
+      { "Iu-ReleaseCommand", "ranap.Iu_ReleaseCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_Iu_ReleaseComplete_PDU,
-      { "Iu-ReleaseComplete", "ranap.Iu_ReleaseComplete",
+      { "Iu-ReleaseComplete", "ranap.Iu_ReleaseComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_DataVolumeReportList_PDU,
@@ -13880,7 +13880,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_DataVolumeReportItem_PDU,
-      { "RAB-DataVolumeReportItem", "ranap.RAB_DataVolumeReportItem",
+      { "RAB-DataVolumeReportItem", "ranap.RAB_DataVolumeReportItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_ReleasedList_IuRelComp_PDU,
@@ -13888,15 +13888,15 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_ReleasedItem_IuRelComp_PDU,
-      { "RAB-ReleasedItem-IuRelComp", "ranap.RAB_ReleasedItem_IuRelComp",
+      { "RAB-ReleasedItem-IuRelComp", "ranap.RAB_ReleasedItem_IuRelComp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RelocationRequired_PDU,
-      { "RelocationRequired", "ranap.RelocationRequired",
+      { "RelocationRequired", "ranap.RelocationRequired_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RelocationCommand_PDU,
-      { "RelocationCommand", "ranap.RelocationCommand",
+      { "RelocationCommand", "ranap.RelocationCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_RelocationReleaseList_PDU,
@@ -13904,7 +13904,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_RelocationReleaseItem_PDU,
-      { "RAB-RelocationReleaseItem", "ranap.RAB_RelocationReleaseItem",
+      { "RAB-RelocationReleaseItem", "ranap.RAB_RelocationReleaseItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_DataForwardingList_PDU,
@@ -13912,15 +13912,15 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_DataForwardingItem_PDU,
-      { "RAB-DataForwardingItem", "ranap.RAB_DataForwardingItem",
+      { "RAB-DataForwardingItem", "ranap.RAB_DataForwardingItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RelocationPreparationFailure_PDU,
-      { "RelocationPreparationFailure", "ranap.RelocationPreparationFailure",
+      { "RelocationPreparationFailure", "ranap.RelocationPreparationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RelocationRequest_PDU,
-      { "RelocationRequest", "ranap.RelocationRequest",
+      { "RelocationRequest", "ranap.RelocationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_SetupList_RelocReq_PDU,
@@ -13928,11 +13928,11 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_SetupItem_RelocReq_PDU,
-      { "RAB-SetupItem-RelocReq", "ranap.RAB_SetupItem_RelocReq",
+      { "RAB-SetupItem-RelocReq", "ranap.RAB_SetupItem_RelocReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_CNMBMSLinkingInformation_PDU,
-      { "CNMBMSLinkingInformation", "ranap.CNMBMSLinkingInformation",
+      { "CNMBMSLinkingInformation", "ranap.CNMBMSLinkingInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_JoinedMBMSBearerService_IEs_PDU,
@@ -13940,7 +13940,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RelocationRequestAcknowledge_PDU,
-      { "RelocationRequestAcknowledge", "ranap.RelocationRequestAcknowledge",
+      { "RelocationRequestAcknowledge", "ranap.RelocationRequestAcknowledge_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_SetupList_RelocReqAck_PDU,
@@ -13948,7 +13948,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_SetupItem_RelocReqAck_PDU,
-      { "RAB-SetupItem-RelocReqAck", "ranap.RAB_SetupItem_RelocReqAck",
+      { "RAB-SetupItem-RelocReqAck", "ranap.RAB_SetupItem_RelocReqAck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_FailedList_PDU,
@@ -13956,23 +13956,23 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_FailedItem_PDU,
-      { "RAB-FailedItem", "ranap.RAB_FailedItem",
+      { "RAB-FailedItem", "ranap.RAB_FailedItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RelocationFailure_PDU,
-      { "RelocationFailure", "ranap.RelocationFailure",
+      { "RelocationFailure", "ranap.RelocationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RelocationCancel_PDU,
-      { "RelocationCancel", "ranap.RelocationCancel",
+      { "RelocationCancel", "ranap.RelocationCancel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RelocationCancelAcknowledge_PDU,
-      { "RelocationCancelAcknowledge", "ranap.RelocationCancelAcknowledge",
+      { "RelocationCancelAcknowledge", "ranap.RelocationCancelAcknowledge_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_SRNS_ContextRequest_PDU,
-      { "SRNS-ContextRequest", "ranap.SRNS_ContextRequest",
+      { "SRNS-ContextRequest", "ranap.SRNS_ContextRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_DataForwardingList_SRNS_CtxReq_PDU,
@@ -13980,11 +13980,11 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_DataForwardingItem_SRNS_CtxReq_PDU,
-      { "RAB-DataForwardingItem-SRNS-CtxReq", "ranap.RAB_DataForwardingItem_SRNS_CtxReq",
+      { "RAB-DataForwardingItem-SRNS-CtxReq", "ranap.RAB_DataForwardingItem_SRNS_CtxReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_SRNS_ContextResponse_PDU,
-      { "SRNS-ContextResponse", "ranap.SRNS_ContextResponse",
+      { "SRNS-ContextResponse", "ranap.SRNS_ContextResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_ContextList_PDU,
@@ -13992,7 +13992,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_ContextItem_PDU,
-      { "RAB-ContextItem", "ranap.RAB_ContextItem",
+      { "RAB-ContextItem", "ranap.RAB_ContextItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_ContextFailedtoTransferList_PDU,
@@ -14000,23 +14000,23 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RABs_ContextFailedtoTransferItem_PDU,
-      { "RABs-ContextFailedtoTransferItem", "ranap.RABs_ContextFailedtoTransferItem",
+      { "RABs-ContextFailedtoTransferItem", "ranap.RABs_ContextFailedtoTransferItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_SecurityModeCommand_PDU,
-      { "SecurityModeCommand", "ranap.SecurityModeCommand",
+      { "SecurityModeCommand", "ranap.SecurityModeCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_SecurityModeComplete_PDU,
-      { "SecurityModeComplete", "ranap.SecurityModeComplete",
+      { "SecurityModeComplete", "ranap.SecurityModeComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_SecurityModeReject_PDU,
-      { "SecurityModeReject", "ranap.SecurityModeReject",
+      { "SecurityModeReject", "ranap.SecurityModeReject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_DataVolumeReportRequest_PDU,
-      { "DataVolumeReportRequest", "ranap.DataVolumeReportRequest",
+      { "DataVolumeReportRequest", "ranap.DataVolumeReportRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_DataVolumeReportRequestList_PDU,
@@ -14024,11 +14024,11 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_DataVolumeReportRequestItem_PDU,
-      { "RAB-DataVolumeReportRequestItem", "ranap.RAB_DataVolumeReportRequestItem",
+      { "RAB-DataVolumeReportRequestItem", "ranap.RAB_DataVolumeReportRequestItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_DataVolumeReport_PDU,
-      { "DataVolumeReport", "ranap.DataVolumeReport",
+      { "DataVolumeReport", "ranap.DataVolumeReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_FailedtoReportList_PDU,
@@ -14036,19 +14036,19 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RABs_failed_to_reportItem_PDU,
-      { "RABs-failed-to-reportItem", "ranap.RABs_failed_to_reportItem",
+      { "RABs-failed-to-reportItem", "ranap.RABs_failed_to_reportItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_Reset_PDU,
-      { "Reset", "ranap.Reset",
+      { "Reset", "ranap.Reset_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_ResetAcknowledge_PDU,
-      { "ResetAcknowledge", "ranap.ResetAcknowledge",
+      { "ResetAcknowledge", "ranap.ResetAcknowledge_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_ResetResource_PDU,
-      { "ResetResource", "ranap.ResetResource",
+      { "ResetResource", "ranap.ResetResource_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_ResetResourceList_PDU,
@@ -14056,11 +14056,11 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_ResetResourceItem_PDU,
-      { "ResetResourceItem", "ranap.ResetResourceItem",
+      { "ResetResourceItem", "ranap.ResetResourceItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_ResetResourceAcknowledge_PDU,
-      { "ResetResourceAcknowledge", "ranap.ResetResourceAcknowledge",
+      { "ResetResourceAcknowledge", "ranap.ResetResourceAcknowledge_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_ResetResourceAckList_PDU,
@@ -14068,11 +14068,11 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_ResetResourceAckItem_PDU,
-      { "ResetResourceAckItem", "ranap.ResetResourceAckItem",
+      { "ResetResourceAckItem", "ranap.ResetResourceAckItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_ReleaseRequest_PDU,
-      { "RAB-ReleaseRequest", "ranap.RAB_ReleaseRequest",
+      { "RAB-ReleaseRequest", "ranap.RAB_ReleaseRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_ReleaseList_PDU,
@@ -14080,23 +14080,23 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_ReleaseItem_PDU,
-      { "RAB-ReleaseItem", "ranap.RAB_ReleaseItem",
+      { "RAB-ReleaseItem", "ranap.RAB_ReleaseItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_Iu_ReleaseRequest_PDU,
-      { "Iu-ReleaseRequest", "ranap.Iu_ReleaseRequest",
+      { "Iu-ReleaseRequest", "ranap.Iu_ReleaseRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RelocationDetect_PDU,
-      { "RelocationDetect", "ranap.RelocationDetect",
+      { "RelocationDetect", "ranap.RelocationDetect_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RelocationComplete_PDU,
-      { "RelocationComplete", "ranap.RelocationComplete",
+      { "RelocationComplete", "ranap.RelocationComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_EnhancedRelocationCompleteRequest_PDU,
-      { "EnhancedRelocationCompleteRequest", "ranap.EnhancedRelocationCompleteRequest",
+      { "EnhancedRelocationCompleteRequest", "ranap.EnhancedRelocationCompleteRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_SetupList_EnhancedRelocCompleteReq_PDU,
@@ -14104,11 +14104,11 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_SetupItem_EnhancedRelocCompleteReq_PDU,
-      { "RAB-SetupItem-EnhancedRelocCompleteReq", "ranap.RAB_SetupItem_EnhancedRelocCompleteReq",
+      { "RAB-SetupItem-EnhancedRelocCompleteReq", "ranap.RAB_SetupItem_EnhancedRelocCompleteReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_EnhancedRelocationCompleteResponse_PDU,
-      { "EnhancedRelocationCompleteResponse", "ranap.EnhancedRelocationCompleteResponse",
+      { "EnhancedRelocationCompleteResponse", "ranap.EnhancedRelocationCompleteResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_SetupList_EnhancedRelocCompleteRes_PDU,
@@ -14116,7 +14116,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_SetupItem_EnhancedRelocCompleteRes_PDU,
-      { "RAB-SetupItem-EnhancedRelocCompleteRes", "ranap.RAB_SetupItem_EnhancedRelocCompleteRes",
+      { "RAB-SetupItem-EnhancedRelocCompleteRes", "ranap.RAB_SetupItem_EnhancedRelocCompleteRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_ToBeReleasedList_EnhancedRelocCompleteRes_PDU,
@@ -14124,47 +14124,47 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_ToBeReleasedItem_EnhancedRelocCompleteRes_PDU,
-      { "RAB-ToBeReleasedItem-EnhancedRelocCompleteRes", "ranap.RAB_ToBeReleasedItem_EnhancedRelocCompleteRes",
+      { "RAB-ToBeReleasedItem-EnhancedRelocCompleteRes", "ranap.RAB_ToBeReleasedItem_EnhancedRelocCompleteRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_EnhancedRelocationCompleteFailure_PDU,
-      { "EnhancedRelocationCompleteFailure", "ranap.EnhancedRelocationCompleteFailure",
+      { "EnhancedRelocationCompleteFailure", "ranap.EnhancedRelocationCompleteFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_EnhancedRelocationCompleteConfirm_PDU,
-      { "EnhancedRelocationCompleteConfirm", "ranap.EnhancedRelocationCompleteConfirm",
+      { "EnhancedRelocationCompleteConfirm", "ranap.EnhancedRelocationCompleteConfirm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_Paging_PDU,
-      { "Paging", "ranap.Paging",
+      { "Paging", "ranap.Paging_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_CommonID_PDU,
-      { "CommonID", "ranap.CommonID",
+      { "CommonID", "ranap.CommonID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_CN_InvokeTrace_PDU,
-      { "CN-InvokeTrace", "ranap.CN_InvokeTrace",
+      { "CN-InvokeTrace", "ranap.CN_InvokeTrace_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_CN_DeactivateTrace_PDU,
-      { "CN-DeactivateTrace", "ranap.CN_DeactivateTrace",
+      { "CN-DeactivateTrace", "ranap.CN_DeactivateTrace_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_LocationReportingControl_PDU,
-      { "LocationReportingControl", "ranap.LocationReportingControl",
+      { "LocationReportingControl", "ranap.LocationReportingControl_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_LocationReport_PDU,
-      { "LocationReport", "ranap.LocationReport",
+      { "LocationReport", "ranap.LocationReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_InitialUE_Message_PDU,
-      { "InitialUE-Message", "ranap.InitialUE_Message",
+      { "InitialUE-Message", "ranap.InitialUE_Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_DirectTransfer_PDU,
-      { "DirectTransfer", "ranap.DirectTransfer",
+      { "DirectTransfer", "ranap.DirectTransfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RedirectionIndication_PDU,
@@ -14172,23 +14172,23 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_Overload_PDU,
-      { "Overload", "ranap.Overload",
+      { "Overload", "ranap.Overload_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_ErrorIndication_PDU,
-      { "ErrorIndication", "ranap.ErrorIndication",
+      { "ErrorIndication", "ranap.ErrorIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_SRNS_DataForwardCommand_PDU,
-      { "SRNS-DataForwardCommand", "ranap.SRNS_DataForwardCommand",
+      { "SRNS-DataForwardCommand", "ranap.SRNS_DataForwardCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_ForwardSRNS_Context_PDU,
-      { "ForwardSRNS-Context", "ranap.ForwardSRNS_Context",
+      { "ForwardSRNS-Context", "ranap.ForwardSRNS_Context_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_AssignmentRequest_PDU,
-      { "RAB-AssignmentRequest", "ranap.RAB_AssignmentRequest",
+      { "RAB-AssignmentRequest", "ranap.RAB_AssignmentRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_SetupOrModifyList_PDU,
@@ -14196,19 +14196,19 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_SetupOrModifyItemFirst_PDU,
-      { "RAB-SetupOrModifyItemFirst", "ranap.RAB_SetupOrModifyItemFirst",
+      { "RAB-SetupOrModifyItemFirst", "ranap.RAB_SetupOrModifyItemFirst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_TransportLayerInformation_PDU,
-      { "TransportLayerInformation", "ranap.TransportLayerInformation",
+      { "TransportLayerInformation", "ranap.TransportLayerInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_SetupOrModifyItemSecond_PDU,
-      { "RAB-SetupOrModifyItemSecond", "ranap.RAB_SetupOrModifyItemSecond",
+      { "RAB-SetupOrModifyItemSecond", "ranap.RAB_SetupOrModifyItemSecond_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_AssignmentResponse_PDU,
-      { "RAB-AssignmentResponse", "ranap.RAB_AssignmentResponse",
+      { "RAB-AssignmentResponse", "ranap.RAB_AssignmentResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_SetupOrModifiedList_PDU,
@@ -14216,7 +14216,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_SetupOrModifiedItem_PDU,
-      { "RAB-SetupOrModifiedItem", "ranap.RAB_SetupOrModifiedItem",
+      { "RAB-SetupOrModifiedItem", "ranap.RAB_SetupOrModifiedItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_ReleasedList_PDU,
@@ -14224,7 +14224,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_ReleasedItem_PDU,
-      { "RAB-ReleasedItem", "ranap.RAB_ReleasedItem",
+      { "RAB-ReleasedItem", "ranap.RAB_ReleasedItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_QueuedList_PDU,
@@ -14232,7 +14232,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_QueuedItem_PDU,
-      { "RAB-QueuedItem", "ranap.RAB_QueuedItem",
+      { "RAB-QueuedItem", "ranap.RAB_QueuedItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_ReleaseFailedList_PDU,
@@ -14244,15 +14244,15 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_GERAN_Iumode_RAB_Failed_RABAssgntResponse_Item_PDU,
-      { "GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item", "ranap.GERAN_Iumode_RAB_Failed_RABAssgntResponse_Item",
+      { "GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item", "ranap.GERAN_Iumode_RAB_Failed_RABAssgntResponse_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_PrivateMessage_PDU,
-      { "PrivateMessage", "ranap.PrivateMessage",
+      { "PrivateMessage", "ranap.PrivateMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RANAP_RelocationInformation_PDU,
-      { "RANAP-RelocationInformation", "ranap.RANAP_RelocationInformation",
+      { "RANAP-RelocationInformation", "ranap.RANAP_RelocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_DirectTransferInformationList_RANAP_RelocInf_PDU,
@@ -14260,7 +14260,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_DirectTransferInformationItem_RANAP_RelocInf_PDU,
-      { "DirectTransferInformationItem-RANAP-RelocInf", "ranap.DirectTransferInformationItem_RANAP_RelocInf",
+      { "DirectTransferInformationItem-RANAP-RelocInf", "ranap.DirectTransferInformationItem_RANAP_RelocInf_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_ContextList_RANAP_RelocInf_PDU,
@@ -14268,11 +14268,11 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_ContextItem_RANAP_RelocInf_PDU,
-      { "RAB-ContextItem-RANAP-RelocInf", "ranap.RAB_ContextItem_RANAP_RelocInf",
+      { "RAB-ContextItem-RANAP-RelocInf", "ranap.RAB_ContextItem_RANAP_RelocInf_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RANAP_EnhancedRelocationInformationRequest_PDU,
-      { "RANAP-EnhancedRelocationInformationRequest", "ranap.RANAP_EnhancedRelocationInformationRequest",
+      { "RANAP-EnhancedRelocationInformationRequest", "ranap.RANAP_EnhancedRelocationInformationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_SetupList_EnhRelocInfoReq_PDU,
@@ -14280,11 +14280,11 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_SetupItem_EnhRelocInfoReq_PDU,
-      { "RAB-SetupItem-EnhRelocInfoReq", "ranap.RAB_SetupItem_EnhRelocInfoReq",
+      { "RAB-SetupItem-EnhRelocInfoReq", "ranap.RAB_SetupItem_EnhRelocInfoReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RANAP_EnhancedRelocationInformationResponse_PDU,
-      { "RANAP-EnhancedRelocationInformationResponse", "ranap.RANAP_EnhancedRelocationInformationResponse",
+      { "RANAP-EnhancedRelocationInformationResponse", "ranap.RANAP_EnhancedRelocationInformationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_SetupList_EnhRelocInfoRes_PDU,
@@ -14292,7 +14292,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_SetupItem_EnhRelocInfoRes_PDU,
-      { "RAB-SetupItem-EnhRelocInfoRes", "ranap.RAB_SetupItem_EnhRelocInfoRes",
+      { "RAB-SetupItem-EnhRelocInfoRes", "ranap.RAB_SetupItem_EnhRelocInfoRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_FailedList_EnhRelocInfoRes_PDU,
@@ -14300,11 +14300,11 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_FailedItem_EnhRelocInfoRes_PDU,
-      { "RAB-FailedItem-EnhRelocInfoRes", "ranap.RAB_FailedItem_EnhRelocInfoRes",
+      { "RAB-FailedItem-EnhRelocInfoRes", "ranap.RAB_FailedItem_EnhRelocInfoRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_ModifyRequest_PDU,
-      { "RAB-ModifyRequest", "ranap.RAB_ModifyRequest",
+      { "RAB-ModifyRequest", "ranap.RAB_ModifyRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_ModifyList_PDU,
@@ -14312,91 +14312,91 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_ModifyItem_PDU,
-      { "RAB-ModifyItem", "ranap.RAB_ModifyItem",
+      { "RAB-ModifyItem", "ranap.RAB_ModifyItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_LocationRelatedDataRequest_PDU,
-      { "LocationRelatedDataRequest", "ranap.LocationRelatedDataRequest",
+      { "LocationRelatedDataRequest", "ranap.LocationRelatedDataRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_LocationRelatedDataResponse_PDU,
-      { "LocationRelatedDataResponse", "ranap.LocationRelatedDataResponse",
+      { "LocationRelatedDataResponse", "ranap.LocationRelatedDataResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_LocationRelatedDataFailure_PDU,
-      { "LocationRelatedDataFailure", "ranap.LocationRelatedDataFailure",
+      { "LocationRelatedDataFailure", "ranap.LocationRelatedDataFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_InformationTransferIndication_PDU,
-      { "InformationTransferIndication", "ranap.InformationTransferIndication",
+      { "InformationTransferIndication", "ranap.InformationTransferIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_InformationTransferConfirmation_PDU,
-      { "InformationTransferConfirmation", "ranap.InformationTransferConfirmation",
+      { "InformationTransferConfirmation", "ranap.InformationTransferConfirmation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_InformationTransferFailure_PDU,
-      { "InformationTransferFailure", "ranap.InformationTransferFailure",
+      { "InformationTransferFailure", "ranap.InformationTransferFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_UESpecificInformationIndication_PDU,
-      { "UESpecificInformationIndication", "ranap.UESpecificInformationIndication",
+      { "UESpecificInformationIndication", "ranap.UESpecificInformationIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_DirectInformationTransfer_PDU,
-      { "DirectInformationTransfer", "ranap.DirectInformationTransfer",
+      { "DirectInformationTransfer", "ranap.DirectInformationTransfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_UplinkInformationExchangeRequest_PDU,
-      { "UplinkInformationExchangeRequest", "ranap.UplinkInformationExchangeRequest",
+      { "UplinkInformationExchangeRequest", "ranap.UplinkInformationExchangeRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_UplinkInformationExchangeResponse_PDU,
-      { "UplinkInformationExchangeResponse", "ranap.UplinkInformationExchangeResponse",
+      { "UplinkInformationExchangeResponse", "ranap.UplinkInformationExchangeResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_UplinkInformationExchangeFailure_PDU,
-      { "UplinkInformationExchangeFailure", "ranap.UplinkInformationExchangeFailure",
+      { "UplinkInformationExchangeFailure", "ranap.UplinkInformationExchangeFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_MBMSSessionStart_PDU,
-      { "MBMSSessionStart", "ranap.MBMSSessionStart",
+      { "MBMSSessionStart", "ranap.MBMSSessionStart_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_MBMSSynchronisationInformation_PDU,
-      { "MBMSSynchronisationInformation", "ranap.MBMSSynchronisationInformation",
+      { "MBMSSynchronisationInformation", "ranap.MBMSSynchronisationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_MBMSSessionStartResponse_PDU,
-      { "MBMSSessionStartResponse", "ranap.MBMSSessionStartResponse",
+      { "MBMSSessionStartResponse", "ranap.MBMSSessionStartResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_MBMSSessionStartFailure_PDU,
-      { "MBMSSessionStartFailure", "ranap.MBMSSessionStartFailure",
+      { "MBMSSessionStartFailure", "ranap.MBMSSessionStartFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_MBMSSessionUpdate_PDU,
-      { "MBMSSessionUpdate", "ranap.MBMSSessionUpdate",
+      { "MBMSSessionUpdate", "ranap.MBMSSessionUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_MBMSSessionUpdateResponse_PDU,
-      { "MBMSSessionUpdateResponse", "ranap.MBMSSessionUpdateResponse",
+      { "MBMSSessionUpdateResponse", "ranap.MBMSSessionUpdateResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_MBMSSessionUpdateFailure_PDU,
-      { "MBMSSessionUpdateFailure", "ranap.MBMSSessionUpdateFailure",
+      { "MBMSSessionUpdateFailure", "ranap.MBMSSessionUpdateFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_MBMSSessionStop_PDU,
-      { "MBMSSessionStop", "ranap.MBMSSessionStop",
+      { "MBMSSessionStop", "ranap.MBMSSessionStop_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_MBMSSessionStopResponse_PDU,
-      { "MBMSSessionStopResponse", "ranap.MBMSSessionStopResponse",
+      { "MBMSSessionStopResponse", "ranap.MBMSSessionStopResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_MBMSUELinkingRequest_PDU,
-      { "MBMSUELinkingRequest", "ranap.MBMSUELinkingRequest",
+      { "MBMSUELinkingRequest", "ranap.MBMSUELinkingRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_LeftMBMSBearerService_IEs_PDU,
@@ -14404,7 +14404,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_MBMSUELinkingResponse_PDU,
-      { "MBMSUELinkingResponse", "ranap.MBMSUELinkingResponse",
+      { "MBMSUELinkingResponse", "ranap.MBMSUELinkingResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_UnsuccessfulLinking_IEs_PDU,
@@ -14412,47 +14412,47 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_MBMSRegistrationRequest_PDU,
-      { "MBMSRegistrationRequest", "ranap.MBMSRegistrationRequest",
+      { "MBMSRegistrationRequest", "ranap.MBMSRegistrationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_MBMSRegistrationResponse_PDU,
-      { "MBMSRegistrationResponse", "ranap.MBMSRegistrationResponse",
+      { "MBMSRegistrationResponse", "ranap.MBMSRegistrationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_MBMSRegistrationFailure_PDU,
-      { "MBMSRegistrationFailure", "ranap.MBMSRegistrationFailure",
+      { "MBMSRegistrationFailure", "ranap.MBMSRegistrationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_MBMSCNDe_RegistrationRequest_PDU,
-      { "MBMSCNDe-RegistrationRequest", "ranap.MBMSCNDe_RegistrationRequest",
+      { "MBMSCNDe-RegistrationRequest", "ranap.MBMSCNDe_RegistrationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_MBMSCNDe_RegistrationResponse_PDU,
-      { "MBMSCNDe-RegistrationResponse", "ranap.MBMSCNDe_RegistrationResponse",
+      { "MBMSCNDe-RegistrationResponse", "ranap.MBMSCNDe_RegistrationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_MBMSRABEstablishmentIndication_PDU,
-      { "MBMSRABEstablishmentIndication", "ranap.MBMSRABEstablishmentIndication",
+      { "MBMSRABEstablishmentIndication", "ranap.MBMSRABEstablishmentIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_MBMSRABReleaseRequest_PDU,
-      { "MBMSRABReleaseRequest", "ranap.MBMSRABReleaseRequest",
+      { "MBMSRABReleaseRequest", "ranap.MBMSRABReleaseRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_MBMSRABRelease_PDU,
-      { "MBMSRABRelease", "ranap.MBMSRABRelease",
+      { "MBMSRABRelease", "ranap.MBMSRABRelease_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_MBMSRABReleaseFailure_PDU,
-      { "MBMSRABReleaseFailure", "ranap.MBMSRABReleaseFailure",
+      { "MBMSRABReleaseFailure", "ranap.MBMSRABReleaseFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_SRVCC_CSKeysRequest_PDU,
-      { "SRVCC-CSKeysRequest", "ranap.SRVCC_CSKeysRequest",
+      { "SRVCC-CSKeysRequest", "ranap.SRVCC_CSKeysRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_SRVCC_CSKeysResponse_PDU,
-      { "SRVCC-CSKeysResponse", "ranap.SRVCC_CSKeysResponse",
+      { "SRVCC-CSKeysResponse", "ranap.SRVCC_CSKeysResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RANAP_PDU_PDU,
@@ -14468,7 +14468,7 @@ void proto_register_ranap(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_ranap_ProtocolIE_Container_item,
-      { "ProtocolIE-Field", "ranap.ProtocolIE_Field",
+      { "ProtocolIE-Field", "ranap.ProtocolIE_Field_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_id,
@@ -14480,11 +14480,11 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_Criticality_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_ie_field_value,
-      { "value", "ranap.value",
+      { "value", "ranap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ie_field_value", HFILL }},
     { &hf_ranap_ProtocolIE_ContainerPair_item,
-      { "ProtocolIE-FieldPair", "ranap.ProtocolIE_FieldPair",
+      { "ProtocolIE-FieldPair", "ranap.ProtocolIE_FieldPair_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_firstCriticality,
@@ -14492,7 +14492,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_Criticality_vals), 0,
         "Criticality", HFILL }},
     { &hf_ranap_firstValue,
-      { "firstValue", "ranap.firstValue",
+      { "firstValue", "ranap.firstValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_secondCriticality,
@@ -14500,7 +14500,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_Criticality_vals), 0,
         "Criticality", HFILL }},
     { &hf_ranap_secondValue,
-      { "secondValue", "ranap.secondValue",
+      { "secondValue", "ranap.secondValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_ProtocolIE_ContainerList_item,
@@ -14512,7 +14512,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_ProtocolExtensionContainer_item,
-      { "ProtocolExtensionField", "ranap.ProtocolExtensionField",
+      { "ProtocolExtensionField", "ranap.ProtocolExtensionField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_ext_id,
@@ -14520,11 +14520,11 @@ void proto_register_ranap(void) {
         FT_UINT8, BASE_DEC|BASE_EXT_STRING, &ranap_ProtocolIE_ID_vals_ext, 0,
         "ProtocolExtensionID", HFILL }},
     { &hf_ranap_extensionValue,
-      { "extensionValue", "ranap.extensionValue",
+      { "extensionValue", "ranap.extensionValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_PrivateIE_Container_item,
-      { "PrivateIE-Field", "ranap.PrivateIE_Field",
+      { "PrivateIE-Field", "ranap.PrivateIE_Field_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_private_id,
@@ -14532,7 +14532,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_PrivateIE_ID_vals), 0,
         "PrivateIE_ID", HFILL }},
     { &hf_ranap_private_value,
-      { "value", "ranap.value",
+      { "value", "ranap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_private_value", HFILL }},
     { &hf_ranap_priorityLevel,
@@ -14556,11 +14556,11 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ProtocolExtensionContainer", HFILL }},
     { &hf_ranap_altMaxBitrateInf,
-      { "altMaxBitrateInf", "ranap.altMaxBitrateInf",
+      { "altMaxBitrateInf", "ranap.altMaxBitrateInf_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Alt_RAB_Parameter_MaxBitrateInf", HFILL }},
     { &hf_ranap_altGuaranteedBitRateInf,
-      { "altGuaranteedBitRateInf", "ranap.altGuaranteedBitRateInf",
+      { "altGuaranteedBitRateInf", "ranap.altGuaranteedBitRateInf_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Alt_RAB_Parameter_GuaranteedBitrateInf", HFILL }},
     { &hf_ranap_altExtendedGuaranteedBitrateType,
@@ -14652,7 +14652,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_sAI,
-      { "sAI", "ranap.sAI",
+      { "sAI", "ranap.sAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_geographicalArea,
@@ -14684,7 +14684,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_AuthorisedPLMNs_item,
-      { "AuthorisedPLMNs item", "ranap.AuthorisedPLMNs_item",
+      { "AuthorisedPLMNs item", "ranap.AuthorisedPLMNs_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_pLMNidentity,
@@ -14768,11 +14768,11 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_SourceCellID_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_uplinkCellLoadInformation,
-      { "uplinkCellLoadInformation", "ranap.uplinkCellLoadInformation",
+      { "uplinkCellLoadInformation", "ranap.uplinkCellLoadInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellLoadInformation", HFILL }},
     { &hf_ranap_downlinkCellLoadInformation,
-      { "downlinkCellLoadInformation", "ranap.downlinkCellLoadInformation",
+      { "downlinkCellLoadInformation", "ranap.downlinkCellLoadInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellLoadInformation", HFILL }},
     { &hf_ranap_procedureCode,
@@ -14792,7 +14792,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CriticalityDiagnostics_IE_List", HFILL }},
     { &hf_ranap_CriticalityDiagnostics_IE_List_item,
-      { "CriticalityDiagnostics-IE-List item", "ranap.CriticalityDiagnostics_IE_List_item",
+      { "CriticalityDiagnostics-IE-List item", "ranap.CriticalityDiagnostics_IE_List_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_iECriticality,
@@ -14808,7 +14808,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RepetitionNumber0", HFILL }},
     { &hf_ranap_MessageStructure_item,
-      { "MessageStructure item", "ranap.MessageStructure_item",
+      { "MessageStructure item", "ranap.MessageStructure_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_item_repetitionNumber,
@@ -14868,11 +14868,11 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_iMEIgroup,
-      { "iMEIgroup", "ranap.iMEIgroup",
+      { "iMEIgroup", "ranap.iMEIgroup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_iMEISVgroup,
-      { "iMEISVgroup", "ranap.iMEISVgroup",
+      { "iMEISVgroup", "ranap.iMEISVgroup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_measurementQuantity,
@@ -14892,11 +14892,11 @@ void proto_register_ranap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_point,
-      { "point", "ranap.point",
+      { "point", "ranap.point_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_Point", HFILL }},
     { &hf_ranap_pointWithUnCertainty,
-      { "pointWithUnCertainty", "ranap.pointWithUnCertainty",
+      { "pointWithUnCertainty", "ranap.pointWithUnCertainty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_PointWithUnCertainty", HFILL }},
     { &hf_ranap_polygon,
@@ -14904,19 +14904,19 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GA_Polygon", HFILL }},
     { &hf_ranap_pointWithUncertaintyEllipse,
-      { "pointWithUncertaintyEllipse", "ranap.pointWithUncertaintyEllipse",
+      { "pointWithUncertaintyEllipse", "ranap.pointWithUncertaintyEllipse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_PointWithUnCertaintyEllipse", HFILL }},
     { &hf_ranap_pointWithAltitude,
-      { "pointWithAltitude", "ranap.pointWithAltitude",
+      { "pointWithAltitude", "ranap.pointWithAltitude_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_PointWithAltitude", HFILL }},
     { &hf_ranap_pointWithAltitudeAndUncertaintyEllipsoid,
-      { "pointWithAltitudeAndUncertaintyEllipsoid", "ranap.pointWithAltitudeAndUncertaintyEllipsoid",
+      { "pointWithAltitudeAndUncertaintyEllipsoid", "ranap.pointWithAltitudeAndUncertaintyEllipsoid_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_PointWithAltitudeAndUncertaintyEllipsoid", HFILL }},
     { &hf_ranap_ellipsoidArc,
-      { "ellipsoidArc", "ranap.ellipsoidArc",
+      { "ellipsoidArc", "ranap.ellipsoidArc_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_EllipsoidArc", HFILL }},
     { &hf_ranap_latitudeSign,
@@ -14940,7 +14940,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_32767", HFILL }},
     { &hf_ranap_geographicalCoordinates,
-      { "geographicalCoordinates", "ranap.geographicalCoordinates",
+      { "geographicalCoordinates", "ranap.geographicalCoordinates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_innerRadius,
@@ -14964,11 +14964,11 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_127", HFILL }},
     { &hf_ranap_altitudeAndDirection,
-      { "altitudeAndDirection", "ranap.altitudeAndDirection",
+      { "altitudeAndDirection", "ranap.altitudeAndDirection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_AltitudeAndDirection", HFILL }},
     { &hf_ranap_uncertaintyEllipse,
-      { "uncertaintyEllipse", "ranap.uncertaintyEllipse",
+      { "uncertaintyEllipse", "ranap.uncertaintyEllipse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_UncertaintyEllipse", HFILL }},
     { &hf_ranap_uncertaintyAltitude,
@@ -14980,7 +14980,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_127", HFILL }},
     { &hf_ranap_GA_Polygon_item,
-      { "GA-Polygon item", "ranap.GA_Polygon_item",
+      { "GA-Polygon item", "ranap.GA_Polygon_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_uncertaintySemi_major,
@@ -14996,7 +14996,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_179", HFILL }},
     { &hf_ranap_lAI,
-      { "lAI", "ranap.lAI",
+      { "lAI", "ranap.lAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_rAC,
@@ -15064,7 +15064,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_PermanentNAS_UE_ID_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_rNCTraceInformation,
-      { "rNCTraceInformation", "ranap.rNCTraceInformation",
+      { "rNCTraceInformation", "ranap.rNCTraceInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_permittedAlgorithms_01,
@@ -15076,7 +15076,7 @@ void proto_register_ranap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "IntegrityProtectionKey", HFILL }},
     { &hf_ranap_rIM_Transfer,
-      { "rIM-Transfer", "ranap.rIM_Transfer",
+      { "rIM-Transfer", "ranap.rIM_Transfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_gTP_TEI,
@@ -15088,7 +15088,7 @@ void proto_register_ranap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_LA_LIST_item,
-      { "LA-LIST item", "ranap.LA_LIST_item",
+      { "LA-LIST item", "ranap.LA_LIST_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_listOF_SNAs,
@@ -15104,7 +15104,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_ListOfInterfacesToTrace_item,
-      { "InterfacesToTraceItem", "ranap.InterfacesToTraceItem",
+      { "InterfacesToTraceItem", "ranap.InterfacesToTraceItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_interface,
@@ -15160,39 +15160,39 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_IncludeVelocity_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_periodicLocationInfo,
-      { "periodicLocationInfo", "ranap.periodicLocationInfo",
+      { "periodicLocationInfo", "ranap.periodicLocationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_periodic,
-      { "periodic", "ranap.periodic",
+      { "periodic", "ranap.periodic_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MDT_Report_Parameters", HFILL }},
     { &hf_ranap_event1F,
-      { "event1F", "ranap.event1F",
+      { "event1F", "ranap.event1F_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event1F_Parameters", HFILL }},
     { &hf_ranap_event1I,
-      { "event1I", "ranap.event1I",
+      { "event1I", "ranap.event1I_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event1I_Parameters", HFILL }},
     { &hf_ranap_MBMSIPMulticastAddressandAPNRequest_item,
-      { "TMGI", "ranap.TMGI",
+      { "TMGI", "ranap.TMGI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_cellbased,
-      { "cellbased", "ranap.cellbased",
+      { "cellbased", "ranap.cellbased_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_labased,
-      { "labased", "ranap.labased",
+      { "labased", "ranap.labased_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_rabased,
-      { "rabased", "ranap.rabased",
+      { "rabased", "ranap.rabased_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_plmn_area_based,
-      { "plmn-area-based", "ranap.plmn_area_based",
+      { "plmn-area-based", "ranap.plmn_area_based_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_mdtActivation,
@@ -15208,11 +15208,11 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_MDTMode_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_immediateMDT,
-      { "immediateMDT", "ranap.immediateMDT",
+      { "immediateMDT", "ranap.immediateMDT_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_loggedMDT,
-      { "loggedMDT", "ranap.loggedMDT",
+      { "loggedMDT", "ranap.loggedMDT_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_reportInterval,
@@ -15232,7 +15232,7 @@ void proto_register_ranap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Offload_RAB_Parameters_ChargingCharacteristics", HFILL }},
     { &hf_ranap_rAI,
-      { "rAI", "ranap.rAI",
+      { "rAI", "ranap.rAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_PDP_TypeInformation_item,
@@ -15268,7 +15268,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "LAI_List", HFILL }},
     { &hf_ranap_LAI_List_item,
-      { "LAI", "ranap.LAI",
+      { "LAI", "ranap.LAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_loggingInterval,
@@ -15280,7 +15280,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_LoggingDuration_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_PLMNs_in_shared_network_item,
-      { "PLMNs-in-shared-network item", "ranap.PLMNs_in_shared_network_item",
+      { "PLMNs-in-shared-network item", "ranap.PLMNs_in_shared_network_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_lA_LIST,
@@ -15300,7 +15300,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_shared_network_information,
-      { "shared-network-information", "ranap.shared_network_information",
+      { "shared-network-information", "ranap.shared_network_information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_raiList,
@@ -15308,11 +15308,11 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RAI_List", HFILL }},
     { &hf_ranap_RAI_List_item,
-      { "RAI", "ranap.RAI",
+      { "RAI", "ranap.RAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RABDataVolumeReport_item,
-      { "RABDataVolumeReport item", "ranap.RABDataVolumeReport_item",
+      { "RABDataVolumeReport item", "ranap.RABDataVolumeReport_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_dl_UnsuccessfullyTransmittedDataVolume,
@@ -15376,7 +15376,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_TrafficHandlingPriority_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_allocationOrRetentionPriority,
-      { "allocationOrRetentionPriority", "ranap.allocationOrRetentionPriority",
+      { "allocationOrRetentionPriority", "ranap.allocationOrRetentionPriority_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_sourceStatisticsDescriptor,
@@ -15388,7 +15388,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_RelocationRequirement_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_RABParametersList_item,
-      { "RABParametersList item", "ranap.RABParametersList_item",
+      { "RABParametersList item", "ranap.RABParametersList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_rab_Id,
@@ -15404,11 +15404,11 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_upInformation,
-      { "upInformation", "ranap.upInformation",
+      { "upInformation", "ranap.upInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RAB_TrCH_Mapping_item,
-      { "RAB-TrCH-MappingItem", "ranap.RAB_TrCH_MappingItem",
+      { "RAB-TrCH-MappingItem", "ranap.RAB_TrCH_MappingItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_rAB_ID,
@@ -15420,7 +15420,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_notEmptyRAListofIdleModeUEs,
-      { "notEmptyRAListofIdleModeUEs", "ranap.notEmptyRAListofIdleModeUEs",
+      { "notEmptyRAListofIdleModeUEs", "ranap.notEmptyRAListofIdleModeUEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_emptyFullRAListofIdleModeUEs,
@@ -15436,15 +15436,15 @@ void proto_register_ranap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_LAListofIdleModeUEs_item,
-      { "LAI", "ranap.LAI",
+      { "LAI", "ranap.LAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RequestedMBMSIPMulticastAddressandAPNRequest_item,
-      { "MBMSIPMulticastAddressandAPNlist", "ranap.MBMSIPMulticastAddressandAPNlist",
+      { "MBMSIPMulticastAddressandAPNlist", "ranap.MBMSIPMulticastAddressandAPNlist_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_tMGI,
-      { "tMGI", "ranap.tMGI",
+      { "tMGI", "ranap.tMGI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_iPMulticastAddress,
@@ -15456,7 +15456,7 @@ void proto_register_ranap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_RequestedMulticastServiceList_item,
-      { "TMGI", "ranap.TMGI",
+      { "TMGI", "ranap.TMGI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_requestedMaxBitrates,
@@ -15512,15 +15512,15 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_RIMRoutingAddress_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_targetRNC_ID,
-      { "targetRNC-ID", "ranap.targetRNC_ID",
+      { "targetRNC-ID", "ranap.targetRNC_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_gERAN_Cell_ID,
-      { "gERAN-Cell-ID", "ranap.gERAN_Cell_ID",
+      { "gERAN-Cell-ID", "ranap.gERAN_Cell_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_targeteNB_ID,
-      { "targeteNB-ID", "ranap.targeteNB_ID",
+      { "targeteNB-ID", "ranap.targeteNB_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_traceReference,
@@ -15540,15 +15540,15 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RABParametersList", HFILL }},
     { &hf_ranap_locationReporting,
-      { "locationReporting", "ranap.locationReporting",
+      { "locationReporting", "ranap.locationReporting_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LocationReportingTransferInformation", HFILL }},
     { &hf_ranap_traceInformation,
-      { "traceInformation", "ranap.traceInformation",
+      { "traceInformation", "ranap.traceInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_sourceSAI,
-      { "sourceSAI", "ranap.sourceSAI",
+      { "sourceSAI", "ranap.sourceSAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SAI", HFILL }},
     { &hf_ranap_sAC,
@@ -15564,7 +15564,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_6", HFILL }},
     { &hf_ranap_SDU_FormatInformationParameters_item,
-      { "SDU-FormatInformationParameters item", "ranap.SDU_FormatInformationParameters_item",
+      { "SDU-FormatInformationParameters item", "ranap.SDU_FormatInformationParameters_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_subflowSDU_Size,
@@ -15576,15 +15576,15 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_SDU_Parameters_item,
-      { "SDU-Parameters item", "ranap.SDU_Parameters_item",
+      { "SDU-Parameters item", "ranap.SDU_Parameters_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_sDU_ErrorRatio,
-      { "sDU-ErrorRatio", "ranap.sDU_ErrorRatio",
+      { "sDU-ErrorRatio", "ranap.sDU_ErrorRatio_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_residualBitErrorRatio,
-      { "residualBitErrorRatio", "ranap.residualBitErrorRatio",
+      { "residualBitErrorRatio", "ranap.residualBitErrorRatio_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_deliveryOfErroneousSDU,
@@ -15600,15 +15600,15 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_sourceUTRANCellID,
-      { "sourceUTRANCellID", "ranap.sourceUTRANCellID",
+      { "sourceUTRANCellID", "ranap.sourceUTRANCellID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_sourceGERANCellID,
-      { "sourceGERANCellID", "ranap.sourceGERANCellID",
+      { "sourceGERANCellID", "ranap.sourceGERANCellID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CGI", HFILL }},
     { &hf_ranap_sourceRNC_ID,
-      { "sourceRNC-ID", "ranap.sourceRNC_ID",
+      { "sourceRNC-ID", "ranap.sourceRNC_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_rRC_Container,
@@ -15668,7 +15668,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_34", HFILL }},
     { &hf_ranap_iRATmeasurementParameters,
-      { "iRATmeasurementParameters", "ranap.iRATmeasurementParameters",
+      { "iRATmeasurementParameters", "ranap.iRATmeasurementParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_measurementDuration,
@@ -15680,7 +15680,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_EUTRANFrequencies_item,
-      { "EUTRANFrequencies item", "ranap.EUTRANFrequencies_item",
+      { "EUTRANFrequencies item", "ranap.EUTRANFrequencies_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_earfcn,
@@ -15700,7 +15700,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TargetCellId", HFILL }},
     { &hf_ranap_SRB_TrCH_Mapping_item,
-      { "SRB-TrCH-MappingItem", "ranap.SRB_TrCH_MappingItem",
+      { "SRB-TrCH-MappingItem", "ranap.SRB_TrCH_MappingItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_sRB_ID,
@@ -15708,7 +15708,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_trCH_ID,
-      { "trCH-ID", "ranap.trCH_ID",
+      { "trCH-ID", "ranap.trCH_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_nonce,
@@ -15720,7 +15720,7 @@ void proto_register_ranap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_cGI,
-      { "cGI", "ranap.cGI",
+      { "cGI", "ranap.cGI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_eNB_ID,
@@ -15728,7 +15728,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_ENB_ID_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_selectedTAI,
-      { "selectedTAI", "ranap.selectedTAI",
+      { "selectedTAI", "ranap.selectedTAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TAI", HFILL }},
     { &hf_ranap_tMSI,
@@ -15748,7 +15748,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_UE_ID_vals), 0,
         "UE_ID", HFILL }},
     { &hf_ranap_tracePropagationParameters,
-      { "tracePropagationParameters", "ranap.tracePropagationParameters",
+      { "tracePropagationParameters", "ranap.tracePropagationParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_traceRecordingSessionReference,
@@ -15776,7 +15776,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_TrCH_ID_List_item,
-      { "TrCH-ID", "ranap.TrCH_ID",
+      { "TrCH-ID", "ranap.TrCH_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_uE_AggregateMaximumBitRateDownlink,
@@ -15832,27 +15832,27 @@ void proto_register_ranap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_horizontalVelocity,
-      { "horizontalVelocity", "ranap.horizontalVelocity",
+      { "horizontalVelocity", "ranap.horizontalVelocity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_horizontalWithVerticalVelocity,
-      { "horizontalWithVerticalVelocity", "ranap.horizontalWithVerticalVelocity",
+      { "horizontalWithVerticalVelocity", "ranap.horizontalWithVerticalVelocity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_horizontalVelocityWithUncertainty,
-      { "horizontalVelocityWithUncertainty", "ranap.horizontalVelocityWithUncertainty",
+      { "horizontalVelocityWithUncertainty", "ranap.horizontalVelocityWithUncertainty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_horizontalWithVeritcalVelocityAndUncertainty,
-      { "horizontalWithVeritcalVelocityAndUncertainty", "ranap.horizontalWithVeritcalVelocityAndUncertainty",
+      { "horizontalWithVeritcalVelocityAndUncertainty", "ranap.horizontalWithVeritcalVelocityAndUncertainty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HorizontalWithVerticalVelocityAndUncertainty", HFILL }},
     { &hf_ranap_horizontalSpeedAndBearing,
-      { "horizontalSpeedAndBearing", "ranap.horizontalSpeedAndBearing",
+      { "horizontalSpeedAndBearing", "ranap.horizontalSpeedAndBearing_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_veritcalVelocity,
-      { "veritcalVelocity", "ranap.veritcalVelocity",
+      { "veritcalVelocity", "ranap.veritcalVelocity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "VerticalVelocity", HFILL }},
     { &hf_ranap_uncertaintySpeed,
@@ -15916,7 +15916,7 @@ void proto_register_ranap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_rAB_Parameters,
-      { "rAB-Parameters", "ranap.rAB_Parameters",
+      { "rAB-Parameters", "ranap.rAB_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_dataVolumeReportingIndication,
@@ -15928,7 +15928,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_userPlaneInformation,
-      { "userPlaneInformation", "ranap.userPlaneInformation",
+      { "userPlaneInformation", "ranap.userPlaneInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_service_Handover,
@@ -15948,7 +15948,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_JoinedMBMSBearerService_IEs_item,
-      { "JoinedMBMSBearerService-IEs item", "ranap.JoinedMBMSBearerService_IEs_item",
+      { "JoinedMBMSBearerService-IEs item", "ranap.JoinedMBMSBearerService_IEs_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_mBMS_PTP_RAB_ID,
@@ -15988,7 +15988,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_IuTransportAssociation_vals), 0,
         "IuTransportAssociation", HFILL }},
     { &hf_ranap_ass_RAB_Parameters,
-      { "ass-RAB-Parameters", "ranap.ass_RAB_Parameters",
+      { "ass-RAB-Parameters", "ranap.ass_RAB_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_transportLayerAddressRes1,
@@ -16004,7 +16004,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RAB_ToBeReleasedList_EnhancedRelocCompleteRes", HFILL }},
     { &hf_ranap_transportLayerInformation,
-      { "transportLayerInformation", "ranap.transportLayerInformation",
+      { "transportLayerInformation", "ranap.transportLayerInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_dl_dataVolumes,
@@ -16012,7 +16012,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DataVolumeList", HFILL }},
     { &hf_ranap_DataVolumeList_item,
-      { "DataVolumeList item", "ranap.DataVolumeList_item",
+      { "DataVolumeList item", "ranap.DataVolumeList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_gERAN_Classmark,
@@ -16036,19 +16036,19 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_CN_DomainIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_ranap_dataForwardingInformation,
-      { "dataForwardingInformation", "ranap.dataForwardingInformation",
+      { "dataForwardingInformation", "ranap.dataForwardingInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TNLInformationEnhRelInfoReq", HFILL }},
     { &hf_ranap_sourceSideIuULTNLInfo,
-      { "sourceSideIuULTNLInfo", "ranap.sourceSideIuULTNLInfo",
+      { "sourceSideIuULTNLInfo", "ranap.sourceSideIuULTNLInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TNLInformationEnhRelInfoReq", HFILL }},
     { &hf_ranap_alt_RAB_Parameters,
-      { "alt-RAB-Parameters", "ranap.alt_RAB_Parameters",
+      { "alt-RAB-Parameters", "ranap.alt_RAB_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_dataForwardingInformation_01,
-      { "dataForwardingInformation", "ranap.dataForwardingInformation",
+      { "dataForwardingInformation", "ranap.dataForwardingInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TNLInformationEnhRelInfoRes", HFILL }},
     { &hf_ranap_dl_forwardingTransportLayerAddress,
@@ -16060,7 +16060,7 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_DEC, VALS(ranap_IuTransportAssociation_vals), 0,
         "IuTransportAssociation", HFILL }},
     { &hf_ranap_requested_RAB_Parameter_Values,
-      { "requested-RAB-Parameter-Values", "ranap.requested_RAB_Parameter_Values",
+      { "requested-RAB-Parameter-Values", "ranap.requested_RAB_Parameter_Values_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_mBMSHCIndicator,
@@ -16072,43 +16072,43 @@ void proto_register_ranap(void) {
         FT_UINT32, BASE_HEX_DEC, NULL, 0,
         "GTP_TEI", HFILL }},
     { &hf_ranap_LeftMBMSBearerService_IEs_item,
-      { "LeftMBMSBearerService-IEs item", "ranap.LeftMBMSBearerService_IEs_item",
+      { "LeftMBMSBearerService-IEs item", "ranap.LeftMBMSBearerService_IEs_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_UnsuccessfulLinking_IEs_item,
-      { "UnsuccessfulLinking-IEs item", "ranap.UnsuccessfulLinking_IEs_item",
+      { "UnsuccessfulLinking-IEs item", "ranap.UnsuccessfulLinking_IEs_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_initiatingMessage,
-      { "initiatingMessage", "ranap.initiatingMessage",
+      { "initiatingMessage", "ranap.initiatingMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_successfulOutcome,
-      { "successfulOutcome", "ranap.successfulOutcome",
+      { "successfulOutcome", "ranap.successfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_unsuccessfulOutcome,
-      { "unsuccessfulOutcome", "ranap.unsuccessfulOutcome",
+      { "unsuccessfulOutcome", "ranap.unsuccessfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_outcome,
-      { "outcome", "ranap.outcome",
+      { "outcome", "ranap.outcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ranap_initiatingMessagevalue,
-      { "value", "ranap.value",
+      { "value", "ranap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InitiatingMessage_value", HFILL }},
     { &hf_ranap_successfulOutcome_value,
-      { "value", "ranap.value",
+      { "value", "ranap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SuccessfulOutcome_value", HFILL }},
     { &hf_ranap_unsuccessfulOutcome_value,
-      { "value", "ranap.value",
+      { "value", "ranap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UnsuccessfulOutcome_value", HFILL }},
     { &hf_ranap_value,
-      { "value", "ranap.value",
+      { "value", "ranap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-rnsap.c b/epan/dissectors/packet-rnsap.c
index b0f91994d7..421aa352e6 100644
--- a/epan/dissectors/packet-rnsap.c
+++ b/epan/dissectors/packet-rnsap.c
@@ -43226,7 +43226,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Active_Pattern_Sequence_Information_PDU,
-      { "Active-Pattern-Sequence-Information", "rnsap.Active_Pattern_Sequence_Information",
+      { "Active-Pattern-Sequence-Information", "rnsap.Active_Pattern_Sequence_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_EDCH_Cell_Information_Response_RLAddList_PDU,
@@ -43234,7 +43234,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_EDCH_Setup_Info_PDU,
-      { "Additional-EDCH-Setup-Info", "rnsap.Additional_EDCH_Setup_Info",
+      { "Additional-EDCH-Setup-Info", "rnsap.Additional_EDCH_Setup_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_EDCH_Cell_Information_Response_List_PDU,
@@ -43250,7 +43250,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Allowed_Rate_Information_PDU,
-      { "Allowed-Rate-Information", "rnsap.Allowed_Rate_Information",
+      { "Allowed-Rate-Information", "rnsap.Allowed_Rate_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_AllowedQueuingTime_PDU,
@@ -43262,7 +43262,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_AlternativeFormatReportingIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_Angle_Of_Arrival_Value_LCR_PDU,
-      { "Angle-Of-Arrival-Value-LCR", "rnsap.Angle_Of_Arrival_Value_LCR",
+      { "Angle-Of-Arrival-Value-LCR", "rnsap.Angle_Of_Arrival_Value_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_AntennaColocationIndicator_PDU,
@@ -43302,7 +43302,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Cell_Capacity_Class_Value_PDU,
-      { "Cell-Capacity-Class-Value", "rnsap.Cell_Capacity_Class_Value",
+      { "Cell-Capacity-Class-Value", "rnsap.Cell_Capacity_Class_Value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CellListValidityIndicator_PDU,
@@ -43354,11 +43354,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Common_EDCH_Support_Indicator_PDU,
-      { "Common-EDCH-Support-Indicator", "rnsap.Common_EDCH_Support_Indicator",
+      { "Common-EDCH-Support-Indicator", "rnsap.Common_EDCH_Support_Indicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Continuous_Packet_Connectivity_DTX_DRX_Information_PDU,
-      { "Continuous-Packet-Connectivity-DTX-DRX-Information", "rnsap.Continuous_Packet_Connectivity_DTX_DRX_Information",
+      { "Continuous-Packet-Connectivity-DTX-DRX-Information", "rnsap.Continuous_Packet_Connectivity_DTX_DRX_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Continuous_Packet_Connectivity_HS_SCCH_Less_Information_PDU,
@@ -43366,7 +43366,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Continuous_Packet_Connectivity_HS_SCCH_Less_Information_Response_PDU,
-      { "Continuous-Packet-Connectivity-HS-SCCH-Less-Information-Response", "rnsap.Continuous_Packet_Connectivity_HS_SCCH_Less_Information_Response",
+      { "Continuous-Packet-Connectivity-HS-SCCH-Less-Information-Response", "rnsap.Continuous_Packet_Connectivity_HS_SCCH_Less_Information_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CoverageIndicator_PDU,
@@ -43374,11 +43374,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_CoverageIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_CPC_Information_PDU,
-      { "CPC-Information", "rnsap.CPC_Information",
+      { "CPC-Information", "rnsap.CPC_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Continuous_Packet_Connectivity_HS_SCCH_less_Deactivate_Indicator_PDU,
-      { "Continuous-Packet-Connectivity-HS-SCCH-less-Deactivate-Indicator", "rnsap.Continuous_Packet_Connectivity_HS_SCCH_less_Deactivate_Indicator",
+      { "Continuous-Packet-Connectivity-HS-SCCH-less-Deactivate-Indicator", "rnsap.Continuous_Packet_Connectivity_HS_SCCH_less_Deactivate_Indicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Counting_Information_PDU,
@@ -43386,7 +43386,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CriticalityDiagnostics_PDU,
-      { "CriticalityDiagnostics", "rnsap.CriticalityDiagnostics",
+      { "CriticalityDiagnostics", "rnsap.CriticalityDiagnostics_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MessageStructure_PDU,
@@ -43394,11 +43394,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CN_CS_DomainIdentifier_PDU,
-      { "CN-CS-DomainIdentifier", "rnsap.CN_CS_DomainIdentifier",
+      { "CN-CS-DomainIdentifier", "rnsap.CN_CS_DomainIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CN_PS_DomainIdentifier_PDU,
-      { "CN-PS-DomainIdentifier", "rnsap.CN_PS_DomainIdentifier",
+      { "CN-PS-DomainIdentifier", "rnsap.CN_PS_DomainIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ControlGAP_PDU,
@@ -43410,11 +43410,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CPC_InformationLCR_PDU,
-      { "CPC-InformationLCR", "rnsap.CPC_InformationLCR",
+      { "CPC-InformationLCR", "rnsap.CPC_InformationLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ContinuousPacketConnectivity_DRX_InformationLCR_PDU,
-      { "ContinuousPacketConnectivity-DRX-InformationLCR", "rnsap.ContinuousPacketConnectivity_DRX_InformationLCR",
+      { "ContinuousPacketConnectivity-DRX-InformationLCR", "rnsap.ContinuousPacketConnectivity_DRX_InformationLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_AGCH_UE_Inactivity_Monitor_Threshold_PDU,
@@ -43422,7 +43422,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_E_AGCH_UE_Inactivity_Monitor_Threshold_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_ContinuousPacketConnectivity_DRX_Information_ResponseLCR_PDU,
-      { "ContinuousPacketConnectivity-DRX-Information-ResponseLCR", "rnsap.ContinuousPacketConnectivity_DRX_Information_ResponseLCR",
+      { "ContinuousPacketConnectivity-DRX-Information-ResponseLCR", "rnsap.ContinuousPacketConnectivity_DRX_Information_ResponseLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DCH_FDD_Information_PDU,
@@ -43458,11 +43458,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_DelayedActivation_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_DGANSS_Corrections_Req_PDU,
-      { "DGANSS-Corrections-Req", "rnsap.DGANSS_Corrections_Req",
+      { "DGANSS-Corrections-Req", "rnsap.DGANSS_Corrections_Req_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DGNSS_ValidityPeriod_PDU,
-      { "DGNSS-ValidityPeriod", "rnsap.DGNSS_ValidityPeriod",
+      { "DGNSS-ValidityPeriod", "rnsap.DGNSS_ValidityPeriod_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DiversityMode_PDU,
@@ -43478,7 +43478,7 @@ void proto_register_rnsap(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_PowerBalancing_Information_PDU,
-      { "DL-PowerBalancing-Information", "rnsap.DL_PowerBalancing_Information",
+      { "DL-PowerBalancing-Information", "rnsap.DL_PowerBalancing_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_PowerBalancing_ActivationIndicator_PDU,
@@ -43490,7 +43490,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_DL_PowerBalancing_UpdatedIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_ReferencePowerInformation_PDU,
-      { "DL-ReferencePowerInformation", "rnsap.DL_ReferencePowerInformation",
+      { "DL-ReferencePowerInformation", "rnsap.DL_ReferencePowerInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_D_RNTI_PDU,
@@ -43542,7 +43542,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_E_AGCH_Table_Choice_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_EDCH_FDD_DL_ControlChannelInformation_PDU,
-      { "EDCH-FDD-DL-ControlChannelInformation", "rnsap.EDCH_FDD_DL_ControlChannelInformation",
+      { "EDCH-FDD-DL-ControlChannelInformation", "rnsap.EDCH_FDD_DL_ControlChannelInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_RGCH_E_HICH_ChannelisationCodeValidityIndicator_PDU,
@@ -43550,19 +43550,19 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_E_RGCH_E_HICH_ChannelisationCodeValidityIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_EDCH_FDD_Information_PDU,
-      { "EDCH-FDD-Information", "rnsap.EDCH_FDD_Information",
+      { "EDCH-FDD-Information", "rnsap.EDCH_FDD_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_EDCH_FDD_InformationResponse_PDU,
-      { "EDCH-FDD-InformationResponse", "rnsap.EDCH_FDD_InformationResponse",
+      { "EDCH-FDD-InformationResponse", "rnsap.EDCH_FDD_InformationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_EDCH_FDD_Information_To_Modify_PDU,
-      { "EDCH-FDD-Information-To-Modify", "rnsap.EDCH_FDD_Information_To_Modify",
+      { "EDCH-FDD-Information-To-Modify", "rnsap.EDCH_FDD_Information_To_Modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_FDD_Update_Information_PDU,
-      { "E-DCH-FDD-Update-Information", "rnsap.E_DCH_FDD_Update_Information",
+      { "E-DCH-FDD-Update-Information", "rnsap.E_DCH_FDD_Update_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_DL_Control_Channel_Change_Information_PDU,
@@ -43582,7 +43582,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_E_DCH_MACdPDUSizeFormat_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_EDCH_MACdFlows_Information_PDU,
-      { "EDCH-MACdFlows-Information", "rnsap.EDCH_MACdFlows_Information",
+      { "EDCH-MACdFlows-Information", "rnsap.EDCH_MACdFlows_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_EDCH_MACdFlows_To_Delete_PDU,
@@ -43594,15 +43594,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_EDCH_RL_Indication_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_Serving_cell_change_informationResponse_PDU,
-      { "E-DCH-Serving-cell-change-informationResponse", "rnsap.E_DCH_Serving_cell_change_informationResponse",
+      { "E-DCH-Serving-cell-change-informationResponse", "rnsap.E_DCH_Serving_cell_change_informationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_EDPCH_Information_FDD_PDU,
-      { "EDPCH-Information-FDD", "rnsap.EDPCH_Information_FDD",
+      { "EDPCH-Information-FDD", "rnsap.EDPCH_Information_FDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_EDPCH_Information_RLReconfRequest_FDD_PDU,
-      { "EDPCH-Information-RLReconfRequest-FDD", "rnsap.EDPCH_Information_RLReconfRequest_FDD",
+      { "EDPCH-Information-RLReconfRequest-FDD", "rnsap.EDPCH_Information_RLReconfRequest_FDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DPDCH_PowerInterpolation_PDU,
@@ -43618,15 +43618,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_EDCH_Serving_RL_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_Enhanced_FACH_Information_ResponseFDD_PDU,
-      { "Enhanced-FACH-Information-ResponseFDD", "rnsap.Enhanced_FACH_Information_ResponseFDD",
+      { "Enhanced-FACH-Information-ResponseFDD", "rnsap.Enhanced_FACH_Information_ResponseFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Enhanced_FACH_Information_ResponseLCR_PDU,
-      { "Enhanced-FACH-Information-ResponseLCR", "rnsap.Enhanced_FACH_Information_ResponseLCR",
+      { "Enhanced-FACH-Information-ResponseLCR", "rnsap.Enhanced_FACH_Information_ResponseLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Enhanced_FACH_Support_Indicator_PDU,
-      { "Enhanced-FACH-Support-Indicator", "rnsap.Enhanced_FACH_Support_Indicator",
+      { "Enhanced-FACH-Support-Indicator", "rnsap.Enhanced_FACH_Support_Indicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_EnhancedHSServingCC_Abort_PDU,
@@ -43642,7 +43642,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_TFCI_Boost_Information_PDU,
-      { "E-TFCI-Boost-Information", "rnsap.E_TFCI_Boost_Information",
+      { "E-TFCI-Boost-Information", "rnsap.E_TFCI_Boost_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_Minimum_Set_E_TFCIValidityIndicator_PDU,
@@ -43658,7 +43658,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_Information_PDU,
-      { "E-DCH-Information", "rnsap.E_DCH_Information",
+      { "E-DCH-Information", "rnsap.E_DCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_MACdFlow_Retransmission_Timer_LCR_PDU,
@@ -43666,27 +43666,27 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rnsap_E_DCH_MACdFlow_Retransmission_Timer_LCR_vals_ext, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_Information_Reconfig_PDU,
-      { "E-DCH-Information-Reconfig", "rnsap.E_DCH_Information_Reconfig",
+      { "E-DCH-Information-Reconfig", "rnsap.E_DCH_Information_Reconfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_Information_Response_PDU,
-      { "E-DCH-Information-Response", "rnsap.E_DCH_Information_Response",
+      { "E-DCH-Information-Response", "rnsap.E_DCH_Information_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_768_Information_PDU,
-      { "E-DCH-768-Information", "rnsap.E_DCH_768_Information",
+      { "E-DCH-768-Information", "rnsap.E_DCH_768_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_768_Information_Reconfig_PDU,
-      { "E-DCH-768-Information-Reconfig", "rnsap.E_DCH_768_Information_Reconfig",
+      { "E-DCH-768-Information-Reconfig", "rnsap.E_DCH_768_Information_Reconfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_768_Information_Response_PDU,
-      { "E-DCH-768-Information-Response", "rnsap.E_DCH_768_Information_Response",
+      { "E-DCH-768-Information-Response", "rnsap.E_DCH_768_Information_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_LCR_Information_PDU,
-      { "E-DCH-LCR-Information", "rnsap.E_DCH_LCR_Information",
+      { "E-DCH-LCR-Information", "rnsap.E_DCH_LCR_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Extended_E_DCH_LCRTDD_PhysicalLayerCategory_PDU,
@@ -43694,11 +43694,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_LCR_Information_Reconfig_PDU,
-      { "E-DCH-LCR-Information-Reconfig", "rnsap.E_DCH_LCR_Information_Reconfig",
+      { "E-DCH-LCR-Information-Reconfig", "rnsap.E_DCH_LCR_Information_Reconfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_LCR_Information_Response_PDU,
-      { "E-DCH-LCR-Information-Response", "rnsap.E_DCH_LCR_Information_Response",
+      { "E-DCH-LCR-Information-Response", "rnsap.E_DCH_LCR_Information_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Ext_Reference_E_TFCI_PO_PDU,
@@ -43722,11 +43722,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_Semi_PersistentScheduling_Information_LCR_PDU,
-      { "E-DCH-Semi-PersistentScheduling-Information-LCR", "rnsap.E_DCH_Semi_PersistentScheduling_Information_LCR",
+      { "E-DCH-Semi-PersistentScheduling-Information-LCR", "rnsap.E_DCH_Semi_PersistentScheduling_Information_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_Semi_PersistentScheduling_Information_ResponseLCR_PDU,
-      { "E-DCH-Semi-PersistentScheduling-Information-ResponseLCR", "rnsap.E_DCH_Semi_PersistentScheduling_Information_ResponseLCR",
+      { "E-DCH-Semi-PersistentScheduling-Information-ResponseLCR", "rnsap.E_DCH_Semi_PersistentScheduling_Information_ResponseLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_FACH_FlowControlInformation_PDU,
@@ -43754,7 +43754,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_F_DPCH_SlotFormatSupportRequest_PDU,
-      { "F-DPCH-SlotFormatSupportRequest", "rnsap.F_DPCH_SlotFormatSupportRequest",
+      { "F-DPCH-SlotFormatSupportRequest", "rnsap.F_DPCH_SlotFormatSupportRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_FNReportingIndicator_PDU,
@@ -43790,11 +43790,11 @@ void proto_register_rnsap(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_GANSS_Additional_Ionospheric_Model_PDU,
-      { "GANSS-Additional-Ionospheric-Model", "rnsap.GANSS_Additional_Ionospheric_Model",
+      { "GANSS-Additional-Ionospheric-Model", "rnsap.GANSS_Additional_Ionospheric_Model_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_GANSS_Additional_Navigation_Models_PDU,
-      { "GANSS-Additional-Navigation-Models", "rnsap.GANSS_Additional_Navigation_Models",
+      { "GANSS-Additional-Navigation-Models", "rnsap.GANSS_Additional_Navigation_Models_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_GANSS_Additional_Time_Models_PDU,
@@ -43806,23 +43806,23 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_GANSS_Additional_UTC_Models_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_GANSS_alm_keplerianNAVAlmanac_PDU,
-      { "GANSS-alm-keplerianNAVAlmanac", "rnsap.GANSS_alm_keplerianNAVAlmanac",
+      { "GANSS-alm-keplerianNAVAlmanac", "rnsap.GANSS_alm_keplerianNAVAlmanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_GANSS_alm_keplerianReducedAlmanac_PDU,
-      { "GANSS-alm-keplerianReducedAlmanac", "rnsap.GANSS_alm_keplerianReducedAlmanac",
+      { "GANSS-alm-keplerianReducedAlmanac", "rnsap.GANSS_alm_keplerianReducedAlmanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_GANSS_alm_keplerianMidiAlmanac_PDU,
-      { "GANSS-alm-keplerianMidiAlmanac", "rnsap.GANSS_alm_keplerianMidiAlmanac",
+      { "GANSS-alm-keplerianMidiAlmanac", "rnsap.GANSS_alm_keplerianMidiAlmanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_GANSS_alm_keplerianGLONASS_PDU,
-      { "GANSS-alm-keplerianGLONASS", "rnsap.GANSS_alm_keplerianGLONASS",
+      { "GANSS-alm-keplerianGLONASS", "rnsap.GANSS_alm_keplerianGLONASS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_GANSS_alm_ecefSBASAlmanac_PDU,
-      { "GANSS-alm-ecefSBASAlmanac", "rnsap.GANSS_alm_ecefSBASAlmanac",
+      { "GANSS-alm-ecefSBASAlmanac", "rnsap.GANSS_alm_ecefSBASAlmanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_GANSS_Auxiliary_Information_PDU,
@@ -43834,11 +43834,11 @@ void proto_register_rnsap(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_GANSS_Common_Data_PDU,
-      { "GANSS-Common-Data", "rnsap.GANSS_Common_Data",
+      { "GANSS-Common-Data", "rnsap.GANSS_Common_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_GANSS_Earth_Orientation_Parameters_PDU,
-      { "GANSS-Earth-Orientation-Parameters", "rnsap.GANSS_Earth_Orientation_Parameters",
+      { "GANSS-Earth-Orientation-Parameters", "rnsap.GANSS_Earth_Orientation_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_GANSS_EarthOrientParaReq_PDU,
@@ -43854,7 +43854,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_GANSS_Information_PDU,
-      { "GANSS-Information", "rnsap.GANSS_Information",
+      { "GANSS-Information", "rnsap.GANSS_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_GANSS_SBAS_ID_PDU,
@@ -43878,7 +43878,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Guaranteed_Rate_Information_PDU,
-      { "Guaranteed-Rate-Information", "rnsap.Guaranteed_Rate_Information",
+      { "Guaranteed-Rate-Information", "rnsap.Guaranteed_Rate_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HARQ_MemoryPartitioningInfoExtForMIMO_PDU,
@@ -43902,19 +43902,19 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_HSDSCH_Configured_Indicator_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_HSDSCH_FDD_Information_PDU,
-      { "HSDSCH-FDD-Information", "rnsap.HSDSCH_FDD_Information",
+      { "HSDSCH-FDD-Information", "rnsap.HSDSCH_FDD_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSDSCH_FDD_Information_Response_PDU,
-      { "HSDSCH-FDD-Information-Response", "rnsap.HSDSCH_FDD_Information_Response",
+      { "HSDSCH-FDD-Information-Response", "rnsap.HSDSCH_FDD_Information_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSDSCH_Information_to_Modify_PDU,
-      { "HSDSCH-Information-to-Modify", "rnsap.HSDSCH_Information_to_Modify",
+      { "HSDSCH-Information-to-Modify", "rnsap.HSDSCH_Information_to_Modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSDSCH_Information_to_Modify_Unsynchronised_PDU,
-      { "HSDSCH-Information-to-Modify-Unsynchronised", "rnsap.HSDSCH_Information_to_Modify_Unsynchronised",
+      { "HSDSCH-Information-to-Modify-Unsynchronised", "rnsap.HSDSCH_Information_to_Modify_Unsynchronised_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSDSCH_MACdPDUSizeFormat_PDU,
@@ -43922,7 +43922,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_HSDSCH_MACdPDUSizeFormat_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_HSDSCH_MACdFlows_Information_PDU,
-      { "HSDSCH-MACdFlows-Information", "rnsap.HSDSCH_MACdFlows_Information",
+      { "HSDSCH-MACdFlows-Information", "rnsap.HSDSCH_MACdFlows_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSDSCH_MACdFlows_to_Delete_PDU,
@@ -43930,7 +43930,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSDSCH_PreconfigurationInfo_PDU,
-      { "HSDSCH-PreconfigurationInfo", "rnsap.HSDSCH_PreconfigurationInfo",
+      { "HSDSCH-PreconfigurationInfo", "rnsap.HSDSCH_PreconfigurationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_EDCH_Preconfiguration_Information_PDU,
@@ -43938,7 +43938,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSDSCH_PreconfigurationSetup_PDU,
-      { "HSDSCH-PreconfigurationSetup", "rnsap.HSDSCH_PreconfigurationSetup",
+      { "HSDSCH-PreconfigurationSetup", "rnsap.HSDSCH_PreconfigurationSetup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSDSCH_RNTI_PDU,
@@ -43946,11 +43946,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HS_DSCH_serving_cell_change_information_PDU,
-      { "HS-DSCH-serving-cell-change-information", "rnsap.HS_DSCH_serving_cell_change_information",
+      { "HS-DSCH-serving-cell-change-information", "rnsap.HS_DSCH_serving_cell_change_information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HS_DSCH_serving_cell_change_informationResponse_PDU,
-      { "HS-DSCH-serving-cell-change-informationResponse", "rnsap.HS_DSCH_serving_cell_change_informationResponse",
+      { "HS-DSCH-serving-cell-change-informationResponse", "rnsap.HS_DSCH_serving_cell_change_informationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSDSCH_TBSizeTableIndicator_PDU,
@@ -43958,11 +43958,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_HSDSCH_TBSizeTableIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_HSDSCH_TDD_Information_PDU,
-      { "HSDSCH-TDD-Information", "rnsap.HSDSCH_TDD_Information",
+      { "HSDSCH-TDD-Information", "rnsap.HSDSCH_TDD_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSDSCH_TDD_Information_Response_PDU,
-      { "HSDSCH-TDD-Information-Response", "rnsap.HSDSCH_TDD_Information_Response",
+      { "HSDSCH-TDD-Information-Response", "rnsap.HSDSCH_TDD_Information_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Multicarrier_Number_PDU,
@@ -43978,7 +43978,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HS_SICH_Reception_Quality_Value_PDU,
-      { "HS-SICH-Reception-Quality-Value", "rnsap.HS_SICH_Reception_Quality_Value",
+      { "HS-SICH-Reception-Quality-Value", "rnsap.HS_SICH_Reception_Quality_Value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HS_SICH_Reception_Quality_Measurement_Value_PDU,
@@ -44002,11 +44002,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_HS_PDSCH_Code_Change_Grant_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_HSDSCH_FDD_Update_Information_PDU,
-      { "HSDSCH-FDD-Update-Information", "rnsap.HSDSCH_FDD_Update_Information",
+      { "HSDSCH-FDD-Update-Information", "rnsap.HSDSCH_FDD_Update_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSDSCH_TDD_Update_Information_PDU,
-      { "HSDSCH-TDD-Update-Information", "rnsap.HSDSCH_TDD_Update_Information",
+      { "HSDSCH-TDD-Update-Information", "rnsap.HSDSCH_TDD_Update_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MIMO_ReferenceSignal_InformationListLCR_PDU,
@@ -44014,7 +44014,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HS_DSCH_Semi_PersistentScheduling_Information_LCR_PDU,
-      { "HS-DSCH-Semi-PersistentScheduling-Information-LCR", "rnsap.HS_DSCH_Semi_PersistentScheduling_Information_LCR",
+      { "HS-DSCH-Semi-PersistentScheduling-Information-LCR", "rnsap.HS_DSCH_Semi_PersistentScheduling_Information_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSDSCH_Physical_Layer_Category_PDU,
@@ -44022,11 +44022,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_TS0_HS_PDSCH_Indication_LCR_PDU,
-      { "TS0-HS-PDSCH-Indication-LCR", "rnsap.TS0_HS_PDSCH_Indication_LCR",
+      { "TS0-HS-PDSCH-Indication-LCR", "rnsap.TS0_HS_PDSCH_Indication_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HS_DSCH_Semi_PersistentScheduling_Information_ResponseLCR_PDU,
-      { "HS-DSCH-Semi-PersistentScheduling-Information-ResponseLCR", "rnsap.HS_DSCH_Semi_PersistentScheduling_Information_ResponseLCR",
+      { "HS-DSCH-Semi-PersistentScheduling-Information-ResponseLCR", "rnsap.HS_DSCH_Semi_PersistentScheduling_Information_ResponseLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_IMSI_PDU,
@@ -44042,7 +44042,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_InformationReportCharacteristics_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_InformationType_PDU,
-      { "InformationType", "rnsap.InformationType",
+      { "InformationType", "rnsap.InformationType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Initial_DL_DPCH_TimingAdjustment_Allowed_PDU,
@@ -44058,15 +44058,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Inter_Frequency_Cell_Information_PDU,
-      { "Inter-Frequency-Cell-Information", "rnsap.Inter_Frequency_Cell_Information",
+      { "Inter-Frequency-Cell-Information", "rnsap.Inter_Frequency_Cell_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_IPDL_TDD_ParametersLCR_PDU,
-      { "IPDL-TDD-ParametersLCR", "rnsap.IPDL_TDD_ParametersLCR",
+      { "IPDL-TDD-ParametersLCR", "rnsap.IPDL_TDD_ParametersLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_IdleIntervalInformation_PDU,
-      { "IdleIntervalInformation", "rnsap.IdleIntervalInformation",
+      { "IdleIntervalInformation", "rnsap.IdleIntervalInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_L3_Information_PDU,
@@ -44082,7 +44082,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_LCRTDD_Uplink_Physical_Channel_Capability_PDU,
-      { "LCRTDD-Uplink-Physical-Channel-Capability", "rnsap.LCRTDD_Uplink_Physical_Channel_Capability",
+      { "LCRTDD-Uplink-Physical-Channel-Capability", "rnsap.LCRTDD_Uplink_Physical_Channel_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MAC_PDU_SizeExtended_PDU,
@@ -44114,7 +44114,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_Max_UE_DTX_Cycle_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_MBMS_Bearer_Service_Full_Address_PDU,
-      { "MBMS-Bearer-Service-Full-Address", "rnsap.MBMS_Bearer_Service_Full_Address",
+      { "MBMS-Bearer-Service-Full-Address", "rnsap.MBMS_Bearer_Service_Full_Address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MBMS_Bearer_Service_List_PDU,
@@ -44122,7 +44122,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MBMS_Neighbouring_Cell_Information_PDU,
-      { "MBMS-Neighbouring-Cell-Information", "rnsap.MBMS_Neighbouring_Cell_Information",
+      { "MBMS-Neighbouring-Cell-Information", "rnsap.MBMS_Neighbouring_Cell_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MBMS_RLC_Sequence_Number_Information_PDU,
@@ -44138,7 +44138,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MCCH_Configuration_Info_PDU,
-      { "MCCH-Configuration-Info", "rnsap.MCCH_Configuration_Info",
+      { "MCCH-Configuration-Info", "rnsap.MCCH_Configuration_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MBSFN_Scheduling_Transmission_Time_Interval_Info_List_PDU,
@@ -44162,23 +44162,23 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MeasurementRecoveryBehavior_PDU,
-      { "MeasurementRecoveryBehavior", "rnsap.MeasurementRecoveryBehavior",
+      { "MeasurementRecoveryBehavior", "rnsap.MeasurementRecoveryBehavior_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MeasurementRecoveryReportingIndicator_PDU,
-      { "MeasurementRecoveryReportingIndicator", "rnsap.MeasurementRecoveryReportingIndicator",
+      { "MeasurementRecoveryReportingIndicator", "rnsap.MeasurementRecoveryReportingIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MeasurementRecoverySupportIndicator_PDU,
-      { "MeasurementRecoverySupportIndicator", "rnsap.MeasurementRecoverySupportIndicator",
+      { "MeasurementRecoverySupportIndicator", "rnsap.MeasurementRecoverySupportIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MIMO_ActivationIndicator_PDU,
-      { "MIMO-ActivationIndicator", "rnsap.MIMO_ActivationIndicator",
+      { "MIMO-ActivationIndicator", "rnsap.MIMO_ActivationIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MIMO_InformationResponse_PDU,
-      { "MIMO-InformationResponse", "rnsap.MIMO_InformationResponse",
+      { "MIMO-InformationResponse", "rnsap.MIMO_InformationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MIMO_Mode_Indicator_PDU,
@@ -44194,15 +44194,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_MinimumReducedE_DPDCH_GainFactor_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_MulticellEDCH_InformationItemIEs_PDU,
-      { "MulticellEDCH-InformationItemIEs", "rnsap.MulticellEDCH_InformationItemIEs",
+      { "MulticellEDCH-InformationItemIEs", "rnsap.MulticellEDCH_InformationItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MulticellEDCH_RL_SpecificInformationItemIEs_PDU,
-      { "MulticellEDCH-RL-SpecificInformationItemIEs", "rnsap.MulticellEDCH_RL_SpecificInformationItemIEs",
+      { "MulticellEDCH-RL-SpecificInformationItemIEs", "rnsap.MulticellEDCH_RL_SpecificInformationItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Multiple_PLMN_List_PDU,
-      { "Multiple-PLMN-List", "rnsap.Multiple_PLMN_List",
+      { "Multiple-PLMN-List", "rnsap.Multiple_PLMN_List_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MAChs_ResetIndicator_PDU,
@@ -44218,11 +44218,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_MIMO_SFMode_For_HSPDSCHDualStream_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_NACC_Related_Data_PDU,
-      { "NACC-Related-Data", "rnsap.NACC_Related_Data",
+      { "NACC-Related-Data", "rnsap.NACC_Related_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Neighbouring_UMTS_CellInformationItem_PDU,
-      { "Neighbouring-UMTS-CellInformationItem", "rnsap.Neighbouring_UMTS_CellInformationItem",
+      { "Neighbouring-UMTS-CellInformationItem", "rnsap.Neighbouring_UMTS_CellInformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Neighbouring_GSM_CellInformationIEs_PDU,
@@ -44230,11 +44230,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_NeighbouringTDDCellMeasurementInformationLCR_PDU,
-      { "NeighbouringTDDCellMeasurementInformationLCR", "rnsap.NeighbouringTDDCellMeasurementInformationLCR",
+      { "NeighbouringTDDCellMeasurementInformationLCR", "rnsap.NeighbouringTDDCellMeasurementInformationLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_NeighbouringTDDCellMeasurementInformation768_PDU,
-      { "NeighbouringTDDCellMeasurementInformation768", "rnsap.NeighbouringTDDCellMeasurementInformation768",
+      { "NeighbouringTDDCellMeasurementInformation768", "rnsap.NeighbouringTDDCellMeasurementInformation768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Neighbouring_LCR_TDD_CellInformation_PDU,
@@ -44258,7 +44258,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_NRTLoadInformationValue_PDU,
-      { "NRTLoadInformationValue", "rnsap.NRTLoadInformationValue",
+      { "NRTLoadInformationValue", "rnsap.NRTLoadInformationValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Number_Of_Supported_Carriers_PDU,
@@ -44270,11 +44270,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Non_Serving_RL_Preconfig_Setup_PDU,
-      { "Non-Serving-RL-Preconfig-Setup", "rnsap.Non_Serving_RL_Preconfig_Setup",
+      { "Non-Serving-RL-Preconfig-Setup", "rnsap.Non_Serving_RL_Preconfig_Setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_E_DCH_Non_Serving_RL_Preconfiguration_Setup_PDU,
-      { "Additional-E-DCH-Non-Serving-RL-Preconfiguration-Setup", "rnsap.Additional_E_DCH_Non_Serving_RL_Preconfiguration_Setup",
+      { "Additional-E-DCH-Non-Serving-RL-Preconfiguration-Setup", "rnsap.Additional_E_DCH_Non_Serving_RL_Preconfiguration_Setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_E_DCH_New_non_serving_RL_E_DCH_FDD_DL_Control_Channel_InfoList_PDU,
@@ -44286,7 +44286,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_NeedforIdleInterval_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_OnModification_PDU,
-      { "OnModification", "rnsap.OnModification",
+      { "OnModification", "rnsap.OnModification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Out_of_Sychronization_Window_PDU,
@@ -44314,7 +44314,7 @@ void proto_register_rnsap(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_PowerOffsetForSecondaryCPICHforMIMORequestIndicator_PDU,
-      { "PowerOffsetForSecondaryCPICHforMIMORequestIndicator", "rnsap.PowerOffsetForSecondaryCPICHforMIMORequestIndicator",
+      { "PowerOffsetForSecondaryCPICHforMIMORequestIndicator", "rnsap.PowerOffsetForSecondaryCPICHforMIMORequestIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Primary_CPICH_Usage_For_Channel_Estimation_PDU,
@@ -44334,7 +44334,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ProvidedInformation_PDU,
-      { "ProvidedInformation", "rnsap.ProvidedInformation",
+      { "ProvidedInformation", "rnsap.ProvidedInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UpPCH_InformationList_LCRTDD_PDU,
@@ -44342,7 +44342,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UpPCH_InformationItem_LCRTDD_PDU,
-      { "UpPCH-InformationItem-LCRTDD", "rnsap.UpPCH_InformationItem_LCRTDD",
+      { "UpPCH-InformationItem-LCRTDD", "rnsap.UpPCH_InformationItem_LCRTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RANAP_EnhancedRelocationInformationRequest_PDU,
@@ -44390,7 +44390,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Specific_EDCH_Information_PDU,
-      { "RL-Specific-EDCH-Information", "rnsap.RL_Specific_EDCH_Information",
+      { "RL-Specific-EDCH-Information", "rnsap.RL_Specific_EDCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_RLC_PDU_Size_Format_PDU,
@@ -44418,7 +44418,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RTLoadValue_PDU,
-      { "RTLoadValue", "rnsap.RTLoadValue",
+      { "RTLoadValue", "rnsap.RTLoadValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RxTimingDeviationForTA_PDU,
@@ -44446,7 +44446,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_SAI_PDU,
-      { "SAI", "rnsap.SAI",
+      { "SAI", "rnsap.SAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ScaledAdjustmentRatio_PDU,
@@ -44454,7 +44454,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Secondary_CPICH_Information_PDU,
-      { "Secondary-CPICH-Information", "rnsap.Secondary_CPICH_Information",
+      { "Secondary-CPICH-Information", "rnsap.Secondary_CPICH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Secondary_CPICH_Information_Change_PDU,
@@ -44462,15 +44462,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_Secondary_CPICH_Information_Change_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_Secondary_LCR_CCPCH_Info_TDD_PDU,
-      { "Secondary-LCR-CCPCH-Info-TDD", "rnsap.Secondary_LCR_CCPCH_Info_TDD",
+      { "Secondary-LCR-CCPCH-Info-TDD", "rnsap.Secondary_LCR_CCPCH_Info_TDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Secondary_CCPCH_Info_TDD768_PDU,
-      { "Secondary-CCPCH-Info-TDD768", "rnsap.Secondary_CCPCH_Info_TDD768",
+      { "Secondary-CCPCH-Info-TDD768", "rnsap.Secondary_CCPCH_Info_TDD768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Secondary_Serving_Cell_List_PDU,
-      { "Secondary-Serving-Cell-List", "rnsap.Secondary_Serving_Cell_List",
+      { "Secondary-Serving-Cell-List", "rnsap.Secondary_Serving_Cell_List_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_SFN_PDU,
@@ -44478,11 +44478,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_SFNSFNMeasurementThresholdInformation_PDU,
-      { "SFNSFNMeasurementThresholdInformation", "rnsap.SFNSFNMeasurementThresholdInformation",
+      { "SFNSFNMeasurementThresholdInformation", "rnsap.SFNSFNMeasurementThresholdInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Single_Stream_MIMO_ActivationIndicator_PDU,
-      { "Single-Stream-MIMO-ActivationIndicator", "rnsap.Single_Stream_MIMO_ActivationIndicator",
+      { "Single-Stream-MIMO-ActivationIndicator", "rnsap.Single_Stream_MIMO_ActivationIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Single_Stream_MIMO_Mode_Indicator_PDU,
@@ -44506,7 +44506,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_SixtyfourQAM_DL_UsageIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_SNA_Information_PDU,
-      { "SNA-Information", "rnsap.SNA_Information",
+      { "SNA-Information", "rnsap.SNA_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_S_RNTI_PDU,
@@ -44594,15 +44594,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_TUTRANGANSSMeasurementThresholdInformation_PDU,
-      { "TUTRANGANSSMeasurementThresholdInformation", "rnsap.TUTRANGANSSMeasurementThresholdInformation",
+      { "TUTRANGANSSMeasurementThresholdInformation", "rnsap.TUTRANGANSSMeasurementThresholdInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_TUTRANGANSSMeasurementValueInformation_PDU,
-      { "TUTRANGANSSMeasurementValueInformation", "rnsap.TUTRANGANSSMeasurementValueInformation",
+      { "TUTRANGANSSMeasurementValueInformation", "rnsap.TUTRANGANSSMeasurementValueInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_TUTRANGPSMeasurementThresholdInformation_PDU,
-      { "TUTRANGPSMeasurementThresholdInformation", "rnsap.TUTRANGPSMeasurementThresholdInformation",
+      { "TUTRANGPSMeasurementThresholdInformation", "rnsap.TUTRANGPSMeasurementThresholdInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_TransportBearerID_PDU,
@@ -44646,15 +44646,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UE_AggregateMaximumBitRate_PDU,
-      { "UE-AggregateMaximumBitRate", "rnsap.UE_AggregateMaximumBitRate",
+      { "UE-AggregateMaximumBitRate", "rnsap.UE_AggregateMaximumBitRate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UE_AggregateMaximumBitRate_Enforcement_Indicator_PDU,
-      { "UE-AggregateMaximumBitRate-Enforcement-Indicator", "rnsap.UE_AggregateMaximumBitRate_Enforcement_Indicator",
+      { "UE-AggregateMaximumBitRate-Enforcement-Indicator", "rnsap.UE_AggregateMaximumBitRate_Enforcement_Indicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UE_Capabilities_Info_PDU,
-      { "UE-Capabilities-Info", "rnsap.UE_Capabilities_Info",
+      { "UE-Capabilities-Info", "rnsap.UE_Capabilities_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UE_TS0_CapabilityLCR_PDU,
@@ -44718,7 +44718,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_UL_DPDCHIndicatorEDCH_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_PLCCHinformation_PDU,
-      { "PLCCHinformation", "rnsap.PLCCHinformation",
+      { "PLCCHinformation", "rnsap.PLCCHinformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_Timeslot_ISCP_Value_PDU,
@@ -44730,7 +44730,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_TimingAdvanceCtrl_LCR_PDU,
-      { "UL-TimingAdvanceCtrl-LCR", "rnsap.UL_TimingAdvanceCtrl_LCR",
+      { "UL-TimingAdvanceCtrl-LCR", "rnsap.UL_TimingAdvanceCtrl_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_SIR_PDU,
@@ -44738,11 +44738,11 @@ void proto_register_rnsap(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UC_ID_PDU,
-      { "UC-ID", "rnsap.UC_ID",
+      { "UC-ID", "rnsap.UC_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_Synchronisation_Parameters_LCR_PDU,
-      { "UL-Synchronisation-Parameters-LCR", "rnsap.UL_Synchronisation_Parameters_LCR",
+      { "UL-Synchronisation-Parameters-LCR", "rnsap.UL_Synchronisation_Parameters_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UPPCHPositionLCR_PDU,
@@ -44762,7 +44762,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_URA_Information_PDU,
-      { "URA-Information", "rnsap.URA_Information",
+      { "URA-Information", "rnsap.URA_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_USCH_Information_PDU,
@@ -44774,15 +44774,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_User_Plane_Congestion_Fields_Inclusion_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkSetupRequestFDD_PDU,
-      { "RadioLinkSetupRequestFDD", "rnsap.RadioLinkSetupRequestFDD",
+      { "RadioLinkSetupRequestFDD", "rnsap.RadioLinkSetupRequestFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_DPCH_Information_RL_SetupRqstFDD_PDU,
-      { "UL-DPCH-Information-RL-SetupRqstFDD", "rnsap.UL_DPCH_Information_RL_SetupRqstFDD",
+      { "UL-DPCH-Information-RL-SetupRqstFDD", "rnsap.UL_DPCH_Information_RL_SetupRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_DPCH_Information_RL_SetupRqstFDD_PDU,
-      { "DL-DPCH-Information-RL-SetupRqstFDD", "rnsap.DL_DPCH_Information_RL_SetupRqstFDD",
+      { "DL-DPCH-Information-RL-SetupRqstFDD", "rnsap.DL_DPCH_Information_RL_SetupRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationList_RL_SetupRqstFDD_PDU,
@@ -44790,7 +44790,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationItem_RL_SetupRqstFDD_PDU,
-      { "RL-InformationItem-RL-SetupRqstFDD", "rnsap.RL_InformationItem_RL_SetupRqstFDD",
+      { "RL-InformationItem-RL-SetupRqstFDD", "rnsap.RL_InformationItem_RL_SetupRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_HS_Cell_Information_RL_Setup_List_PDU,
@@ -44798,19 +44798,19 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_F_DPCH_Information_RL_SetupRqstFDD_PDU,
-      { "F-DPCH-Information-RL-SetupRqstFDD", "rnsap.F_DPCH_Information_RL_SetupRqstFDD",
+      { "F-DPCH-Information-RL-SetupRqstFDD", "rnsap.F_DPCH_Information_RL_SetupRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkSetupRequestTDD_PDU,
-      { "RadioLinkSetupRequestTDD", "rnsap.RadioLinkSetupRequestTDD",
+      { "RadioLinkSetupRequestTDD", "rnsap.RadioLinkSetupRequestTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_Physical_Channel_Information_RL_SetupRqstTDD_PDU,
-      { "UL-Physical-Channel-Information-RL-SetupRqstTDD", "rnsap.UL_Physical_Channel_Information_RL_SetupRqstTDD",
+      { "UL-Physical-Channel-Information-RL-SetupRqstTDD", "rnsap.UL_Physical_Channel_Information_RL_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_Physical_Channel_Information_RL_SetupRqstTDD_PDU,
-      { "DL-Physical-Channel-Information-RL-SetupRqstTDD", "rnsap.DL_Physical_Channel_Information_RL_SetupRqstTDD",
+      { "DL-Physical-Channel-Information-RL-SetupRqstTDD", "rnsap.DL_Physical_Channel_Information_RL_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCH_InformationList_RL_SetupRqstTDD_PDU,
@@ -44818,7 +44818,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCH_InformationItem_RL_SetupRqstTDD_PDU,
-      { "UL-CCTrCH-InformationItem-RL-SetupRqstTDD", "rnsap.UL_CCTrCH_InformationItem_RL_SetupRqstTDD",
+      { "UL-CCTrCH-InformationItem-RL-SetupRqstTDD", "rnsap.UL_CCTrCH_InformationItem_RL_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCH_InformationList_RL_SetupRqstTDD_PDU,
@@ -44826,15 +44826,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCH_InformationItem_RL_SetupRqstTDD_PDU,
-      { "DL-CCTrCH-InformationItem-RL-SetupRqstTDD", "rnsap.DL_CCTrCH_InformationItem_RL_SetupRqstTDD",
+      { "DL-CCTrCH-InformationItem-RL-SetupRqstTDD", "rnsap.DL_CCTrCH_InformationItem_RL_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Information_RL_SetupRqstTDD_PDU,
-      { "RL-Information-RL-SetupRqstTDD", "rnsap.RL_Information_RL_SetupRqstTDD",
+      { "RL-Information-RL-SetupRqstTDD", "rnsap.RL_Information_RL_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkSetupResponseFDD_PDU,
-      { "RadioLinkSetupResponseFDD", "rnsap.RadioLinkSetupResponseFDD",
+      { "RadioLinkSetupResponseFDD", "rnsap.RadioLinkSetupResponseFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationResponseList_RL_SetupRspFDD_PDU,
@@ -44842,7 +44842,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationResponseItem_RL_SetupRspFDD_PDU,
-      { "RL-InformationResponseItem-RL-SetupRspFDD", "rnsap.RL_InformationResponseItem_RL_SetupRspFDD",
+      { "RL-InformationResponseItem-RL-SetupRspFDD", "rnsap.RL_InformationResponseItem_RL_SetupRspFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_HS_Cell_Information_Response_List_PDU,
@@ -44850,11 +44850,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkSetupResponseTDD_PDU,
-      { "RadioLinkSetupResponseTDD", "rnsap.RadioLinkSetupResponseTDD",
+      { "RadioLinkSetupResponseTDD", "rnsap.RadioLinkSetupResponseTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationResponse_RL_SetupRspTDD_PDU,
-      { "RL-InformationResponse-RL-SetupRspTDD", "rnsap.RL_InformationResponse_RL_SetupRspTDD",
+      { "RL-InformationResponse-RL-SetupRspTDD", "rnsap.RL_InformationResponse_RL_SetupRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCHInformationListIE_RL_SetupRspTDD_PDU,
@@ -44862,7 +44862,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_DPCH_InformationItem_RL_SetupRspTDD_PDU,
-      { "UL-DPCH-InformationItem-RL-SetupRspTDD", "rnsap.UL_DPCH_InformationItem_RL_SetupRspTDD",
+      { "UL-DPCH-InformationItem-RL-SetupRspTDD", "rnsap.UL_DPCH_InformationItem_RL_SetupRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCHInformationListIE_RL_SetupRspTDD_PDU,
@@ -44870,7 +44870,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_DPCH_InformationItem_RL_SetupRspTDD_PDU,
-      { "DL-DPCH-InformationItem-RL-SetupRspTDD", "rnsap.DL_DPCH_InformationItem_RL_SetupRspTDD",
+      { "DL-DPCH-InformationItem-RL-SetupRspTDD", "rnsap.DL_DPCH_InformationItem_RL_SetupRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DSCH_InformationListIEs_RL_SetupRspTDD_PDU,
@@ -44882,7 +44882,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_LCR_InformationResponse_RL_SetupRspTDD_PDU,
-      { "RL-LCR-InformationResponse-RL-SetupRspTDD", "rnsap.RL_LCR_InformationResponse_RL_SetupRspTDD",
+      { "RL-LCR-InformationResponse-RL-SetupRspTDD", "rnsap.RL_LCR_InformationResponse_RL_SetupRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_LCR_CCTrCHInformationListIE_RL_SetupRspTDD_PDU,
@@ -44890,7 +44890,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_DPCH_LCR_InformationItem_RL_SetupRspTDD_PDU,
-      { "UL-DPCH-LCR-InformationItem-RL-SetupRspTDD", "rnsap.UL_DPCH_LCR_InformationItem_RL_SetupRspTDD",
+      { "UL-DPCH-LCR-InformationItem-RL-SetupRspTDD", "rnsap.UL_DPCH_LCR_InformationItem_RL_SetupRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCH_LCR_InformationListIE_RL_SetupRspTDD_PDU,
@@ -44898,7 +44898,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_DPCH_LCR_InformationItem_RL_SetupRspTDD_PDU,
-      { "DL-DPCH-LCR-InformationItem-RL-SetupRspTDD", "rnsap.DL_DPCH_LCR_InformationItem_RL_SetupRspTDD",
+      { "DL-DPCH-LCR-InformationItem-RL-SetupRspTDD", "rnsap.DL_DPCH_LCR_InformationItem_RL_SetupRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DSCH_LCR_InformationListIEs_RL_SetupRspTDD_PDU,
@@ -44910,7 +44910,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationResponse_RL_SetupRspTDD768_PDU,
-      { "RL-InformationResponse-RL-SetupRspTDD768", "rnsap.RL_InformationResponse_RL_SetupRspTDD768",
+      { "RL-InformationResponse-RL-SetupRspTDD768", "rnsap.RL_InformationResponse_RL_SetupRspTDD768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCHInformationListIE_RL_SetupRspTDD768_PDU,
@@ -44918,7 +44918,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_DPCH_InformationItem_RL_SetupRspTDD768_PDU,
-      { "UL-DPCH-InformationItem-RL-SetupRspTDD768", "rnsap.UL_DPCH_InformationItem_RL_SetupRspTDD768",
+      { "UL-DPCH-InformationItem-RL-SetupRspTDD768", "rnsap.UL_DPCH_InformationItem_RL_SetupRspTDD768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCHInformationListIE_RL_SetupRspTDD768_PDU,
@@ -44926,11 +44926,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_DPCH_InformationItem_RL_SetupRspTDD768_PDU,
-      { "DL-DPCH-InformationItem-RL-SetupRspTDD768", "rnsap.DL_DPCH_InformationItem_RL_SetupRspTDD768",
+      { "DL-DPCH-InformationItem-RL-SetupRspTDD768", "rnsap.DL_DPCH_InformationItem_RL_SetupRspTDD768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkSetupFailureFDD_PDU,
-      { "RadioLinkSetupFailureFDD", "rnsap.RadioLinkSetupFailureFDD",
+      { "RadioLinkSetupFailureFDD", "rnsap.RadioLinkSetupFailureFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CauseLevel_RL_SetupFailureFDD_PDU,
@@ -44938,15 +44938,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_CauseLevel_RL_SetupFailureFDD_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_UnsuccessfulRL_InformationResponse_RL_SetupFailureFDD_PDU,
-      { "UnsuccessfulRL-InformationResponse-RL-SetupFailureFDD", "rnsap.UnsuccessfulRL_InformationResponse_RL_SetupFailureFDD",
+      { "UnsuccessfulRL-InformationResponse-RL-SetupFailureFDD", "rnsap.UnsuccessfulRL_InformationResponse_RL_SetupFailureFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_SuccessfulRL_InformationResponse_RL_SetupFailureFDD_PDU,
-      { "SuccessfulRL-InformationResponse-RL-SetupFailureFDD", "rnsap.SuccessfulRL_InformationResponse_RL_SetupFailureFDD",
+      { "SuccessfulRL-InformationResponse-RL-SetupFailureFDD", "rnsap.SuccessfulRL_InformationResponse_RL_SetupFailureFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkSetupFailureTDD_PDU,
-      { "RadioLinkSetupFailureTDD", "rnsap.RadioLinkSetupFailureTDD",
+      { "RadioLinkSetupFailureTDD", "rnsap.RadioLinkSetupFailureTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CauseLevel_RL_SetupFailureTDD_PDU,
@@ -44954,11 +44954,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_CauseLevel_RL_SetupFailureTDD_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_UnsuccessfulRL_InformationResponse_RL_SetupFailureTDD_PDU,
-      { "UnsuccessfulRL-InformationResponse-RL-SetupFailureTDD", "rnsap.UnsuccessfulRL_InformationResponse_RL_SetupFailureTDD",
+      { "UnsuccessfulRL-InformationResponse-RL-SetupFailureTDD", "rnsap.UnsuccessfulRL_InformationResponse_RL_SetupFailureTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkAdditionRequestFDD_PDU,
-      { "RadioLinkAdditionRequestFDD", "rnsap.RadioLinkAdditionRequestFDD",
+      { "RadioLinkAdditionRequestFDD", "rnsap.RadioLinkAdditionRequestFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationList_RL_AdditionRqstFDD_PDU,
@@ -44966,7 +44966,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Information_RL_AdditionRqstFDD_PDU,
-      { "RL-Information-RL-AdditionRqstFDD", "rnsap.RL_Information_RL_AdditionRqstFDD",
+      { "RL-Information-RL-AdditionRqstFDD", "rnsap.RL_Information_RL_AdditionRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_HS_Cell_Information_RL_Addition_List_PDU,
@@ -44974,19 +44974,19 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_EDCH_Cell_Information_RL_Add_Req_PDU,
-      { "Additional-EDCH-Cell-Information-RL-Add-Req", "rnsap.Additional_EDCH_Cell_Information_RL_Add_Req",
+      { "Additional-EDCH-Cell-Information-RL-Add-Req", "rnsap.Additional_EDCH_Cell_Information_RL_Add_Req_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_EDPCH_Information_RLAdditionReq_FDD_PDU,
-      { "EDPCH-Information-RLAdditionReq-FDD", "rnsap.EDPCH_Information_RLAdditionReq_FDD",
+      { "EDPCH-Information-RLAdditionReq-FDD", "rnsap.EDPCH_Information_RLAdditionReq_FDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkAdditionRequestTDD_PDU,
-      { "RadioLinkAdditionRequestTDD", "rnsap.RadioLinkAdditionRequestTDD",
+      { "RadioLinkAdditionRequestTDD", "rnsap.RadioLinkAdditionRequestTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Information_RL_AdditionRqstTDD_PDU,
-      { "RL-Information-RL-AdditionRqstTDD", "rnsap.RL_Information_RL_AdditionRqstTDD",
+      { "RL-Information-RL-AdditionRqstTDD", "rnsap.RL_Information_RL_AdditionRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCH_InformationList_RL_AdditionRqstTDD_PDU,
@@ -44994,7 +44994,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCH_InformationItem_RL_AdditionRqstTDD_PDU,
-      { "UL-CCTrCH-InformationItem-RL-AdditionRqstTDD", "rnsap.UL_CCTrCH_InformationItem_RL_AdditionRqstTDD",
+      { "UL-CCTrCH-InformationItem-RL-AdditionRqstTDD", "rnsap.UL_CCTrCH_InformationItem_RL_AdditionRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCH_InformationList_RL_AdditionRqstTDD_PDU,
@@ -45002,11 +45002,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCH_InformationItem_RL_AdditionRqstTDD_PDU,
-      { "DL-CCTrCH-InformationItem-RL-AdditionRqstTDD", "rnsap.DL_CCTrCH_InformationItem_RL_AdditionRqstTDD",
+      { "DL-CCTrCH-InformationItem-RL-AdditionRqstTDD", "rnsap.DL_CCTrCH_InformationItem_RL_AdditionRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkAdditionResponseFDD_PDU,
-      { "RadioLinkAdditionResponseFDD", "rnsap.RadioLinkAdditionResponseFDD",
+      { "RadioLinkAdditionResponseFDD", "rnsap.RadioLinkAdditionResponseFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationResponseList_RL_AdditionRspFDD_PDU,
@@ -45014,7 +45014,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationResponseItem_RL_AdditionRspFDD_PDU,
-      { "RL-InformationResponseItem-RL-AdditionRspFDD", "rnsap.RL_InformationResponseItem_RL_AdditionRspFDD",
+      { "RL-InformationResponseItem-RL-AdditionRspFDD", "rnsap.RL_InformationResponseItem_RL_AdditionRspFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_HS_Cell_Change_Information_Response_List_PDU,
@@ -45022,11 +45022,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkAdditionResponseTDD_PDU,
-      { "RadioLinkAdditionResponseTDD", "rnsap.RadioLinkAdditionResponseTDD",
+      { "RadioLinkAdditionResponseTDD", "rnsap.RadioLinkAdditionResponseTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationResponse_RL_AdditionRspTDD_PDU,
-      { "RL-InformationResponse-RL-AdditionRspTDD", "rnsap.RL_InformationResponse_RL_AdditionRspTDD",
+      { "RL-InformationResponse-RL-AdditionRspTDD", "rnsap.RL_InformationResponse_RL_AdditionRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCHInformationListIE_RL_AdditionRspTDD_PDU,
@@ -45034,7 +45034,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_DPCH_InformationItem_RL_AdditionRspTDD_PDU,
-      { "UL-DPCH-InformationItem-RL-AdditionRspTDD", "rnsap.UL_DPCH_InformationItem_RL_AdditionRspTDD",
+      { "UL-DPCH-InformationItem-RL-AdditionRspTDD", "rnsap.UL_DPCH_InformationItem_RL_AdditionRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCHInformationListIE_RL_AdditionRspTDD_PDU,
@@ -45042,7 +45042,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_DPCH_InformationItem_RL_AdditionRspTDD_PDU,
-      { "DL-DPCH-InformationItem-RL-AdditionRspTDD", "rnsap.DL_DPCH_InformationItem_RL_AdditionRspTDD",
+      { "DL-DPCH-InformationItem-RL-AdditionRspTDD", "rnsap.DL_DPCH_InformationItem_RL_AdditionRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DSCH_InformationListIE_RL_AdditionRspTDD_PDU,
@@ -45054,7 +45054,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_LCR_InformationResponse_RL_AdditionRspTDD_PDU,
-      { "RL-LCR-InformationResponse-RL-AdditionRspTDD", "rnsap.RL_LCR_InformationResponse_RL_AdditionRspTDD",
+      { "RL-LCR-InformationResponse-RL-AdditionRspTDD", "rnsap.RL_LCR_InformationResponse_RL_AdditionRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCH_LCR_InformationListIE_RL_AdditionRspTDD_PDU,
@@ -45062,7 +45062,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_DPCH_LCR_InformationItem_RL_AdditionRspTDD_PDU,
-      { "UL-DPCH-LCR-InformationItem-RL-AdditionRspTDD", "rnsap.UL_DPCH_LCR_InformationItem_RL_AdditionRspTDD",
+      { "UL-DPCH-LCR-InformationItem-RL-AdditionRspTDD", "rnsap.UL_DPCH_LCR_InformationItem_RL_AdditionRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCH_LCR_InformationListIE_RL_AdditionRspTDD_PDU,
@@ -45070,7 +45070,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_DPCH_LCR_InformationItem_RL_AdditionRspTDD_PDU,
-      { "DL-DPCH-LCR-InformationItem-RL-AdditionRspTDD", "rnsap.DL_DPCH_LCR_InformationItem_RL_AdditionRspTDD",
+      { "DL-DPCH-LCR-InformationItem-RL-AdditionRspTDD", "rnsap.DL_DPCH_LCR_InformationItem_RL_AdditionRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DSCH_LCR_InformationListIEs_RL_AdditionRspTDD_PDU,
@@ -45082,7 +45082,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationResponse_RL_AdditionRspTDD768_PDU,
-      { "RL-InformationResponse-RL-AdditionRspTDD768", "rnsap.RL_InformationResponse_RL_AdditionRspTDD768",
+      { "RL-InformationResponse-RL-AdditionRspTDD768", "rnsap.RL_InformationResponse_RL_AdditionRspTDD768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCHInformationListIE_RL_AdditionRspTDD768_PDU,
@@ -45090,7 +45090,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_DPCH_InformationItem_RL_AdditionRspTDD768_PDU,
-      { "UL-DPCH-InformationItem-RL-AdditionRspTDD768", "rnsap.UL_DPCH_InformationItem_RL_AdditionRspTDD768",
+      { "UL-DPCH-InformationItem-RL-AdditionRspTDD768", "rnsap.UL_DPCH_InformationItem_RL_AdditionRspTDD768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCHInformationListIE_RL_AdditionRspTDD768_PDU,
@@ -45098,11 +45098,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_DPCH_InformationItem_RL_AdditionRspTDD768_PDU,
-      { "DL-DPCH-InformationItem-RL-AdditionRspTDD768", "rnsap.DL_DPCH_InformationItem_RL_AdditionRspTDD768",
+      { "DL-DPCH-InformationItem-RL-AdditionRspTDD768", "rnsap.DL_DPCH_InformationItem_RL_AdditionRspTDD768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkAdditionFailureFDD_PDU,
-      { "RadioLinkAdditionFailureFDD", "rnsap.RadioLinkAdditionFailureFDD",
+      { "RadioLinkAdditionFailureFDD", "rnsap.RadioLinkAdditionFailureFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CauseLevel_RL_AdditionFailureFDD_PDU,
@@ -45110,15 +45110,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_CauseLevel_RL_AdditionFailureFDD_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_UnsuccessfulRL_InformationResponse_RL_AdditionFailureFDD_PDU,
-      { "UnsuccessfulRL-InformationResponse-RL-AdditionFailureFDD", "rnsap.UnsuccessfulRL_InformationResponse_RL_AdditionFailureFDD",
+      { "UnsuccessfulRL-InformationResponse-RL-AdditionFailureFDD", "rnsap.UnsuccessfulRL_InformationResponse_RL_AdditionFailureFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_SuccessfulRL_InformationResponse_RL_AdditionFailureFDD_PDU,
-      { "SuccessfulRL-InformationResponse-RL-AdditionFailureFDD", "rnsap.SuccessfulRL_InformationResponse_RL_AdditionFailureFDD",
+      { "SuccessfulRL-InformationResponse-RL-AdditionFailureFDD", "rnsap.SuccessfulRL_InformationResponse_RL_AdditionFailureFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkAdditionFailureTDD_PDU,
-      { "RadioLinkAdditionFailureTDD", "rnsap.RadioLinkAdditionFailureTDD",
+      { "RadioLinkAdditionFailureTDD", "rnsap.RadioLinkAdditionFailureTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CauseLevel_RL_AdditionFailureTDD_PDU,
@@ -45126,11 +45126,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_CauseLevel_RL_AdditionFailureTDD_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_UnsuccessfulRL_InformationResponse_RL_AdditionFailureTDD_PDU,
-      { "UnsuccessfulRL-InformationResponse-RL-AdditionFailureTDD", "rnsap.UnsuccessfulRL_InformationResponse_RL_AdditionFailureTDD",
+      { "UnsuccessfulRL-InformationResponse-RL-AdditionFailureTDD", "rnsap.UnsuccessfulRL_InformationResponse_RL_AdditionFailureTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkDeletionRequest_PDU,
-      { "RadioLinkDeletionRequest", "rnsap.RadioLinkDeletionRequest",
+      { "RadioLinkDeletionRequest", "rnsap.RadioLinkDeletionRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationList_RL_DeletionRqst_PDU,
@@ -45138,27 +45138,27 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Information_RL_DeletionRqst_PDU,
-      { "RL-Information-RL-DeletionRqst", "rnsap.RL_Information_RL_DeletionRqst",
+      { "RL-Information-RL-DeletionRqst", "rnsap.RL_Information_RL_DeletionRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkDeletionResponse_PDU,
-      { "RadioLinkDeletionResponse", "rnsap.RadioLinkDeletionResponse",
+      { "RadioLinkDeletionResponse", "rnsap.RadioLinkDeletionResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkReconfigurationPrepareFDD_PDU,
-      { "RadioLinkReconfigurationPrepareFDD", "rnsap.RadioLinkReconfigurationPrepareFDD",
+      { "RadioLinkReconfigurationPrepareFDD", "rnsap.RadioLinkReconfigurationPrepareFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_DPCH_Information_RL_ReconfPrepFDD_PDU,
-      { "UL-DPCH-Information-RL-ReconfPrepFDD", "rnsap.UL_DPCH_Information_RL_ReconfPrepFDD",
+      { "UL-DPCH-Information-RL-ReconfPrepFDD", "rnsap.UL_DPCH_Information_RL_ReconfPrepFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_DPCH_Information_RL_ReconfPrepFDD_PDU,
-      { "DL-DPCH-Information-RL-ReconfPrepFDD", "rnsap.DL_DPCH_Information_RL_ReconfPrepFDD",
+      { "DL-DPCH-Information-RL-ReconfPrepFDD", "rnsap.DL_DPCH_Information_RL_ReconfPrepFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_DPCH_Power_Information_RL_ReconfPrepFDD_PDU,
-      { "DL-DPCH-Power-Information-RL-ReconfPrepFDD", "rnsap.DL_DPCH_Power_Information_RL_ReconfPrepFDD",
+      { "DL-DPCH-Power-Information-RL-ReconfPrepFDD", "rnsap.DL_DPCH_Power_Information_RL_ReconfPrepFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DCH_DeleteList_RL_ReconfPrepFDD_PDU,
@@ -45170,7 +45170,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Information_RL_ReconfPrepFDD_PDU,
-      { "RL-Information-RL-ReconfPrepFDD", "rnsap.RL_Information_RL_ReconfPrepFDD",
+      { "RL-Information-RL-ReconfPrepFDD", "rnsap.RL_Information_RL_ReconfPrepFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_HS_Cell_Information_RL_Reconf_Prep_PDU,
@@ -45178,15 +45178,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_EDCH_Cell_Information_RL_Reconf_Prep_PDU,
-      { "Additional-EDCH-Cell-Information-RL-Reconf-Prep", "rnsap.Additional_EDCH_Cell_Information_RL_Reconf_Prep",
+      { "Additional-EDCH-Cell-Information-RL-Reconf-Prep", "rnsap.Additional_EDCH_Cell_Information_RL_Reconf_Prep_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_F_DPCH_Information_RL_ReconfPrepFDD_PDU,
-      { "F-DPCH-Information-RL-ReconfPrepFDD", "rnsap.F_DPCH_Information_RL_ReconfPrepFDD",
+      { "F-DPCH-Information-RL-ReconfPrepFDD", "rnsap.F_DPCH_Information_RL_ReconfPrepFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkReconfigurationPrepareTDD_PDU,
-      { "RadioLinkReconfigurationPrepareTDD", "rnsap.RadioLinkReconfigurationPrepareTDD",
+      { "RadioLinkReconfigurationPrepareTDD", "rnsap.RadioLinkReconfigurationPrepareTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCH_InformationAddList_RL_ReconfPrepTDD_PDU,
@@ -45194,7 +45194,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCH_AddInformation_RL_ReconfPrepTDD_PDU,
-      { "UL-CCTrCH-AddInformation-RL-ReconfPrepTDD", "rnsap.UL_CCTrCH_AddInformation_RL_ReconfPrepTDD",
+      { "UL-CCTrCH-AddInformation-RL-ReconfPrepTDD", "rnsap.UL_CCTrCH_AddInformation_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD_PDU,
@@ -45202,7 +45202,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCH_ModifyInformation_RL_ReconfPrepTDD_PDU,
-      { "UL-CCTrCH-ModifyInformation-RL-ReconfPrepTDD", "rnsap.UL_CCTrCH_ModifyInformation_RL_ReconfPrepTDD",
+      { "UL-CCTrCH-ModifyInformation-RL-ReconfPrepTDD", "rnsap.UL_CCTrCH_ModifyInformation_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD_PDU,
@@ -45210,7 +45210,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCH_DeleteInformation_RL_ReconfPrepTDD_PDU,
-      { "UL-CCTrCH-DeleteInformation-RL-ReconfPrepTDD", "rnsap.UL_CCTrCH_DeleteInformation_RL_ReconfPrepTDD",
+      { "UL-CCTrCH-DeleteInformation-RL-ReconfPrepTDD", "rnsap.UL_CCTrCH_DeleteInformation_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCH_InformationAddList_RL_ReconfPrepTDD_PDU,
@@ -45218,7 +45218,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCH_InformationAddItem_RL_ReconfPrepTDD_PDU,
-      { "DL-CCTrCH-InformationAddItem-RL-ReconfPrepTDD", "rnsap.DL_CCTrCH_InformationAddItem_RL_ReconfPrepTDD",
+      { "DL-CCTrCH-InformationAddItem-RL-ReconfPrepTDD", "rnsap.DL_CCTrCH_InformationAddItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD_PDU,
@@ -45226,7 +45226,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCH_InformationModifyItem_RL_ReconfPrepTDD_PDU,
-      { "DL-CCTrCH-InformationModifyItem-RL-ReconfPrepTDD", "rnsap.DL_CCTrCH_InformationModifyItem_RL_ReconfPrepTDD",
+      { "DL-CCTrCH-InformationModifyItem-RL-ReconfPrepTDD", "rnsap.DL_CCTrCH_InformationModifyItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD_PDU,
@@ -45234,7 +45234,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCH_InformationDeleteItem_RL_ReconfPrepTDD_PDU,
-      { "DL-CCTrCH-InformationDeleteItem-RL-ReconfPrepTDD", "rnsap.DL_CCTrCH_InformationDeleteItem_RL_ReconfPrepTDD",
+      { "DL-CCTrCH-InformationDeleteItem-RL-ReconfPrepTDD", "rnsap.DL_CCTrCH_InformationDeleteItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DCH_DeleteList_RL_ReconfPrepTDD_PDU,
@@ -45262,7 +45262,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkReconfigurationReadyFDD_PDU,
-      { "RadioLinkReconfigurationReadyFDD", "rnsap.RadioLinkReconfigurationReadyFDD",
+      { "RadioLinkReconfigurationReadyFDD", "rnsap.RadioLinkReconfigurationReadyFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationResponseList_RL_ReconfReadyFDD_PDU,
@@ -45270,7 +45270,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationResponseItem_RL_ReconfReadyFDD_PDU,
-      { "RL-InformationResponseItem-RL-ReconfReadyFDD", "rnsap.RL_InformationResponseItem_RL_ReconfReadyFDD",
+      { "RL-InformationResponseItem-RL-ReconfReadyFDD", "rnsap.RL_InformationResponseItem_RL_ReconfReadyFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_HS_Cell_RL_Reconf_Response_PDU,
@@ -45278,7 +45278,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkReconfigurationReadyTDD_PDU,
-      { "RadioLinkReconfigurationReadyTDD", "rnsap.RadioLinkReconfigurationReadyTDD",
+      { "RadioLinkReconfigurationReadyTDD", "rnsap.RadioLinkReconfigurationReadyTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCHInformationListIE_RL_ReconfReadyTDD_PDU,
@@ -45286,19 +45286,19 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_DPCH_LCR_InformationAddList_RL_ReconfReadyTDD_PDU,
-      { "UL-DPCH-LCR-InformationAddList-RL-ReconfReadyTDD", "rnsap.UL_DPCH_LCR_InformationAddList_RL_ReconfReadyTDD",
+      { "UL-DPCH-LCR-InformationAddList-RL-ReconfReadyTDD", "rnsap.UL_DPCH_LCR_InformationAddList_RL_ReconfReadyTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_DPCH_InformationAddListIE_RL_ReconfReadyTDD_PDU,
-      { "UL-DPCH-InformationAddListIE-RL-ReconfReadyTDD", "rnsap.UL_DPCH_InformationAddListIE_RL_ReconfReadyTDD",
+      { "UL-DPCH-InformationAddListIE-RL-ReconfReadyTDD", "rnsap.UL_DPCH_InformationAddListIE_RL_ReconfReadyTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_DPCH_InformationAddList_RL_ReconfReadyTDD768_PDU,
-      { "UL-DPCH-InformationAddList-RL-ReconfReadyTDD768", "rnsap.UL_DPCH_InformationAddList_RL_ReconfReadyTDD768",
+      { "UL-DPCH-InformationAddList-RL-ReconfReadyTDD768", "rnsap.UL_DPCH_InformationAddList_RL_ReconfReadyTDD768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_DPCH_InformationModifyListIE_RL_ReconfReadyTDD_PDU,
-      { "UL-DPCH-InformationModifyListIE-RL-ReconfReadyTDD", "rnsap.UL_DPCH_InformationModifyListIE_RL_ReconfReadyTDD",
+      { "UL-DPCH-InformationModifyListIE-RL-ReconfReadyTDD", "rnsap.UL_DPCH_InformationModifyListIE_RL_ReconfReadyTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_TimeslotLCR_InformationModifyList_RL_ReconfReadyTDD_PDU,
@@ -45318,19 +45318,19 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_DPCH_LCR_InformationAddList_RL_ReconfReadyTDD_PDU,
-      { "DL-DPCH-LCR-InformationAddList-RL-ReconfReadyTDD", "rnsap.DL_DPCH_LCR_InformationAddList_RL_ReconfReadyTDD",
+      { "DL-DPCH-LCR-InformationAddList-RL-ReconfReadyTDD", "rnsap.DL_DPCH_LCR_InformationAddList_RL_ReconfReadyTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_DPCH_InformationAddListIE_RL_ReconfReadyTDD_PDU,
-      { "DL-DPCH-InformationAddListIE-RL-ReconfReadyTDD", "rnsap.DL_DPCH_InformationAddListIE_RL_ReconfReadyTDD",
+      { "DL-DPCH-InformationAddListIE-RL-ReconfReadyTDD", "rnsap.DL_DPCH_InformationAddListIE_RL_ReconfReadyTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_DPCH_InformationAddList_RL_ReconfReadyTDD768_PDU,
-      { "DL-DPCH-InformationAddList-RL-ReconfReadyTDD768", "rnsap.DL_DPCH_InformationAddList_RL_ReconfReadyTDD768",
+      { "DL-DPCH-InformationAddList-RL-ReconfReadyTDD768", "rnsap.DL_DPCH_InformationAddList_RL_ReconfReadyTDD768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_DPCH_InformationModifyListIE_RL_ReconfReadyTDD_PDU,
-      { "DL-DPCH-InformationModifyListIE-RL-ReconfReadyTDD", "rnsap.DL_DPCH_InformationModifyListIE_RL_ReconfReadyTDD",
+      { "DL-DPCH-InformationModifyListIE-RL-ReconfReadyTDD", "rnsap.DL_DPCH_InformationModifyListIE_RL_ReconfReadyTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_TimeslotLCR_InformationModifyList_RL_ReconfReadyTDD_PDU,
@@ -45362,11 +45362,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkReconfigurationCommit_PDU,
-      { "RadioLinkReconfigurationCommit", "rnsap.RadioLinkReconfigurationCommit",
+      { "RadioLinkReconfigurationCommit", "rnsap.RadioLinkReconfigurationCommit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkReconfigurationFailure_PDU,
-      { "RadioLinkReconfigurationFailure", "rnsap.RadioLinkReconfigurationFailure",
+      { "RadioLinkReconfigurationFailure", "rnsap.RadioLinkReconfigurationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CauseLevel_RL_ReconfFailure_PDU,
@@ -45374,23 +45374,23 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_CauseLevel_RL_ReconfFailure_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_ReconfigurationFailure_RL_ReconfFail_PDU,
-      { "RL-ReconfigurationFailure-RL-ReconfFail", "rnsap.RL_ReconfigurationFailure_RL_ReconfFail",
+      { "RL-ReconfigurationFailure-RL-ReconfFail", "rnsap.RL_ReconfigurationFailure_RL_ReconfFail_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkReconfigurationCancel_PDU,
-      { "RadioLinkReconfigurationCancel", "rnsap.RadioLinkReconfigurationCancel",
+      { "RadioLinkReconfigurationCancel", "rnsap.RadioLinkReconfigurationCancel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkReconfigurationRequestFDD_PDU,
-      { "RadioLinkReconfigurationRequestFDD", "rnsap.RadioLinkReconfigurationRequestFDD",
+      { "RadioLinkReconfigurationRequestFDD", "rnsap.RadioLinkReconfigurationRequestFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_DPCH_Information_RL_ReconfRqstFDD_PDU,
-      { "UL-DPCH-Information-RL-ReconfRqstFDD", "rnsap.UL_DPCH_Information_RL_ReconfRqstFDD",
+      { "UL-DPCH-Information-RL-ReconfRqstFDD", "rnsap.UL_DPCH_Information_RL_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_DPCH_Information_RL_ReconfRqstFDD_PDU,
-      { "DL-DPCH-Information-RL-ReconfRqstFDD", "rnsap.DL_DPCH_Information_RL_ReconfRqstFDD",
+      { "DL-DPCH-Information-RL-ReconfRqstFDD", "rnsap.DL_DPCH_Information_RL_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DCH_DeleteList_RL_ReconfRqstFDD_PDU,
@@ -45402,7 +45402,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_EDCH_Cell_Information_RL_Reconf_Req_PDU,
-      { "Additional-EDCH-Cell-Information-RL-Reconf-Req", "rnsap.Additional_EDCH_Cell_Information_RL_Reconf_Req",
+      { "Additional-EDCH-Cell-Information-RL-Reconf-Req", "rnsap.Additional_EDCH_Cell_Information_RL_Reconf_Req_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_ReconfigurationRequestFDD_RL_InformationList_PDU,
@@ -45410,11 +45410,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_ReconfigurationRequestFDD_RL_Information_IEs_PDU,
-      { "RL-ReconfigurationRequestFDD-RL-Information-IEs", "rnsap.RL_ReconfigurationRequestFDD_RL_Information_IEs",
+      { "RL-ReconfigurationRequestFDD-RL-Information-IEs", "rnsap.RL_ReconfigurationRequestFDD_RL_Information_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkReconfigurationRequestTDD_PDU,
-      { "RadioLinkReconfigurationRequestTDD", "rnsap.RadioLinkReconfigurationRequestTDD",
+      { "RadioLinkReconfigurationRequestTDD", "rnsap.RadioLinkReconfigurationRequestTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_PDU,
@@ -45422,7 +45422,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD_PDU,
-      { "UL-CCTrCH-InformationModifyItem-RL-ReconfRqstTDD", "rnsap.UL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD",
+      { "UL-CCTrCH-InformationModifyItem-RL-ReconfRqstTDD", "rnsap.UL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_PDU,
@@ -45430,7 +45430,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD_PDU,
-      { "UL-CCTrCH-InformationDeleteItem-RL-ReconfRqstTDD", "rnsap.UL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD",
+      { "UL-CCTrCH-InformationDeleteItem-RL-ReconfRqstTDD", "rnsap.UL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_PDU,
@@ -45438,7 +45438,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD_PDU,
-      { "DL-CCTrCH-InformationModifyItem-RL-ReconfRqstTDD", "rnsap.DL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD",
+      { "DL-CCTrCH-InformationModifyItem-RL-ReconfRqstTDD", "rnsap.DL_CCTrCH_InformationModifyItem_RL_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_PDU,
@@ -45446,7 +45446,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD_PDU,
-      { "DL-CCTrCH-InformationDeleteItem-RL-ReconfRqstTDD", "rnsap.DL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD",
+      { "DL-CCTrCH-InformationDeleteItem-RL-ReconfRqstTDD", "rnsap.DL_CCTrCH_InformationDeleteItem_RL_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DCH_DeleteList_RL_ReconfRqstTDD_PDU,
@@ -45458,7 +45458,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkReconfigurationResponseFDD_PDU,
-      { "RadioLinkReconfigurationResponseFDD", "rnsap.RadioLinkReconfigurationResponseFDD",
+      { "RadioLinkReconfigurationResponseFDD", "rnsap.RadioLinkReconfigurationResponseFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationResponseList_RL_ReconfRspFDD_PDU,
@@ -45466,15 +45466,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationResponseItem_RL_ReconfRspFDD_PDU,
-      { "RL-InformationResponseItem-RL-ReconfRspFDD", "rnsap.RL_InformationResponseItem_RL_ReconfRspFDD",
+      { "RL-InformationResponseItem-RL-ReconfRspFDD", "rnsap.RL_InformationResponseItem_RL_ReconfRspFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkReconfigurationResponseTDD_PDU,
-      { "RadioLinkReconfigurationResponseTDD", "rnsap.RadioLinkReconfigurationResponseTDD",
+      { "RadioLinkReconfigurationResponseTDD", "rnsap.RadioLinkReconfigurationResponseTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationResponse_RL_ReconfRspTDD_PDU,
-      { "RL-InformationResponse-RL-ReconfRspTDD", "rnsap.RL_InformationResponse_RL_ReconfRspTDD",
+      { "RL-InformationResponse-RL-ReconfRspTDD", "rnsap.RL_InformationResponse_RL_ReconfRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCH_InformationList_RL_ReconfRspTDD_PDU,
@@ -45482,7 +45482,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_DPCH_InformationModifyItem_LCR_RL_ReconfRspTDD_PDU,
-      { "DL-DPCH-InformationModifyItem-LCR-RL-ReconfRspTDD", "rnsap.DL_DPCH_InformationModifyItem_LCR_RL_ReconfRspTDD",
+      { "DL-DPCH-InformationModifyItem-LCR-RL-ReconfRspTDD", "rnsap.DL_DPCH_InformationModifyItem_LCR_RL_ReconfRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Multiple_RL_InformationResponse_RL_ReconfRspTDD_PDU,
@@ -45490,7 +45490,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkFailureIndication_PDU,
-      { "RadioLinkFailureIndication", "rnsap.RadioLinkFailureIndication",
+      { "RadioLinkFailureIndication", "rnsap.RadioLinkFailureIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Reporting_Object_RL_FailureInd_PDU,
@@ -45498,19 +45498,19 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_Reporting_Object_RL_FailureInd_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Information_RL_FailureInd_PDU,
-      { "RL-Information-RL-FailureInd", "rnsap.RL_Information_RL_FailureInd",
+      { "RL-Information-RL-FailureInd", "rnsap.RL_Information_RL_FailureInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Set_Information_RL_FailureInd_PDU,
-      { "RL-Set-Information-RL-FailureInd", "rnsap.RL_Set_Information_RL_FailureInd",
+      { "RL-Set-Information-RL-FailureInd", "rnsap.RL_Set_Information_RL_FailureInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CCTrCH_InformationItem_RL_FailureInd_PDU,
-      { "CCTrCH-InformationItem-RL-FailureInd", "rnsap.CCTrCH_InformationItem_RL_FailureInd",
+      { "CCTrCH-InformationItem-RL-FailureInd", "rnsap.CCTrCH_InformationItem_RL_FailureInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkPreemptionRequiredIndication_PDU,
-      { "RadioLinkPreemptionRequiredIndication", "rnsap.RadioLinkPreemptionRequiredIndication",
+      { "RadioLinkPreemptionRequiredIndication", "rnsap.RadioLinkPreemptionRequiredIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationList_RL_PreemptRequiredInd_PDU,
@@ -45518,7 +45518,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationItem_RL_PreemptRequiredInd_PDU,
-      { "RL-InformationItem-RL-PreemptRequiredInd", "rnsap.RL_InformationItem_RL_PreemptRequiredInd",
+      { "RL-InformationItem-RL-PreemptRequiredInd", "rnsap.RL_InformationItem_RL_PreemptRequiredInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSDSCHMacdFlowSpecificInformationList_RL_PreemptRequiredInd_PDU,
@@ -45526,7 +45526,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSDSCHMacdFlowSpecificInformationItem_RL_PreemptRequiredInd_PDU,
-      { "HSDSCHMacdFlowSpecificInformationItem-RL-PreemptRequiredInd", "rnsap.HSDSCHMacdFlowSpecificInformationItem_RL_PreemptRequiredInd",
+      { "HSDSCHMacdFlowSpecificInformationItem-RL-PreemptRequiredInd", "rnsap.HSDSCHMacdFlowSpecificInformationItem_RL_PreemptRequiredInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_EDCH_MacdFlowSpecificInformationList_RL_PreemptRequiredInd_PDU,
@@ -45534,11 +45534,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_EDCH_MacdFlowSpecificInformationItem_RL_PreemptRequiredInd_PDU,
-      { "EDCH-MacdFlowSpecificInformationItem-RL-PreemptRequiredInd", "rnsap.EDCH_MacdFlowSpecificInformationItem_RL_PreemptRequiredInd",
+      { "EDCH-MacdFlowSpecificInformationItem-RL-PreemptRequiredInd", "rnsap.EDCH_MacdFlowSpecificInformationItem_RL_PreemptRequiredInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkRestoreIndication_PDU,
-      { "RadioLinkRestoreIndication", "rnsap.RadioLinkRestoreIndication",
+      { "RadioLinkRestoreIndication", "rnsap.RadioLinkRestoreIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Reporting_Object_RL_RestoreInd_PDU,
@@ -45546,19 +45546,19 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_Reporting_Object_RL_RestoreInd_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Information_RL_RestoreInd_PDU,
-      { "RL-Information-RL-RestoreInd", "rnsap.RL_Information_RL_RestoreInd",
+      { "RL-Information-RL-RestoreInd", "rnsap.RL_Information_RL_RestoreInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Set_Information_RL_RestoreInd_PDU,
-      { "RL-Set-Information-RL-RestoreInd", "rnsap.RL_Set_Information_RL_RestoreInd",
+      { "RL-Set-Information-RL-RestoreInd", "rnsap.RL_Set_Information_RL_RestoreInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CCTrCH_InformationItem_RL_RestoreInd_PDU,
-      { "CCTrCH-InformationItem-RL-RestoreInd", "rnsap.CCTrCH_InformationItem_RL_RestoreInd",
+      { "CCTrCH-InformationItem-RL-RestoreInd", "rnsap.CCTrCH_InformationItem_RL_RestoreInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_PowerControlRequest_PDU,
-      { "DL-PowerControlRequest", "rnsap.DL_PowerControlRequest",
+      { "DL-PowerControlRequest", "rnsap.DL_PowerControlRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_ReferencePowerInformationList_DL_PC_Rqst_PDU,
@@ -45566,27 +45566,27 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_ReferencePowerInformation_DL_PC_Rqst_PDU,
-      { "DL-ReferencePowerInformation-DL-PC-Rqst", "rnsap.DL_ReferencePowerInformation_DL_PC_Rqst",
+      { "DL-ReferencePowerInformation-DL-PC-Rqst", "rnsap.DL_ReferencePowerInformation_DL_PC_Rqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_PowerTimeslotControlRequest_PDU,
-      { "DL-PowerTimeslotControlRequest", "rnsap.DL_PowerTimeslotControlRequest",
+      { "DL-PowerTimeslotControlRequest", "rnsap.DL_PowerTimeslotControlRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_PhysicalChannelReconfigurationRequestFDD_PDU,
-      { "PhysicalChannelReconfigurationRequestFDD", "rnsap.PhysicalChannelReconfigurationRequestFDD",
+      { "PhysicalChannelReconfigurationRequestFDD", "rnsap.PhysicalChannelReconfigurationRequestFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Information_PhyChReconfRqstFDD_PDU,
-      { "RL-Information-PhyChReconfRqstFDD", "rnsap.RL_Information_PhyChReconfRqstFDD",
+      { "RL-Information-PhyChReconfRqstFDD", "rnsap.RL_Information_PhyChReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_PhysicalChannelReconfigurationRequestTDD_PDU,
-      { "PhysicalChannelReconfigurationRequestTDD", "rnsap.PhysicalChannelReconfigurationRequestTDD",
+      { "PhysicalChannelReconfigurationRequestTDD", "rnsap.PhysicalChannelReconfigurationRequestTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Information_PhyChReconfRqstTDD_PDU,
-      { "RL-Information-PhyChReconfRqstTDD", "rnsap.RL_Information_PhyChReconfRqstTDD",
+      { "RL-Information-PhyChReconfRqstTDD", "rnsap.RL_Information_PhyChReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCH_InformationListIE_PhyChReconfRqstTDD_PDU,
@@ -45594,7 +45594,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_DPCH_InformationItem_PhyChReconfRqstTDD_PDU,
-      { "UL-DPCH-InformationItem-PhyChReconfRqstTDD", "rnsap.UL_DPCH_InformationItem_PhyChReconfRqstTDD",
+      { "UL-DPCH-InformationItem-PhyChReconfRqstTDD", "rnsap.UL_DPCH_InformationItem_PhyChReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_TimeslotLCR_InformationList_PhyChReconfRqstTDD_PDU,
@@ -45610,7 +45610,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_DPCH_InformationItem_PhyChReconfRqstTDD_PDU,
-      { "DL-DPCH-InformationItem-PhyChReconfRqstTDD", "rnsap.DL_DPCH_InformationItem_PhyChReconfRqstTDD",
+      { "DL-DPCH-InformationItem-PhyChReconfRqstTDD", "rnsap.DL_DPCH_InformationItem_PhyChReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_TimeslotLCR_InformationList_PhyChReconfRqstTDD_PDU,
@@ -45634,15 +45634,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_PhysicalChannelReconfigurationCommand_PDU,
-      { "PhysicalChannelReconfigurationCommand", "rnsap.PhysicalChannelReconfigurationCommand",
+      { "PhysicalChannelReconfigurationCommand", "rnsap.PhysicalChannelReconfigurationCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_PhysicalChannelReconfigurationFailure_PDU,
-      { "PhysicalChannelReconfigurationFailure", "rnsap.PhysicalChannelReconfigurationFailure",
+      { "PhysicalChannelReconfigurationFailure", "rnsap.PhysicalChannelReconfigurationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkCongestionIndication_PDU,
-      { "RadioLinkCongestionIndication", "rnsap.RadioLinkCongestionIndication",
+      { "RadioLinkCongestionIndication", "rnsap.RadioLinkCongestionIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationList_RL_CongestInd_PDU,
@@ -45650,11 +45650,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationItem_RL_CongestInd_PDU,
-      { "RL-InformationItem-RL-CongestInd", "rnsap.RL_InformationItem_RL_CongestInd",
+      { "RL-InformationItem-RL-CongestInd", "rnsap.RL_InformationItem_RL_CongestInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DCH_Rate_InformationItem_RL_CongestInd_PDU,
-      { "DCH-Rate-InformationItem-RL-CongestInd", "rnsap.DCH_Rate_InformationItem_RL_CongestInd",
+      { "DCH-Rate-InformationItem-RL-CongestInd", "rnsap.DCH_Rate_InformationItem_RL_CongestInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_EDCH_MacdFlowSpecificInformationList_RL_CongestInd_PDU,
@@ -45662,27 +45662,27 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_EDCH_MacdFlowSpecificInformationItem_RL_CongestInd_PDU,
-      { "EDCH-MacdFlowSpecificInformationItem-RL-CongestInd", "rnsap.EDCH_MacdFlowSpecificInformationItem_RL_CongestInd",
+      { "EDCH-MacdFlowSpecificInformationItem-RL-CongestInd", "rnsap.EDCH_MacdFlowSpecificInformationItem_RL_CongestInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UplinkSignallingTransferIndicationFDD_PDU,
-      { "UplinkSignallingTransferIndicationFDD", "rnsap.UplinkSignallingTransferIndicationFDD",
+      { "UplinkSignallingTransferIndicationFDD", "rnsap.UplinkSignallingTransferIndicationFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UplinkSignallingTransferIndicationTDD_PDU,
-      { "UplinkSignallingTransferIndicationTDD", "rnsap.UplinkSignallingTransferIndicationTDD",
+      { "UplinkSignallingTransferIndicationTDD", "rnsap.UplinkSignallingTransferIndicationTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DownlinkSignallingTransferRequest_PDU,
-      { "DownlinkSignallingTransferRequest", "rnsap.DownlinkSignallingTransferRequest",
+      { "DownlinkSignallingTransferRequest", "rnsap.DownlinkSignallingTransferRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RelocationCommit_PDU,
-      { "RelocationCommit", "rnsap.RelocationCommit",
+      { "RelocationCommit", "rnsap.RelocationCommit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_PagingRequest_PDU,
-      { "PagingRequest", "rnsap.PagingRequest",
+      { "PagingRequest", "rnsap.PagingRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_PagingArea_PagingRqst_PDU,
@@ -45690,11 +45690,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_PagingArea_PagingRqst_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_CNOriginatedPage_PagingRqst_PDU,
-      { "CNOriginatedPage-PagingRqst", "rnsap.CNOriginatedPage_PagingRqst",
+      { "CNOriginatedPage-PagingRqst", "rnsap.CNOriginatedPage_PagingRqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DedicatedMeasurementInitiationRequest_PDU,
-      { "DedicatedMeasurementInitiationRequest", "rnsap.DedicatedMeasurementInitiationRequest",
+      { "DedicatedMeasurementInitiationRequest", "rnsap.DedicatedMeasurementInitiationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DedicatedMeasurementObjectType_DM_Rqst_PDU,
@@ -45702,7 +45702,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_DedicatedMeasurementObjectType_DM_Rqst_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationItem_DM_Rqst_PDU,
-      { "RL-InformationItem-DM-Rqst", "rnsap.RL_InformationItem_DM_Rqst",
+      { "RL-InformationItem-DM-Rqst", "rnsap.RL_InformationItem_DM_Rqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSSICH_Info_DM_Rqst_PDU,
@@ -45714,11 +45714,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Set_InformationItem_DM_Rqst_PDU,
-      { "RL-Set-InformationItem-DM-Rqst", "rnsap.RL_Set_InformationItem_DM_Rqst",
+      { "RL-Set-InformationItem-DM-Rqst", "rnsap.RL_Set_InformationItem_DM_Rqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DedicatedMeasurementInitiationResponse_PDU,
-      { "DedicatedMeasurementInitiationResponse", "rnsap.DedicatedMeasurementInitiationResponse",
+      { "DedicatedMeasurementInitiationResponse", "rnsap.DedicatedMeasurementInitiationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DedicatedMeasurementObjectType_DM_Rsp_PDU,
@@ -45726,11 +45726,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_DedicatedMeasurementObjectType_DM_Rsp_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationItem_DM_Rsp_PDU,
-      { "RL-InformationItem-DM-Rsp", "rnsap.RL_InformationItem_DM_Rsp",
+      { "RL-InformationItem-DM-Rsp", "rnsap.RL_InformationItem_DM_Rsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Set_InformationItem_DM_Rsp_PDU,
-      { "RL-Set-InformationItem-DM-Rsp", "rnsap.RL_Set_InformationItem_DM_Rsp",
+      { "RL-Set-InformationItem-DM-Rsp", "rnsap.RL_Set_InformationItem_DM_Rsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Multiple_DedicatedMeasurementValueList_TDD_DM_Rsp_PDU,
@@ -45750,7 +45750,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DedicatedMeasurementInitiationFailure_PDU,
-      { "DedicatedMeasurementInitiationFailure", "rnsap.DedicatedMeasurementInitiationFailure",
+      { "DedicatedMeasurementInitiationFailure", "rnsap.DedicatedMeasurementInitiationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DedicatedMeasurementObjectType_DM_Fail_PDU,
@@ -45758,23 +45758,23 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_DedicatedMeasurementObjectType_DM_Fail_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Unsuccessful_InformationItem_DM_Fail_PDU,
-      { "RL-Unsuccessful-InformationItem-DM-Fail", "rnsap.RL_Unsuccessful_InformationItem_DM_Fail",
+      { "RL-Unsuccessful-InformationItem-DM-Fail", "rnsap.RL_Unsuccessful_InformationItem_DM_Fail_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Successful_InformationItem_DM_Fail_PDU,
-      { "RL-Successful-InformationItem-DM-Fail", "rnsap.RL_Successful_InformationItem_DM_Fail",
+      { "RL-Successful-InformationItem-DM-Fail", "rnsap.RL_Successful_InformationItem_DM_Fail_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Set_Unsuccessful_InformationItem_DM_Fail_PDU,
-      { "RL-Set-Unsuccessful-InformationItem-DM-Fail", "rnsap.RL_Set_Unsuccessful_InformationItem_DM_Fail",
+      { "RL-Set-Unsuccessful-InformationItem-DM-Fail", "rnsap.RL_Set_Unsuccessful_InformationItem_DM_Fail_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Set_Successful_InformationItem_DM_Fail_PDU,
-      { "RL-Set-Successful-InformationItem-DM-Fail", "rnsap.RL_Set_Successful_InformationItem_DM_Fail",
+      { "RL-Set-Successful-InformationItem-DM-Fail", "rnsap.RL_Set_Successful_InformationItem_DM_Fail_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DedicatedMeasurementReport_PDU,
-      { "DedicatedMeasurementReport", "rnsap.DedicatedMeasurementReport",
+      { "DedicatedMeasurementReport", "rnsap.DedicatedMeasurementReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DedicatedMeasurementObjectType_DM_Rprt_PDU,
@@ -45782,19 +45782,19 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_DedicatedMeasurementObjectType_DM_Rprt_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationItem_DM_Rprt_PDU,
-      { "RL-InformationItem-DM-Rprt", "rnsap.RL_InformationItem_DM_Rprt",
+      { "RL-InformationItem-DM-Rprt", "rnsap.RL_InformationItem_DM_Rprt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Set_InformationItem_DM_Rprt_PDU,
-      { "RL-Set-InformationItem-DM-Rprt", "rnsap.RL_Set_InformationItem_DM_Rprt",
+      { "RL-Set-InformationItem-DM-Rprt", "rnsap.RL_Set_InformationItem_DM_Rprt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DedicatedMeasurementTerminationRequest_PDU,
-      { "DedicatedMeasurementTerminationRequest", "rnsap.DedicatedMeasurementTerminationRequest",
+      { "DedicatedMeasurementTerminationRequest", "rnsap.DedicatedMeasurementTerminationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DedicatedMeasurementFailureIndication_PDU,
-      { "DedicatedMeasurementFailureIndication", "rnsap.DedicatedMeasurementFailureIndication",
+      { "DedicatedMeasurementFailureIndication", "rnsap.DedicatedMeasurementFailureIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DedicatedMeasurementObjectType_DM_Fail_Ind_PDU,
@@ -45802,51 +45802,51 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_DedicatedMeasurementObjectType_DM_Fail_Ind_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Unsuccessful_InformationItem_DM_Fail_Ind_PDU,
-      { "RL-Unsuccessful-InformationItem-DM-Fail-Ind", "rnsap.RL_Unsuccessful_InformationItem_DM_Fail_Ind",
+      { "RL-Unsuccessful-InformationItem-DM-Fail-Ind", "rnsap.RL_Unsuccessful_InformationItem_DM_Fail_Ind_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Set_Unsuccessful_InformationItem_DM_Fail_Ind_PDU,
-      { "RL-Set-Unsuccessful-InformationItem-DM-Fail-Ind", "rnsap.RL_Set_Unsuccessful_InformationItem_DM_Fail_Ind",
+      { "RL-Set-Unsuccessful-InformationItem-DM-Fail-Ind", "rnsap.RL_Set_Unsuccessful_InformationItem_DM_Fail_Ind_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CommonTransportChannelResourcesReleaseRequest_PDU,
-      { "CommonTransportChannelResourcesReleaseRequest", "rnsap.CommonTransportChannelResourcesReleaseRequest",
+      { "CommonTransportChannelResourcesReleaseRequest", "rnsap.CommonTransportChannelResourcesReleaseRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CommonTransportChannelResourcesRequest_PDU,
-      { "CommonTransportChannelResourcesRequest", "rnsap.CommonTransportChannelResourcesRequest",
+      { "CommonTransportChannelResourcesRequest", "rnsap.CommonTransportChannelResourcesRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CommonTransportChannelResourcesResponseFDD_PDU,
-      { "CommonTransportChannelResourcesResponseFDD", "rnsap.CommonTransportChannelResourcesResponseFDD",
+      { "CommonTransportChannelResourcesResponseFDD", "rnsap.CommonTransportChannelResourcesResponseFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_FACH_InfoForUESelectedS_CCPCH_CTCH_ResourceRspFDD_PDU,
-      { "FACH-InfoForUESelectedS-CCPCH-CTCH-ResourceRspFDD", "rnsap.FACH_InfoForUESelectedS_CCPCH_CTCH_ResourceRspFDD",
+      { "FACH-InfoForUESelectedS-CCPCH-CTCH-ResourceRspFDD", "rnsap.FACH_InfoForUESelectedS_CCPCH_CTCH_ResourceRspFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CommonTransportChannelResourcesResponseTDD_PDU,
-      { "CommonTransportChannelResourcesResponseTDD", "rnsap.CommonTransportChannelResourcesResponseTDD",
+      { "CommonTransportChannelResourcesResponseTDD", "rnsap.CommonTransportChannelResourcesResponseTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_FACH_InfoForUESelectedS_CCPCH_CTCH_ResourceRspTDD_PDU,
-      { "FACH-InfoForUESelectedS-CCPCH-CTCH-ResourceRspTDD", "rnsap.FACH_InfoForUESelectedS_CCPCH_CTCH_ResourceRspTDD",
+      { "FACH-InfoForUESelectedS-CCPCH-CTCH-ResourceRspTDD", "rnsap.FACH_InfoForUESelectedS_CCPCH_CTCH_ResourceRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CommonTransportChannelResourcesFailure_PDU,
-      { "CommonTransportChannelResourcesFailure", "rnsap.CommonTransportChannelResourcesFailure",
+      { "CommonTransportChannelResourcesFailure", "rnsap.CommonTransportChannelResourcesFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CompressedModeCommand_PDU,
-      { "CompressedModeCommand", "rnsap.CompressedModeCommand",
+      { "CompressedModeCommand", "rnsap.CompressedModeCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ErrorIndication_PDU,
-      { "ErrorIndication", "rnsap.ErrorIndication",
+      { "ErrorIndication", "rnsap.ErrorIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CommonMeasurementInitiationRequest_PDU,
-      { "CommonMeasurementInitiationRequest", "rnsap.CommonMeasurementInitiationRequest",
+      { "CommonMeasurementInitiationRequest", "rnsap.CommonMeasurementInitiationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CommonMeasurementObjectType_CM_Rqst_PDU,
@@ -45854,7 +45854,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_CommonMeasurementObjectType_CM_Rqst_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_CommonMeasurementInitiationResponse_PDU,
-      { "CommonMeasurementInitiationResponse", "rnsap.CommonMeasurementInitiationResponse",
+      { "CommonMeasurementInitiationResponse", "rnsap.CommonMeasurementInitiationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CommonMeasurementObjectType_CM_Rsp_PDU,
@@ -45862,11 +45862,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_CommonMeasurementObjectType_CM_Rsp_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_CommonMeasurementInitiationFailure_PDU,
-      { "CommonMeasurementInitiationFailure", "rnsap.CommonMeasurementInitiationFailure",
+      { "CommonMeasurementInitiationFailure", "rnsap.CommonMeasurementInitiationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CommonMeasurementReport_PDU,
-      { "CommonMeasurementReport", "rnsap.CommonMeasurementReport",
+      { "CommonMeasurementReport", "rnsap.CommonMeasurementReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CommonMeasurementObjectType_CM_Rprt_PDU,
@@ -45874,15 +45874,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_CommonMeasurementObjectType_CM_Rprt_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_CommonMeasurementTerminationRequest_PDU,
-      { "CommonMeasurementTerminationRequest", "rnsap.CommonMeasurementTerminationRequest",
+      { "CommonMeasurementTerminationRequest", "rnsap.CommonMeasurementTerminationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CommonMeasurementFailureIndication_PDU,
-      { "CommonMeasurementFailureIndication", "rnsap.CommonMeasurementFailureIndication",
+      { "CommonMeasurementFailureIndication", "rnsap.CommonMeasurementFailureIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_InformationExchangeInitiationRequest_PDU,
-      { "InformationExchangeInitiationRequest", "rnsap.InformationExchangeInitiationRequest",
+      { "InformationExchangeInitiationRequest", "rnsap.InformationExchangeInitiationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_InformationExchangeObjectType_InfEx_Rqst_PDU,
@@ -45890,7 +45890,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_InformationExchangeObjectType_InfEx_Rqst_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_GSM_Cell_InfEx_Rqst_PDU,
-      { "GSM-Cell-InfEx-Rqst", "rnsap.GSM_Cell_InfEx_Rqst",
+      { "GSM-Cell-InfEx-Rqst", "rnsap.GSM_Cell_InfEx_Rqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MBMS_Bearer_Service_in_MBMS_Cell_InfEx_Rqst_PDU,
@@ -45902,7 +45902,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_InformationExchangeInitiationResponse_PDU,
-      { "InformationExchangeInitiationResponse", "rnsap.InformationExchangeInitiationResponse",
+      { "InformationExchangeInitiationResponse", "rnsap.InformationExchangeInitiationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_InformationExchangeObjectType_InfEx_Rsp_PDU,
@@ -45922,11 +45922,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_InformationExchangeInitiationFailure_PDU,
-      { "InformationExchangeInitiationFailure", "rnsap.InformationExchangeInitiationFailure",
+      { "InformationExchangeInitiationFailure", "rnsap.InformationExchangeInitiationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_InformationReport_PDU,
-      { "InformationReport", "rnsap.InformationReport",
+      { "InformationReport", "rnsap.InformationReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_InformationExchangeObjectType_InfEx_Rprt_PDU,
@@ -45942,15 +45942,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_InformationExchangeTerminationRequest_PDU,
-      { "InformationExchangeTerminationRequest", "rnsap.InformationExchangeTerminationRequest",
+      { "InformationExchangeTerminationRequest", "rnsap.InformationExchangeTerminationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_InformationExchangeFailureIndication_PDU,
-      { "InformationExchangeFailureIndication", "rnsap.InformationExchangeFailureIndication",
+      { "InformationExchangeFailureIndication", "rnsap.InformationExchangeFailureIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ResetRequest_PDU,
-      { "ResetRequest", "rnsap.ResetRequest",
+      { "ResetRequest", "rnsap.ResetRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ResetIndicator_PDU,
@@ -45958,19 +45958,19 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_ResetIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_ContextInfoItem_Reset_PDU,
-      { "ContextInfoItem-Reset", "rnsap.ContextInfoItem_Reset",
+      { "ContextInfoItem-Reset", "rnsap.ContextInfoItem_Reset_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ContextGroupInfoItem_Reset_PDU,
-      { "ContextGroupInfoItem-Reset", "rnsap.ContextGroupInfoItem_Reset",
+      { "ContextGroupInfoItem-Reset", "rnsap.ContextGroupInfoItem_Reset_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ResetResponse_PDU,
-      { "ResetResponse", "rnsap.ResetResponse",
+      { "ResetResponse", "rnsap.ResetResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkActivationCommandFDD_PDU,
-      { "RadioLinkActivationCommandFDD", "rnsap.RadioLinkActivationCommandFDD",
+      { "RadioLinkActivationCommandFDD", "rnsap.RadioLinkActivationCommandFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DelayedActivationInformationList_RL_ActivationCmdFDD_PDU,
@@ -45978,11 +45978,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DelayedActivationInformation_RL_ActivationCmdFDD_PDU,
-      { "DelayedActivationInformation-RL-ActivationCmdFDD", "rnsap.DelayedActivationInformation_RL_ActivationCmdFDD",
+      { "DelayedActivationInformation-RL-ActivationCmdFDD", "rnsap.DelayedActivationInformation_RL_ActivationCmdFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkActivationCommandTDD_PDU,
-      { "RadioLinkActivationCommandTDD", "rnsap.RadioLinkActivationCommandTDD",
+      { "RadioLinkActivationCommandTDD", "rnsap.RadioLinkActivationCommandTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DelayedActivationInformationList_RL_ActivationCmdTDD_PDU,
@@ -45990,15 +45990,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DelayedActivationInformation_RL_ActivationCmdTDD_PDU,
-      { "DelayedActivationInformation-RL-ActivationCmdTDD", "rnsap.DelayedActivationInformation_RL_ActivationCmdTDD",
+      { "DelayedActivationInformation-RL-ActivationCmdTDD", "rnsap.DelayedActivationInformation_RL_ActivationCmdTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_GERANUplinkSignallingTransferIndication_PDU,
-      { "GERANUplinkSignallingTransferIndication", "rnsap.GERANUplinkSignallingTransferIndication",
+      { "GERANUplinkSignallingTransferIndication", "rnsap.GERANUplinkSignallingTransferIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkParameterUpdateIndicationFDD_PDU,
-      { "RadioLinkParameterUpdateIndicationFDD", "rnsap.RadioLinkParameterUpdateIndicationFDD",
+      { "RadioLinkParameterUpdateIndicationFDD", "rnsap.RadioLinkParameterUpdateIndicationFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_ParameterUpdateIndicationFDD_RL_InformationList_PDU,
@@ -46006,7 +46006,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_ParameterUpdateIndicationFDD_RL_Information_Item_PDU,
-      { "RL-ParameterUpdateIndicationFDD-RL-Information-Item", "rnsap.RL_ParameterUpdateIndicationFDD_RL_Information_Item",
+      { "RL-ParameterUpdateIndicationFDD-RL-Information-Item", "rnsap.RL_ParameterUpdateIndicationFDD_RL_Information_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_HS_Cell_Information_RL_Param_Upd_PDU,
@@ -46018,35 +46018,35 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RadioLinkParameterUpdateIndicationTDD_PDU,
-      { "RadioLinkParameterUpdateIndicationTDD", "rnsap.RadioLinkParameterUpdateIndicationTDD",
+      { "RadioLinkParameterUpdateIndicationTDD", "rnsap.RadioLinkParameterUpdateIndicationTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UEMeasurementInitiationRequest_PDU,
-      { "UEMeasurementInitiationRequest", "rnsap.UEMeasurementInitiationRequest",
+      { "UEMeasurementInitiationRequest", "rnsap.UEMeasurementInitiationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UEMeasurementInitiationResponse_PDU,
-      { "UEMeasurementInitiationResponse", "rnsap.UEMeasurementInitiationResponse",
+      { "UEMeasurementInitiationResponse", "rnsap.UEMeasurementInitiationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UEMeasurementInitiationFailure_PDU,
-      { "UEMeasurementInitiationFailure", "rnsap.UEMeasurementInitiationFailure",
+      { "UEMeasurementInitiationFailure", "rnsap.UEMeasurementInitiationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UEMeasurementReport_PDU,
-      { "UEMeasurementReport", "rnsap.UEMeasurementReport",
+      { "UEMeasurementReport", "rnsap.UEMeasurementReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UEMeasurementTerminationRequest_PDU,
-      { "UEMeasurementTerminationRequest", "rnsap.UEMeasurementTerminationRequest",
+      { "UEMeasurementTerminationRequest", "rnsap.UEMeasurementTerminationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UEMeasurementFailureIndication_PDU,
-      { "UEMeasurementFailureIndication", "rnsap.UEMeasurementFailureIndication",
+      { "UEMeasurementFailureIndication", "rnsap.UEMeasurementFailureIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_IurInvokeTrace_PDU,
-      { "IurInvokeTrace", "rnsap.IurInvokeTrace",
+      { "IurInvokeTrace", "rnsap.IurInvokeTrace_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ListOfInterfacesToTrace_PDU,
@@ -46054,63 +46054,63 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_InterfacesToTraceItem_PDU,
-      { "InterfacesToTraceItem", "rnsap.InterfacesToTraceItem",
+      { "InterfacesToTraceItem", "rnsap.InterfacesToTraceItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_IurDeactivateTrace_PDU,
-      { "IurDeactivateTrace", "rnsap.IurDeactivateTrace",
+      { "IurDeactivateTrace", "rnsap.IurDeactivateTrace_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MBMSAttachCommand_PDU,
-      { "MBMSAttachCommand", "rnsap.MBMSAttachCommand",
+      { "MBMSAttachCommand", "rnsap.MBMSAttachCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MBMSDetachCommand_PDU,
-      { "MBMSDetachCommand", "rnsap.MBMSDetachCommand",
+      { "MBMSDetachCommand", "rnsap.MBMSDetachCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DirectInformationTransfer_PDU,
-      { "DirectInformationTransfer", "rnsap.DirectInformationTransfer",
+      { "DirectInformationTransfer", "rnsap.DirectInformationTransfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_EnhancedRelocationRequest_PDU,
-      { "EnhancedRelocationRequest", "rnsap.EnhancedRelocationRequest",
+      { "EnhancedRelocationRequest", "rnsap.EnhancedRelocationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_EnhancedRelocationResponse_PDU,
-      { "EnhancedRelocationResponse", "rnsap.EnhancedRelocationResponse",
+      { "EnhancedRelocationResponse", "rnsap.EnhancedRelocationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_EnhancedRelocationFailure_PDU,
-      { "EnhancedRelocationFailure", "rnsap.EnhancedRelocationFailure",
+      { "EnhancedRelocationFailure", "rnsap.EnhancedRelocationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_EnhancedRelocationCancel_PDU,
-      { "EnhancedRelocationCancel", "rnsap.EnhancedRelocationCancel",
+      { "EnhancedRelocationCancel", "rnsap.EnhancedRelocationCancel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_EnhancedRelocationSignallingTransfer_PDU,
-      { "EnhancedRelocationSignallingTransfer", "rnsap.EnhancedRelocationSignallingTransfer",
+      { "EnhancedRelocationSignallingTransfer", "rnsap.EnhancedRelocationSignallingTransfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_EnhancedRelocationRelease_PDU,
-      { "EnhancedRelocationRelease", "rnsap.EnhancedRelocationRelease",
+      { "EnhancedRelocationRelease", "rnsap.EnhancedRelocationRelease_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MBSFNMCCHInformation_PDU,
-      { "MBSFNMCCHInformation", "rnsap.MBSFNMCCHInformation",
+      { "MBSFNMCCHInformation", "rnsap.MBSFNMCCHInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_SecondaryULFrequencyReport_PDU,
-      { "SecondaryULFrequencyReport", "rnsap.SecondaryULFrequencyReport",
+      { "SecondaryULFrequencyReport", "rnsap.SecondaryULFrequencyReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_SecondaryULFrequencyUpdateIndication_PDU,
-      { "SecondaryULFrequencyUpdateIndication", "rnsap.SecondaryULFrequencyUpdateIndication",
+      { "SecondaryULFrequencyUpdateIndication", "rnsap.SecondaryULFrequencyUpdateIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_PrivateMessage_PDU,
-      { "PrivateMessage", "rnsap.PrivateMessage",
+      { "PrivateMessage", "rnsap.PrivateMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RNSAP_PDU_PDU,
@@ -46118,7 +46118,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_RNSAP_PDU_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_NULL_PDU,
-      { "NULL", "rnsap.NULL",
+      { "NULL", "rnsap.NULL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_local,
@@ -46146,7 +46146,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_32767", HFILL }},
     { &hf_rnsap_ProtocolIE_Container_item,
-      { "ProtocolIE-Field", "rnsap.ProtocolIE_Field",
+      { "ProtocolIE-Field", "rnsap.ProtocolIE_Field_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_id,
@@ -46158,19 +46158,19 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_Criticality_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_value,
-      { "value", "rnsap.value",
+      { "value", "rnsap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProtocolIE_Field_value", HFILL }},
     { &hf_rnsap_ProtocolExtensionContainer_item,
-      { "ProtocolExtensionField", "rnsap.ProtocolExtensionField",
+      { "ProtocolExtensionField", "rnsap.ProtocolExtensionField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_extensionValue,
-      { "extensionValue", "rnsap.extensionValue",
+      { "extensionValue", "rnsap.extensionValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_PrivateIE_Container_item,
-      { "PrivateIE-Field", "rnsap.PrivateIE_Field",
+      { "PrivateIE-Field", "rnsap.PrivateIE_Field_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_id_01,
@@ -46178,11 +46178,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_PrivateIE_ID_vals), 0,
         "PrivateIE_ID", HFILL }},
     { &hf_rnsap_value_01,
-      { "value", "rnsap.value",
+      { "value", "rnsap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrivateIE_Field_value", HFILL }},
     { &hf_rnsap_ActivationInformation_item,
-      { "ActivationInformationItem", "rnsap.ActivationInformationItem",
+      { "ActivationInformationItem", "rnsap.ActivationInformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_uU_ActivationState,
@@ -46194,19 +46194,19 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ProtocolExtensionContainer", HFILL }},
     { &hf_rnsap_Active_MBMS_Bearer_Service_ListFDD_item,
-      { "MBMS-Bearer-ServiceItemFDD", "rnsap.MBMS_Bearer_ServiceItemFDD",
+      { "MBMS-Bearer-ServiceItemFDD", "rnsap.MBMS_Bearer_ServiceItemFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Active_MBMS_Bearer_Service_ListFDD_PFL_item,
-      { "MBMS-Bearer-ServiceItemFDD-PFL", "rnsap.MBMS_Bearer_ServiceItemFDD_PFL",
+      { "MBMS-Bearer-ServiceItemFDD-PFL", "rnsap.MBMS_Bearer_ServiceItemFDD_PFL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Active_MBMS_Bearer_Service_ListTDD_item,
-      { "MBMS-Bearer-ServiceItemTDD", "rnsap.MBMS_Bearer_ServiceItemTDD",
+      { "MBMS-Bearer-ServiceItemTDD", "rnsap.MBMS_Bearer_ServiceItemTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Active_MBMS_Bearer_Service_ListTDD_PFL_item,
-      { "MBMS-Bearer-ServiceItemTDD-PFL", "rnsap.MBMS_Bearer_ServiceItemTDD_PFL",
+      { "MBMS-Bearer-ServiceItemTDD-PFL", "rnsap.MBMS_Bearer_ServiceItemTDD_PFL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_cMConfigurationChangeCFN,
@@ -46218,15 +46218,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Transmission_Gap_Pattern_Sequence_Status_List", HFILL }},
     { &hf_rnsap_Additional_EDCH_Cell_Information_Response_RLAddList_item,
-      { "Additional-EDCH-Cell-Information-Response-RLAdd-ItemIEs", "rnsap.Additional_EDCH_Cell_Information_Response_RLAdd_ItemIEs",
+      { "Additional-EDCH-Cell-Information-Response-RLAdd-ItemIEs", "rnsap.Additional_EDCH_Cell_Information_Response_RLAdd_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_additional_EDCH_FDD_Information_Response,
-      { "additional-EDCH-FDD-Information-Response", "rnsap.additional_EDCH_FDD_Information_Response",
+      { "additional-EDCH-FDD-Information-Response", "rnsap.additional_EDCH_FDD_Information_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Additional_EDCH_FDD_Information_Response_ItemIEs", HFILL }},
     { &hf_rnsap_additional_EDCH_Serving_Cell_Change_Information_Response_RLAdd,
-      { "additional-EDCH-Serving-Cell-Change-Information-Response-RLAdd", "rnsap.additional_EDCH_Serving_Cell_Change_Information_Response_RLAdd",
+      { "additional-EDCH-Serving-Cell-Change-Information-Response-RLAdd", "rnsap.additional_EDCH_Serving_Cell_Change_Information_Response_RLAdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_DCH_Serving_cell_change_informationResponse", HFILL }},
     { &hf_rnsap_multicell_EDCH_Transport_Bearer_Mode,
@@ -46238,11 +46238,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_EDCH_Cell_Information_Setup_item,
-      { "Additional-EDCH-FDD-Setup-Cell-Information", "rnsap.Additional_EDCH_FDD_Setup_Cell_Information",
+      { "Additional-EDCH-FDD-Setup-Cell-Information", "rnsap.Additional_EDCH_FDD_Setup_Cell_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_additional_EDCH_UL_DPCH_Information_Setup,
-      { "additional-EDCH-UL-DPCH-Information-Setup", "rnsap.additional_EDCH_UL_DPCH_Information_Setup",
+      { "additional-EDCH-UL-DPCH-Information-Setup", "rnsap.additional_EDCH_UL_DPCH_Information_Setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_additional_EDCH_RL_Specific_Information_To_Setup,
@@ -46250,19 +46250,19 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Additional_EDCH_RL_Specific_Information_To_Setup_List", HFILL }},
     { &hf_rnsap_additional_EDCH_FDD_Information,
-      { "additional-EDCH-FDD-Information", "rnsap.additional_EDCH_FDD_Information",
+      { "additional-EDCH-FDD-Information", "rnsap.additional_EDCH_FDD_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_additional_EDCH_F_DPCH_Information_Setup,
-      { "additional-EDCH-F-DPCH-Information-Setup", "rnsap.additional_EDCH_F_DPCH_Information_Setup",
+      { "additional-EDCH-F-DPCH-Information-Setup", "rnsap.additional_EDCH_F_DPCH_Information_Setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Additional_EDCH_F_DPCH_Information", HFILL }},
     { &hf_rnsap_multicellEDCH_Information,
-      { "multicellEDCH-Information", "rnsap.multicellEDCH_Information",
+      { "multicellEDCH-Information", "rnsap.multicellEDCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ul_ScramblingCode,
-      { "ul-ScramblingCode", "rnsap.ul_ScramblingCode",
+      { "ul-ScramblingCode", "rnsap.ul_ScramblingCode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ul_SIR_Target,
@@ -46282,11 +46282,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_InnerLoopDLPCStatus_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_f_DPCH_SlotFormatSupportRequest,
-      { "f-DPCH-SlotFormatSupportRequest", "rnsap.f_DPCH_SlotFormatSupportRequest",
+      { "f-DPCH-SlotFormatSupportRequest", "rnsap.f_DPCH_SlotFormatSupportRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_EDCH_RL_Specific_Information_To_Setup_List_item,
-      { "Additional-EDCH-RL-Specific-Information-To-Setup-ItemIEs", "rnsap.Additional_EDCH_RL_Specific_Information_To_Setup_ItemIEs",
+      { "Additional-EDCH-RL-Specific-Information-To-Setup-ItemIEs", "rnsap.Additional_EDCH_RL_Specific_Information_To_Setup_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_eDCH_Additional_RL_ID,
@@ -46330,15 +46330,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_multicellEDCH_RL_SpecificInformation,
-      { "multicellEDCH-RL-SpecificInformation", "rnsap.multicellEDCH_RL_SpecificInformation",
+      { "multicellEDCH-RL-SpecificInformation", "rnsap.multicellEDCH_RL_SpecificInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_EDCH_Cell_Information_To_Add_List_item,
-      { "Additional-EDCH-Cell-Information-To-Add-ItemIEs", "rnsap.Additional_EDCH_Cell_Information_To_Add_ItemIEs",
+      { "Additional-EDCH-Cell-Information-To-Add-ItemIEs", "rnsap.Additional_EDCH_Cell_Information_To_Add_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_additional_EDCH_UL_DPCH_Information_Setup_01,
-      { "additional-EDCH-UL-DPCH-Information-Setup", "rnsap.additional_EDCH_UL_DPCH_Information_Setup",
+      { "additional-EDCH-UL-DPCH-Information-Setup", "rnsap.additional_EDCH_UL_DPCH_Information_Setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Additional_EDCH_UL_DPCH_Information_Addition", HFILL }},
     { &hf_rnsap_additional_EDCH_RL_Specific_Information_To_Add_List,
@@ -46346,11 +46346,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_EDCH_RL_Specific_Information_To_Add_List_item,
-      { "Additional-EDCH-RL-Specific-Information-To-Add-ItemIEs", "rnsap.Additional_EDCH_RL_Specific_Information_To_Add_ItemIEs",
+      { "Additional-EDCH-RL-Specific-Information-To-Add-ItemIEs", "rnsap.Additional_EDCH_RL_Specific_Information_To_Add_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_EDCH_RL_Specific_Information_To_Modify_List_item,
-      { "Additional-EDCH-RL-Specific-Information-To-Modify-ItemIEs", "rnsap.Additional_EDCH_RL_Specific_Information_To_Modify_ItemIEs",
+      { "Additional-EDCH-RL-Specific-Information-To-Modify-ItemIEs", "rnsap.Additional_EDCH_RL_Specific_Information_To_Modify_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hARQ_Process_Allocation_Scheduled_2ms_EDCH,
@@ -46370,7 +46370,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_TFCI", HFILL }},
     { &hf_rnsap_Additional_EDCH_MAC_d_Flows_Specific_Info_List_item,
-      { "Additional-EDCH-MAC-d-Flows-Specific-Info", "rnsap.Additional_EDCH_MAC_d_Flows_Specific_Info",
+      { "Additional-EDCH-MAC-d-Flows-Specific-Info", "rnsap.Additional_EDCH_MAC_d_Flows_Specific_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_DCH_MACdFlow_ID,
@@ -46386,11 +46386,11 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_EDCH_MAC_d_Flow_Specific_Information_Response_List_item,
-      { "Additional-EDCH-MAC-d-Flows-Specific-Info-Response", "rnsap.Additional_EDCH_MAC_d_Flows_Specific_Info_Response",
+      { "Additional-EDCH-MAC-d-Flows-Specific-Info-Response", "rnsap.Additional_EDCH_MAC_d_Flows_Specific_Info_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_EDCH_Cell_Information_Response_List_item,
-      { "Additional-EDCH-FDD-Information-Response-ItemIEs", "rnsap.Additional_EDCH_FDD_Information_Response_ItemIEs",
+      { "Additional-EDCH-FDD-Information-Response-ItemIEs", "rnsap.Additional_EDCH_FDD_Information_Response_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_eDCH_Additional_RL_Specific_Information_Response,
@@ -46398,7 +46398,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "EDCH_Additional_RL_Specific_Information_Response_List", HFILL }},
     { &hf_rnsap_EDCH_Additional_RL_Specific_Information_Response_List_item,
-      { "EDCH-Additional-RL-Specific-Information-Response-ItemIEs", "rnsap.EDCH_Additional_RL_Specific_Information_Response_ItemIEs",
+      { "EDCH-Additional-RL-Specific-Information-Response-ItemIEs", "rnsap.EDCH_Additional_RL_Specific_Information_Response_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_received_total_wide_band_power,
@@ -46418,7 +46418,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RL_Set_ID", HFILL }},
     { &hf_rnsap_eDCH_FDD_DL_ControlChannelInformation,
-      { "eDCH-FDD-DL-ControlChannelInformation", "rnsap.eDCH_FDD_DL_ControlChannelInformation",
+      { "eDCH-FDD-DL-ControlChannelInformation", "rnsap.eDCH_FDD_DL_ControlChannelInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dl_CodeInformation,
@@ -46474,7 +46474,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_Primary_CPICH_Usage_For_Channel_Estimation_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_secondary_CPICH_Information,
-      { "secondary-CPICH-Information", "rnsap.secondary_CPICH_Information",
+      { "secondary-CPICH-Information", "rnsap.secondary_CPICH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_f_DPCH_SlotFormat,
@@ -46482,7 +46482,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_EDCH_Cell_Information_Response_RLReconf_List_item,
-      { "Additional-EDCH-FDD-Information-Response-RLReconf-Items", "rnsap.Additional_EDCH_FDD_Information_Response_RLReconf_Items",
+      { "Additional-EDCH-FDD-Information-Response-RLReconf-Items", "rnsap.Additional_EDCH_FDD_Information_Response_RLReconf_Items_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_eDCH_Additional_RL_Specific_Modified_Information_Response,
@@ -46490,7 +46490,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "EDCH_Additional_RL_Specific_Modified_Information_Response_List", HFILL }},
     { &hf_rnsap_EDCH_Additional_RL_Specific_Modified_Information_Response_List_item,
-      { "EDCH-Additional-RL-Specific-Modified-Information-Response-ItemIEs", "rnsap.EDCH_Additional_RL_Specific_Modified_Information_Response_ItemIEs",
+      { "EDCH-Additional-RL-Specific-Modified-Information-Response-ItemIEs", "rnsap.EDCH_Additional_RL_Specific_Modified_Information_Response_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dL_PowerBalancing_UpdatedIndicator,
@@ -46502,11 +46502,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_Secondary_CPICH_Information_Change_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_EDCH_Cell_Information_ConfigurationChange_List_item,
-      { "Additional-EDCH-ConfigurationChange-Info-ItemIEs", "rnsap.Additional_EDCH_ConfigurationChange_Info_ItemIEs",
+      { "Additional-EDCH-ConfigurationChange-Info-ItemIEs", "rnsap.Additional_EDCH_ConfigurationChange_Info_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_additional_EDCH_UL_DPCH_Information_Modify,
-      { "additional-EDCH-UL-DPCH-Information-Modify", "rnsap.additional_EDCH_UL_DPCH_Information_Modify",
+      { "additional-EDCH-UL-DPCH-Information-Modify", "rnsap.additional_EDCH_UL_DPCH_Information_Modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_additional_EDCH_RL_Specific_Information_To_Add,
@@ -46518,15 +46518,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Additional_EDCH_RL_Specific_Information_To_Modify_List", HFILL }},
     { &hf_rnsap_additional_EDCH_FDD_Information_To_Modify,
-      { "additional-EDCH-FDD-Information-To-Modify", "rnsap.additional_EDCH_FDD_Information_To_Modify",
+      { "additional-EDCH-FDD-Information-To-Modify", "rnsap.additional_EDCH_FDD_Information_To_Modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Additional_EDCH_FDD_Information", HFILL }},
     { &hf_rnsap_additional_EDCH_F_DPCH_Information_Modify,
-      { "additional-EDCH-F-DPCH-Information-Modify", "rnsap.additional_EDCH_F_DPCH_Information_Modify",
+      { "additional-EDCH-F-DPCH-Information-Modify", "rnsap.additional_EDCH_F_DPCH_Information_Modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Additional_EDCH_F_DPCH_Information", HFILL }},
     { &hf_rnsap_Additional_EDCH_Cell_Information_Removal_List_item,
-      { "Additional-EDCH-Cell-Information-Removal-Info-ItemIEs", "rnsap.Additional_EDCH_Cell_Information_Removal_Info_ItemIEs",
+      { "Additional-EDCH-Cell-Information-Removal-Info-ItemIEs", "rnsap.Additional_EDCH_Cell_Information_Removal_Info_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_rL_on_Secondary_UL_Frequency,
@@ -46538,11 +46538,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Additional_EDCH_DL_Control_Channel_Change_Information_List", HFILL }},
     { &hf_rnsap_Additional_EDCH_DL_Control_Channel_Change_Information_List_item,
-      { "Additional-EDCH-DL-Control-Channel-Change-Info-ItemIEs", "rnsap.Additional_EDCH_DL_Control_Channel_Change_Info_ItemIEs",
+      { "Additional-EDCH-DL-Control-Channel-Change-Info-ItemIEs", "rnsap.Additional_EDCH_DL_Control_Channel_Change_Info_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_AdditionalPreferredFrequency_item,
-      { "AdditionalPreferredFrequencyItem", "rnsap.AdditionalPreferredFrequencyItem",
+      { "AdditionalPreferredFrequencyItem", "rnsap.AdditionalPreferredFrequencyItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_correspondingCells,
@@ -46586,7 +46586,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_badSatelliteInformation_item,
-      { "badSatelliteInformation item", "rnsap.badSatelliteInformation_item",
+      { "badSatelliteInformation item", "rnsap.badSatelliteInformation_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_badSAT_ID,
@@ -46638,7 +46638,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_100_", HFILL }},
     { &hf_rnsap_lAI,
-      { "lAI", "rnsap.lAI",
+      { "lAI", "rnsap.lAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_pLMN_Identity,
@@ -46662,15 +46662,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_TUTRANGANSSAccuracyClass_vals), 0,
         "TUTRANGANSSAccuracyClass", HFILL }},
     { &hf_rnsap_tUTRANGPSMeasurementValueInformation,
-      { "tUTRANGPSMeasurementValueInformation", "rnsap.tUTRANGPSMeasurementValueInformation",
+      { "tUTRANGPSMeasurementValueInformation", "rnsap.tUTRANGPSMeasurementValueInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_sFNSFNMeasurementValueInformation,
-      { "sFNSFNMeasurementValueInformation", "rnsap.sFNSFNMeasurementValueInformation",
+      { "sFNSFNMeasurementValueInformation", "rnsap.sFNSFNMeasurementValueInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_loadValue,
-      { "loadValue", "rnsap.loadValue",
+      { "loadValue", "rnsap.loadValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_transmittedCarrierPowerValue,
@@ -46686,15 +46686,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "UL_TimeslotISCP", HFILL }},
     { &hf_rnsap_extension_CommonMeasurementValue,
-      { "extension-CommonMeasurementValue", "rnsap.extension_CommonMeasurementValue",
+      { "extension-CommonMeasurementValue", "rnsap.extension_CommonMeasurementValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_measurementAvailable,
-      { "measurementAvailable", "rnsap.measurementAvailable",
+      { "measurementAvailable", "rnsap.measurementAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CommonMeasurementAvailable", HFILL }},
     { &hf_rnsap_measurementnotAvailable,
-      { "measurementnotAvailable", "rnsap.measurementnotAvailable",
+      { "measurementnotAvailable", "rnsap.measurementnotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_commonMeasurementValue,
@@ -46702,7 +46702,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_CommonMeasurementValue_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_Common_EDCH_MAC_d_Flow_Specific_InformationFDD_item,
-      { "Common-EDCH-MAC-d-Flow-Specific-InformationFDDItem", "rnsap.Common_EDCH_MAC_d_Flow_Specific_InformationFDDItem",
+      { "Common-EDCH-MAC-d-Flow-Specific-InformationFDDItem", "rnsap.Common_EDCH_MAC_d_Flow_Specific_InformationFDDItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_common_EDCH_MACdFlow_ID,
@@ -46726,7 +46726,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Common_E_DCH_LogicalChannelInformation", HFILL }},
     { &hf_rnsap_Common_EDCH_MAC_d_Flow_Specific_InformationLCR_item,
-      { "Common-EDCH-MAC-d-Flow-Specific-InformationItemLCR", "rnsap.Common_EDCH_MAC_d_Flow_Specific_InformationItemLCR",
+      { "Common-EDCH-MAC-d-Flow-Specific-InformationItemLCR", "rnsap.Common_EDCH_MAC_d_Flow_Specific_InformationItemLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_common_EDCH_MACdFlow_ID_LCR,
@@ -46738,7 +46738,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_DCH_HARQ_PO_TDD", HFILL }},
     { &hf_rnsap_Common_E_DCH_LogicalChannelInformation_item,
-      { "Common-E-DCH-LogicalChannelInformationItem", "rnsap.Common_E_DCH_LogicalChannelInformationItem",
+      { "Common-E-DCH-LogicalChannelInformationItem", "rnsap.Common_E_DCH_LogicalChannelInformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_logicalChannelId,
@@ -46758,11 +46758,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_Enabling_Delay_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_dTX_Information,
-      { "dTX-Information", "rnsap.dTX_Information",
+      { "dTX-Information", "rnsap.dTX_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dRX_Information,
-      { "dRX-Information", "rnsap.dRX_Information",
+      { "dRX-Information", "rnsap.dRX_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dTX_Information_to_Modify,
@@ -46774,7 +46774,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_DRX_Information_to_Modify_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_Continuous_Packet_Connectivity_HS_SCCH_Less_Information_item,
-      { "Continuous-Packet-Connectivity-HS-SCCH-Less-InformationItem", "rnsap.Continuous_Packet_Connectivity_HS_SCCH_Less_InformationItem",
+      { "Continuous-Packet-Connectivity-HS-SCCH-Less-InformationItem", "rnsap.Continuous_Packet_Connectivity_HS_SCCH_Less_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_transport_Block_Size_Index,
@@ -46798,11 +46798,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_continuous_Packet_Connectivity_DTX_DRX_Information,
-      { "continuous-Packet-Connectivity-DTX-DRX-Information", "rnsap.continuous_Packet_Connectivity_DTX_DRX_Information",
+      { "continuous-Packet-Connectivity-DTX-DRX-Information", "rnsap.continuous_Packet_Connectivity_DTX_DRX_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_continuous_Packet_Connectivity_DTX_DRX_Information_to_Modify,
-      { "continuous-Packet-Connectivity-DTX-DRX-Information-to-Modify", "rnsap.continuous_Packet_Connectivity_DTX_DRX_Information_to_Modify",
+      { "continuous-Packet-Connectivity-DTX-DRX-Information-to-Modify", "rnsap.continuous_Packet_Connectivity_DTX_DRX_Information_to_Modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_continuous_Packet_Connectivity_HS_SCCH_Less_Information,
@@ -46810,7 +46810,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Counting_Information_item,
-      { "Counting-Information-List", "rnsap.Counting_Information_List",
+      { "Counting-Information-List", "rnsap.Counting_Information_List_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_counting_Result,
@@ -46818,7 +46818,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_procedureID,
-      { "procedureID", "rnsap.procedureID",
+      { "procedureID", "rnsap.procedureID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_triggeringMessage,
@@ -46838,7 +46838,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CriticalityDiagnostics_IE_List", HFILL }},
     { &hf_rnsap_CriticalityDiagnostics_IE_List_item,
-      { "CriticalityDiagnostics-IE-List item", "rnsap.CriticalityDiagnostics_IE_List_item",
+      { "CriticalityDiagnostics-IE-List item", "rnsap.CriticalityDiagnostics_IE_List_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_iECriticality,
@@ -46854,7 +46854,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RepetitionNumber0", HFILL }},
     { &hf_rnsap_MessageStructure_item,
-      { "MessageStructure item", "rnsap.MessageStructure_item",
+      { "MessageStructure item", "rnsap.MessageStructure_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_repetitionNumber_01,
@@ -46866,39 +46866,39 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_continuousPacketConnectivity_DRX_InformationLCR,
-      { "continuousPacketConnectivity-DRX-InformationLCR", "rnsap.continuousPacketConnectivity_DRX_InformationLCR",
+      { "continuousPacketConnectivity-DRX-InformationLCR", "rnsap.continuousPacketConnectivity_DRX_InformationLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_continuousPacketConnectivity_DRX_Information_to_Modify_LCR,
-      { "continuousPacketConnectivity-DRX-Information-to-Modify-LCR", "rnsap.continuousPacketConnectivity_DRX_Information_to_Modify_LCR",
+      { "continuousPacketConnectivity-DRX-Information-to-Modify-LCR", "rnsap.continuousPacketConnectivity_DRX_Information_to_Modify_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hS_DSCH_Semi_PersistentScheduling_Information_LCR,
-      { "hS-DSCH-Semi-PersistentScheduling-Information-LCR", "rnsap.hS_DSCH_Semi_PersistentScheduling_Information_LCR",
+      { "hS-DSCH-Semi-PersistentScheduling-Information-LCR", "rnsap.hS_DSCH_Semi_PersistentScheduling_Information_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hS_DSCH_Semi_PersistentScheduling_Information_to_Modify_LCR,
-      { "hS-DSCH-Semi-PersistentScheduling-Information-to-Modify-LCR", "rnsap.hS_DSCH_Semi_PersistentScheduling_Information_to_Modify_LCR",
+      { "hS-DSCH-Semi-PersistentScheduling-Information-to-Modify-LCR", "rnsap.hS_DSCH_Semi_PersistentScheduling_Information_to_Modify_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hS_DSCH_SPS_Deactivate_Indicator_LCR,
-      { "hS-DSCH-SPS-Deactivate-Indicator-LCR", "rnsap.hS_DSCH_SPS_Deactivate_Indicator_LCR",
+      { "hS-DSCH-SPS-Deactivate-Indicator-LCR", "rnsap.hS_DSCH_SPS_Deactivate_Indicator_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_DCH_Semi_PersistentScheduling_Information_LCR,
-      { "e-DCH-Semi-PersistentScheduling-Information-LCR", "rnsap.e_DCH_Semi_PersistentScheduling_Information_LCR",
+      { "e-DCH-Semi-PersistentScheduling-Information-LCR", "rnsap.e_DCH_Semi_PersistentScheduling_Information_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_DCH_Semi_PersistentScheduling_Information_to_Modify_LCR,
-      { "e-DCH-Semi-PersistentScheduling-Information-to-Modify-LCR", "rnsap.e_DCH_Semi_PersistentScheduling_Information_to_Modify_LCR",
+      { "e-DCH-Semi-PersistentScheduling-Information-to-Modify-LCR", "rnsap.e_DCH_Semi_PersistentScheduling_Information_to_Modify_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_DCH_SPS_Deactivate_Indicator_LCR,
-      { "e-DCH-SPS-Deactivate-Indicator-LCR", "rnsap.e_DCH_SPS_Deactivate_Indicator_LCR",
+      { "e-DCH-SPS-Deactivate-Indicator-LCR", "rnsap.e_DCH_SPS_Deactivate_Indicator_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hS_SCCH_DRX_Information_LCR,
-      { "hS-SCCH-DRX-Information-LCR", "rnsap.hS_SCCH_DRX_Information_LCR",
+      { "hS-SCCH-DRX-Information-LCR", "rnsap.hS_SCCH_DRX_Information_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_AGCH_DRX_Information_LCR,
@@ -46918,11 +46918,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "UE_DRX_Offset_LCR", HFILL }},
     { &hf_rnsap_sameAsHS_SCCH,
-      { "sameAsHS-SCCH", "rnsap.sameAsHS_SCCH",
+      { "sameAsHS-SCCH", "rnsap.sameAsHS_SCCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_AGCH_DRX_Parameters,
-      { "e-AGCH-DRX-Parameters", "rnsap.e_AGCH_DRX_Parameters",
+      { "e-AGCH-DRX-Parameters", "rnsap.e_AGCH_DRX_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_AGCH_UE_DRX_Cycle_LCR,
@@ -46942,15 +46942,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_DRX_Information_to_Modify_LCR_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_modify,
-      { "modify", "rnsap.modify",
+      { "modify", "rnsap.modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DRX_Information_to_Modify_Items_LCR", HFILL }},
     { &hf_rnsap_deactivate,
-      { "deactivate", "rnsap.deactivate",
+      { "deactivate", "rnsap.deactivate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hS_SCCH_DRX_Information_ResponseLCR,
-      { "hS-SCCH-DRX-Information-ResponseLCR", "rnsap.hS_SCCH_DRX_Information_ResponseLCR",
+      { "hS-SCCH-DRX-Information-ResponseLCR", "rnsap.hS_SCCH_DRX_Information_ResponseLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_AGCH_DRX_Information_ResponseLCR,
@@ -46958,11 +46958,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_E_AGCH_DRX_Information_ResponseLCR_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_e_AGCH_DRX_Parameters_Response,
-      { "e-AGCH-DRX-Parameters-Response", "rnsap.e_AGCH_DRX_Parameters_Response",
+      { "e-AGCH-DRX-Parameters-Response", "rnsap.e_AGCH_DRX_Parameters_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DCH_FDD_Information_item,
-      { "DCH-FDD-InformationItem", "rnsap.DCH_FDD_InformationItem",
+      { "DCH-FDD-InformationItem", "rnsap.DCH_FDD_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_payloadCRC_PresenceIndicator,
@@ -46986,7 +46986,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DCH_Specific_FDD_InformationList", HFILL }},
     { &hf_rnsap_DCH_MeasurementOccasion_Information_item,
-      { "DchMeasurementOccasionInformation-Item", "rnsap.DchMeasurementOccasionInformation_Item",
+      { "DchMeasurementOccasionInformation-Item", "rnsap.DchMeasurementOccasionInformation_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_pattern_Sequence_Identifier,
@@ -46998,7 +46998,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_Status_Flag_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_measurement_Occasion_Pattern_Sequence_parameters,
-      { "measurement-Occasion-Pattern-Sequence-parameters", "rnsap.measurement_Occasion_Pattern_Sequence_parameters",
+      { "measurement-Occasion-Pattern-Sequence-parameters", "rnsap.measurement_Occasion_Pattern_Sequence_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_measurement_Occasion_Pattern_Sequence_parameters_k,
@@ -47018,7 +47018,7 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_7", HFILL }},
     { &hf_rnsap_DCH_Specific_FDD_InformationList_item,
-      { "DCH-Specific-FDD-Item", "rnsap.DCH_Specific_FDD_Item",
+      { "DCH-Specific-FDD-Item", "rnsap.DCH_Specific_FDD_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dCH_ID,
@@ -47030,11 +47030,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_TrCH_SrcStatisticsDescr_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_ul_transportFormatSet,
-      { "ul-transportFormatSet", "rnsap.ul_transportFormatSet",
+      { "ul-transportFormatSet", "rnsap.ul_transportFormatSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportFormatSet", HFILL }},
     { &hf_rnsap_dl_transportFormatSet,
-      { "dl-transportFormatSet", "rnsap.dl_transportFormatSet",
+      { "dl-transportFormatSet", "rnsap.dl_transportFormatSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportFormatSet", HFILL }},
     { &hf_rnsap_ul_BLER,
@@ -47046,7 +47046,7 @@ void proto_register_rnsap(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "BLER", HFILL }},
     { &hf_rnsap_allocationRetentionPriority,
-      { "allocationRetentionPriority", "rnsap.allocationRetentionPriority",
+      { "allocationRetentionPriority", "rnsap.allocationRetentionPriority_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_frameHandlingPriority,
@@ -47062,11 +47062,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_DRACControl_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_DCH_InformationResponse_item,
-      { "DCH-InformationResponseItem", "rnsap.DCH_InformationResponseItem",
+      { "DCH-InformationResponseItem", "rnsap.DCH_InformationResponseItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DCH_TDD_Information_item,
-      { "DCH-TDD-InformationItem", "rnsap.DCH_TDD_InformationItem",
+      { "DCH-TDD-InformationItem", "rnsap.DCH_TDD_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dCH_SpecificInformationList_01,
@@ -47074,7 +47074,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DCH_Specific_TDD_InformationList", HFILL }},
     { &hf_rnsap_DCH_Specific_TDD_InformationList_item,
-      { "DCH-Specific-TDD-Item", "rnsap.DCH_Specific_TDD_Item",
+      { "DCH-Specific-TDD-Item", "rnsap.DCH_Specific_TDD_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ul_cCTrCH_ID,
@@ -47110,15 +47110,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Round_Trip_Time_Value", HFILL }},
     { &hf_rnsap_extension_DedicatedMeasurementValue,
-      { "extension-DedicatedMeasurementValue", "rnsap.extension_DedicatedMeasurementValue",
+      { "extension-DedicatedMeasurementValue", "rnsap.extension_DedicatedMeasurementValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_measurementAvailable_01,
-      { "measurementAvailable", "rnsap.measurementAvailable",
+      { "measurementAvailable", "rnsap.measurementAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DedicatedMeasurementAvailable", HFILL }},
     { &hf_rnsap_measurementnotAvailable_01,
-      { "measurementnotAvailable", "rnsap.measurementnotAvailable",
+      { "measurementnotAvailable", "rnsap.measurementnotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DedicatedMeasurementnotAvailable", HFILL }},
     { &hf_rnsap_dedicatedmeasurementValue,
@@ -47138,15 +47138,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_separate_indication,
-      { "separate-indication", "rnsap.separate_indication",
+      { "separate-indication", "rnsap.separate_indication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_activate,
-      { "activate", "rnsap.activate",
+      { "activate", "rnsap.activate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Activate_Info", HFILL }},
     { &hf_rnsap_deactivate_01,
-      { "deactivate", "rnsap.deactivate",
+      { "deactivate", "rnsap.deactivate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Deactivate_Info", HFILL }},
     { &hf_rnsap_activation_type,
@@ -47174,7 +47174,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CFN", HFILL }},
     { &hf_rnsap_unsynchronised,
-      { "unsynchronised", "rnsap.unsynchronised",
+      { "unsynchronised", "rnsap.unsynchronised_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dGANSS_ReferenceTime,
@@ -47186,7 +47186,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dGANSS_Information_item,
-      { "dGANSS-Information item", "rnsap.dGANSS_Information_item",
+      { "dGANSS-Information item", "rnsap.dGANSS_Information_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_gANSS_SignalId,
@@ -47202,7 +47202,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dGANSS_SignalInformation_item,
-      { "dGANSS-SignalInformation item", "rnsap.dGANSS_SignalInformation_item",
+      { "dGANSS-SignalInformation item", "rnsap.dGANSS_SignalInformation_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_satId,
@@ -47254,7 +47254,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_satellite_DGPSCorrections_Information_item,
-      { "satellite-DGPSCorrections-Information item", "rnsap.satellite_DGPSCorrections_Information_item",
+      { "satellite-DGPSCorrections-Information item", "rnsap.satellite_DGPSCorrections_Information_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_sAT_ID,
@@ -47302,7 +47302,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ScaledAdjustmentRatio", HFILL }},
     { &hf_rnsap_DL_ReferencePowerInformationList_item,
-      { "DL-ReferencePowerInformationItem", "rnsap.DL_ReferencePowerInformationItem",
+      { "DL-ReferencePowerInformationItem", "rnsap.DL_ReferencePowerInformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_rL_ID,
@@ -47322,7 +47322,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DL_ReferencePowerInformationList", HFILL }},
     { &hf_rnsap_DL_Timeslot_Information_item,
-      { "DL-Timeslot-InformationItem", "rnsap.DL_Timeslot_InformationItem",
+      { "DL-Timeslot-InformationItem", "rnsap.DL_Timeslot_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_timeSlot,
@@ -47342,7 +47342,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TDD_DL_Code_Information", HFILL }},
     { &hf_rnsap_DL_TimeslotLCR_Information_item,
-      { "DL-TimeslotLCR-InformationItem", "rnsap.DL_TimeslotLCR_InformationItem",
+      { "DL-TimeslotLCR-InformationItem", "rnsap.DL_TimeslotLCR_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_timeSlotLCR,
@@ -47350,7 +47350,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_midambleShiftLCR,
-      { "midambleShiftLCR", "rnsap.midambleShiftLCR",
+      { "midambleShiftLCR", "rnsap.midambleShiftLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dL_Code_LCR_Information,
@@ -47358,7 +47358,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TDD_DL_Code_LCR_Information", HFILL }},
     { &hf_rnsap_DL_Timeslot_Information768_item,
-      { "DL-Timeslot-InformationItem768", "rnsap.DL_Timeslot_InformationItem768",
+      { "DL-Timeslot-InformationItem768", "rnsap.DL_Timeslot_InformationItem768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_midambleShiftAndBurstType768,
@@ -47370,7 +47370,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TDD_DL_Code_Information768", HFILL }},
     { &hf_rnsap_DL_TimeSlot_ISCP_Info_item,
-      { "DL-TimeSlot-ISCP-InfoItem", "rnsap.DL_TimeSlot_ISCP_InfoItem",
+      { "DL-TimeSlot-ISCP-InfoItem", "rnsap.DL_TimeSlot_ISCP_InfoItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dL_TimeslotISCP,
@@ -47378,7 +47378,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_TimeSlot_ISCP_LCR_Information_item,
-      { "DL-TimeSlot-ISCP-LCR-InfoItem", "rnsap.DL_TimeSlot_ISCP_LCR_InfoItem",
+      { "DL-TimeSlot-ISCP-LCR-InfoItem", "rnsap.DL_TimeSlot_ISCP_LCR_InfoItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_uE_DRX_Cycle,
@@ -47398,11 +47398,11 @@ void proto_register_rnsap(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_modify_01,
-      { "modify", "rnsap.modify",
+      { "modify", "rnsap.modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DRX_Information_to_Modify_Items", HFILL }},
     { &hf_rnsap_DSCH_FlowControlInformation_item,
-      { "DSCH-FlowControlItem", "rnsap.DSCH_FlowControlItem",
+      { "DSCH-FlowControlItem", "rnsap.DSCH_FlowControlItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dSCH_SchedulingPriority,
@@ -47414,7 +47414,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MAC_c_sh_SDU_LengthList", HFILL }},
     { &hf_rnsap_DSCH_TDD_Information_item,
-      { "DSCH-TDD-InformationItem", "rnsap.DSCH_TDD_InformationItem",
+      { "DSCH-TDD-InformationItem", "rnsap.DSCH_TDD_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dSCH_ID,
@@ -47430,7 +47430,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_TrCH_SrcStatisticsDescr_vals), 0,
         "TrCH_SrcStatisticsDescr", HFILL }},
     { &hf_rnsap_transportFormatSet,
-      { "transportFormatSet", "rnsap.transportFormatSet",
+      { "transportFormatSet", "rnsap.transportFormatSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_schedulingPriorityIndicator,
@@ -47494,7 +47494,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_UE_DPCCH_burst2_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_modify_02,
-      { "modify", "rnsap.modify",
+      { "modify", "rnsap.modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DTX_Information_to_Modify_Items", HFILL }},
     { &hf_rnsap_e_DCH_TTI_Length_to_Modify,
@@ -47502,7 +47502,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_E_DCH_TTI_Length_to_Modify_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_fDD,
-      { "fDD", "rnsap.fDD",
+      { "fDD", "rnsap.fDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EARFCN_FDD", HFILL }},
     { &hf_rnsap_tDD,
@@ -47562,7 +47562,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_E_RGCH_Release_Indicator_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_eDCH_MACdFlows_Information,
-      { "eDCH-MACdFlows-Information", "rnsap.eDCH_MACdFlows_Information",
+      { "eDCH-MACdFlows-Information", "rnsap.eDCH_MACdFlows_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_DCH_Reference_Power_Offset,
@@ -47574,7 +47574,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_EDCH_MACdFlow_Specific_InformationResponse_item,
-      { "EDCH-MACdFlow-Specific-InformationResponseItem", "rnsap.EDCH_MACdFlow_Specific_InformationResponseItem",
+      { "EDCH-MACdFlow-Specific-InformationResponseItem", "rnsap.EDCH_MACdFlow_Specific_InformationResponseItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_eDCH_MACdFlow_ID,
@@ -47598,11 +47598,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_MACdFlow_Specific_UpdateInformation_item,
-      { "E-DCH-MACdFlow-Specific-UpdateInformation-Item", "rnsap.E_DCH_MACdFlow_Specific_UpdateInformation_Item",
+      { "E-DCH-MACdFlow-Specific-UpdateInformation-Item", "rnsap.E_DCH_MACdFlow_Specific_UpdateInformation_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_DL_Control_Channel_Change_Information_item,
-      { "E-DCH-DL-Control-Channel-Change-Information-Item", "rnsap.E_DCH_DL_Control_Channel_Change_Information_Item",
+      { "E-DCH-DL-Control-Channel-Change-Information-Item", "rnsap.E_DCH_DL_Control_Channel_Change_Information_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_DCH_RL_ID,
@@ -47610,19 +47610,19 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RL_ID", HFILL }},
     { &hf_rnsap_E_DCH_DL_Control_Channel_Grant_Information_item,
-      { "E-DCH-DL-Control-Channel-Grant-Information-Item", "rnsap.E_DCH_DL_Control_Channel_Grant_Information_Item",
+      { "E-DCH-DL-Control-Channel-Grant-Information-Item", "rnsap.E_DCH_DL_Control_Channel_Grant_Information_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_DCH_Non_Scheduled_Transmission_Grant,
-      { "e-DCH-Non-Scheduled-Transmission-Grant", "rnsap.e_DCH_Non_Scheduled_Transmission_Grant",
+      { "e-DCH-Non-Scheduled-Transmission-Grant", "rnsap.e_DCH_Non_Scheduled_Transmission_Grant_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_DCH_Non_Scheduled_Transmission_Grant_Items", HFILL }},
     { &hf_rnsap_e_DCH_Scheduled_Transmission_Grant,
-      { "e-DCH-Scheduled-Transmission-Grant", "rnsap.e_DCH_Scheduled_Transmission_Grant",
+      { "e-DCH-Scheduled-Transmission-Grant", "rnsap.e_DCH_Scheduled_Transmission_Grant_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_LogicalChannelInformation_item,
-      { "E-DCH-LogicalChannelInformationItem", "rnsap.E_DCH_LogicalChannelInformationItem",
+      { "E-DCH-LogicalChannelInformationItem", "rnsap.E_DCH_LogicalChannelInformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_schedulingInformation,
@@ -47642,7 +47642,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_DCH_MACdPDU_SizeList", HFILL }},
     { &hf_rnsap_E_DCH_MACdPDU_SizeList_item,
-      { "E-DCH-MACdPDU-SizeListItem", "rnsap.E_DCH_MACdPDU_SizeListItem",
+      { "E-DCH-MACdPDU-SizeListItem", "rnsap.E_DCH_MACdPDU_SizeListItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_mACdPDU_Size,
@@ -47650,7 +47650,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_LogicalChannelToModify_item,
-      { "E-DCH-LogicalChannelToModifyItem", "rnsap.E_DCH_LogicalChannelToModifyItem",
+      { "E-DCH-LogicalChannelToModifyItem", "rnsap.E_DCH_LogicalChannelToModifyItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_mACd_PDU_Size_List_01,
@@ -47658,11 +47658,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_DCH_MACdPDU_SizeToModifyList", HFILL }},
     { &hf_rnsap_E_DCH_MACdPDU_SizeToModifyList_item,
-      { "E-DCH-MACdPDU-SizeListItem", "rnsap.E_DCH_MACdPDU_SizeListItem",
+      { "E-DCH-MACdPDU-SizeListItem", "rnsap.E_DCH_MACdPDU_SizeListItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_LogicalChannelToDelete_item,
-      { "E-DCH-LogicalChannelToDeleteItem", "rnsap.E_DCH_LogicalChannelToDeleteItem",
+      { "E-DCH-LogicalChannelToDeleteItem", "rnsap.E_DCH_LogicalChannelToDeleteItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_eDCH_MACdFlow_Specific_Information_01,
@@ -47670,7 +47670,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "EDCH_MACdFlow_Specific_InfoList", HFILL }},
     { &hf_rnsap_EDCH_MACdFlow_Specific_InfoList_item,
-      { "EDCH-MACdFlow-Specific-InfoItem", "rnsap.EDCH_MACdFlow_Specific_InfoItem",
+      { "EDCH-MACdFlow-Specific-InfoItem", "rnsap.EDCH_MACdFlow_Specific_InfoItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_tnlQoS,
@@ -47698,7 +47698,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_DCH_LogicalChannelInformation", HFILL }},
     { &hf_rnsap_EDCH_MACdFlow_Specific_InfoToModifyList_item,
-      { "EDCH-MACdFlow-Specific-InfoToModifyItem", "rnsap.EDCH_MACdFlow_Specific_InfoToModifyItem",
+      { "EDCH-MACdFlow-Specific-InfoToModifyItem", "rnsap.EDCH_MACdFlow_Specific_InfoToModifyItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_transportBearerRequestIndicator,
@@ -47718,7 +47718,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_DCH_LogicalChannelToDelete", HFILL }},
     { &hf_rnsap_EDCH_MACdFlows_To_Delete_item,
-      { "EDCH-MACdFlows-To-Delete-Item", "rnsap.EDCH_MACdFlows_To_Delete_Item",
+      { "EDCH-MACdFlows-To-Delete-Item", "rnsap.EDCH_MACdFlows_To_Delete_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_maxBits_MACe_PDU_non_scheduled,
@@ -47734,11 +47734,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_E_DCH_serving_cell_change_choice_vals), 0,
         "E_DCH_serving_cell_change_choice", HFILL }},
     { &hf_rnsap_e_DCH_serving_cell_change_successful,
-      { "e-DCH-serving-cell-change-successful", "rnsap.e_DCH_serving_cell_change_successful",
+      { "e-DCH-serving-cell-change-successful", "rnsap.e_DCH_serving_cell_change_successful_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_DCH_serving_cell_change_unsuccessful,
-      { "e-DCH-serving-cell-change-unsuccessful", "rnsap.e_DCH_serving_cell_change_unsuccessful",
+      { "e-DCH-serving-cell-change-unsuccessful", "rnsap.e_DCH_serving_cell_change_unsuccessful_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_DCH_RL_InformationList_Rsp,
@@ -47746,7 +47746,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_RL_InformationList_Rsp_item,
-      { "E-DCH-RL-InformationList-Rsp-Item", "rnsap.E_DCH_RL_InformationList_Rsp_Item",
+      { "E-DCH-RL-InformationList-Rsp-Item", "rnsap.E_DCH_RL_InformationList_Rsp_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_DCH_reconfigured_RL_Id,
@@ -47754,7 +47754,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RL_ID", HFILL }},
     { &hf_rnsap_e_DCH_FDD_DL_Control_Channel_Info,
-      { "e-DCH-FDD-DL-Control-Channel-Info", "rnsap.e_DCH_FDD_DL_Control_Channel_Info",
+      { "e-DCH-FDD-DL-Control-Channel-Info", "rnsap.e_DCH_FDD_DL_Control_Channel_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EDCH_FDD_DL_ControlChannelInformation", HFILL }},
     { &hf_rnsap_cause,
@@ -47762,19 +47762,19 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_Cause_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_two_ms,
-      { "two-ms", "rnsap.two_ms",
+      { "two-ms", "rnsap.two_ms_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DTX_Cycle_2ms_Items", HFILL }},
     { &hf_rnsap_ten_ms,
-      { "ten-ms", "rnsap.ten_ms",
+      { "ten-ms", "rnsap.ten_ms_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DTX_Cycle_10ms_Items", HFILL }},
     { &hf_rnsap_two_ms_01,
-      { "two-ms", "rnsap.two_ms",
+      { "two-ms", "rnsap.two_ms_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DTX_Cycle_2ms_to_Modify_Items", HFILL }},
     { &hf_rnsap_ten_ms_01,
-      { "ten-ms", "rnsap.ten_ms",
+      { "ten-ms", "rnsap.ten_ms_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DTX_Cycle_10ms_to_Modify_Items", HFILL }},
     { &hf_rnsap_maxSet_E_DPDCHs,
@@ -47786,7 +47786,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_TFCS_Information,
-      { "e-TFCS-Information", "rnsap.e_TFCS_Information",
+      { "e-TFCS-Information", "rnsap.e_TFCS_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_TTI,
@@ -47814,11 +47814,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_HSDSCH_Configured_Indicator_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_e_DCH_Serving_RL_in_this_DRNS,
-      { "e-DCH-Serving-RL-in-this-DRNS", "rnsap.e_DCH_Serving_RL_in_this_DRNS",
+      { "e-DCH-Serving-RL-in-this-DRNS", "rnsap.e_DCH_Serving_RL_in_this_DRNS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EDCH_Serving_RL_in_this_DRNS", HFILL }},
     { &hf_rnsap_e_DCH_Serving_RL_not_in_this_DRNS,
-      { "e-DCH-Serving-RL-not-in-this-DRNS", "rnsap.e_DCH_Serving_RL_not_in_this_DRNS",
+      { "e-DCH-Serving-RL-not-in-this-DRNS", "rnsap.e_DCH_Serving_RL_not_in_this_DRNS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_DCH_Serving_RL_Id,
@@ -47890,11 +47890,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_ReportPeriodicity_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_e_PUCH_Information,
-      { "e-PUCH-Information", "rnsap.e_PUCH_Information",
+      { "e-PUCH-Information", "rnsap.e_PUCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_TFCS_Information_TDD,
-      { "e-TFCS-Information-TDD", "rnsap.e_TFCS_Information_TDD",
+      { "e-TFCS-Information-TDD", "rnsap.e_TFCS_Information_TDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_DCH_MACdFlows_Information_TDD,
@@ -47902,7 +47902,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_DCH_TDD_Information,
-      { "e-DCH-TDD-Information", "rnsap.e_DCH_TDD_Information",
+      { "e-DCH-TDD-Information", "rnsap.e_DCH_TDD_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_minCR,
@@ -47930,11 +47930,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_QPSK_RefBetaInfo_item,
-      { "E-DCH-RefBeta-Item", "rnsap.E_DCH_RefBeta_Item",
+      { "E-DCH-RefBeta-Item", "rnsap.E_DCH_RefBeta_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_sixteenQAM_RefBetaInfo_item,
-      { "E-DCH-RefBeta-Item", "rnsap.E_DCH_RefBeta_Item",
+      { "E-DCH-RefBeta-Item", "rnsap.E_DCH_RefBeta_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_refCodeRate,
@@ -47946,7 +47946,7 @@ void proto_register_rnsap(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_MACdFlows_Information_TDD_item,
-      { "E-DCH-MACdFlow-InfoTDDItem", "rnsap.E_DCH_MACdFlow_InfoTDDItem",
+      { "E-DCH-MACdFlow-InfoTDDItem", "rnsap.E_DCH_MACdFlow_InfoTDDItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_tnlQos,
@@ -47974,11 +47974,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "EDCH_MACdFlows_To_Delete", HFILL }},
     { &hf_rnsap_e_DCH_Non_Scheduled_Grant_Info,
-      { "e-DCH-Non-Scheduled-Grant-Info", "rnsap.e_DCH_Non_Scheduled_Grant_Info",
+      { "e-DCH-Non-Scheduled-Grant-Info", "rnsap.e_DCH_Non_Scheduled_Grant_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_DCH_TDD_Information_to_Modify,
-      { "e-DCH-TDD-Information-to-Modify", "rnsap.e_DCH_TDD_Information_to_Modify",
+      { "e-DCH-TDD-Information-to-Modify", "rnsap.e_DCH_TDD_Information_to_Modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_DCH_TDD_Information_to_Modify_List,
@@ -47986,7 +47986,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_TDD_Information_to_Modify_List_item,
-      { "E-DCH-MACdFlow-ModifyTDDItem", "rnsap.E_DCH_MACdFlow_ModifyTDDItem",
+      { "E-DCH-MACdFlow-ModifyTDDItem", "rnsap.E_DCH_MACdFlow_ModifyTDDItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_DCH_LogicalChannelToAdd,
@@ -48010,7 +48010,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_AGCH_Specific_InformationRespListTDD", HFILL }},
     { &hf_rnsap_e_HICH_Information_Response,
-      { "e-HICH-Information-Response", "rnsap.e_HICH_Information_Response",
+      { "e-HICH-Information-Response", "rnsap.e_HICH_Information_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_HICH_InformationResp", HFILL }},
     { &hf_rnsap_e_RNTI,
@@ -48018,7 +48018,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_DCH_TDD_MACdFlow_Specific_InformationResp_item,
-      { "E-DCH-TDD-MACdFlow-Specific-InformationResp-Item", "rnsap.E_DCH_TDD_MACdFlow_Specific_InformationResp_Item",
+      { "E-DCH-TDD-MACdFlow-Specific-InformationResp-Item", "rnsap.E_DCH_TDD_MACdFlow_Specific_InformationResp_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_DCH_MacdFlow_Id,
@@ -48026,7 +48026,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "EDCH_MACdFlow_ID", HFILL }},
     { &hf_rnsap_E_AGCH_Specific_InformationRespListTDD_item,
-      { "E-AGCH-Specific-InformationResp-ItemTDD", "rnsap.E_AGCH_Specific_InformationResp_ItemTDD",
+      { "E-AGCH-Specific-InformationResp-ItemTDD", "rnsap.E_AGCH_Specific_InformationResp_ItemTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_timeslot,
@@ -48066,7 +48066,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rnsap_TDD_ChannelisationCode_vals_ext, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_DCH_TDD_Information768,
-      { "e-DCH-TDD-Information768", "rnsap.e_DCH_TDD_Information768",
+      { "e-DCH-TDD-Information768", "rnsap.e_DCH_TDD_Information768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_DCH_TDD_Maximum_Bitrate768,
@@ -48074,7 +48074,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_DCH_Non_Scheduled_Grant_Info768,
-      { "e-DCH-Non-Scheduled-Grant-Info768", "rnsap.e_DCH_Non_Scheduled_Grant_Info768",
+      { "e-DCH-Non-Scheduled-Grant-Info768", "rnsap.e_DCH_Non_Scheduled_Grant_Info768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_AGCH_Specific_Information_Response768TDD,
@@ -48082,11 +48082,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_AGCH_Specific_InformationRespList768TDD", HFILL }},
     { &hf_rnsap_e_HICH_Information_Response768,
-      { "e-HICH-Information-Response768", "rnsap.e_HICH_Information_Response768",
+      { "e-HICH-Information-Response768", "rnsap.e_HICH_Information_Response768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_HICH_InformationResp768", HFILL }},
     { &hf_rnsap_E_AGCH_Specific_InformationRespList768TDD_item,
-      { "E-AGCH-Specific-InformationResp-Item768TDD", "rnsap.E_AGCH_Specific_InformationResp_Item768TDD",
+      { "E-AGCH-Specific-InformationResp-Item768TDD", "rnsap.E_AGCH_Specific_InformationResp_Item768TDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_tDD_ChannelisationCode768,
@@ -48098,11 +48098,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rnsap_TDD_ChannelisationCode768_vals_ext, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_PUCH_LCR_Information,
-      { "e-PUCH-LCR-Information", "rnsap.e_PUCH_LCR_Information",
+      { "e-PUCH-LCR-Information", "rnsap.e_PUCH_LCR_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_DCH_LCR_TDD_Information,
-      { "e-DCH-LCR-TDD-Information", "rnsap.e_DCH_LCR_TDD_Information",
+      { "e-DCH-LCR-TDD-Information", "rnsap.e_DCH_LCR_TDD_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_pRxdesBase,
@@ -48126,15 +48126,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_AGCH_Specific_InformationRespList_LCR_TDD", HFILL }},
     { &hf_rnsap_e_HICH_Specific_Information_Response_LCR,
-      { "e-HICH-Specific-Information-Response-LCR", "rnsap.e_HICH_Specific_Information_Response_LCR",
+      { "e-HICH-Specific-Information-Response-LCR", "rnsap.e_HICH_Specific_Information_Response_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_HICH_Specific_InformationResp_LCR", HFILL }},
     { &hf_rnsap_e_DCH_Non_Scheduled_Grant_Info_LCR,
-      { "e-DCH-Non-Scheduled-Grant-Info-LCR", "rnsap.e_DCH_Non_Scheduled_Grant_Info_LCR",
+      { "e-DCH-Non-Scheduled-Grant-Info-LCR", "rnsap.e_DCH_Non_Scheduled_Grant_Info_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_AGCH_Specific_InformationRespList_LCR_TDD_item,
-      { "E-AGCH-Specific-InformationResp-Item-LCR-TDD", "rnsap.E_AGCH_Specific_InformationResp_Item_LCR_TDD",
+      { "E-AGCH-Specific-InformationResp-Item-LCR-TDD", "rnsap.E_AGCH_Specific_InformationResp_Item_LCR_TDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_HICH_Scheduled_InformationResp_LCR,
@@ -48142,7 +48142,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_HICH_Scheduled_InformationRespList_LCR_TDD", HFILL }},
     { &hf_rnsap_e_HICH_non_Scheduled_InformationResp_LCR,
-      { "e-HICH-non-Scheduled-InformationResp-LCR", "rnsap.e_HICH_non_Scheduled_InformationResp_LCR",
+      { "e-HICH-non-Scheduled-InformationResp-LCR", "rnsap.e_HICH_non_Scheduled_InformationResp_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_HICH_InformationResp_LCR", HFILL }},
     { &hf_rnsap_e_HICH_TimeOffset_lcr,
@@ -48150,7 +48150,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_E_HICH_Scheduled_InformationRespList_LCR_TDD_item,
-      { "E-HICH-Scheduled-InformationResp-Item-LCR-TDD", "rnsap.E_HICH_Scheduled_InformationResp_Item_LCR_TDD",
+      { "E-HICH-Scheduled-InformationResp-Item-LCR-TDD", "rnsap.E_HICH_Scheduled_InformationResp_Item_LCR_TDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_HICH_EI,
@@ -48158,7 +48158,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_HICH_Scheduled_InformationResp_LCR_01,
-      { "e-HICH-Scheduled-InformationResp-LCR", "rnsap.e_HICH_Scheduled_InformationResp_LCR",
+      { "e-HICH-Scheduled-InformationResp-LCR", "rnsap.e_HICH_Scheduled_InformationResp_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_HICH_InformationResp_LCR", HFILL }},
     { &hf_rnsap_signatureSequenceGroupIndex,
@@ -48186,11 +48186,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_SPS_Reservation_Indicator_vals), 0,
         "SPS_Reservation_Indicator", HFILL }},
     { &hf_rnsap_initial_E_DCH_SPS_resource,
-      { "initial-E-DCH-SPS-resource", "rnsap.initial_E_DCH_SPS_resource",
+      { "initial-E-DCH-SPS-resource", "rnsap.initial_E_DCH_SPS_resource_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_e_DCH_SPS_HICH_Information,
-      { "e-DCH-SPS-HICH-Information", "rnsap.e_DCH_SPS_HICH_Information",
+      { "e-DCH-SPS-HICH-Information", "rnsap.e_DCH_SPS_HICH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_timeslot_Resource_Related_Information,
@@ -48214,15 +48214,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_E_HICH_Configuration_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_same_As_Scheduled_E_HICH,
-      { "same-As-Scheduled-E-HICH", "rnsap.same_As_Scheduled_E_HICH",
+      { "same-As-Scheduled-E-HICH", "rnsap.same_As_Scheduled_E_HICH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_explicit,
-      { "explicit", "rnsap.explicit",
+      { "explicit", "rnsap.explicit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_HICH_InformationResp_ExplicitConfiguration_LCR", HFILL }},
     { &hf_rnsap_FACH_FlowControlInformation_item,
-      { "FACH-FlowControlInformationItem", "rnsap.FACH_FlowControlInformationItem",
+      { "FACH-FlowControlInformationItem", "rnsap.FACH_FlowControlInformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_fACH_SchedulingPriority,
@@ -48234,11 +48234,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_FACH_InitialWindowSize_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_FACH_InformationList_item,
-      { "FACH-InformationItem", "rnsap.FACH_InformationItem",
+      { "FACH-InformationItem", "rnsap.FACH_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_FDD_DCHs_to_Modify_item,
-      { "FDD-DCHs-to-ModifyItem", "rnsap.FDD_DCHs_to_ModifyItem",
+      { "FDD-DCHs-to-ModifyItem", "rnsap.FDD_DCHs_to_ModifyItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dCH_SpecificInformationList_02,
@@ -48246,23 +48246,23 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "FDD_DCHs_to_ModifySpecificInformationList", HFILL }},
     { &hf_rnsap_FDD_DCHs_to_ModifySpecificInformationList_item,
-      { "FDD-DCHs-to-ModifySpecificItem", "rnsap.FDD_DCHs_to_ModifySpecificItem",
+      { "FDD-DCHs-to-ModifySpecificItem", "rnsap.FDD_DCHs_to_ModifySpecificItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ul_TransportformatSet,
-      { "ul-TransportformatSet", "rnsap.ul_TransportformatSet",
+      { "ul-TransportformatSet", "rnsap.ul_TransportformatSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportFormatSet", HFILL }},
     { &hf_rnsap_dl_TransportformatSet,
-      { "dl-TransportformatSet", "rnsap.dl_TransportformatSet",
+      { "dl-TransportformatSet", "rnsap.dl_TransportformatSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportFormatSet", HFILL }},
     { &hf_rnsap_not_Used_dRACControl,
-      { "not-Used-dRACControl", "rnsap.not_Used_dRACControl",
+      { "not-Used-dRACControl", "rnsap.not_Used_dRACControl_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_FDD_DL_CodeInformation_item,
-      { "FDD-DL-CodeInformationItem", "rnsap.FDD_DL_CodeInformationItem",
+      { "FDD-DL-CodeInformationItem", "rnsap.FDD_DL_CodeInformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dl_ScramblingCode,
@@ -48278,7 +48278,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_Transmission_Gap_Pattern_Sequence_ScramblingCode_Information_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_tDD_ChannelisationCodeLCR,
-      { "tDD-ChannelisationCodeLCR", "rnsap.tDD_ChannelisationCodeLCR",
+      { "tDD-ChannelisationCodeLCR", "rnsap.tDD_ChannelisationCodeLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_wT,
@@ -48286,31 +48286,31 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_4", HFILL }},
     { &hf_rnsap_GA_Cell_item,
-      { "GA-Cell item", "rnsap.GA_Cell_item",
+      { "GA-Cell item", "rnsap.GA_Cell_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_cell_GAIgeographicalCoordinate,
-      { "cell-GAIgeographicalCoordinate", "rnsap.cell_GAIgeographicalCoordinate",
+      { "cell-GAIgeographicalCoordinate", "rnsap.cell_GAIgeographicalCoordinate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GeographicalCoordinate", HFILL }},
     { &hf_rnsap_pointWithUncertainty,
-      { "pointWithUncertainty", "rnsap.pointWithUncertainty",
+      { "pointWithUncertainty", "rnsap.pointWithUncertainty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_PointWithUnCertainty", HFILL }},
     { &hf_rnsap_pointWithUncertaintyEllipse,
-      { "pointWithUncertaintyEllipse", "rnsap.pointWithUncertaintyEllipse",
+      { "pointWithUncertaintyEllipse", "rnsap.pointWithUncertaintyEllipse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_PointWithUnCertaintyEllipse", HFILL }},
     { &hf_rnsap_pointWithAltitude,
-      { "pointWithAltitude", "rnsap.pointWithAltitude",
+      { "pointWithAltitude", "rnsap.pointWithAltitude_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_PointWithAltitude", HFILL }},
     { &hf_rnsap_pointWithAltitudeAndUncertaintyEllipsoid,
-      { "pointWithAltitudeAndUncertaintyEllipsoid", "rnsap.pointWithAltitudeAndUncertaintyEllipsoid",
+      { "pointWithAltitudeAndUncertaintyEllipsoid", "rnsap.pointWithAltitudeAndUncertaintyEllipsoid_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_PointWithAltitudeAndUncertaintyEllipsoid", HFILL }},
     { &hf_rnsap_ellipsoidArc,
-      { "ellipsoidArc", "rnsap.ellipsoidArc",
+      { "ellipsoidArc", "rnsap.ellipsoidArc_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_EllipsoidArc", HFILL }},
     { &hf_rnsap_directionOfAltitude,
@@ -48322,7 +48322,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_32767", HFILL }},
     { &hf_rnsap_geographicalCoordinates,
-      { "geographicalCoordinates", "rnsap.geographicalCoordinates",
+      { "geographicalCoordinates", "rnsap.geographicalCoordinates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GeographicalCoordinate", HFILL }},
     { &hf_rnsap_innerRadius,
@@ -48346,35 +48346,35 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_127", HFILL }},
     { &hf_rnsap_navClockModel,
-      { "navClockModel", "rnsap.navClockModel",
+      { "navClockModel", "rnsap.navClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_NAVclockModel", HFILL }},
     { &hf_rnsap_cnavClockModel,
-      { "cnavClockModel", "rnsap.cnavClockModel",
+      { "cnavClockModel", "rnsap.cnavClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_CNAVclockModel", HFILL }},
     { &hf_rnsap_glonassClockModel,
-      { "glonassClockModel", "rnsap.glonassClockModel",
+      { "glonassClockModel", "rnsap.glonassClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_GLONASSclockModel", HFILL }},
     { &hf_rnsap_sbasClockModel,
-      { "sbasClockModel", "rnsap.sbasClockModel",
+      { "sbasClockModel", "rnsap.sbasClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_SBASclockModel", HFILL }},
     { &hf_rnsap_navKeplerianSet,
-      { "navKeplerianSet", "rnsap.navKeplerianSet",
+      { "navKeplerianSet", "rnsap.navKeplerianSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_NavModel_NAVKeplerianSet", HFILL }},
     { &hf_rnsap_cnavKeplerianSet,
-      { "cnavKeplerianSet", "rnsap.cnavKeplerianSet",
+      { "cnavKeplerianSet", "rnsap.cnavKeplerianSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_NavModel_CNAVKeplerianSet", HFILL }},
     { &hf_rnsap_glonassECEF,
-      { "glonassECEF", "rnsap.glonassECEF",
+      { "glonassECEF", "rnsap.glonassECEF_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_NavModel_GLONASSecef", HFILL }},
     { &hf_rnsap_sbasECEF,
-      { "sbasECEF", "rnsap.sbasECEF",
+      { "sbasECEF", "rnsap.sbasECEF_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_NavModel_SBASecef", HFILL }},
     { &hf_rnsap_dataID,
@@ -48382,11 +48382,11 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_2", HFILL }},
     { &hf_rnsap_alpha_beta_parameters,
-      { "alpha-beta-parameters", "rnsap.alpha_beta_parameters",
+      { "alpha-beta-parameters", "rnsap.alpha_beta_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GPS_Ionospheric_Model", HFILL }},
     { &hf_rnsap_ganss_Transmission_Time,
-      { "ganss-Transmission-Time", "rnsap.ganss_Transmission_Time",
+      { "ganss-Transmission-Time", "rnsap.ganss_Transmission_Time_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_non_broadcastIndication,
@@ -48398,19 +48398,19 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Ganss_Sat_Info_AddNavList", HFILL }},
     { &hf_rnsap_GANSS_Additional_Time_Models_item,
-      { "GANSS-Time-Model", "rnsap.GANSS_Time_Model",
+      { "GANSS-Time-Model", "rnsap.GANSS_Time_Model_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_utcModel1,
-      { "utcModel1", "rnsap.utcModel1",
+      { "utcModel1", "rnsap.utcModel1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_UTCmodelSet1", HFILL }},
     { &hf_rnsap_utcModel2,
-      { "utcModel2", "rnsap.utcModel2",
+      { "utcModel2", "rnsap.utcModel2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_UTCmodelSet2", HFILL }},
     { &hf_rnsap_utcModel3,
-      { "utcModel3", "rnsap.utcModel3",
+      { "utcModel3", "rnsap.utcModel3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_UTCmodelSet3", HFILL }},
     { &hf_rnsap_ganss_wk_number,
@@ -48422,7 +48422,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_T_gANSS_AlmanacModel_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_gANSS_keplerianParameters,
-      { "gANSS-keplerianParameters", "rnsap.gANSS_keplerianParameters",
+      { "gANSS-keplerianParameters", "rnsap.gANSS_keplerianParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_t_oa,
@@ -48438,7 +48438,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_extension_GANSS_AlmanacModel,
-      { "extension-GANSS-AlmanacModel", "rnsap.extension_GANSS_AlmanacModel",
+      { "extension-GANSS-AlmanacModel", "rnsap.extension_GANSS_AlmanacModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_sat_info_NAVkpList,
@@ -48470,7 +48470,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GANSS_AuxInfoGANSS_ID3", HFILL }},
     { &hf_rnsap_GANSS_AuxInfoGANSS_ID1_item,
-      { "GANSS-AuxInfoGANSS-ID1 item", "rnsap.GANSS_AuxInfoGANSS_ID1_item",
+      { "GANSS-AuxInfoGANSS-ID1 item", "rnsap.GANSS_AuxInfoGANSS_ID1_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_svID,
@@ -48482,7 +48482,7 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_GANSS_AuxInfoGANSS_ID3_item,
-      { "GANSS-AuxInfoGANSS-ID3 item", "rnsap.GANSS_AuxInfoGANSS_ID3_item",
+      { "GANSS-AuxInfoGANSS-ID3 item", "rnsap.GANSS_AuxInfoGANSS_ID3_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_channelNumber,
@@ -48490,7 +48490,7 @@ void proto_register_rnsap(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M7_13", HFILL }},
     { &hf_rnsap_GANSS_Clock_Model_item,
-      { "GANSS-Clock-Model item", "rnsap.GANSS_Clock_Model_item",
+      { "GANSS-Clock-Model item", "rnsap.GANSS_Clock_Model_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_t_oc,
@@ -48578,11 +48578,11 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_13", HFILL }},
     { &hf_rnsap_ganss_Ionospheric_Model,
-      { "ganss-Ionospheric-Model", "rnsap.ganss_Ionospheric_Model",
+      { "ganss-Ionospheric-Model", "rnsap.ganss_Ionospheric_Model_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ganss_Rx_Pos,
-      { "ganss-Rx-Pos", "rnsap.ganss_Rx_Pos",
+      { "ganss-Rx-Pos", "rnsap.ganss_Rx_Pos_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ionospheric_Model,
@@ -48598,7 +48598,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GANSS_DataBitAssistanceList", HFILL }},
     { &hf_rnsap_GANSS_DataBitAssistanceList_item,
-      { "GANSS-DataBitAssistanceItem", "rnsap.GANSS_DataBitAssistanceItem",
+      { "GANSS-DataBitAssistanceItem", "rnsap.GANSS_DataBitAssistanceItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dataBitAssistanceSgnList,
@@ -48606,7 +48606,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GANSS_DataBitAssistanceSgnList", HFILL }},
     { &hf_rnsap_GANSS_DataBitAssistanceSgnList_item,
-      { "GANSS-DataBitAssistanceSgnItem", "rnsap.GANSS_DataBitAssistanceSgnItem",
+      { "GANSS-DataBitAssistanceSgnItem", "rnsap.GANSS_DataBitAssistanceSgnItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ganss_SignalId,
@@ -48622,7 +48622,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_86399", HFILL }},
     { &hf_rnsap_ganss_Data_Bit_Assistance_ReqList,
-      { "ganss-Data-Bit-Assistance-ReqList", "rnsap.ganss_Data_Bit_Assistance_ReqList",
+      { "ganss-Data-Bit-Assistance-ReqList", "rnsap.ganss_Data_Bit_Assistance_ReqList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ganss_DataBitInterval,
@@ -48674,7 +48674,7 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_19", HFILL }},
     { &hf_rnsap_GANSS_GenericDataInfoReqList_item,
-      { "GANSS-GenericDataInfoReqItem", "rnsap.GANSS_GenericDataInfoReqItem",
+      { "GANSS-GenericDataInfoReqItem", "rnsap.GANSS_GenericDataInfoReqItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ganss_Id,
@@ -48702,31 +48702,31 @@ void proto_register_rnsap(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rnsap_ganss_Data_Bit_Assistance_Req,
-      { "ganss-Data-Bit-Assistance-Req", "rnsap.ganss_Data_Bit_Assistance_Req",
+      { "ganss-Data-Bit-Assistance-Req", "rnsap.ganss_Data_Bit_Assistance_Req_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_Data_Bit_Assistance_ReqItem", HFILL }},
     { &hf_rnsap_GANSS_Generic_Data_item,
-      { "GANSS-Generic-DataItem", "rnsap.GANSS_Generic_DataItem",
+      { "GANSS-Generic-DataItem", "rnsap.GANSS_Generic_DataItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dganss_Correction,
-      { "dganss-Correction", "rnsap.dganss_Correction",
+      { "dganss-Correction", "rnsap.dganss_Correction_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DGANSSCorrections", HFILL }},
     { &hf_rnsap_ganss_Navigation_Model_And_Time_Recovery_01,
-      { "ganss-Navigation-Model-And-Time-Recovery", "rnsap.ganss_Navigation_Model_And_Time_Recovery",
+      { "ganss-Navigation-Model-And-Time-Recovery", "rnsap.ganss_Navigation_Model_And_Time_Recovery_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ganss_Time_Model,
-      { "ganss-Time-Model", "rnsap.ganss_Time_Model",
+      { "ganss-Time-Model", "rnsap.ganss_Time_Model_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ganss_UTC_TIME,
-      { "ganss-UTC-TIME", "rnsap.ganss_UTC_TIME",
+      { "ganss-UTC-TIME", "rnsap.ganss_UTC_TIME_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_UTC_Model", HFILL }},
     { &hf_rnsap_ganss_Almanac_01,
-      { "ganss-Almanac", "rnsap.ganss_Almanac",
+      { "ganss-Almanac", "rnsap.ganss_Almanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ganss_Real_Time_Integrity_01,
@@ -48734,7 +48734,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ganss_Data_Bit_Assistance,
-      { "ganss-Data-Bit-Assistance", "rnsap.ganss_Data_Bit_Assistance",
+      { "ganss-Data-Bit-Assistance", "rnsap.ganss_Data_Bit_Assistance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_gloTau,
@@ -48750,7 +48750,7 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_5", HFILL }},
     { &hf_rnsap_gANSS_CommonDataInfoReq,
-      { "gANSS-CommonDataInfoReq", "rnsap.gANSS_CommonDataInfoReq",
+      { "gANSS-CommonDataInfoReq", "rnsap.gANSS_CommonDataInfoReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_gANSS_GenericDataInfoReqList,
@@ -48770,7 +48770,7 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_12", HFILL }},
     { &hf_rnsap_gANSS_IonosphereRegionalStormFlags,
-      { "gANSS-IonosphereRegionalStormFlags", "rnsap.gANSS_IonosphereRegionalStormFlags",
+      { "gANSS-IonosphereRegionalStormFlags", "rnsap.gANSS_IonosphereRegionalStormFlags_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_storm_flag_one,
@@ -49062,7 +49062,7 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_10", HFILL }},
     { &hf_rnsap_gANSS_keplerianParameters_01,
-      { "gANSS-keplerianParameters", "rnsap.gANSS_keplerianParameters",
+      { "gANSS-keplerianParameters", "rnsap.gANSS_keplerianParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_gANSS_keplerianParameters_01", HFILL }},
     { &hf_rnsap_toe_nav,
@@ -49130,7 +49130,7 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_16", HFILL }},
     { &hf_rnsap_GANSS_Real_Time_Integrity_item,
-      { "GANSS-Real-Time-Integrity item", "rnsap.GANSS_Real_Time_Integrity_item",
+      { "GANSS-Real-Time-Integrity item", "rnsap.GANSS_Real_Time_Integrity_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_bad_ganss_satId,
@@ -49158,7 +49158,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_T_directionOfAltitude_01_vals), 0,
         "T_directionOfAltitude_01", HFILL }},
     { &hf_rnsap_GANSS_SatelliteInformationKP_item,
-      { "GANSS-SatelliteInformationKP item", "rnsap.GANSS_SatelliteInformationKP_item",
+      { "GANSS-SatelliteInformationKP item", "rnsap.GANSS_SatelliteInformationKP_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ganss_e_alm,
@@ -49202,7 +49202,7 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_11", HFILL }},
     { &hf_rnsap_Ganss_Sat_Info_AddNavList_item,
-      { "Ganss-Sat-Info-AddNavList item", "rnsap.Ganss_Sat_Info_AddNavList_item",
+      { "Ganss-Sat-Info-AddNavList item", "rnsap.Ganss_Sat_Info_AddNavList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_svHealth,
@@ -49222,7 +49222,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_GANSS_AddOrbitModels_vals), 0,
         "GANSS_AddOrbitModels", HFILL }},
     { &hf_rnsap_GANSS_SAT_Info_Almanac_GLOkpList_item,
-      { "GANSS-SAT-Info-Almanac-GLOkpList item", "rnsap.GANSS_SAT_Info_Almanac_GLOkpList_item",
+      { "GANSS-SAT-Info-Almanac-GLOkpList item", "rnsap.GANSS_SAT_Info_Almanac_GLOkpList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_gloAlmNA,
@@ -49278,7 +49278,7 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_2", HFILL }},
     { &hf_rnsap_GANSS_SAT_Info_Almanac_MIDIkpList_item,
-      { "GANSS-SAT-Info-Almanac-MIDIkpList item", "rnsap.GANSS_SAT_Info_Almanac_MIDIkpList_item",
+      { "GANSS-SAT-Info-Almanac-MIDIkpList item", "rnsap.GANSS_SAT_Info_Almanac_MIDIkpList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_midiAlmE,
@@ -49330,7 +49330,7 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_1", HFILL }},
     { &hf_rnsap_GANSS_SAT_Info_Almanac_NAVkpList_item,
-      { "GANSS-SAT-Info-Almanac-NAVkpList item", "rnsap.GANSS_SAT_Info_Almanac_NAVkpList_item",
+      { "GANSS-SAT-Info-Almanac-NAVkpList item", "rnsap.GANSS_SAT_Info_Almanac_NAVkpList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_navAlmE,
@@ -49374,7 +49374,7 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_11", HFILL }},
     { &hf_rnsap_GANSS_SAT_Info_Almanac_REDkpList_item,
-      { "GANSS-SAT-Info-Almanac-REDkpList item", "rnsap.GANSS_SAT_Info_Almanac_REDkpList_item",
+      { "GANSS-SAT-Info-Almanac-REDkpList item", "rnsap.GANSS_SAT_Info_Almanac_REDkpList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_redAlmDeltaA,
@@ -49402,7 +49402,7 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_1", HFILL }},
     { &hf_rnsap_GANSS_SAT_Info_Almanac_SBASecefList_item,
-      { "GANSS-SAT-Info-Almanac-SBASecefList item", "rnsap.GANSS_SAT_Info_Almanac_SBASecefList_item",
+      { "GANSS-SAT-Info-Almanac-SBASecefList item", "rnsap.GANSS_SAT_Info_Almanac_SBASecefList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_sbasAlmDataID,
@@ -49442,7 +49442,7 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_11", HFILL }},
     { &hf_rnsap_GANSS_Sat_Info_Nav_item,
-      { "GANSS-Sat-Info-Nav item", "rnsap.GANSS_Sat_Info_Nav_item",
+      { "GANSS-Sat-Info-Nav item", "rnsap.GANSS_Sat_Info_Nav_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_svHealth_01,
@@ -49574,7 +49574,7 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_32", HFILL }},
     { &hf_rnsap_deltaUT1_01,
-      { "deltaUT1", "rnsap.deltaUT1",
+      { "deltaUT1", "rnsap.deltaUT1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_DeltaUT1", HFILL }},
     { &hf_rnsap_kp,
@@ -49606,11 +49606,11 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_3", HFILL }},
     { &hf_rnsap_altitudeAndDirection,
-      { "altitudeAndDirection", "rnsap.altitudeAndDirection",
+      { "altitudeAndDirection", "rnsap.altitudeAndDirection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_AltitudeAndDirection", HFILL }},
     { &hf_rnsap_uncertaintyEllipse,
-      { "uncertaintyEllipse", "rnsap.uncertaintyEllipse",
+      { "uncertaintyEllipse", "rnsap.uncertaintyEllipse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_UncertaintyEllipse", HFILL }},
     { &hf_rnsap_uncertaintyAltitude,
@@ -49634,7 +49634,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_127", HFILL }},
     { &hf_rnsap_geographicalCoordinate,
-      { "geographicalCoordinate", "rnsap.geographicalCoordinate",
+      { "geographicalCoordinate", "rnsap.geographicalCoordinate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_latitudeSign_01,
@@ -49658,7 +49658,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GERAN_SystemInfo", HFILL }},
     { &hf_rnsap_GERAN_SystemInfo_item,
-      { "GERAN-SystemInfo item", "rnsap.GERAN_SystemInfo_item",
+      { "GERAN-SystemInfo item", "rnsap.GERAN_SystemInfo_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_gERAN_SI_block,
@@ -49674,7 +49674,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_satellite_Almanac_Information_item,
-      { "satellite-Almanac-Information item", "rnsap.satellite_Almanac_Information_item",
+      { "satellite-Almanac-Information item", "rnsap.satellite_Almanac_Information_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dATA_ID,
@@ -49730,11 +49730,11 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_364", HFILL }},
     { &hf_rnsap_Satellite_Almanac_Information_ExtItem_item,
-      { "Satellite-Almanac-Information-ExtItem item", "rnsap.Satellite_Almanac_Information_ExtItem_item",
+      { "Satellite-Almanac-Information-ExtItem item", "rnsap.Satellite_Almanac_Information_ExtItem_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_GPSInformation_item,
-      { "GPSInformation item", "rnsap.GPSInformation_item",
+      { "GPSInformation item", "rnsap.GPSInformation_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_gPSInformationItem,
@@ -49774,7 +49774,7 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_GPS_NavigationModel_and_TimeRecovery_item,
-      { "GPS-NavigationModel-and-TimeRecovery item", "rnsap.GPS_NavigationModel_and_TimeRecovery_item",
+      { "GPS-NavigationModel-and-TimeRecovery item", "rnsap.GPS_NavigationModel_and_TimeRecovery_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_tx_tow_nav,
@@ -49866,11 +49866,11 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_20", HFILL }},
     { &hf_rnsap_badSatellites,
-      { "badSatellites", "rnsap.badSatellites",
+      { "badSatellites", "rnsap.badSatellites_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_noBadSatellite,
-      { "noBadSatellite", "rnsap.noBadSatellite",
+      { "noBadSatellite", "rnsap.noBadSatellite_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_guaranteed_UL_Rate,
@@ -49882,11 +49882,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Guaranteed_Rate", HFILL }},
     { &hf_rnsap_implicit,
-      { "implicit", "rnsap.implicit",
+      { "implicit", "rnsap.implicit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HARQ_MemoryPartitioning_Implicit", HFILL }},
     { &hf_rnsap_explicit_01,
-      { "explicit", "rnsap.explicit",
+      { "explicit", "rnsap.explicit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HARQ_MemoryPartitioning_Explicit", HFILL }},
     { &hf_rnsap_number_of_Processes,
@@ -49898,11 +49898,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HARQ_MemoryPartitioningList_item,
-      { "HARQ-MemoryPartitioningItem", "rnsap.HARQ_MemoryPartitioningItem",
+      { "HARQ-MemoryPartitioningItem", "rnsap.HARQ_MemoryPartitioningItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HARQ_MemoryPartitioningInfoExtForMIMO_item,
-      { "HARQ-MemoryPartitioningItem", "rnsap.HARQ_MemoryPartitioningItem",
+      { "HARQ-MemoryPartitioningItem", "rnsap.HARQ_MemoryPartitioningItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_process_Memory_Size,
@@ -49910,11 +49910,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_T_process_Memory_Size_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_hSDSCH_MACdFlows_Information,
-      { "hSDSCH-MACdFlows-Information", "rnsap.hSDSCH_MACdFlows_Information",
+      { "hSDSCH-MACdFlows-Information", "rnsap.hSDSCH_MACdFlows_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_uE_Capabilities_Info,
-      { "uE-Capabilities-Info", "rnsap.uE_Capabilities_Info",
+      { "uE-Capabilities-Info", "rnsap.uE_Capabilities_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_mAChs_Reordering_Buffer_Size_for_RLC_UM,
@@ -49998,15 +49998,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_HS_DSCH_Secondary_Serving_cell_change_choice_vals), 0,
         "HS_DSCH_Secondary_Serving_cell_change_choice", HFILL }},
     { &hf_rnsap_hS_Secondary_Serving_cell_change_successful,
-      { "hS-Secondary-Serving-cell-change-successful", "rnsap.hS_Secondary_Serving_cell_change_successful",
+      { "hS-Secondary-Serving-cell-change-successful", "rnsap.hS_Secondary_Serving_cell_change_successful_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hS_Secondary_Serving_cell_change_unsuccessful,
-      { "hS-Secondary-Serving-cell-change-unsuccessful", "rnsap.hS_Secondary_Serving_cell_change_unsuccessful",
+      { "hS-Secondary-Serving-cell-change-unsuccessful", "rnsap.hS_Secondary_Serving_cell_change_unsuccessful_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hS_DSCH_FDD_Secondary_Serving_Information_Response,
-      { "hS-DSCH-FDD-Secondary-Serving-Information-Response", "rnsap.hS_DSCH_FDD_Secondary_Serving_Information_Response",
+      { "hS-DSCH-FDD-Secondary-Serving-Information-Response", "rnsap.hS_DSCH_FDD_Secondary_Serving_Information_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hSDSCH_MACdFlow_Specific_InfoList_to_Modify,
@@ -50026,7 +50026,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PriorityQueue_InfoList_to_Modify_Unsynchronised", HFILL }},
     { &hf_rnsap_HSDSCH_MACdFlow_Specific_InfoList_item,
-      { "HSDSCH-MACdFlow-Specific-InfoItem", "rnsap.HSDSCH_MACdFlow_Specific_InfoItem",
+      { "HSDSCH-MACdFlow-Specific-InfoItem", "rnsap.HSDSCH_MACdFlow_Specific_InfoItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hSDSCH_MACdFlow_ID,
@@ -50034,11 +50034,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSDSCH_MACdFlow_Specific_InfoList_Response_item,
-      { "HSDSCH-MACdFlow-Specific-InfoItem-Response", "rnsap.HSDSCH_MACdFlow_Specific_InfoItem_Response",
+      { "HSDSCH-MACdFlow-Specific-InfoItem-Response", "rnsap.HSDSCH_MACdFlow_Specific_InfoItem_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSDSCH_MACdFlow_Specific_InfoList_to_Modify_item,
-      { "HSDSCH-MACdFlow-Specific-InfoItem-to-Modify", "rnsap.HSDSCH_MACdFlow_Specific_InfoItem_to_Modify",
+      { "HSDSCH-MACdFlow-Specific-InfoItem-to-Modify", "rnsap.HSDSCH_MACdFlow_Specific_InfoItem_to_Modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hSDSCH_MACdFlow_Specific_Info,
@@ -50050,7 +50050,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PriorityQueue_InfoList", HFILL }},
     { &hf_rnsap_HSDSCH_MACdFlows_to_Delete_item,
-      { "HSDSCH-MACdFlows-to-Delete-Item", "rnsap.HSDSCH_MACdFlows_to_Delete_Item",
+      { "HSDSCH-MACdFlows-to-Delete-Item", "rnsap.HSDSCH_MACdFlows_to_Delete_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hsDSCH_MACdFlow_ID,
@@ -50058,7 +50058,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSDSCH_Initial_Capacity_Allocation_item,
-      { "HSDSCH-Initial-Capacity-AllocationItem", "rnsap.HSDSCH_Initial_Capacity_AllocationItem",
+      { "HSDSCH-Initial-Capacity-AllocationItem", "rnsap.HSDSCH_Initial_Capacity_AllocationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_maximum_MACdPDU_Size,
@@ -50078,15 +50078,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_HARQ_Preamble_Mode_Activation_Indicator_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_mIMO_N_M_Ratio,
-      { "mIMO-N-M-Ratio", "rnsap.mIMO_N_M_Ratio",
+      { "mIMO-N-M-Ratio", "rnsap.mIMO_N_M_Ratio_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MIMO_InformationResponse", HFILL }},
     { &hf_rnsap_continuous_Packet_Connectivity_HS_SCCH_Less_Information_Response,
-      { "continuous-Packet-Connectivity-HS-SCCH-Less-Information-Response", "rnsap.continuous_Packet_Connectivity_HS_SCCH_Less_Information_Response",
+      { "continuous-Packet-Connectivity-HS-SCCH-Less-Information-Response", "rnsap.continuous_Packet_Connectivity_HS_SCCH_Less_Information_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_EDCH_Preconfiguration_Information_item,
-      { "Additional-EDCH-Preconfiguration-Information-ItemIEs", "rnsap.Additional_EDCH_Preconfiguration_Information_ItemIEs",
+      { "Additional-EDCH-Preconfiguration-Information-ItemIEs", "rnsap.Additional_EDCH_Preconfiguration_Information_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_mAChsResetScheme,
@@ -50110,7 +50110,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_HARQ_Preamble_Mode_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_mIMO_ActivationIndicator,
-      { "mIMO-ActivationIndicator", "rnsap.mIMO_ActivationIndicator",
+      { "mIMO-ActivationIndicator", "rnsap.mIMO_ActivationIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hSDSCH_MACdPDUSizeFormat,
@@ -50118,11 +50118,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_HSDSCH_MACdPDUSizeFormat_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_uE_with_enhanced_HS_SCCH_support_indicator,
-      { "uE-with-enhanced-HS-SCCH-support-indicator", "rnsap.uE_with_enhanced_HS_SCCH_support_indicator",
+      { "uE-with-enhanced-HS-SCCH-support-indicator", "rnsap.uE_with_enhanced_HS_SCCH_support_indicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HS_SCCH_PreconfiguredCodes_item,
-      { "HS-SCCH-PreconfiguredCodesItem", "rnsap.HS_SCCH_PreconfiguredCodesItem",
+      { "HS-SCCH-PreconfiguredCodesItem", "rnsap.HS_SCCH_PreconfiguredCodesItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hS_SCCH_CodeNumber,
@@ -50134,7 +50134,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RL_ID", HFILL }},
     { &hf_rnsap_hSDSCH_FDD_Information,
-      { "hSDSCH-FDD-Information", "rnsap.hSDSCH_FDD_Information",
+      { "hSDSCH-FDD-Information", "rnsap.hSDSCH_FDD_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hS_DSCH_serving_cell_choice,
@@ -50142,15 +50142,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_HS_DSCH_serving_cell_change_choice_vals), 0,
         "HS_DSCH_serving_cell_change_choice", HFILL }},
     { &hf_rnsap_hS_serving_cell_change_successful,
-      { "hS-serving-cell-change-successful", "rnsap.hS_serving_cell_change_successful",
+      { "hS-serving-cell-change-successful", "rnsap.hS_serving_cell_change_successful_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hS_serving_cell_change_unsuccessful,
-      { "hS-serving-cell-change-unsuccessful", "rnsap.hS_serving_cell_change_unsuccessful",
+      { "hS-serving-cell-change-unsuccessful", "rnsap.hS_serving_cell_change_unsuccessful_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hSDSCH_FDD_Information_Response,
-      { "hSDSCH-FDD-Information-Response", "rnsap.hSDSCH_FDD_Information_Response",
+      { "hSDSCH-FDD-Information-Response", "rnsap.hSDSCH_FDD_Information_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_tDD_AckNack_Power_Offset,
@@ -50174,11 +50174,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSPDSCH_TDD_Specific_InfoList_Response_item,
-      { "HSPDSCH-TDD-Specific-InfoItem-Response", "rnsap.HSPDSCH_TDD_Specific_InfoItem_Response",
+      { "HSPDSCH-TDD-Specific-InfoItem-Response", "rnsap.HSPDSCH_TDD_Specific_InfoItem_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSPDSCH_TDD_Specific_InfoList_Response_LCR_item,
-      { "HSPDSCH-TDD-Specific-InfoItem-Response-LCR", "rnsap.HSPDSCH_TDD_Specific_InfoItem_Response_LCR",
+      { "HSPDSCH-TDD-Specific-InfoItem-Response-LCR", "rnsap.HSPDSCH_TDD_Specific_InfoItem_Response_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_timeslotLCR,
@@ -50186,11 +50186,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSPDSCH_TDD_Specific_InfoList_Response768_item,
-      { "HSPDSCH-TDD-Specific-InfoItem-Response768", "rnsap.HSPDSCH_TDD_Specific_InfoItem_Response768",
+      { "HSPDSCH-TDD-Specific-InfoItem-Response768", "rnsap.HSPDSCH_TDD_Specific_InfoItem_Response768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSSCCH_FDD_Specific_InfoList_Response_item,
-      { "HSSCCH-FDD-Specific-InfoItem-Response", "rnsap.HSSCCH_FDD_Specific_InfoItem_Response",
+      { "HSSCCH-FDD-Specific-InfoItem-Response", "rnsap.HSSCCH_FDD_Specific_InfoItem_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_code_Number,
@@ -50198,15 +50198,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_127", HFILL }},
     { &hf_rnsap_HSSCCH_TDD_Specific_InfoList_Response_item,
-      { "HSSCCH-TDD-Specific-InfoItem-Response", "rnsap.HSSCCH_TDD_Specific_InfoItem_Response",
+      { "HSSCCH-TDD-Specific-InfoItem-Response", "rnsap.HSSCCH_TDD_Specific_InfoItem_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hSSICH_Info,
-      { "hSSICH-Info", "rnsap.hSSICH_Info",
+      { "hSSICH-Info", "rnsap.hSSICH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSSCCH_TDD_Specific_InfoList_Response_LCR_item,
-      { "HSSCCH-TDD-Specific-InfoItem-Response-LCR", "rnsap.HSSCCH_TDD_Specific_InfoItem_Response_LCR",
+      { "HSSCCH-TDD-Specific-InfoItem-Response-LCR", "rnsap.HSSCCH_TDD_Specific_InfoItem_Response_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_first_TDD_ChannelisationCode,
@@ -50218,15 +50218,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rnsap_TDD_ChannelisationCode_vals_ext, 0,
         "TDD_ChannelisationCode", HFILL }},
     { &hf_rnsap_hSSICH_InfoLCR,
-      { "hSSICH-InfoLCR", "rnsap.hSSICH_InfoLCR",
+      { "hSSICH-InfoLCR", "rnsap.hSSICH_InfoLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSSCCH_TDD_Specific_InfoList_Response768_item,
-      { "HSSCCH-TDD-Specific-InfoItem-Response768", "rnsap.HSSCCH_TDD_Specific_InfoItem_Response768",
+      { "HSSCCH-TDD-Specific-InfoItem-Response768", "rnsap.HSSCCH_TDD_Specific_InfoItem_Response768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hSSICH_Info768,
-      { "hSSICH-Info768", "rnsap.hSSICH_Info768",
+      { "hSSICH-Info768", "rnsap.hSSICH_Info768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hsSICH_ID,
@@ -50246,7 +50246,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "HS_SICH_total", HFILL }},
     { &hf_rnsap_MIMO_ReferenceSignal_InformationListLCR_item,
-      { "HSSICH-ReferenceSignal-InformationLCR", "rnsap.HSSICH_ReferenceSignal_InformationLCR",
+      { "HSSICH-ReferenceSignal-InformationLCR", "rnsap.HSSICH_ReferenceSignal_InformationLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_midambleConfigurationLCR,
@@ -50270,7 +50270,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_HS_DSCH_SPS_Operation_Indicator_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_Transport_Block_Size_List_LCR_item,
-      { "Transport-Block-Size-Item-LCR", "rnsap.Transport_Block_Size_Item_LCR",
+      { "Transport-Block-Size-Item-LCR", "rnsap.Transport_Block_Size_Item_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_transport_Block_Size_maping_Index_LCR,
@@ -50282,7 +50282,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Repetition_Period_List_LCR_item,
-      { "Repetition-Period-Item-LCR", "rnsap.Repetition_Period_Item_LCR",
+      { "Repetition-Period-Item-LCR", "rnsap.Repetition_Period_Item_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_logicalChannellevel,
@@ -50298,7 +50298,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_initial_HS_PDSCH_SPS_Resource,
-      { "initial-HS-PDSCH-SPS-Resource", "rnsap.initial_HS_PDSCH_SPS_Resource",
+      { "initial-HS-PDSCH-SPS-Resource", "rnsap.initial_HS_PDSCH_SPS_Resource_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_buffer_Size_for_HS_DSCH_SPS,
@@ -50310,7 +50310,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HS_SICH_InformationList_for_HS_DSCH_SPS_item,
-      { "HS-SICH-InformationItem-for-HS-DSCH-SPS", "rnsap.HS_SICH_InformationItem_for_HS_DSCH_SPS",
+      { "HS-SICH-InformationItem-for-HS-DSCH-SPS", "rnsap.HS_SICH_InformationItem_for_HS_DSCH_SPS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hS_SICH_Mapping_Index,
@@ -50322,11 +50322,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_HS_SICH_Type_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_hS_SCCH_Associated_HS_SICH,
-      { "hS-SCCH-Associated-HS-SICH", "rnsap.hS_SCCH_Associated_HS_SICH",
+      { "hS-SCCH-Associated-HS-SICH", "rnsap.hS_SCCH_Associated_HS_SICH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_non_HS_SCCH_Associated_HS_SICH,
-      { "non-HS-SCCH-Associated-HS-SICH", "rnsap.non_HS_SCCH_Associated_HS_SICH",
+      { "non-HS-SCCH-Associated-HS-SICH", "rnsap.non_HS_SCCH_Associated_HS_SICH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_extended_HS_SICH_ID,
@@ -50342,7 +50342,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TDD_PhysicalChannelOffset", HFILL }},
     { &hf_rnsap_hS_PDSCH_Midamble_Configuation,
-      { "hS-PDSCH-Midamble-Configuation", "rnsap.hS_PDSCH_Midamble_Configuation",
+      { "hS-PDSCH-Midamble-Configuation", "rnsap.hS_PDSCH_Midamble_Configuation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MidambleShiftLCR", HFILL }},
     { &hf_rnsap_timeslot_Resource_Related_Information_01,
@@ -50366,19 +50366,19 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_ModulationSPS_LCR_vals), 0,
         "ModulationSPS_LCR", HFILL }},
     { &hf_rnsap_requestedDataValue,
-      { "requestedDataValue", "rnsap.requestedDataValue",
+      { "requestedDataValue", "rnsap.requestedDataValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_onDemand,
-      { "onDemand", "rnsap.onDemand",
+      { "onDemand", "rnsap.onDemand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_periodic,
-      { "periodic", "rnsap.periodic",
+      { "periodic", "rnsap.periodic_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PeriodicInformation", HFILL }},
     { &hf_rnsap_onModification,
-      { "onModification", "rnsap.onModification",
+      { "onModification", "rnsap.onModification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OnModificationInformation", HFILL }},
     { &hf_rnsap_min,
@@ -50390,11 +50390,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_24_", HFILL }},
     { &hf_rnsap_dGPSThreshold,
-      { "dGPSThreshold", "rnsap.dGPSThreshold",
+      { "dGPSThreshold", "rnsap.dGPSThreshold_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dGANSSThreshold,
-      { "dGANSSThreshold", "rnsap.dGANSSThreshold",
+      { "dGANSSThreshold", "rnsap.dGANSSThreshold_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_informationTypeItem,
@@ -50406,19 +50406,19 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_iPDL_FDD_Parameters,
-      { "iPDL-FDD-Parameters", "rnsap.iPDL_FDD_Parameters",
+      { "iPDL-FDD-Parameters", "rnsap.iPDL_FDD_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_iPDL_TDD_Parameters,
-      { "iPDL-TDD-Parameters", "rnsap.iPDL_TDD_Parameters",
+      { "iPDL-TDD-Parameters", "rnsap.iPDL_TDD_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_extension_IPDLParameters,
-      { "extension-IPDLParameters", "rnsap.extension_IPDLParameters",
+      { "extension-IPDLParameters", "rnsap.extension_IPDLParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Inter_Frequency_Cell_List_item,
-      { "Inter-Frequency-Cell", "rnsap.Inter_Frequency_Cell",
+      { "Inter-Frequency-Cell", "rnsap.Inter_Frequency_Cell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_inter_Frequency_Cell_Information_SIB11,
@@ -50430,11 +50430,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Inter_Frequency_Cell_Information_SIB11_item,
-      { "Inter-Frequency-Cells-Information-SIB11-Per-Indication", "rnsap.Inter_Frequency_Cells_Information_SIB11_Per_Indication",
+      { "Inter-Frequency-Cells-Information-SIB11-Per-Indication", "rnsap.Inter_Frequency_Cells_Information_SIB11_Per_Indication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Inter_Frequency_Cell_Information_SIB12_item,
-      { "Inter-Frequency-Cells-Information-SIB12-Per-Indication", "rnsap.Inter_Frequency_Cells_Information_SIB12_Per_Indication",
+      { "Inter-Frequency-Cells-Information-SIB12-Per-Indication", "rnsap.Inter_Frequency_Cells_Information_SIB12_Per_Indication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_inter_Frequency_Cell_Indication_SIB11,
@@ -50454,7 +50454,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Inter_Frequency_Cell_SIB11_or_SIB12_List", HFILL }},
     { &hf_rnsap_Inter_Frequency_Cell_SIB11_or_SIB12_List_item,
-      { "Inter-Frequency-Cell-SIB11-or-SIB12", "rnsap.Inter_Frequency_Cell_SIB11_or_SIB12",
+      { "Inter-Frequency-Cell-SIB11-or-SIB12", "rnsap.Inter_Frequency_Cell_SIB11_or_SIB12_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_interFrequencyCellID,
@@ -50478,7 +50478,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_burstModeParameters,
-      { "burstModeParameters", "rnsap.burstModeParameters",
+      { "burstModeParameters", "rnsap.burstModeParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_iPSpacingTDD,
@@ -50534,7 +50534,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MACdPDU_Size_IndexList_item,
-      { "MACdPDU-Size-IndexItem", "rnsap.MACdPDU_Size_IndexItem",
+      { "MACdPDU-Size-IndexItem", "rnsap.MACdPDU_Size_IndexItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_sID,
@@ -50542,7 +50542,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MACdPDU_Size_IndexList_to_Modify_item,
-      { "MACdPDU-Size-IndexItem-to-Modify", "rnsap.MACdPDU_Size_IndexItem_to_Modify",
+      { "MACdPDU-Size-IndexItem-to-Modify", "rnsap.MACdPDU_Size_IndexItem_to_Modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_accessPointName,
@@ -50554,11 +50554,11 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MBMS_Bearer_Service_List_item,
-      { "TMGI", "rnsap.TMGI",
+      { "TMGI", "rnsap.TMGI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_tmgi,
-      { "tmgi", "rnsap.tmgi",
+      { "tmgi", "rnsap.tmgi_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_transmissionMode,
@@ -50570,7 +50570,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "UARFCN", HFILL }},
     { &hf_rnsap_tMGI,
-      { "tMGI", "rnsap.tMGI",
+      { "tMGI", "rnsap.tMGI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_pTM_Cell_List,
@@ -50590,7 +50590,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_preferredFrequencyLayerInfo,
-      { "preferredFrequencyLayerInfo", "rnsap.preferredFrequencyLayerInfo",
+      { "preferredFrequencyLayerInfo", "rnsap.preferredFrequencyLayerInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_mBMS_ConcatenatedServiceList,
@@ -50606,11 +50606,11 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "L3_Information", HFILL }},
     { &hf_rnsap_MBMS_ConcatenatedServiceList_item,
-      { "TMGI", "rnsap.TMGI",
+      { "TMGI", "rnsap.TMGI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MBMS_RLC_Sequence_Number_Information_item,
-      { "MBMS-RLC-Sequence-Number-Information-List", "rnsap.MBMS_RLC_Sequence_Number_Information_List",
+      { "MBMS-RLC-Sequence-Number-Information-List", "rnsap.MBMS_RLC_Sequence_Number_Information_List_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_mBMS_Bearer_Service_List_RLC,
@@ -50618,7 +50618,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MBMS_Bearer_Service_List_RLC_item,
-      { "MBMS-Bearer-Service-List-RLCinfo", "rnsap.MBMS_Bearer_Service_List_RLCinfo",
+      { "MBMS-Bearer-Service-List-RLCinfo", "rnsap.MBMS_Bearer_Service_List_RLCinfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_time_Stamp,
@@ -50634,7 +50634,7 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Secondary_CCPCH_System_Information_MBMS", HFILL }},
     { &hf_rnsap_MBSFN_Scheduling_Transmission_Time_Interval_Info_List_item,
-      { "MBSFN-Scheduling-Transmission-Time-Interval-Item", "rnsap.MBSFN_Scheduling_Transmission_Time_Interval_Item",
+      { "MBSFN-Scheduling-Transmission-Time-Interval-Item", "rnsap.MBSFN_Scheduling_Transmission_Time_Interval_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_mbsfnSchedulingTransmissionTimeInterval,
@@ -50662,7 +50662,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Round_Trip_Time_IncrDecrThres", HFILL }},
     { &hf_rnsap_extension_MeasurementIncreaseDecreaseThreshold,
-      { "extension-MeasurementIncreaseDecreaseThreshold", "rnsap.extension_MeasurementIncreaseDecreaseThreshold",
+      { "extension-MeasurementIncreaseDecreaseThreshold", "rnsap.extension_MeasurementIncreaseDecreaseThreshold_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_sir_01,
@@ -50690,11 +50690,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Round_Trip_Time_Value", HFILL }},
     { &hf_rnsap_extension_MeasurementThreshold,
-      { "extension-MeasurementThreshold", "rnsap.extension_MeasurementThreshold",
+      { "extension-MeasurementThreshold", "rnsap.extension_MeasurementThreshold_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_type1,
-      { "type1", "rnsap.type1",
+      { "type1", "rnsap.type1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_midambleConfigurationBurstType1And3,
@@ -50706,11 +50706,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_MidambleAllocationMode1_vals), 0,
         "MidambleAllocationMode1", HFILL }},
     { &hf_rnsap_defaultMidamble,
-      { "defaultMidamble", "rnsap.defaultMidamble",
+      { "defaultMidamble", "rnsap.defaultMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_commonMidamble,
-      { "commonMidamble", "rnsap.commonMidamble",
+      { "commonMidamble", "rnsap.commonMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ueSpecificMidamble,
@@ -50718,7 +50718,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MidambleShiftLong", HFILL }},
     { &hf_rnsap_type2,
-      { "type2", "rnsap.type2",
+      { "type2", "rnsap.type2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_midambleConfigurationBurstType2,
@@ -50734,7 +50734,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MidambleShiftShort", HFILL }},
     { &hf_rnsap_type3,
-      { "type3", "rnsap.type3",
+      { "type3", "rnsap.type3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_midambleAllocationMode_02,
@@ -50750,7 +50750,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MidambleShiftLong", HFILL }},
     { &hf_rnsap_type1_01,
-      { "type1", "rnsap.type1",
+      { "type1", "rnsap.type1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Type7681", HFILL }},
     { &hf_rnsap_midambleAllocationMode_04,
@@ -50758,7 +50758,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_MidambleAllocationMode7681_vals), 0,
         "MidambleAllocationMode7681", HFILL }},
     { &hf_rnsap_type2_01,
-      { "type2", "rnsap.type2",
+      { "type2", "rnsap.type2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Type7682", HFILL }},
     { &hf_rnsap_midambleConfigurationBurstType2_768,
@@ -50774,7 +50774,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MidambleShiftShort768", HFILL }},
     { &hf_rnsap_type3_01,
-      { "type3", "rnsap.type3",
+      { "type3", "rnsap.type3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Type7683", HFILL }},
     { &hf_rnsap_midambleAllocationMode_06,
@@ -50794,15 +50794,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MIMO_S_CPICH_Channelisation_Code", HFILL }},
     { &hf_rnsap_normal_and_diversity_primary_CPICH,
-      { "normal-and-diversity-primary-CPICH", "rnsap.normal_and_diversity_primary_CPICH",
+      { "normal-and-diversity-primary-CPICH", "rnsap.normal_and_diversity_primary_CPICH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_addPriorityQueue,
-      { "addPriorityQueue", "rnsap.addPriorityQueue",
+      { "addPriorityQueue", "rnsap.addPriorityQueue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PriorityQueue_InfoItem_to_Add", HFILL }},
     { &hf_rnsap_modifyPriorityQueue,
-      { "modifyPriorityQueue", "rnsap.modifyPriorityQueue",
+      { "modifyPriorityQueue", "rnsap.modifyPriorityQueue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PriorityQueue_InfoItem_to_Modify", HFILL }},
     { &hf_rnsap_deletePriorityQueue,
@@ -50810,7 +50810,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PriorityQueue_Id", HFILL }},
     { &hf_rnsap_dL_PowerBalancing_Information,
-      { "dL-PowerBalancing-Information", "rnsap.dL_PowerBalancing_Information",
+      { "dL-PowerBalancing-Information", "rnsap.dL_PowerBalancing_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_minimumReducedE_DPDCH_GainFactor,
@@ -50834,7 +50834,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_Phase_Reference_Update_Indicator_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_additional_e_DCH_DL_Control_Channel_Grant,
-      { "additional-e-DCH-DL-Control-Channel-Grant", "rnsap.additional_e_DCH_DL_Control_Channel_Grant",
+      { "additional-e-DCH-DL-Control-Channel-Grant", "rnsap.additional_e_DCH_DL_Control_Channel_Grant_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_list_Of_PLMNs,
@@ -50842,7 +50842,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MultipleFreq_HSPDSCH_InformationList_ResponseTDDLCR_item,
-      { "MultipleFreq-HSPDSCH-InformationItem-ResponseTDDLCR", "rnsap.MultipleFreq_HSPDSCH_InformationItem_ResponseTDDLCR",
+      { "MultipleFreq-HSPDSCH-InformationItem-ResponseTDDLCR", "rnsap.MultipleFreq_HSPDSCH_InformationItem_ResponseTDDLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_uARFCN,
@@ -50854,7 +50854,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_GERAN_SI_Type_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_Neighbouring_UMTS_CellInformation_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_rNC_ID,
@@ -50862,11 +50862,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_cN_PS_DomainIdentifier,
-      { "cN-PS-DomainIdentifier", "rnsap.cN_PS_DomainIdentifier",
+      { "cN-PS-DomainIdentifier", "rnsap.cN_PS_DomainIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_cN_CS_DomainIdentifier,
-      { "cN-CS-DomainIdentifier", "rnsap.cN_CS_DomainIdentifier",
+      { "cN-CS-DomainIdentifier", "rnsap.cN_CS_DomainIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_neighbouring_FDD_CellInformation,
@@ -50878,7 +50878,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Neighbouring_FDD_CellInformation_item,
-      { "Neighbouring-FDD-CellInformationItem", "rnsap.Neighbouring_FDD_CellInformationItem",
+      { "Neighbouring-FDD-CellInformationItem", "rnsap.Neighbouring_FDD_CellInformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_uARFCNforNu,
@@ -50910,23 +50910,23 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_ClosedLoopMode1_SupportIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_not_used_closedLoopMode2_SupportIndicator,
-      { "not-used-closedLoopMode2-SupportIndicator", "rnsap.not_used_closedLoopMode2_SupportIndicator",
+      { "not-used-closedLoopMode2-SupportIndicator", "rnsap.not_used_closedLoopMode2_SupportIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_uC_ID,
-      { "uC-ID", "rnsap.uC_ID",
+      { "uC-ID", "rnsap.uC_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Neighbouring_GSM_CellInformationIEs_item,
-      { "Neighbouring-GSM-CellInformationItem", "rnsap.Neighbouring_GSM_CellInformationItem",
+      { "Neighbouring-GSM-CellInformationItem", "rnsap.Neighbouring_GSM_CellInformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_cGI,
-      { "cGI", "rnsap.cGI",
+      { "cGI", "rnsap.cGI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_bSIC,
-      { "bSIC", "rnsap.bSIC",
+      { "bSIC", "rnsap.bSIC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_band_Indicator,
@@ -50938,7 +50938,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Neighbouring_TDD_CellInformation_item,
-      { "Neighbouring-TDD-CellInformationItem", "rnsap.Neighbouring_TDD_CellInformationItem",
+      { "Neighbouring-TDD-CellInformationItem", "rnsap.Neighbouring_TDD_CellInformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_uARFCNforNt,
@@ -50970,7 +50970,7 @@ void proto_register_rnsap(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Neighbouring_LCR_TDD_CellInformation_item,
-      { "Neighbouring-LCR-TDD-CellInformationItem", "rnsap.Neighbouring_LCR_TDD_CellInformationItem",
+      { "Neighbouring-LCR-TDD-CellInformationItem", "rnsap.Neighbouring_LCR_TDD_CellInformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_restrictionStateIndicator,
@@ -50978,11 +50978,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_RestrictionStateIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_Neighbouring_E_UTRA_CellInformation_item,
-      { "Neighbouring-E-UTRA-CellInformationItem", "rnsap.Neighbouring_E_UTRA_CellInformationItem",
+      { "Neighbouring-E-UTRA-CellInformationItem", "rnsap.Neighbouring_E_UTRA_CellInformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_eCGI,
-      { "eCGI", "rnsap.eCGI",
+      { "eCGI", "rnsap.eCGI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_eARFCN_Information,
@@ -50990,7 +50990,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_EARFCN_Information_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_NotProvidedCellList_item,
-      { "MBMSChannelTypeCellList", "rnsap.MBMSChannelTypeCellList",
+      { "MBMSChannelTypeCellList", "rnsap.MBMSChannelTypeCellList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_uplinkNRTLoadInformationValue,
@@ -51006,43 +51006,43 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_New_non_serving_RL_setup_selection_vals), 0,
         "New_non_serving_RL_setup_selection", HFILL }},
     { &hf_rnsap_new_Serving_RL_in_DRNS,
-      { "new-Serving-RL-in-DRNS", "rnsap.new_Serving_RL_in_DRNS",
+      { "new-Serving-RL-in-DRNS", "rnsap.new_Serving_RL_in_DRNS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_new_Serving_RL_Not_in_DRNS,
-      { "new-Serving-RL-Not-in-DRNS", "rnsap.new_Serving_RL_Not_in_DRNS",
+      { "new-Serving-RL-Not-in-DRNS", "rnsap.new_Serving_RL_Not_in_DRNS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_new_Serving_RL_in_or_Not_in_DRNS,
-      { "new-Serving-RL-in-or-Not-in-DRNS", "rnsap.new_Serving_RL_in_or_Not_in_DRNS",
+      { "new-Serving-RL-in-or-Not-in-DRNS", "rnsap.new_Serving_RL_in_or_Not_in_DRNS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_new_non_serving_RL_E_DCH_FDD_DL_ControlChannelInformation_A,
-      { "new-non-serving-RL-E-DCH-FDD-DL-ControlChannelInformation-A", "rnsap.new_non_serving_RL_E_DCH_FDD_DL_ControlChannelInformation_A",
+      { "new-non-serving-RL-E-DCH-FDD-DL-ControlChannelInformation-A", "rnsap.new_non_serving_RL_E_DCH_FDD_DL_ControlChannelInformation_A_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EDCH_FDD_DL_ControlChannelInformation", HFILL }},
     { &hf_rnsap_new_non_serving_RL_E_DCH_FDD_DL_ControlChannelInformation_B,
-      { "new-non-serving-RL-E-DCH-FDD-DL-ControlChannelInformation-B", "rnsap.new_non_serving_RL_E_DCH_FDD_DL_ControlChannelInformation_B",
+      { "new-non-serving-RL-E-DCH-FDD-DL-ControlChannelInformation-B", "rnsap.new_non_serving_RL_E_DCH_FDD_DL_ControlChannelInformation_B_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EDCH_FDD_DL_ControlChannelInformation", HFILL }},
     { &hf_rnsap_new_non_serving_RL_E_DCH_FDD_DL_ControlChannelInformation_C,
-      { "new-non-serving-RL-E-DCH-FDD-DL-ControlChannelInformation-C", "rnsap.new_non_serving_RL_E_DCH_FDD_DL_ControlChannelInformation_C",
+      { "new-non-serving-RL-E-DCH-FDD-DL-ControlChannelInformation-C", "rnsap.new_non_serving_RL_E_DCH_FDD_DL_ControlChannelInformation_C_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EDCH_FDD_DL_ControlChannelInformation", HFILL }},
     { &hf_rnsap_Additional_E_DCH_New_non_serving_RL_E_DCH_FDD_DL_Control_Channel_InfoList_item,
-      { "Additional-E-DCH-New-non-serving-RL-E-DCH-FDD-DL-Control-Channel-InfoList item", "rnsap.Additional_E_DCH_New_non_serving_RL_E_DCH_FDD_DL_Control_Channel_InfoList_item",
+      { "Additional-E-DCH-New-non-serving-RL-E-DCH-FDD-DL-Control-Channel-InfoList item", "rnsap.Additional_E_DCH_New_non_serving_RL_E_DCH_FDD_DL_Control_Channel_InfoList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_new_non_serving_RL_E_DCH_FDD_DL_Control_Channel_Information_A,
-      { "new-non-serving-RL-E-DCH-FDD-DL-Control-Channel-Information-A", "rnsap.new_non_serving_RL_E_DCH_FDD_DL_Control_Channel_Information_A",
+      { "new-non-serving-RL-E-DCH-FDD-DL-Control-Channel-Information-A", "rnsap.new_non_serving_RL_E_DCH_FDD_DL_Control_Channel_Information_A_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EDCH_FDD_DL_ControlChannelInformation", HFILL }},
     { &hf_rnsap_new_non_serving_RL_E_DCH_FDD_DL_Control_Channel_Information_B,
-      { "new-non-serving-RL-E-DCH-FDD-DL-Control-Channel-Information-B", "rnsap.new_non_serving_RL_E_DCH_FDD_DL_Control_Channel_Information_B",
+      { "new-non-serving-RL-E-DCH-FDD-DL-Control-Channel-Information-B", "rnsap.new_non_serving_RL_E_DCH_FDD_DL_Control_Channel_Information_B_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EDCH_FDD_DL_ControlChannelInformation", HFILL }},
     { &hf_rnsap_new_non_serving_RL_E_DCH_FDD_DL_Control_Channel_Information_C,
-      { "new-non-serving-RL-E-DCH-FDD-DL-Control-Channel-Information-C", "rnsap.new_non_serving_RL_E_DCH_FDD_DL_Control_Channel_Information_C",
+      { "new-non-serving-RL-E-DCH-FDD-DL-Control-Channel-Information-C", "rnsap.new_non_serving_RL_E_DCH_FDD_DL_Control_Channel_Information_C_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EDCH_FDD_DL_ControlChannelInformation", HFILL }},
     { &hf_rnsap_measurementThreshold,
@@ -51054,7 +51054,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_InformationThreshold_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_PCH_InformationList_item,
-      { "PCH-InformationItem", "rnsap.PCH_InformationItem",
+      { "PCH-InformationItem", "rnsap.PCH_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_informationReportPeriodicity,
@@ -51074,7 +51074,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_PriorityQueue_InfoList_item,
-      { "PriorityQueue-InfoItem", "rnsap.PriorityQueue_InfoItem",
+      { "PriorityQueue-InfoItem", "rnsap.PriorityQueue_InfoItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_priorityQueue_Id,
@@ -51110,7 +51110,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_RLC_Mode_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_PriorityQueue_InfoList_EnhancedFACH_PCH_item,
-      { "PriorityQueue-InfoItem-EnhancedFACH-PCH", "rnsap.PriorityQueue_InfoItem_EnhancedFACH_PCH",
+      { "PriorityQueue-InfoItem-EnhancedFACH-PCH", "rnsap.PriorityQueue_InfoItem_EnhancedFACH_PCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_mAC_ehs_Reset_Timer,
@@ -51130,7 +51130,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MACdPDU_Size_IndexList_to_Modify", HFILL }},
     { &hf_rnsap_PriorityQueue_InfoList_to_Modify_Unsynchronised_item,
-      { "PriorityQueue-InfoItem-to-Modify-Unsynchronised", "rnsap.PriorityQueue_InfoItem_to_Modify_Unsynchronised",
+      { "PriorityQueue-InfoItem-to-Modify-Unsynchronised", "rnsap.PriorityQueue_InfoItem_to_Modify_Unsynchronised_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_priorityQueueId,
@@ -51138,15 +51138,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PriorityQueue_Id", HFILL }},
     { &hf_rnsap_mBMSChannelTypeInfo,
-      { "mBMSChannelTypeInfo", "rnsap.mBMSChannelTypeInfo",
+      { "mBMSChannelTypeInfo", "rnsap.mBMSChannelTypeInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_mBMSPreferredFreqLayerInfo,
-      { "mBMSPreferredFreqLayerInfo", "rnsap.mBMSPreferredFreqLayerInfo",
+      { "mBMSPreferredFreqLayerInfo", "rnsap.mBMSPreferredFreqLayerInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UpPCH_InformationList_LCRTDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_uPPCHPositionLCR,
@@ -51154,11 +51154,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_PTMCellList_item,
-      { "MBMSChannelTypeCellList", "rnsap.MBMSChannelTypeCellList",
+      { "MBMSChannelTypeCellList", "rnsap.MBMSChannelTypeCellList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_PTPCellList_item,
-      { "MBMSChannelTypeCellList", "rnsap.MBMSChannelTypeCellList",
+      { "MBMSChannelTypeCellList", "rnsap.MBMSChannelTypeCellList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RB_Info_item,
@@ -51166,7 +51166,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Reference_E_TFCI_Information_item,
-      { "Reference-E-TFCI-Information-Item", "rnsap.Reference_E_TFCI_Information_Item",
+      { "Reference-E-TFCI-Information-Item", "rnsap.Reference_E_TFCI_Information_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_reference_E_TFCI,
@@ -51178,47 +51178,47 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_pSDomain,
-      { "pSDomain", "rnsap.pSDomain",
+      { "pSDomain", "rnsap.pSDomain_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_cSDomain,
-      { "cSDomain", "rnsap.cSDomain",
+      { "cSDomain", "rnsap.cSDomain_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_pS_CSDomain,
-      { "pS-CSDomain", "rnsap.pS_CSDomain",
+      { "pS-CSDomain", "rnsap.pS_CSDomain_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_periodic_01,
-      { "periodic", "rnsap.periodic",
+      { "periodic", "rnsap.periodic_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_eventA,
-      { "eventA", "rnsap.eventA",
+      { "eventA", "rnsap.eventA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_eventB,
-      { "eventB", "rnsap.eventB",
+      { "eventB", "rnsap.eventB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_eventC,
-      { "eventC", "rnsap.eventC",
+      { "eventC", "rnsap.eventC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_eventD,
-      { "eventD", "rnsap.eventD",
+      { "eventD", "rnsap.eventD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_eventE,
-      { "eventE", "rnsap.eventE",
+      { "eventE", "rnsap.eventE_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_eventF,
-      { "eventF", "rnsap.eventF",
+      { "eventF", "rnsap.eventF_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_extension_ReportCharacteristics,
-      { "extension-ReportCharacteristics", "rnsap.extension_ReportCharacteristics",
+      { "extension-ReportCharacteristics", "rnsap.extension_ReportCharacteristics_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ten_msec,
@@ -51226,7 +51226,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_6000_", HFILL }},
     { &hf_rnsap_gA_AccessPointPositionwithAltitude,
-      { "gA-AccessPointPositionwithAltitude", "rnsap.gA_AccessPointPositionwithAltitude",
+      { "gA-AccessPointPositionwithAltitude", "rnsap.gA_AccessPointPositionwithAltitude_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_AccessPointPositionwithOptionalAltitude", HFILL }},
     { &hf_rnsap_iPDLParameters,
@@ -51234,7 +51234,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_IPDLParameters_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_dGPSCorrections,
-      { "dGPSCorrections", "rnsap.dGPSCorrections",
+      { "dGPSCorrections", "rnsap.dGPSCorrections_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_gPS_NavigationModel_and_TimeRecovery,
@@ -51242,15 +51242,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_gPS_Ionospheric_Model,
-      { "gPS-Ionospheric-Model", "rnsap.gPS_Ionospheric_Model",
+      { "gPS-Ionospheric-Model", "rnsap.gPS_Ionospheric_Model_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_gPS_UTC_Model,
-      { "gPS-UTC-Model", "rnsap.gPS_UTC_Model",
+      { "gPS-UTC-Model", "rnsap.gPS_UTC_Model_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_gPS_Almanac,
-      { "gPS-Almanac", "rnsap.gPS_Almanac",
+      { "gPS-Almanac", "rnsap.gPS_Almanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_gPS_RealTime_Integrity,
@@ -51258,23 +51258,23 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_GPS_RealTime_Integrity_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_gPS_RX_POS,
-      { "gPS-RX-POS", "rnsap.gPS_RX_POS",
+      { "gPS-RX-POS", "rnsap.gPS_RX_POS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_sFNSFN_GA_AccessPointPosition,
-      { "sFNSFN-GA-AccessPointPosition", "rnsap.sFNSFN_GA_AccessPointPosition",
+      { "sFNSFN-GA-AccessPointPosition", "rnsap.sFNSFN_GA_AccessPointPosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_AccessPointPositionwithOptionalAltitude", HFILL }},
     { &hf_rnsap_informationAvailable,
-      { "informationAvailable", "rnsap.informationAvailable",
+      { "informationAvailable", "rnsap.informationAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_informationNotAvailable,
-      { "informationNotAvailable", "rnsap.informationNotAvailable",
+      { "informationNotAvailable", "rnsap.informationNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Specific_DCH_Info_item,
-      { "RL-Specific-DCH-Info-Item", "rnsap.RL_Specific_DCH_Info_Item",
+      { "RL-Specific-DCH-Info-Item", "rnsap.RL_Specific_DCH_Info_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dCH_id,
@@ -51286,7 +51286,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Specific_EDCH_Info_item,
-      { "RL-Specific-EDCH-InfoItem", "rnsap.RL_Specific_EDCH_InfoItem",
+      { "RL-Specific-EDCH-InfoItem", "rnsap.RL_Specific_EDCH_InfoItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_uplinkRTLoadValue,
@@ -51302,7 +51302,7 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_SecondaryServingCells_item,
-      { "SecondaryServingCellsItem", "rnsap.SecondaryServingCellsItem",
+      { "SecondaryServingCellsItem", "rnsap.SecondaryServingCellsItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_secondaryC_ID,
@@ -51314,7 +51314,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "NumHS_SCCH_Codes", HFILL }},
     { &hf_rnsap_dl_TFCS,
-      { "dl-TFCS", "rnsap.dl_TFCS",
+      { "dl-TFCS", "rnsap.dl_TFCS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TFCS", HFILL }},
     { &hf_rnsap_tFCI_Coding,
@@ -51334,11 +51334,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_new_secondary_CPICH,
-      { "new-secondary-CPICH", "rnsap.new_secondary_CPICH",
+      { "new-secondary-CPICH", "rnsap.new_secondary_CPICH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Secondary_CPICH_Information", HFILL }},
     { &hf_rnsap_secondary_CPICH_shall_not_be_used,
-      { "secondary-CPICH-shall-not-be-used", "rnsap.secondary_CPICH_shall_not_be_used",
+      { "secondary-CPICH-shall-not-be-used", "rnsap.secondary_CPICH_shall_not_be_used_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_secondary_LCR_CCPCH_TDD_InformationList,
@@ -51350,7 +51350,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Secondary_CCPCH_TDD_InformationList_item,
-      { "Secondary-CCPCH-TDD-InformationItem", "rnsap.Secondary_CCPCH_TDD_InformationItem",
+      { "Secondary-CCPCH-TDD-InformationItem", "rnsap.Secondary_CCPCH_TDD_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_secondary_CCPCH_TDD_Code_Information,
@@ -51362,7 +51362,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Secondary_LCR_CCPCH_TDD_InformationList_item,
-      { "Secondary-LCR-CCPCH-TDD-InformationItem", "rnsap.Secondary_LCR_CCPCH_TDD_InformationItem",
+      { "Secondary-LCR-CCPCH-TDD-InformationItem", "rnsap.Secondary_LCR_CCPCH_TDD_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_secondary_LCR_CCPCH_TDD_Code_Information,
@@ -51370,7 +51370,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Secondary_CCPCH_TDD_InformationList768_item,
-      { "Secondary-CCPCH-TDD-InformationItem768", "rnsap.Secondary_CCPCH_TDD_InformationItem768",
+      { "Secondary-CCPCH-TDD-InformationItem768", "rnsap.Secondary_CCPCH_TDD_InformationItem768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_secondary_CCPCH_TDD_Code_Information768,
@@ -51378,11 +51378,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Secondary_CCPCH_TDD_Code_Information_item,
-      { "Secondary-CCPCH-TDD-Code-InformationItem", "rnsap.Secondary_CCPCH_TDD_Code_InformationItem",
+      { "Secondary-CCPCH-TDD-Code-InformationItem", "rnsap.Secondary_CCPCH_TDD_Code_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Secondary_LCR_CCPCH_TDD_Code_Information_item,
-      { "Secondary-LCR-CCPCH-TDD-Code-InformationItem", "rnsap.Secondary_LCR_CCPCH_TDD_Code_InformationItem",
+      { "Secondary-LCR-CCPCH-TDD-Code-InformationItem", "rnsap.Secondary_LCR_CCPCH_TDD_Code_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_s_CCPCH_TimeSlotFormat_LCR,
@@ -51390,7 +51390,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_TDD_DL_DPCH_TimeSlotFormat_LCR_vals), 0,
         "TDD_DL_DPCH_TimeSlotFormat_LCR", HFILL }},
     { &hf_rnsap_Secondary_CCPCH_TDD_Code_Information768_item,
-      { "Secondary-CCPCH-TDD-Code-InformationItem768", "rnsap.Secondary_CCPCH_TDD_Code_InformationItem768",
+      { "Secondary-CCPCH-TDD-Code-InformationItem768", "rnsap.Secondary_CCPCH_TDD_Code_InformationItem768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_possible_Secondary_Serving_Cell_List,
@@ -51398,11 +51398,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Possible_Secondary_Serving_Cell_List_item,
-      { "Possible-Secondary-Serving-Cell", "rnsap.Possible_Secondary_Serving_Cell",
+      { "Possible-Secondary-Serving-Cell", "rnsap.Possible_Secondary_Serving_Cell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_SetsOfHS_SCCH_Codes_item,
-      { "SetsOfHS-SCCH-CodesItem", "rnsap.SetsOfHS_SCCH_CodesItem",
+      { "SetsOfHS-SCCH-CodesItem", "rnsap.SetsOfHS_SCCH_CodesItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hS_SCCH_PreconfiguredCodes,
@@ -51414,7 +51414,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_SixtyfourQAM_DL_SupportIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_setup,
-      { "setup", "rnsap.setup",
+      { "setup", "rnsap.setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Additional_EDCH_Setup_Info", HFILL }},
     { &hf_rnsap_configurationChange,
@@ -51438,7 +51438,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item,
-      { "successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation item", "rnsap.successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item",
+      { "successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation item", "rnsap.successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_sFNSFNValue,
@@ -51466,7 +51466,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item,
-      { "unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation item", "rnsap.unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item",
+      { "unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation item", "rnsap.unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_sFNSFNTimeStamp_FDD,
@@ -51474,7 +51474,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SFN", HFILL }},
     { &hf_rnsap_sFNSFNTimeStamp_TDD,
-      { "sFNSFNTimeStamp-TDD", "rnsap.sFNSFNTimeStamp_TDD",
+      { "sFNSFNTimeStamp-TDD", "rnsap.sFNSFNTimeStamp_TDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_sFN,
@@ -51534,7 +51534,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_Modulation_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_TDD_DCHs_to_Modify_item,
-      { "TDD-DCHs-to-ModifyItem", "rnsap.TDD_DCHs_to_ModifyItem",
+      { "TDD-DCHs-to-ModifyItem", "rnsap.TDD_DCHs_to_ModifyItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dCH_SpecificInformationList_03,
@@ -51542,7 +51542,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TDD_DCHs_to_ModifySpecificInformationList", HFILL }},
     { &hf_rnsap_TDD_DCHs_to_ModifySpecificInformationList_item,
-      { "TDD-DCHs-to-ModifySpecificItem", "rnsap.TDD_DCHs_to_ModifySpecificItem",
+      { "TDD-DCHs-to-ModifySpecificItem", "rnsap.TDD_DCHs_to_ModifySpecificItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ul_CCTrCH_ID,
@@ -51554,7 +51554,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CCTrCH_ID", HFILL }},
     { &hf_rnsap_TDD_DL_Code_Information_item,
-      { "TDD-DL-Code-InformationItem", "rnsap.TDD_DL_Code_InformationItem",
+      { "TDD-DL-Code-InformationItem", "rnsap.TDD_DL_Code_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dPCH_ID,
@@ -51562,11 +51562,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_TDD_DL_Code_LCR_Information_item,
-      { "TDD-DL-Code-LCR-InformationItem", "rnsap.TDD_DL_Code_LCR_InformationItem",
+      { "TDD-DL-Code-LCR-InformationItem", "rnsap.TDD_DL_Code_LCR_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_tdd_ChannelisationCodeLCR,
-      { "tdd-ChannelisationCodeLCR", "rnsap.tdd_ChannelisationCodeLCR",
+      { "tdd-ChannelisationCodeLCR", "rnsap.tdd_ChannelisationCodeLCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_tdd_DL_DPCH_TimeSlotFormat_LCR,
@@ -51574,7 +51574,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_TDD_DL_DPCH_TimeSlotFormat_LCR_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_TDD_DL_Code_Information768_item,
-      { "TDD-DL-Code-InformationItem768", "rnsap.TDD_DL_Code_InformationItem768",
+      { "TDD-DL-Code-InformationItem768", "rnsap.TDD_DL_Code_InformationItem768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_qPSK,
@@ -51594,11 +51594,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_63", HFILL }},
     { &hf_rnsap_TDD_UL_Code_Information_item,
-      { "TDD-UL-Code-InformationItem", "rnsap.TDD_UL_Code_InformationItem",
+      { "TDD-UL-Code-InformationItem", "rnsap.TDD_UL_Code_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_TDD_UL_Code_LCR_Information_item,
-      { "TDD-UL-Code-LCR-InformationItem", "rnsap.TDD_UL_Code_LCR_InformationItem",
+      { "TDD-UL-Code-LCR-InformationItem", "rnsap.TDD_UL_Code_LCR_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_tdd_UL_DPCH_TimeSlotFormat_LCR,
@@ -51606,7 +51606,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_TDD_UL_DPCH_TimeSlotFormat_LCR_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_TDD_UL_Code_Information768_item,
-      { "TDD-UL-Code-InformationItem768", "rnsap.TDD_UL_Code_InformationItem768",
+      { "TDD-UL-Code-InformationItem768", "rnsap.TDD_UL_Code_InformationItem768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_qPSK_01,
@@ -51634,7 +51634,7 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Transmission_Gap_Pattern_Sequence_Information_item,
-      { "Transmission-Gap-Pattern-Sequence-Information item", "rnsap.Transmission_Gap_Pattern_Sequence_Information_item",
+      { "Transmission-Gap-Pattern-Sequence-Information item", "rnsap.Transmission_Gap_Pattern_Sequence_Information_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_tGPSID,
@@ -51698,7 +51698,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DeltaSIR", HFILL }},
     { &hf_rnsap_Transmission_Gap_Pattern_Sequence_Status_List_item,
-      { "Transmission-Gap-Pattern-Sequence-Status-List item", "rnsap.Transmission_Gap_Pattern_Sequence_Status_List_item",
+      { "Transmission-Gap-Pattern-Sequence-Status-List item", "rnsap.Transmission_Gap_Pattern_Sequence_Status_List_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_tGPRC,
@@ -51710,7 +51710,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CFN", HFILL }},
     { &hf_rnsap_Transmission_Mode_Information_item,
-      { "Transmission-Mode-Information-List", "rnsap.Transmission_Mode_Information_List",
+      { "Transmission-Mode-Information-List", "rnsap.Transmission_Mode_Information_List_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_mS,
@@ -51730,7 +51730,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_256", HFILL }},
     { &hf_rnsap_tUTRANGANSS,
-      { "tUTRANGANSS", "rnsap.tUTRANGANSS",
+      { "tUTRANGANSS", "rnsap.tUTRANGANSS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_tUTRANGANSSQuality,
@@ -51762,7 +51762,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_tUTRANGPS,
-      { "tUTRANGPS", "rnsap.tUTRANGPS",
+      { "tUTRANGPS", "rnsap.tUTRANGPS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_tUTRANGPSQuality,
@@ -51782,7 +51782,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ProtocolExtensionContainer", HFILL }},
     { &hf_rnsap_signalledGainFactors,
-      { "signalledGainFactors", "rnsap.signalledGainFactors",
+      { "signalledGainFactors", "rnsap.signalledGainFactors_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_betaC,
@@ -51806,11 +51806,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TFCS_TFCSList", HFILL }},
     { &hf_rnsap_not_Used_split_in_TFCI,
-      { "not-Used-split-in-TFCI", "rnsap.not_Used_split_in_TFCI",
+      { "not-Used-split-in-TFCI", "rnsap.not_Used_split_in_TFCI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_TFCS_TFCSList_item,
-      { "TFCS-TFCSList item", "rnsap.TFCS_TFCSList_item",
+      { "TFCS-TFCSList item", "rnsap.TFCS_TFCSList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_cTFC,
@@ -51854,11 +51854,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TransportFormatSet_DynamicPartList", HFILL }},
     { &hf_rnsap_semi_staticPart,
-      { "semi-staticPart", "rnsap.semi_staticPart",
+      { "semi-staticPart", "rnsap.semi_staticPart_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportFormatSet_Semi_staticPart", HFILL }},
     { &hf_rnsap_TransportFormatSet_DynamicPartList_item,
-      { "TransportFormatSet-DynamicPartList item", "rnsap.TransportFormatSet_DynamicPartList_item",
+      { "TransportFormatSet-DynamicPartList item", "rnsap.TransportFormatSet_DynamicPartList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_nrOfTransportBlocks,
@@ -51874,11 +51874,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_TransportFormatSet_ModeDP_vals), 0,
         "TransportFormatSet_ModeDP", HFILL }},
     { &hf_rnsap_tdd,
-      { "tdd", "rnsap.tdd",
+      { "tdd", "rnsap.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TDD_TransportFormatSet_ModeDP", HFILL }},
     { &hf_rnsap_notApplicable,
-      { "notApplicable", "rnsap.notApplicable",
+      { "notApplicable", "rnsap.notApplicable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_transmissionTimeIntervalInformation,
@@ -51886,7 +51886,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_TransmissionTimeIntervalInformation_item,
-      { "TransmissionTimeIntervalInformation item", "rnsap.TransmissionTimeIntervalInformation_item",
+      { "TransmissionTimeIntervalInformation item", "rnsap.TransmissionTimeIntervalInformation_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_transmissionTimeInterval,
@@ -51938,35 +51938,35 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_periodic_02,
-      { "periodic", "rnsap.periodic",
+      { "periodic", "rnsap.periodic_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UEMeasurementReportCharacteristicsPeriodic", HFILL }},
     { &hf_rnsap_event1h,
-      { "event1h", "rnsap.event1h",
+      { "event1h", "rnsap.event1h_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UEMeasurementReportCharacteristicsEvent1h", HFILL }},
     { &hf_rnsap_event1i,
-      { "event1i", "rnsap.event1i",
+      { "event1i", "rnsap.event1i_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UEMeasurementReportCharacteristicsEvent1i", HFILL }},
     { &hf_rnsap_event6a,
-      { "event6a", "rnsap.event6a",
+      { "event6a", "rnsap.event6a_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UEMeasurementReportCharacteristicsEvent6a", HFILL }},
     { &hf_rnsap_event6b,
-      { "event6b", "rnsap.event6b",
+      { "event6b", "rnsap.event6b_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UEMeasurementReportCharacteristicsEvent6b", HFILL }},
     { &hf_rnsap_event6c,
-      { "event6c", "rnsap.event6c",
+      { "event6c", "rnsap.event6c_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UEMeasurementReportCharacteristicsEvent6c", HFILL }},
     { &hf_rnsap_event6d,
-      { "event6d", "rnsap.event6d",
+      { "event6d", "rnsap.event6d_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UEMeasurementReportCharacteristicsEvent6d", HFILL }},
     { &hf_rnsap_extension_ReportCharacteristics_01,
-      { "extension-ReportCharacteristics", "rnsap.extension_ReportCharacteristics",
+      { "extension-ReportCharacteristics", "rnsap.extension_ReportCharacteristics_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UEMeasurementReportCharacteristics_Extension", HFILL }},
     { &hf_rnsap_uEMeasurementTreshold,
@@ -51998,11 +51998,11 @@ void proto_register_rnsap(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "UEMeasurementThresholdUETransmitPower", HFILL }},
     { &hf_rnsap_extension_UEMeasurementThreshold,
-      { "extension-UEMeasurementThreshold", "rnsap.extension_UEMeasurementThreshold",
+      { "extension-UEMeasurementThreshold", "rnsap.extension_UEMeasurementThreshold_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UEMeasurementThreshold_Extension", HFILL }},
     { &hf_rnsap_UEMeasurementTimeslotInfoHCR_item,
-      { "UEMeasurementTimeslotInfoHCR-IEs", "rnsap.UEMeasurementTimeslotInfoHCR_IEs",
+      { "UEMeasurementTimeslotInfoHCR-IEs", "rnsap.UEMeasurementTimeslotInfoHCR_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_burstType,
@@ -52010,11 +52010,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_UEMeasurementTimeslotInfoHCRBurstType_vals), 0,
         "UEMeasurementTimeslotInfoHCRBurstType", HFILL }},
     { &hf_rnsap_UEMeasurementTimeslotInfoLCR_item,
-      { "UEMeasurementTimeslotInfoLCR-IEs", "rnsap.UEMeasurementTimeslotInfoLCR_IEs",
+      { "UEMeasurementTimeslotInfoLCR-IEs", "rnsap.UEMeasurementTimeslotInfoLCR_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UEMeasurementTimeslotInfo768_item,
-      { "UEMeasurementTimeslotInfo768-IEs", "rnsap.UEMeasurementTimeslotInfo768_IEs",
+      { "UEMeasurementTimeslotInfo768-IEs", "rnsap.UEMeasurementTimeslotInfo768_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_burstType_01,
@@ -52022,19 +52022,19 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_UEMeasurementTimeslotInfo768BurstType_vals), 0,
         "UEMeasurementTimeslotInfo768BurstType", HFILL }},
     { &hf_rnsap_uE_Transmitted_Power,
-      { "uE-Transmitted-Power", "rnsap.uE_Transmitted_Power",
+      { "uE-Transmitted-Power", "rnsap.uE_Transmitted_Power_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_MeasurementValue_UE_Transmitted_Power", HFILL }},
     { &hf_rnsap_primary_CCPCH_RSCP,
-      { "primary-CCPCH-RSCP", "rnsap.primary_CCPCH_RSCP",
+      { "primary-CCPCH-RSCP", "rnsap.primary_CCPCH_RSCP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_MeasurementValue_Primary_CCPCH_RSCP", HFILL }},
     { &hf_rnsap_dL_Timeslot_ISCP,
-      { "dL-Timeslot-ISCP", "rnsap.dL_Timeslot_ISCP",
+      { "dL-Timeslot-ISCP", "rnsap.dL_Timeslot_ISCP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_MeasurementValue_DL_Timeslot_ISCP", HFILL }},
     { &hf_rnsap_extension_UEMeasurementValue,
-      { "extension-UEMeasurementValue", "rnsap.extension_UEMeasurementValue",
+      { "extension-UEMeasurementValue", "rnsap.extension_UEMeasurementValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UEMeasurementValue_Extension", HFILL }},
     { &hf_rnsap_uEMeasurementTransmittedPowerListHCR,
@@ -52046,7 +52046,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "UEMeasurementValueTransmittedPowerListLCR", HFILL }},
     { &hf_rnsap_UEMeasurementValueTransmittedPowerListHCR_item,
-      { "UEMeasurementValueTransmittedPowerListHCR-IEs", "rnsap.UEMeasurementValueTransmittedPowerListHCR_IEs",
+      { "UEMeasurementValueTransmittedPowerListHCR-IEs", "rnsap.UEMeasurementValueTransmittedPowerListHCR_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_uETransmitPower_01,
@@ -52054,11 +52054,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_104", HFILL }},
     { &hf_rnsap_UEMeasurementValueTransmittedPowerListLCR_item,
-      { "UEMeasurementValueTransmittedPowerListLCR-IEs", "rnsap.UEMeasurementValueTransmittedPowerListLCR_IEs",
+      { "UEMeasurementValueTransmittedPowerListLCR-IEs", "rnsap.UEMeasurementValueTransmittedPowerListLCR_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UEMeasurementValueTransmittedPowerList768_item,
-      { "UEMeasurementValueTransmittedPowerList768-IEs", "rnsap.UEMeasurementValueTransmittedPowerList768_IEs",
+      { "UEMeasurementValueTransmittedPowerList768-IEs", "rnsap.UEMeasurementValueTransmittedPowerList768_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_primaryCCPCH_RSCP,
@@ -52078,23 +52078,23 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "UEMeasurementValueTimeslotISCPListLCR", HFILL }},
     { &hf_rnsap_UEMeasurementValueTimeslotISCPListHCR_item,
-      { "UEMeasurementValueTimeslotISCPListHCR-IEs", "rnsap.UEMeasurementValueTimeslotISCPListHCR_IEs",
+      { "UEMeasurementValueTimeslotISCPListHCR-IEs", "rnsap.UEMeasurementValueTimeslotISCPListHCR_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UEMeasurementValueTimeslotISCPListLCR_item,
-      { "UEMeasurementValueTimeslotISCPListLCR-IEs", "rnsap.UEMeasurementValueTimeslotISCPListLCR_IEs",
+      { "UEMeasurementValueTimeslotISCPListLCR-IEs", "rnsap.UEMeasurementValueTimeslotISCPListLCR_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UEMeasurementValueTimeslotISCPList768_item,
-      { "UEMeasurementValueTimeslotISCPList768-IEs", "rnsap.UEMeasurementValueTimeslotISCPList768_IEs",
+      { "UEMeasurementValueTimeslotISCPList768-IEs", "rnsap.UEMeasurementValueTimeslotISCPList768_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_measurementAvailable_02,
-      { "measurementAvailable", "rnsap.measurementAvailable",
+      { "measurementAvailable", "rnsap.measurementAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UEMeasurementValueInformationAvailable", HFILL }},
     { &hf_rnsap_measurementnotAvailable_02,
-      { "measurementnotAvailable", "rnsap.measurementnotAvailable",
+      { "measurementnotAvailable", "rnsap.measurementnotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UEMeasurementValueInformationnotAvailable", HFILL }},
     { &hf_rnsap_uEmeasurementValue,
@@ -52102,11 +52102,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_UEMeasurementValue_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_cell_fach_pch,
-      { "cell-fach-pch", "rnsap.cell_fach_pch",
+      { "cell-fach-pch", "rnsap.cell_fach_pch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Cell_Fach_Pch_State", HFILL }},
     { &hf_rnsap_ura_pch,
-      { "ura-pch", "rnsap.ura_pch",
+      { "ura-pch", "rnsap.ura_pch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ura_Pch_State", HFILL }},
     { &hf_rnsap_d_RNTI,
@@ -52122,7 +52122,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_Timeslot_Information_item,
-      { "UL-Timeslot-InformationItem", "rnsap.UL_Timeslot_InformationItem",
+      { "UL-Timeslot-InformationItem", "rnsap.UL_Timeslot_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_uL_Code_Information,
@@ -52130,7 +52130,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TDD_UL_Code_Information", HFILL }},
     { &hf_rnsap_UL_TimeslotLCR_Information_item,
-      { "UL-TimeslotLCR-InformationItem", "rnsap.UL_TimeslotLCR_InformationItem",
+      { "UL-TimeslotLCR-InformationItem", "rnsap.UL_TimeslotLCR_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_uL_Code_LCR_InformationList,
@@ -52142,7 +52142,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PLCCHsequenceNumber", HFILL }},
     { &hf_rnsap_UL_Timeslot_Information768_item,
-      { "UL-Timeslot-InformationItem768", "rnsap.UL_Timeslot_InformationItem768",
+      { "UL-Timeslot-InformationItem768", "rnsap.UL_Timeslot_InformationItem768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_uL_Code_Information768,
@@ -52150,7 +52150,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TDD_UL_Code_Information768", HFILL }},
     { &hf_rnsap_UL_TimeSlot_ISCP_Info_item,
-      { "UL-TimeSlot-ISCP-InfoItem", "rnsap.UL_TimeSlot_ISCP_InfoItem",
+      { "UL-TimeSlot-ISCP-InfoItem", "rnsap.UL_TimeSlot_ISCP_InfoItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_uL_TimeslotISCP,
@@ -52158,7 +52158,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_TimeSlot_ISCP_LCR_Info_item,
-      { "UL-TimeSlot-ISCP-LCR-InfoItem", "rnsap.UL_TimeSlot_ISCP_LCR_InfoItem",
+      { "UL-TimeSlot-ISCP-LCR-InfoItem", "rnsap.UL_TimeSlot_ISCP_LCR_InfoItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_iSCP,
@@ -52170,7 +52170,7 @@ void proto_register_rnsap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_fPACH_info,
-      { "fPACH-info", "rnsap.fPACH_info",
+      { "fPACH-info", "rnsap.fPACH_info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FPACH_Information", HFILL }},
     { &hf_rnsap_prxUpPCHdes,
@@ -52178,7 +52178,7 @@ void proto_register_rnsap(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M120_M58_", HFILL }},
     { &hf_rnsap_syncUL_procParameter,
-      { "syncUL-procParameter", "rnsap.syncUL_procParameter",
+      { "syncUL-procParameter", "rnsap.syncUL_procParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SYNC_UL_ProcParameters", HFILL }},
     { &hf_rnsap_mMax,
@@ -52214,11 +52214,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RNCsWithCellsInTheAccessedURA_List_item,
-      { "RNCsWithCellsInTheAccessedURA-Item", "rnsap.RNCsWithCellsInTheAccessedURA_Item",
+      { "RNCsWithCellsInTheAccessedURA-Item", "rnsap.RNCsWithCellsInTheAccessedURA_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_USCH_Information_item,
-      { "USCH-InformationItem", "rnsap.USCH_InformationItem",
+      { "USCH-InformationItem", "rnsap.USCH_InformationItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_uSCH_ID,
@@ -52250,7 +52250,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PunctureLimit", HFILL }},
     { &hf_rnsap_ul_TFCS,
-      { "ul-TFCS", "rnsap.ul_TFCS",
+      { "ul-TFCS", "rnsap.ul_TFCS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TFCS", HFILL }},
     { &hf_rnsap_ul_DPCCH_SlotFormat,
@@ -52266,15 +52266,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_DiversityMode_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_not_Used_sSDT_CellIdLength,
-      { "not-Used-sSDT-CellIdLength", "rnsap.not_Used_sSDT_CellIdLength",
+      { "not-Used-sSDT-CellIdLength", "rnsap.not_Used_sSDT_CellIdLength_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_not_Used_s_FieldLength,
-      { "not-Used-s-FieldLength", "rnsap.not_Used_s_FieldLength",
+      { "not-Used-s-FieldLength", "rnsap.not_Used_s_FieldLength_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_tFCS,
-      { "tFCS", "rnsap.tFCS",
+      { "tFCS", "rnsap.tFCS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dl_DPCH_SlotFormat,
@@ -52294,7 +52294,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_MultiplexingPosition_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_powerOffsetInformation,
-      { "powerOffsetInformation", "rnsap.powerOffsetInformation",
+      { "powerOffsetInformation", "rnsap.powerOffsetInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PowerOffsetInformation_RL_SetupRqstFDD", HFILL }},
     { &hf_rnsap_fdd_dl_TPC_DownlinkStepSize,
@@ -52314,7 +52314,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PowerOffset", HFILL }},
     { &hf_rnsap_RL_InformationList_RL_SetupRqstFDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_chipOffset,
@@ -52330,7 +52330,7 @@ void proto_register_rnsap(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "DL_Power", HFILL }},
     { &hf_rnsap_not_Used_sSDT_CellID,
-      { "not-Used-sSDT-CellID", "rnsap.not_Used_sSDT_CellID",
+      { "not-Used-sSDT-CellID", "rnsap.not_Used_sSDT_CellID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_transmitDiversityIndicator,
@@ -52338,7 +52338,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_TransmitDiversityIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_HS_Cell_Information_RL_Setup_List_item,
-      { "Additional-HS-Cell-Information-RL-Setup-ItemIEs", "rnsap.Additional_HS_Cell_Information_RL_Setup_ItemIEs",
+      { "Additional-HS-Cell-Information-RL-Setup-ItemIEs", "rnsap.Additional_HS_Cell_Information_RL_Setup_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hSPDSCH_RL_ID,
@@ -52346,11 +52346,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RL_ID", HFILL }},
     { &hf_rnsap_hS_DSCH_FDD_Secondary_Serving_Information,
-      { "hS-DSCH-FDD-Secondary-Serving-Information", "rnsap.hS_DSCH_FDD_Secondary_Serving_Information",
+      { "hS-DSCH-FDD-Secondary-Serving-Information", "rnsap.hS_DSCH_FDD_Secondary_Serving_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_powerOffsetInformation_01,
-      { "powerOffsetInformation", "rnsap.powerOffsetInformation",
+      { "powerOffsetInformation", "rnsap.powerOffsetInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PowerOffsetInformation_F_DPCH_RL_SetupRqstFDD", HFILL }},
     { &hf_rnsap_maxNrTimeslots_UL,
@@ -52378,7 +52378,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCH_InformationList_RL_SetupRqstTDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_cCTrCH_ID,
@@ -52386,7 +52386,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCH_InformationList_RL_SetupRqstTDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dl_PunctureLimit,
@@ -52402,7 +52402,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CCTrCH_TPCList_RL_SetupRqstTDD", HFILL }},
     { &hf_rnsap_CCTrCH_TPCList_RL_SetupRqstTDD_item,
-      { "CCTrCH-TPCItem-RL-SetupRqstTDD", "rnsap.CCTrCH_TPCItem_RL_SetupRqstTDD",
+      { "CCTrCH-TPCItem-RL-SetupRqstTDD", "rnsap.CCTrCH_TPCItem_RL_SetupRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_specialBurstScheduling,
@@ -52414,15 +52414,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DL_TimeSlot_ISCP_Info", HFILL }},
     { &hf_rnsap_RL_InformationResponseList_RL_SetupRspFDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_uRA_Information,
-      { "uRA-Information", "rnsap.uRA_Information",
+      { "uRA-Information", "rnsap.uRA_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_sAI,
-      { "sAI", "rnsap.sAI",
+      { "sAI", "rnsap.sAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_gA_Cell,
@@ -52430,11 +52430,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_gA_AccessPointPosition,
-      { "gA-AccessPointPosition", "rnsap.gA_AccessPointPosition",
+      { "gA-AccessPointPosition", "rnsap.gA_AccessPointPosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_not_Used_secondary_CCPCH_Info,
-      { "not-Used-secondary-CCPCH-Info", "rnsap.not_Used_secondary_CCPCH_Info",
+      { "not-Used-secondary-CCPCH-Info", "rnsap.not_Used_secondary_CCPCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_diversityIndication,
@@ -52458,7 +52458,7 @@ void proto_register_rnsap(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "DL_Power", HFILL }},
     { &hf_rnsap_not_Used_dSCHInformationResponse,
-      { "not-Used-dSCHInformationResponse", "rnsap.not_Used_dSCHInformationResponse",
+      { "not-Used-dSCHInformationResponse", "rnsap.not_Used_dSCHInformationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_neighbouring_UMTS_CellInformation,
@@ -52466,7 +52466,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_neighbouring_GSM_CellInformation,
-      { "neighbouring-GSM-CellInformation", "rnsap.neighbouring_GSM_CellInformation",
+      { "neighbouring-GSM-CellInformation", "rnsap.neighbouring_GSM_CellInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_sRB_Delay,
@@ -52474,11 +52474,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_combining,
-      { "combining", "rnsap.combining",
+      { "combining", "rnsap.combining_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Combining_RL_SetupRspFDD", HFILL }},
     { &hf_rnsap_nonCombiningOrFirstRL,
-      { "nonCombiningOrFirstRL", "rnsap.nonCombiningOrFirstRL",
+      { "nonCombiningOrFirstRL", "rnsap.nonCombiningOrFirstRL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonCombiningOrFirstRL_RL_SetupRspFDD", HFILL }},
     { &hf_rnsap_dCH_InformationResponse,
@@ -52486,7 +52486,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_HS_Cell_Information_Response_List_item,
-      { "Additional-HS-Cell-Information-Response-ItemIEs", "rnsap.Additional_HS_Cell_Information_Response_ItemIEs",
+      { "Additional-HS-Cell-Information-Response-ItemIEs", "rnsap.Additional_HS_Cell_Information_Response_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ul_TimeSlot_ISCP_Info,
@@ -52506,39 +52506,39 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_UL_PhysCH_SF_Variation_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_synchronisationConfiguration,
-      { "synchronisationConfiguration", "rnsap.synchronisationConfiguration",
+      { "synchronisationConfiguration", "rnsap.synchronisationConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_secondary_CCPCH_Info_TDD,
-      { "secondary-CCPCH-Info-TDD", "rnsap.secondary_CCPCH_Info_TDD",
+      { "secondary-CCPCH-Info-TDD", "rnsap.secondary_CCPCH_Info_TDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ul_CCTrCHInformation,
-      { "ul-CCTrCHInformation", "rnsap.ul_CCTrCHInformation",
+      { "ul-CCTrCHInformation", "rnsap.ul_CCTrCHInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_CCTrCHInformationList_RL_SetupRspTDD", HFILL }},
     { &hf_rnsap_dl_CCTrCHInformation,
-      { "dl-CCTrCHInformation", "rnsap.dl_CCTrCHInformation",
+      { "dl-CCTrCHInformation", "rnsap.dl_CCTrCHInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_CCTrCHInformationList_RL_SetupRspTDD", HFILL }},
     { &hf_rnsap_dCH_InformationResponse_01,
-      { "dCH-InformationResponse", "rnsap.dCH_InformationResponse",
+      { "dCH-InformationResponse", "rnsap.dCH_InformationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DCH_InformationResponseList_RL_SetupRspTDD", HFILL }},
     { &hf_rnsap_dsch_InformationResponse,
-      { "dsch-InformationResponse", "rnsap.dsch_InformationResponse",
+      { "dsch-InformationResponse", "rnsap.dsch_InformationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DSCH_InformationResponse_RL_SetupRspTDD", HFILL }},
     { &hf_rnsap_usch_InformationResponse,
-      { "usch-InformationResponse", "rnsap.usch_InformationResponse",
+      { "usch-InformationResponse", "rnsap.usch_InformationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "USCH_InformationResponse_RL_SetupRspTDD", HFILL }},
     { &hf_rnsap_UL_CCTrCHInformationListIE_RL_SetupRspTDD_item,
-      { "UL-CCTrCHInformationItem-RL-SetupRspTDD", "rnsap.UL_CCTrCHInformationItem_RL_SetupRspTDD",
+      { "UL-CCTrCHInformationItem-RL-SetupRspTDD", "rnsap.UL_CCTrCHInformationItem_RL_SetupRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ul_DPCH_Information,
-      { "ul-DPCH-Information", "rnsap.ul_DPCH_Information",
+      { "ul-DPCH-Information", "rnsap.ul_DPCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_InformationList_RL_SetupRspTDD", HFILL }},
     { &hf_rnsap_tDD_DPCHOffset,
@@ -52550,11 +52550,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCHInformationListIE_RL_SetupRspTDD_item,
-      { "DL-CCTrCHInformationItem-RL-SetupRspTDD", "rnsap.DL_CCTrCHInformationItem_RL_SetupRspTDD",
+      { "DL-CCTrCHInformationItem-RL-SetupRspTDD", "rnsap.DL_CCTrCHInformationItem_RL_SetupRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dl_DPCH_Information,
-      { "dl-DPCH-Information", "rnsap.dl_DPCH_Information",
+      { "dl-DPCH-Information", "rnsap.dl_DPCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_InformationList_RL_SetupRspTDD", HFILL }},
     { &hf_rnsap_dL_Timeslot_Information,
@@ -52562,7 +52562,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DSCH_InformationListIEs_RL_SetupRspTDD_item,
-      { "DSCHInformationItem-RL-SetupRspTDD", "rnsap.DSCHInformationItem_RL_SetupRspTDD",
+      { "DSCHInformationItem-RL-SetupRspTDD", "rnsap.DSCHInformationItem_RL_SetupRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dsch_ID,
@@ -52578,7 +52578,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_TransportFormatManagement_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_USCH_InformationListIEs_RL_SetupRspTDD_item,
-      { "USCHInformationItem-RL-SetupRspTDD", "rnsap.USCHInformationItem_RL_SetupRspTDD",
+      { "USCHInformationItem-RL-SetupRspTDD", "rnsap.USCHInformationItem_RL_SetupRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_usch_ID,
@@ -52590,31 +52590,31 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_secondary_LCR_CCPCH_Info_TDD,
-      { "secondary-LCR-CCPCH-Info-TDD", "rnsap.secondary_LCR_CCPCH_Info_TDD",
+      { "secondary-LCR-CCPCH-Info-TDD", "rnsap.secondary_LCR_CCPCH_Info_TDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ul_LCR_CCTrCHInformation,
-      { "ul-LCR-CCTrCHInformation", "rnsap.ul_LCR_CCTrCHInformation",
+      { "ul-LCR-CCTrCHInformation", "rnsap.ul_LCR_CCTrCHInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_LCR_CCTrCHInformationList_RL_SetupRspTDD", HFILL }},
     { &hf_rnsap_dl_LCR_CCTrCHInformation,
-      { "dl-LCR-CCTrCHInformation", "rnsap.dl_LCR_CCTrCHInformation",
+      { "dl-LCR-CCTrCHInformation", "rnsap.dl_LCR_CCTrCHInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_LCR_CCTrCHInformationList_RL_SetupRspTDD", HFILL }},
     { &hf_rnsap_dsch_LCR_InformationResponse,
-      { "dsch-LCR-InformationResponse", "rnsap.dsch_LCR_InformationResponse",
+      { "dsch-LCR-InformationResponse", "rnsap.dsch_LCR_InformationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DSCH_LCR_InformationResponse_RL_SetupRspTDD", HFILL }},
     { &hf_rnsap_usch_LCR_InformationResponse,
-      { "usch-LCR-InformationResponse", "rnsap.usch_LCR_InformationResponse",
+      { "usch-LCR-InformationResponse", "rnsap.usch_LCR_InformationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "USCH_LCR_InformationResponse_RL_SetupRspTDD", HFILL }},
     { &hf_rnsap_UL_LCR_CCTrCHInformationListIE_RL_SetupRspTDD_item,
-      { "UL-LCR-CCTrCHInformationItem-RL-SetupRspTDD", "rnsap.UL_LCR_CCTrCHInformationItem_RL_SetupRspTDD",
+      { "UL-LCR-CCTrCHInformationItem-RL-SetupRspTDD", "rnsap.UL_LCR_CCTrCHInformationItem_RL_SetupRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ul_DPCH_LCR_Information,
-      { "ul-DPCH-LCR-Information", "rnsap.ul_DPCH_LCR_Information",
+      { "ul-DPCH-LCR-Information", "rnsap.ul_DPCH_LCR_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_LCR_InformationList_RL_SetupRspTDD", HFILL }},
     { &hf_rnsap_uL_TimeslotLCR_Information,
@@ -52622,11 +52622,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCH_LCR_InformationListIE_RL_SetupRspTDD_item,
-      { "DL-CCTrCH-LCR-InformationItem-RL-SetupRspTDD", "rnsap.DL_CCTrCH_LCR_InformationItem_RL_SetupRspTDD",
+      { "DL-CCTrCH-LCR-InformationItem-RL-SetupRspTDD", "rnsap.DL_CCTrCH_LCR_InformationItem_RL_SetupRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dl_DPCH_LCR_Information,
-      { "dl-DPCH-LCR-Information", "rnsap.dl_DPCH_LCR_Information",
+      { "dl-DPCH-LCR-Information", "rnsap.dl_DPCH_LCR_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_LCR_InformationList_RL_SetupRspTDD", HFILL }},
     { &hf_rnsap_dL_Timeslot_LCR_Information,
@@ -52638,23 +52638,23 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_TSTD_Indicator_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_DSCH_LCR_InformationListIEs_RL_SetupRspTDD_item,
-      { "DSCH-LCR-InformationItem-RL-SetupRspTDD", "rnsap.DSCH_LCR_InformationItem_RL_SetupRspTDD",
+      { "DSCH-LCR-InformationItem-RL-SetupRspTDD", "rnsap.DSCH_LCR_InformationItem_RL_SetupRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_USCH_LCR_InformationListIEs_RL_SetupRspTDD_item,
-      { "USCH-LCR-InformationItem-RL-SetupRspTDD", "rnsap.USCH_LCR_InformationItem_RL_SetupRspTDD",
+      { "USCH-LCR-InformationItem-RL-SetupRspTDD", "rnsap.USCH_LCR_InformationItem_RL_SetupRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_secondary_CCPCH_Info_TDD768,
-      { "secondary-CCPCH-Info-TDD768", "rnsap.secondary_CCPCH_Info_TDD768",
+      { "secondary-CCPCH-Info-TDD768", "rnsap.secondary_CCPCH_Info_TDD768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ul_CCTrCHInformation768,
-      { "ul-CCTrCHInformation768", "rnsap.ul_CCTrCHInformation768",
+      { "ul-CCTrCHInformation768", "rnsap.ul_CCTrCHInformation768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_CCTrCHInformationList_RL_SetupRspTDD768", HFILL }},
     { &hf_rnsap_dl_CCTrCHInformation768,
-      { "dl-CCTrCHInformation768", "rnsap.dl_CCTrCHInformation768",
+      { "dl-CCTrCHInformation768", "rnsap.dl_CCTrCHInformation768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_CCTrCHInformationList_RL_SetupRspTDD768", HFILL }},
     { &hf_rnsap_gA_CellAdditionalShapes,
@@ -52670,11 +52670,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TimeSlot", HFILL }},
     { &hf_rnsap_UL_CCTrCHInformationListIE_RL_SetupRspTDD768_item,
-      { "UL-CCTrCHInformationItem-RL-SetupRspTDD768", "rnsap.UL_CCTrCHInformationItem_RL_SetupRspTDD768",
+      { "UL-CCTrCHInformationItem-RL-SetupRspTDD768", "rnsap.UL_CCTrCHInformationItem_RL_SetupRspTDD768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ul_DPCH_Information768,
-      { "ul-DPCH-Information768", "rnsap.ul_DPCH_Information768",
+      { "ul-DPCH-Information768", "rnsap.ul_DPCH_Information768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_InformationList_RL_SetupRspTDD768", HFILL }},
     { &hf_rnsap_uL_SIR_Target_CCTrCH_InformationItem_RL_SetupRspTDD768,
@@ -52686,11 +52686,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCHInformationListIE_RL_SetupRspTDD768_item,
-      { "DL-CCTrCHInformationItem-RL-SetupRspTDD768", "rnsap.DL_CCTrCHInformationItem_RL_SetupRspTDD768",
+      { "DL-CCTrCHInformationItem-RL-SetupRspTDD768", "rnsap.DL_CCTrCHInformationItem_RL_SetupRspTDD768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dl_DPCH_Information768,
-      { "dl-DPCH-Information768", "rnsap.dl_DPCH_Information768",
+      { "dl-DPCH-Information768", "rnsap.dl_DPCH_Information768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_InformationList_RL_SetupRspTDD768", HFILL }},
     { &hf_rnsap_cCTrCH_Maximum_DL_Power,
@@ -52706,11 +52706,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_generalCause,
-      { "generalCause", "rnsap.generalCause",
+      { "generalCause", "rnsap.generalCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GeneralCauseList_RL_SetupFailureFDD", HFILL }},
     { &hf_rnsap_rLSpecificCause,
-      { "rLSpecificCause", "rnsap.rLSpecificCause",
+      { "rLSpecificCause", "rnsap.rLSpecificCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLSpecificCauseList_RL_SetupFailureFDD", HFILL }},
     { &hf_rnsap_unsuccessful_RL_InformationRespList_RL_SetupFailureFDD,
@@ -52722,11 +52722,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SuccessfulRL_InformationResponseList_RL_SetupFailureFDD", HFILL }},
     { &hf_rnsap_UnsuccessfulRL_InformationResponseList_RL_SetupFailureFDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_SuccessfulRL_InformationResponseList_RL_SetupFailureFDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_diversityIndication_01,
@@ -52734,35 +52734,35 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_DiversityIndication_RL_SetupFailureFDD_vals), 0,
         "DiversityIndication_RL_SetupFailureFDD", HFILL }},
     { &hf_rnsap_not_Used_dSCH_InformationResponse_RL_SetupFailureFDD,
-      { "not-Used-dSCH-InformationResponse-RL-SetupFailureFDD", "rnsap.not_Used_dSCH_InformationResponse_RL_SetupFailureFDD",
+      { "not-Used-dSCH-InformationResponse-RL-SetupFailureFDD", "rnsap.not_Used_dSCH_InformationResponse_RL_SetupFailureFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_combining_01,
-      { "combining", "rnsap.combining",
+      { "combining", "rnsap.combining_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Combining_RL_SetupFailureFDD", HFILL }},
     { &hf_rnsap_nonCombiningOrFirstRL_01,
-      { "nonCombiningOrFirstRL", "rnsap.nonCombiningOrFirstRL",
+      { "nonCombiningOrFirstRL", "rnsap.nonCombiningOrFirstRL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonCombiningOrFirstRL_RL_SetupFailureFDD", HFILL }},
     { &hf_rnsap_generalCause_01,
-      { "generalCause", "rnsap.generalCause",
+      { "generalCause", "rnsap.generalCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GeneralCauseList_RL_SetupFailureTDD", HFILL }},
     { &hf_rnsap_rLSpecificCause_01,
-      { "rLSpecificCause", "rnsap.rLSpecificCause",
+      { "rLSpecificCause", "rnsap.rLSpecificCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLSpecificCauseList_RL_SetupFailureTDD", HFILL }},
     { &hf_rnsap_unsuccessful_RL_InformationRespItem_RL_SetupFailureTDD,
-      { "unsuccessful-RL-InformationRespItem-RL-SetupFailureTDD", "rnsap.unsuccessful_RL_InformationRespItem_RL_SetupFailureTDD",
+      { "unsuccessful-RL-InformationRespItem-RL-SetupFailureTDD", "rnsap.unsuccessful_RL_InformationRespItem_RL_SetupFailureTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationList_RL_AdditionRqstFDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_HS_Cell_Information_RL_Addition_List_item,
-      { "Additional-HS-Cell-Information-RL-Addition-ItemIEs", "rnsap.Additional_HS_Cell_Information_RL_Addition_ItemIEs",
+      { "Additional-HS-Cell-Information-RL-Addition-ItemIEs", "rnsap.Additional_HS_Cell_Information_RL_Addition_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_setup_Or_Addition_Of_EDCH_On_secondary_UL_Frequency,
@@ -52778,7 +52778,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCH_InformationList_RL_AdditionRqstTDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_uplinkStepSizeLCR,
@@ -52786,7 +52786,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_TDD_TPC_UplinkStepSize_LCR_vals), 0,
         "TDD_TPC_UplinkStepSize_LCR", HFILL }},
     { &hf_rnsap_DL_CCTrCH_InformationList_RL_AdditionRqstTDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_downlinkStepSize,
@@ -52794,11 +52794,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_TDD_TPC_DownlinkStepSize_vals), 0,
         "TDD_TPC_DownlinkStepSize", HFILL }},
     { &hf_rnsap_RL_InformationResponseList_RL_AdditionRspFDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dl_CodeInformation_01,
-      { "dl-CodeInformation", "rnsap.dl_CodeInformation",
+      { "dl-CodeInformation", "rnsap.dl_CodeInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_CodeInformationList_RL_AdditionRspFDD", HFILL }},
     { &hf_rnsap_diversityIndication_02,
@@ -52806,55 +52806,55 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_DiversityIndication_RL_AdditionRspFDD_vals), 0,
         "DiversityIndication_RL_AdditionRspFDD", HFILL }},
     { &hf_rnsap_combining_02,
-      { "combining", "rnsap.combining",
+      { "combining", "rnsap.combining_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Combining_RL_AdditionRspFDD", HFILL }},
     { &hf_rnsap_nonCombining,
-      { "nonCombining", "rnsap.nonCombining",
+      { "nonCombining", "rnsap.nonCombining_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonCombining_RL_AdditionRspFDD", HFILL }},
     { &hf_rnsap_Additional_HS_Cell_Change_Information_Response_List_item,
-      { "Additional-HS-Cell-Change-Information-Response-ItemIEs", "rnsap.Additional_HS_Cell_Change_Information_Response_ItemIEs",
+      { "Additional-HS-Cell-Change-Information-Response-ItemIEs", "rnsap.Additional_HS_Cell_Change_Information_Response_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hS_DSCH_Secondary_Serving_Cell_Change_Information_Response,
-      { "hS-DSCH-Secondary-Serving-Cell-Change-Information-Response", "rnsap.hS_DSCH_Secondary_Serving_Cell_Change_Information_Response",
+      { "hS-DSCH-Secondary-Serving-Cell-Change-Information-Response", "rnsap.hS_DSCH_Secondary_Serving_Cell_Change_Information_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ul_CCTrCHInformation_01,
-      { "ul-CCTrCHInformation", "rnsap.ul_CCTrCHInformation",
+      { "ul-CCTrCHInformation", "rnsap.ul_CCTrCHInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_CCTrCHInformationList_RL_AdditionRspTDD", HFILL }},
     { &hf_rnsap_dl_CCTrCHInformation_01,
-      { "dl-CCTrCHInformation", "rnsap.dl_CCTrCHInformation",
+      { "dl-CCTrCHInformation", "rnsap.dl_CCTrCHInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_CCTrCHInformationList_RL_AdditionRspTDD", HFILL }},
     { &hf_rnsap_dCH_Information,
-      { "dCH-Information", "rnsap.dCH_Information",
+      { "dCH-Information", "rnsap.dCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DCH_Information_RL_AdditionRspTDD", HFILL }},
     { &hf_rnsap_dSCH_InformationResponse,
-      { "dSCH-InformationResponse", "rnsap.dSCH_InformationResponse",
+      { "dSCH-InformationResponse", "rnsap.dSCH_InformationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DSCH_InformationResponse_RL_AdditionRspTDD", HFILL }},
     { &hf_rnsap_uSCH_InformationResponse,
-      { "uSCH-InformationResponse", "rnsap.uSCH_InformationResponse",
+      { "uSCH-InformationResponse", "rnsap.uSCH_InformationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "USCH_InformationResponse_RL_AdditionRspTDD", HFILL }},
     { &hf_rnsap_UL_CCTrCHInformationListIE_RL_AdditionRspTDD_item,
-      { "UL-CCTrCHInformationItem-RL-AdditionRspTDD", "rnsap.UL_CCTrCHInformationItem_RL_AdditionRspTDD",
+      { "UL-CCTrCHInformationItem-RL-AdditionRspTDD", "rnsap.UL_CCTrCHInformationItem_RL_AdditionRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ul_DPCH_Information_01,
-      { "ul-DPCH-Information", "rnsap.ul_DPCH_Information",
+      { "ul-DPCH-Information", "rnsap.ul_DPCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_InformationList_RL_AdditionRspTDD", HFILL }},
     { &hf_rnsap_DL_CCTrCHInformationListIE_RL_AdditionRspTDD_item,
-      { "DL-CCTrCHInformationItem-RL-AdditionRspTDD", "rnsap.DL_CCTrCHInformationItem_RL_AdditionRspTDD",
+      { "DL-CCTrCHInformationItem-RL-AdditionRspTDD", "rnsap.DL_CCTrCHInformationItem_RL_AdditionRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dl_DPCH_Information_01,
-      { "dl-DPCH-Information", "rnsap.dl_DPCH_Information",
+      { "dl-DPCH-Information", "rnsap.dl_DPCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_InformationList_RL_AdditionRspTDD", HFILL }},
     { &hf_rnsap_diversityIndication_03,
@@ -52862,59 +52862,59 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_DiversityIndication_RL_AdditionRspTDD_vals), 0,
         "DiversityIndication_RL_AdditionRspTDD", HFILL }},
     { &hf_rnsap_combining_03,
-      { "combining", "rnsap.combining",
+      { "combining", "rnsap.combining_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Combining_RL_AdditionRspTDD", HFILL }},
     { &hf_rnsap_nonCombining_01,
-      { "nonCombining", "rnsap.nonCombining",
+      { "nonCombining", "rnsap.nonCombining_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonCombining_RL_AdditionRspTDD", HFILL }},
     { &hf_rnsap_DSCH_InformationListIE_RL_AdditionRspTDD_item,
-      { "DSCHInformationItem-RL-AdditionRspTDD", "rnsap.DSCHInformationItem_RL_AdditionRspTDD",
+      { "DSCHInformationItem-RL-AdditionRspTDD", "rnsap.DSCHInformationItem_RL_AdditionRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_diversityIndication_04,
-      { "diversityIndication", "rnsap.diversityIndication",
+      { "diversityIndication", "rnsap.diversityIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DiversityIndication_RL_AdditionRspTDD2", HFILL }},
     { &hf_rnsap_USCH_InformationListIE_RL_AdditionRspTDD_item,
-      { "USCHInformationItem-RL-AdditionRspTDD", "rnsap.USCHInformationItem_RL_AdditionRspTDD",
+      { "USCHInformationItem-RL-AdditionRspTDD", "rnsap.USCHInformationItem_RL_AdditionRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ul_CCTrCH_LCR_Information,
-      { "ul-CCTrCH-LCR-Information", "rnsap.ul_CCTrCH_LCR_Information",
+      { "ul-CCTrCH-LCR-Information", "rnsap.ul_CCTrCH_LCR_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_CCTrCH_LCR_InformationList_RL_AdditionRspTDD", HFILL }},
     { &hf_rnsap_dl_CCTrCH_LCR_Information,
-      { "dl-CCTrCH-LCR-Information", "rnsap.dl_CCTrCH_LCR_Information",
+      { "dl-CCTrCH-LCR-Information", "rnsap.dl_CCTrCH_LCR_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_CCTrCH_LCR_InformationList_RL_AdditionRspTDD", HFILL }},
     { &hf_rnsap_dCH_InformationResponse_02,
-      { "dCH-InformationResponse", "rnsap.dCH_InformationResponse",
+      { "dCH-InformationResponse", "rnsap.dCH_InformationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DCH_InformationResponseList_RL_AdditionRspTDD", HFILL }},
     { &hf_rnsap_dsch_LCR_InformationResponse_01,
-      { "dsch-LCR-InformationResponse", "rnsap.dsch_LCR_InformationResponse",
+      { "dsch-LCR-InformationResponse", "rnsap.dsch_LCR_InformationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DSCH_LCR_InformationResponse_RL_AdditionRspTDD", HFILL }},
     { &hf_rnsap_usch_LCR_InformationResponse_01,
-      { "usch-LCR-InformationResponse", "rnsap.usch_LCR_InformationResponse",
+      { "usch-LCR-InformationResponse", "rnsap.usch_LCR_InformationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "USCH_LCR_InformationResponse_RL_AdditionRspTDD", HFILL }},
     { &hf_rnsap_UL_CCTrCH_LCR_InformationListIE_RL_AdditionRspTDD_item,
-      { "UL-CCTrCH-LCR-InformationItem-RL-AdditionRspTDD", "rnsap.UL_CCTrCH_LCR_InformationItem_RL_AdditionRspTDD",
+      { "UL-CCTrCH-LCR-InformationItem-RL-AdditionRspTDD", "rnsap.UL_CCTrCH_LCR_InformationItem_RL_AdditionRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ul_DPCH_LCR_Information_01,
-      { "ul-DPCH-LCR-Information", "rnsap.ul_DPCH_LCR_Information",
+      { "ul-DPCH-LCR-Information", "rnsap.ul_DPCH_LCR_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_LCR_InformationList_RL_AdditionRspTDD", HFILL }},
     { &hf_rnsap_DL_CCTrCH_LCR_InformationListIE_RL_AdditionRspTDD_item,
-      { "DL-CCTrCH-LCR-InformationItem-RL-AdditionRspTDD", "rnsap.DL_CCTrCH_LCR_InformationItem_RL_AdditionRspTDD",
+      { "DL-CCTrCH-LCR-InformationItem-RL-AdditionRspTDD", "rnsap.DL_CCTrCH_LCR_InformationItem_RL_AdditionRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dl_DPCH_LCR_Information_01,
-      { "dl-DPCH-LCR-Information", "rnsap.dl_DPCH_LCR_Information",
+      { "dl-DPCH-LCR-Information", "rnsap.dl_DPCH_LCR_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_LCR_InformationList_RL_AdditionRspTDD", HFILL }},
     { &hf_rnsap_dL_TimeslotLCR_Information,
@@ -52922,43 +52922,43 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DSCH_LCR_InformationListIEs_RL_AdditionRspTDD_item,
-      { "DSCH-LCR-InformationItem-RL-AdditionRspTDD", "rnsap.DSCH_LCR_InformationItem_RL_AdditionRspTDD",
+      { "DSCH-LCR-InformationItem-RL-AdditionRspTDD", "rnsap.DSCH_LCR_InformationItem_RL_AdditionRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_USCH_LCR_InformationListIEs_RL_AdditionRspTDD_item,
-      { "USCH-LCR-InformationItem-RL-AdditionRspTDD", "rnsap.USCH_LCR_InformationItem_RL_AdditionRspTDD",
+      { "USCH-LCR-InformationItem-RL-AdditionRspTDD", "rnsap.USCH_LCR_InformationItem_RL_AdditionRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ul_CCTrCHInformation768_01,
-      { "ul-CCTrCHInformation768", "rnsap.ul_CCTrCHInformation768",
+      { "ul-CCTrCHInformation768", "rnsap.ul_CCTrCHInformation768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_CCTrCHInformationList_RL_AdditionRspTDD768", HFILL }},
     { &hf_rnsap_dl_CCTrCHInformation768_01,
-      { "dl-CCTrCHInformation768", "rnsap.dl_CCTrCHInformation768",
+      { "dl-CCTrCHInformation768", "rnsap.dl_CCTrCHInformation768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_CCTrCHInformationList_RL_AdditionRspTDD768", HFILL }},
     { &hf_rnsap_UL_CCTrCHInformationListIE_RL_AdditionRspTDD768_item,
-      { "UL-CCTrCHInformationItem-RL-AdditionRspTDD768", "rnsap.UL_CCTrCHInformationItem_RL_AdditionRspTDD768",
+      { "UL-CCTrCHInformationItem-RL-AdditionRspTDD768", "rnsap.UL_CCTrCHInformationItem_RL_AdditionRspTDD768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ul_DPCH_Information768_01,
-      { "ul-DPCH-Information768", "rnsap.ul_DPCH_Information768",
+      { "ul-DPCH-Information768", "rnsap.ul_DPCH_Information768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_InformationList_RL_AdditionRspTDD768", HFILL }},
     { &hf_rnsap_DL_CCTrCHInformationListIE_RL_AdditionRspTDD768_item,
-      { "DL-CCTrCHInformationItem-RL-AdditionRspTDD768", "rnsap.DL_CCTrCHInformationItem_RL_AdditionRspTDD768",
+      { "DL-CCTrCHInformationItem-RL-AdditionRspTDD768", "rnsap.DL_CCTrCHInformationItem_RL_AdditionRspTDD768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dl_DPCH_Information768_01,
-      { "dl-DPCH-Information768", "rnsap.dl_DPCH_Information768",
+      { "dl-DPCH-Information768", "rnsap.dl_DPCH_Information768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_InformationList_RL_AdditionRspTDD768", HFILL }},
     { &hf_rnsap_generalCause_02,
-      { "generalCause", "rnsap.generalCause",
+      { "generalCause", "rnsap.generalCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GeneralCauseList_RL_AdditionFailureFDD", HFILL }},
     { &hf_rnsap_rLSpecificCause_02,
-      { "rLSpecificCause", "rnsap.rLSpecificCause",
+      { "rLSpecificCause", "rnsap.rLSpecificCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLSpecificCauseList_RL_AdditionFailureFDD", HFILL }},
     { &hf_rnsap_unsuccessful_RL_InformationRespList_RL_AdditionFailureFDD,
@@ -52970,15 +52970,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SuccessfulRL_InformationResponseList_RL_AdditionFailureFDD", HFILL }},
     { &hf_rnsap_UnsuccessfulRL_InformationResponseList_RL_AdditionFailureFDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_SuccessfulRL_InformationResponseList_RL_AdditionFailureFDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dl_CodeInformation_02,
-      { "dl-CodeInformation", "rnsap.dl_CodeInformation",
+      { "dl-CodeInformation", "rnsap.dl_CodeInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_CodeInformationList_RL_AdditionFailureFDD", HFILL }},
     { &hf_rnsap_diversityIndication_05,
@@ -52986,27 +52986,27 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_DiversityIndication_RL_AdditionFailureFDD_vals), 0,
         "DiversityIndication_RL_AdditionFailureFDD", HFILL }},
     { &hf_rnsap_combining_04,
-      { "combining", "rnsap.combining",
+      { "combining", "rnsap.combining_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Combining_RL_AdditionFailureFDD", HFILL }},
     { &hf_rnsap_nonCombining_02,
-      { "nonCombining", "rnsap.nonCombining",
+      { "nonCombining", "rnsap.nonCombining_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonCombining_RL_AdditionFailureFDD", HFILL }},
     { &hf_rnsap_generalCause_03,
-      { "generalCause", "rnsap.generalCause",
+      { "generalCause", "rnsap.generalCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GeneralCauseList_RL_AdditionFailureTDD", HFILL }},
     { &hf_rnsap_rLSpecificCause_03,
-      { "rLSpecificCause", "rnsap.rLSpecificCause",
+      { "rLSpecificCause", "rnsap.rLSpecificCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLSpecificCauseList_RL_AdditionFailureTDD", HFILL }},
     { &hf_rnsap_unsuccessful_RL_InformationRespItem_RL_AdditionFailureTDD,
-      { "unsuccessful-RL-InformationRespItem-RL-AdditionFailureTDD", "rnsap.unsuccessful_RL_InformationRespItem_RL_AdditionFailureTDD",
+      { "unsuccessful-RL-InformationRespItem-RL-AdditionFailureTDD", "rnsap.unsuccessful_RL_InformationRespItem_RL_AdditionFailureTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationList_RL_DeletionRqst_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_maxNrOfUL_DPDCHs,
@@ -53014,11 +53014,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MaxNrOfUL_DPCHs", HFILL }},
     { &hf_rnsap_not_Used_sSDT_CellIDLength,
-      { "not-Used-sSDT-CellIDLength", "rnsap.not_Used_sSDT_CellIDLength",
+      { "not-Used-sSDT-CellIDLength", "rnsap.not_Used_sSDT_CellIDLength_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_powerOffsetInformation_02,
-      { "powerOffsetInformation", "rnsap.powerOffsetInformation",
+      { "powerOffsetInformation", "rnsap.powerOffsetInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PowerOffsetInformation_RL_ReconfPrepFDD", HFILL }},
     { &hf_rnsap_pO1_ForTFCI_Bits,
@@ -53034,31 +53034,31 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PowerOffset", HFILL }},
     { &hf_rnsap_DCH_DeleteList_RL_ReconfPrepFDD_item,
-      { "DCH-DeleteItem-RL-ReconfPrepFDD", "rnsap.DCH_DeleteItem_RL_ReconfPrepFDD",
+      { "DCH-DeleteItem-RL-ReconfPrepFDD", "rnsap.DCH_DeleteItem_RL_ReconfPrepFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationList_RL_ReconfPrepFDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_not_Used_sSDT_Indication,
-      { "not-Used-sSDT-Indication", "rnsap.not_Used_sSDT_Indication",
+      { "not-Used-sSDT-Indication", "rnsap.not_Used_sSDT_Indication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_not_Used_sSDT_CellIdentity,
-      { "not-Used-sSDT-CellIdentity", "rnsap.not_Used_sSDT_CellIdentity",
+      { "not-Used-sSDT-CellIdentity", "rnsap.not_Used_sSDT_CellIdentity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_HS_Cell_Information_RL_Reconf_Prep_item,
-      { "Additional-HS-Cell-Information-RL-Reconf-Prep-ItemIEs", "rnsap.Additional_HS_Cell_Information_RL_Reconf_Prep_ItemIEs",
+      { "Additional-HS-Cell-Information-RL-Reconf-Prep-ItemIEs", "rnsap.Additional_HS_Cell_Information_RL_Reconf_Prep_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hS_DSCH_Secondary_Serving_Information_To_Modify,
-      { "hS-DSCH-Secondary-Serving-Information-To-Modify", "rnsap.hS_DSCH_Secondary_Serving_Information_To_Modify",
+      { "hS-DSCH-Secondary-Serving-Information-To-Modify", "rnsap.hS_DSCH_Secondary_Serving_Information_To_Modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hS_HS_DSCH_Secondary_Serving_Remove,
-      { "hS-HS-DSCH-Secondary-Serving-Remove", "rnsap.hS_HS_DSCH_Secondary_Serving_Remove",
+      { "hS-HS-DSCH-Secondary-Serving-Remove", "rnsap.hS_HS_DSCH_Secondary_Serving_Remove_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_DSCH_Secondary_Serving_Remove", HFILL }},
     { &hf_rnsap_setup_Or_ConfigurationChange_Or_Removal_Of_EDCH_On_secondary_UL_Frequency,
@@ -53066,23 +53066,23 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_Setup_Or_ConfigurationChange_Or_Removal_Of_EDCH_On_secondary_UL_Frequency_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_powerOffsetInformation_03,
-      { "powerOffsetInformation", "rnsap.powerOffsetInformation",
+      { "powerOffsetInformation", "rnsap.powerOffsetInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PowerOffsetInformation_F_DPCH_RL_ReconfPrepFDD", HFILL }},
     { &hf_rnsap_UL_CCTrCH_InformationAddList_RL_ReconfPrepTDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCH_InformationAddList_RL_ReconfPrepTDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_cCTrCH_TPCList_01,
@@ -53090,11 +53090,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CCTrCH_TPCAddList_RL_ReconfPrepTDD", HFILL }},
     { &hf_rnsap_CCTrCH_TPCAddList_RL_ReconfPrepTDD_item,
-      { "CCTrCH-TPCAddItem-RL-ReconfPrepTDD", "rnsap.CCTrCH_TPCAddItem_RL_ReconfPrepTDD",
+      { "CCTrCH-TPCAddItem-RL-ReconfPrepTDD", "rnsap.CCTrCH_TPCAddItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_cCTrCH_TPCList_02,
@@ -53102,27 +53102,27 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CCTrCH_TPCModifyList_RL_ReconfPrepTDD", HFILL }},
     { &hf_rnsap_CCTrCH_TPCModifyList_RL_ReconfPrepTDD_item,
-      { "CCTrCH-TPCModifyItem-RL-ReconfPrepTDD", "rnsap.CCTrCH_TPCModifyItem_RL_ReconfPrepTDD",
+      { "CCTrCH-TPCModifyItem-RL-ReconfPrepTDD", "rnsap.CCTrCH_TPCModifyItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DCH_DeleteList_RL_ReconfPrepTDD_item,
-      { "DCH-DeleteItem-RL-ReconfPrepTDD", "rnsap.DCH_DeleteItem_RL_ReconfPrepTDD",
+      { "DCH-DeleteItem-RL-ReconfPrepTDD", "rnsap.DCH_DeleteItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DSCH_ModifyList_RL_ReconfPrepTDD_item,
-      { "DSCH-ModifyItem-RL-ReconfPrepTDD", "rnsap.DSCH_ModifyItem_RL_ReconfPrepTDD",
+      { "DSCH-ModifyItem-RL-ReconfPrepTDD", "rnsap.DSCH_ModifyItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DSCH_DeleteList_RL_ReconfPrepTDD_item,
-      { "DSCH-DeleteItem-RL-ReconfPrepTDD", "rnsap.DSCH_DeleteItem_RL_ReconfPrepTDD",
+      { "DSCH-DeleteItem-RL-ReconfPrepTDD", "rnsap.DSCH_DeleteItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_USCH_ModifyList_RL_ReconfPrepTDD_item,
-      { "USCH-ModifyItem-RL-ReconfPrepTDD", "rnsap.USCH_ModifyItem_RL_ReconfPrepTDD",
+      { "USCH-ModifyItem-RL-ReconfPrepTDD", "rnsap.USCH_ModifyItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ul_ccTrCHID,
@@ -53130,11 +53130,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CCTrCH_ID", HFILL }},
     { &hf_rnsap_USCH_DeleteList_RL_ReconfPrepTDD_item,
-      { "USCH-DeleteItem-RL-ReconfPrepTDD", "rnsap.USCH_DeleteItem_RL_ReconfPrepTDD",
+      { "USCH-DeleteItem-RL-ReconfPrepTDD", "rnsap.USCH_DeleteItem_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Information_RL_ReconfPrepTDD_item,
-      { "RL-InformationIE-RL-ReconfPrepTDD", "rnsap.RL_InformationIE_RL_ReconfPrepTDD",
+      { "RL-InformationIE-RL-ReconfPrepTDD", "rnsap.RL_InformationIE_RL_ReconfPrepTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_rL_Specific_DCH_Info,
@@ -53142,7 +53142,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationResponseList_RL_ReconfReadyFDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_max_UL_SIR,
@@ -53154,55 +53154,55 @@ void proto_register_rnsap(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "UL_SIR", HFILL }},
     { &hf_rnsap_dl_CodeInformationList,
-      { "dl-CodeInformationList", "rnsap.dl_CodeInformationList",
+      { "dl-CodeInformationList", "rnsap.dl_CodeInformationList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_CodeInformationList_RL_ReconfReadyFDD", HFILL }},
     { &hf_rnsap_dCHInformationResponse,
-      { "dCHInformationResponse", "rnsap.dCHInformationResponse",
+      { "dCHInformationResponse", "rnsap.dCHInformationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DCH_InformationResponseList_RL_ReconfReadyFDD", HFILL }},
     { &hf_rnsap_not_Used_dSCHsToBeAddedOrModified,
-      { "not-Used-dSCHsToBeAddedOrModified", "rnsap.not_Used_dSCHsToBeAddedOrModified",
+      { "not-Used-dSCHsToBeAddedOrModified", "rnsap.not_Used_dSCHsToBeAddedOrModified_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_HS_Cell_RL_Reconf_Response_item,
-      { "Additional-HS-Cell-RL-Reconf-Response-ItemIEs", "rnsap.Additional_HS_Cell_RL_Reconf_Response_ItemIEs",
+      { "Additional-HS-Cell-RL-Reconf-Response-ItemIEs", "rnsap.Additional_HS_Cell_RL_Reconf_Response_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ul_CCTrCH_Information,
-      { "ul-CCTrCH-Information", "rnsap.ul_CCTrCH_Information",
+      { "ul-CCTrCH-Information", "rnsap.ul_CCTrCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_CCTrCH_InformationList_RL_ReconfReadyTDD", HFILL }},
     { &hf_rnsap_dl_CCTrCH_Information,
-      { "dl-CCTrCH-Information", "rnsap.dl_CCTrCH_Information",
+      { "dl-CCTrCH-Information", "rnsap.dl_CCTrCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_CCTrCH_InformationList_RL_ReconfReadyTDD", HFILL }},
     { &hf_rnsap_dCHInformationResponse_01,
-      { "dCHInformationResponse", "rnsap.dCHInformationResponse",
+      { "dCHInformationResponse", "rnsap.dCHInformationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DCH_InformationResponseList_RL_ReconfReadyTDD", HFILL }},
     { &hf_rnsap_dSCHsToBeAddedOrModified,
-      { "dSCHsToBeAddedOrModified", "rnsap.dSCHsToBeAddedOrModified",
+      { "dSCHsToBeAddedOrModified", "rnsap.dSCHsToBeAddedOrModified_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DSCHToBeAddedOrModified_RL_ReconfReadyTDD", HFILL }},
     { &hf_rnsap_uSCHsToBeAddedOrModified,
-      { "uSCHsToBeAddedOrModified", "rnsap.uSCHsToBeAddedOrModified",
+      { "uSCHsToBeAddedOrModified", "rnsap.uSCHsToBeAddedOrModified_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "USCHToBeAddedOrModified_RL_ReconfReadyTDD", HFILL }},
     { &hf_rnsap_UL_CCTrCHInformationListIE_RL_ReconfReadyTDD_item,
-      { "UL-CCTrCH-InformationItem-RL-ReconfReadyTDD", "rnsap.UL_CCTrCH_InformationItem_RL_ReconfReadyTDD",
+      { "UL-CCTrCH-InformationItem-RL-ReconfReadyTDD", "rnsap.UL_CCTrCH_InformationItem_RL_ReconfReadyTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ul_DPCH_AddInformation,
-      { "ul-DPCH-AddInformation", "rnsap.ul_DPCH_AddInformation",
+      { "ul-DPCH-AddInformation", "rnsap.ul_DPCH_AddInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_InformationAddList_RL_ReconfReadyTDD", HFILL }},
     { &hf_rnsap_ul_DPCH_ModifyInformation,
-      { "ul-DPCH-ModifyInformation", "rnsap.ul_DPCH_ModifyInformation",
+      { "ul-DPCH-ModifyInformation", "rnsap.ul_DPCH_ModifyInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_InformationModifyList_RL_ReconfReadyTDD", HFILL }},
     { &hf_rnsap_ul_DPCH_DeleteInformation,
-      { "ul-DPCH-DeleteInformation", "rnsap.ul_DPCH_DeleteInformation",
+      { "ul-DPCH-DeleteInformation", "rnsap.ul_DPCH_DeleteInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_InformationDeleteList_RL_ReconfReadyTDD", HFILL }},
     { &hf_rnsap_uL_TimeslotLCR_Info,
@@ -53222,7 +53222,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_TimeslotLCR_InformationModifyList_RL_ReconfReadyTDD_item,
-      { "UL-TimeslotLCR-InformationModifyItem-RL-ReconfReadyTDD", "rnsap.UL_TimeslotLCR_InformationModifyItem_RL_ReconfReadyTDD",
+      { "UL-TimeslotLCR-InformationModifyItem-RL-ReconfReadyTDD", "rnsap.UL_TimeslotLCR_InformationModifyItem_RL_ReconfReadyTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_tDD_uL_Code_LCR_Information,
@@ -53230,11 +53230,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TDD_UL_Code_LCR_InformationModifyList_RL_ReconfReadyTDD", HFILL }},
     { &hf_rnsap_TDD_UL_Code_LCR_InformationModifyList_RL_ReconfReadyTDD_item,
-      { "TDD-UL-Code-LCR-InformationModifyItem-RL-ReconfReadyTDD", "rnsap.TDD_UL_Code_LCR_InformationModifyItem_RL_ReconfReadyTDD",
+      { "TDD-UL-Code-LCR-InformationModifyItem-RL-ReconfReadyTDD", "rnsap.TDD_UL_Code_LCR_InformationModifyItem_RL_ReconfReadyTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_Timeslot_InformationModifyList_RL_ReconfReadyTDD_item,
-      { "UL-Timeslot-InformationModifyItem-RL-ReconfReadyTDD", "rnsap.UL_Timeslot_InformationModifyItem_RL_ReconfReadyTDD",
+      { "UL-Timeslot-InformationModifyItem-RL-ReconfReadyTDD", "rnsap.UL_Timeslot_InformationModifyItem_RL_ReconfReadyTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_uL_Code_Information_01,
@@ -53242,11 +53242,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TDD_UL_Code_InformationModifyList_RL_ReconfReadyTDD", HFILL }},
     { &hf_rnsap_TDD_UL_Code_InformationModifyList_RL_ReconfReadyTDD_item,
-      { "TDD-UL-Code-InformationModifyItem-RL-ReconfReadyTDD", "rnsap.TDD_UL_Code_InformationModifyItem_RL_ReconfReadyTDD",
+      { "TDD-UL-Code-InformationModifyItem-RL-ReconfReadyTDD", "rnsap.TDD_UL_Code_InformationModifyItem_RL_ReconfReadyTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_Timeslot_InformationModifyList_RL_ReconfReadyTDD768_item,
-      { "UL-Timeslot-InformationModifyItem-RL-ReconfReadyTDD768", "rnsap.UL_Timeslot_InformationModifyItem_RL_ReconfReadyTDD768",
+      { "UL-Timeslot-InformationModifyItem-RL-ReconfReadyTDD768", "rnsap.UL_Timeslot_InformationModifyItem_RL_ReconfReadyTDD768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_uL_Code_Information768_01,
@@ -53254,27 +53254,27 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TDD_UL_Code_InformationModifyList_RL_ReconfReadyTDD768", HFILL }},
     { &hf_rnsap_TDD_UL_Code_InformationModifyList_RL_ReconfReadyTDD768_item,
-      { "TDD-UL-Code-InformationModifyItem-RL-ReconfReadyTDD768", "rnsap.TDD_UL_Code_InformationModifyItem_RL_ReconfReadyTDD768",
+      { "TDD-UL-Code-InformationModifyItem-RL-ReconfReadyTDD768", "rnsap.TDD_UL_Code_InformationModifyItem_RL_ReconfReadyTDD768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_DPCH_InformationDeleteListIE_RL_ReconfReadyTDD_item,
-      { "UL-DPCH-InformationDeleteItem-RL-ReconfReadyTDD", "rnsap.UL_DPCH_InformationDeleteItem_RL_ReconfReadyTDD",
+      { "UL-DPCH-InformationDeleteItem-RL-ReconfReadyTDD", "rnsap.UL_DPCH_InformationDeleteItem_RL_ReconfReadyTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCHInformationListIE_RL_ReconfReadyTDD_item,
-      { "DL-CCTrCH-InformationItem-RL-ReconfReadyTDD", "rnsap.DL_CCTrCH_InformationItem_RL_ReconfReadyTDD",
+      { "DL-CCTrCH-InformationItem-RL-ReconfReadyTDD", "rnsap.DL_CCTrCH_InformationItem_RL_ReconfReadyTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dl_DPCH_AddInformation,
-      { "dl-DPCH-AddInformation", "rnsap.dl_DPCH_AddInformation",
+      { "dl-DPCH-AddInformation", "rnsap.dl_DPCH_AddInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_InformationAddList_RL_ReconfReadyTDD", HFILL }},
     { &hf_rnsap_dl_DPCH_ModifyInformation,
-      { "dl-DPCH-ModifyInformation", "rnsap.dl_DPCH_ModifyInformation",
+      { "dl-DPCH-ModifyInformation", "rnsap.dl_DPCH_ModifyInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_InformationModifyList_RL_ReconfReadyTDD", HFILL }},
     { &hf_rnsap_dl_DPCH_DeleteInformation,
-      { "dl-DPCH-DeleteInformation", "rnsap.dl_DPCH_DeleteInformation",
+      { "dl-DPCH-DeleteInformation", "rnsap.dl_DPCH_DeleteInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_InformationDeleteList_RL_ReconfReadyTDD", HFILL }},
     { &hf_rnsap_dL_TimeslotLCR_Info,
@@ -53286,7 +53286,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_TimeslotLCR_InformationModifyList_RL_ReconfReadyTDD_item,
-      { "DL-TimeslotLCR-InformationModifyItem-RL-ReconfReadyTDD", "rnsap.DL_TimeslotLCR_InformationModifyItem_RL_ReconfReadyTDD",
+      { "DL-TimeslotLCR-InformationModifyItem-RL-ReconfReadyTDD", "rnsap.DL_TimeslotLCR_InformationModifyItem_RL_ReconfReadyTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_tDD_dL_Code_LCR_Information,
@@ -53294,11 +53294,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TDD_DL_Code_LCR_InformationModifyList_RL_ReconfReadyTDD", HFILL }},
     { &hf_rnsap_TDD_DL_Code_LCR_InformationModifyList_RL_ReconfReadyTDD_item,
-      { "TDD-DL-Code-LCR-InformationModifyItem-RL-ReconfReadyTDD", "rnsap.TDD_DL_Code_LCR_InformationModifyItem_RL_ReconfReadyTDD",
+      { "TDD-DL-Code-LCR-InformationModifyItem-RL-ReconfReadyTDD", "rnsap.TDD_DL_Code_LCR_InformationModifyItem_RL_ReconfReadyTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_Timeslot_InformationModifyList_RL_ReconfReadyTDD_item,
-      { "DL-Timeslot-InformationModifyItem-RL-ReconfReadyTDD", "rnsap.DL_Timeslot_InformationModifyItem_RL_ReconfReadyTDD",
+      { "DL-Timeslot-InformationModifyItem-RL-ReconfReadyTDD", "rnsap.DL_Timeslot_InformationModifyItem_RL_ReconfReadyTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dL_Code_Information_01,
@@ -53306,11 +53306,11 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TDD_DL_Code_InformationModifyList_RL_ReconfReadyTDD", HFILL }},
     { &hf_rnsap_TDD_DL_Code_InformationModifyList_RL_ReconfReadyTDD_item,
-      { "TDD-DL-Code-InformationModifyItem-RL-ReconfReadyTDD", "rnsap.TDD_DL_Code_InformationModifyItem_RL_ReconfReadyTDD",
+      { "TDD-DL-Code-InformationModifyItem-RL-ReconfReadyTDD", "rnsap.TDD_DL_Code_InformationModifyItem_RL_ReconfReadyTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_Timeslot_InformationModifyList_RL_ReconfReadyTDD768_item,
-      { "DL-Timeslot-InformationModifyItem-RL-ReconfReadyTDD768", "rnsap.DL_Timeslot_InformationModifyItem_RL_ReconfReadyTDD768",
+      { "DL-Timeslot-InformationModifyItem-RL-ReconfReadyTDD768", "rnsap.DL_Timeslot_InformationModifyItem_RL_ReconfReadyTDD768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dL_Code_Information768_01,
@@ -53318,7 +53318,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TDD_DL_Code_InformationModifyList_RL_ReconfReadyTDD768", HFILL }},
     { &hf_rnsap_TDD_DL_Code_InformationModifyList_RL_ReconfReadyTDD768_item,
-      { "TDD-DL-Code-InformationModifyItem-RL-ReconfReadyTDD768", "rnsap.TDD_DL_Code_InformationModifyItem_RL_ReconfReadyTDD768",
+      { "TDD-DL-Code-InformationModifyItem-RL-ReconfReadyTDD768", "rnsap.TDD_DL_Code_InformationModifyItem_RL_ReconfReadyTDD768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dPCH_ID768,
@@ -53326,31 +53326,31 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_DPCH_InformationDeleteListIE_RL_ReconfReadyTDD_item,
-      { "DL-DPCH-InformationDeleteItem-RL-ReconfReadyTDD", "rnsap.DL_DPCH_InformationDeleteItem_RL_ReconfReadyTDD",
+      { "DL-DPCH-InformationDeleteItem-RL-ReconfReadyTDD", "rnsap.DL_DPCH_InformationDeleteItem_RL_ReconfReadyTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_DPCH_InformationDeleteList768_RL_ReconfReadyTDD_item,
-      { "DL-DPCH-InformationDeleteItem768-RL-ReconfReadyTDD", "rnsap.DL_DPCH_InformationDeleteItem768_RL_ReconfReadyTDD",
+      { "DL-DPCH-InformationDeleteItem768-RL-ReconfReadyTDD", "rnsap.DL_DPCH_InformationDeleteItem768_RL_ReconfReadyTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DSCHToBeAddedOrModifiedList_RL_ReconfReadyTDD_item,
-      { "DSCHToBeAddedOrModifiedItem-RL-ReconfReadyTDD", "rnsap.DSCHToBeAddedOrModifiedItem_RL_ReconfReadyTDD",
+      { "DSCHToBeAddedOrModifiedItem-RL-ReconfReadyTDD", "rnsap.DSCHToBeAddedOrModifiedItem_RL_ReconfReadyTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_USCHToBeAddedOrModifiedList_RL_ReconfReadyTDD_item,
-      { "USCHToBeAddedOrModifiedItem-RL-ReconfReadyTDD", "rnsap.USCHToBeAddedOrModifiedItem_RL_ReconfReadyTDD",
+      { "USCHToBeAddedOrModifiedItem-RL-ReconfReadyTDD", "rnsap.USCHToBeAddedOrModifiedItem_RL_ReconfReadyTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Multiple_RL_InformationResponse_RL_ReconfReadyTDD_item,
-      { "RL-InformationResponse-RL-ReconfReadyTDD", "rnsap.RL_InformationResponse_RL_ReconfReadyTDD",
+      { "RL-InformationResponse-RL-ReconfReadyTDD", "rnsap.RL_InformationResponse_RL_ReconfReadyTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_generalCause_04,
-      { "generalCause", "rnsap.generalCause",
+      { "generalCause", "rnsap.generalCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GeneralCauseList_RL_ReconfFailure", HFILL }},
     { &hf_rnsap_rLSpecificCause_04,
-      { "rLSpecificCause", "rnsap.rLSpecificCause",
+      { "rLSpecificCause", "rnsap.rLSpecificCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLSpecificCauseList_RL_ReconfFailure", HFILL }},
     { &hf_rnsap_rL_ReconfigurationFailureList_RL_ReconfFailure,
@@ -53358,75 +53358,75 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_ReconfigurationFailureList_RL_ReconfFailure_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DCH_DeleteList_RL_ReconfRqstFDD_item,
-      { "DCH-DeleteItem-RL-ReconfRqstFDD", "rnsap.DCH_DeleteItem_RL_ReconfRqstFDD",
+      { "DCH-DeleteItem-RL-ReconfRqstFDD", "rnsap.DCH_DeleteItem_RL_ReconfRqstFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_HS_Cell_Information_RL_Reconf_Req_item,
-      { "Additional-HS-Cell-Information-RL-Reconf-Req-ItemIEs", "rnsap.Additional_HS_Cell_Information_RL_Reconf_Req_ItemIEs",
+      { "Additional-HS-Cell-Information-RL-Reconf-Req-ItemIEs", "rnsap.Additional_HS_Cell_Information_RL_Reconf_Req_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hS_DSCH_FDD_Secondary_Serving_Information_To_Modify_Unsynchronised,
-      { "hS-DSCH-FDD-Secondary-Serving-Information-To-Modify-Unsynchronised", "rnsap.hS_DSCH_FDD_Secondary_Serving_Information_To_Modify_Unsynchronised",
+      { "hS-DSCH-FDD-Secondary-Serving-Information-To-Modify-Unsynchronised", "rnsap.hS_DSCH_FDD_Secondary_Serving_Information_To_Modify_Unsynchronised_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hS_DSCH_Secondary_Serving_Remove,
-      { "hS-DSCH-Secondary-Serving-Remove", "rnsap.hS_DSCH_Secondary_Serving_Remove",
+      { "hS-DSCH-Secondary-Serving-Remove", "rnsap.hS_DSCH_Secondary_Serving_Remove_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_ReconfigurationRequestFDD_RL_InformationList_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DCH_DeleteList_RL_ReconfRqstTDD_item,
-      { "DCH-DeleteItem-RL-ReconfRqstTDD", "rnsap.DCH_DeleteItem_RL_ReconfRqstTDD",
+      { "DCH-DeleteItem-RL-ReconfRqstTDD", "rnsap.DCH_DeleteItem_RL_ReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Multiple_RL_ReconfigurationRequestTDD_RL_Information_item,
-      { "RL-ReconfigurationRequestTDD-RL-Information", "rnsap.RL_ReconfigurationRequestTDD_RL_Information",
+      { "RL-ReconfigurationRequestTDD-RL-Information", "rnsap.RL_ReconfigurationRequestTDD_RL_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationResponseList_RL_ReconfRspFDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dCHsInformationResponseList,
-      { "dCHsInformationResponseList", "rnsap.dCHsInformationResponseList",
+      { "dCHsInformationResponseList", "rnsap.dCHsInformationResponseList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DCH_InformationResponseList_RL_ReconfRspFDD", HFILL }},
     { &hf_rnsap_dL_CodeInformationList_RL_ReconfResp,
-      { "dL-CodeInformationList-RL-ReconfResp", "rnsap.dL_CodeInformationList_RL_ReconfResp",
+      { "dL-CodeInformationList-RL-ReconfResp", "rnsap.dL_CodeInformationList_RL_ReconfResp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_CodeInformationList_RL_ReconfRspFDD", HFILL }},
     { &hf_rnsap_dCHsInformationResponseList_01,
-      { "dCHsInformationResponseList", "rnsap.dCHsInformationResponseList",
+      { "dCHsInformationResponseList", "rnsap.dCHsInformationResponseList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DCH_InformationResponseList_RL_ReconfRspTDD", HFILL }},
     { &hf_rnsap_DL_CCTrCH_InformationList_RL_ReconfRspTDD_item,
-      { "DL-CCTrCH-InformationItem-RL-ReconfRspTDD", "rnsap.DL_CCTrCH_InformationItem_RL_ReconfRspTDD",
+      { "DL-CCTrCH-InformationItem-RL-ReconfRspTDD", "rnsap.DL_CCTrCH_InformationItem_RL_ReconfRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dl_DPCH_ModifyInformation_LCR,
-      { "dl-DPCH-ModifyInformation-LCR", "rnsap.dl_DPCH_ModifyInformation_LCR",
+      { "dl-DPCH-ModifyInformation-LCR", "rnsap.dl_DPCH_ModifyInformation_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_InformationModifyList_LCR_RL_ReconfRspTDD", HFILL }},
     { &hf_rnsap_dL_Timeslot_LCR_InformationModifyList_RL_ReconfRqstTDD,
@@ -53434,7 +53434,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DL_Timeslot_LCR_InformationModifyList_RL_ReconfRspTDD", HFILL }},
     { &hf_rnsap_DL_Timeslot_LCR_InformationModifyList_RL_ReconfRspTDD_item,
-      { "DL-Timeslot-LCR-InformationModifyItem-RL-ReconfRspTDD", "rnsap.DL_Timeslot_LCR_InformationModifyItem_RL_ReconfRspTDD",
+      { "DL-Timeslot-LCR-InformationModifyItem-RL-ReconfRspTDD", "rnsap.DL_Timeslot_LCR_InformationModifyItem_RL_ReconfRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_maxPowerLCR,
@@ -53446,19 +53446,19 @@ void proto_register_rnsap(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "DL_Power", HFILL }},
     { &hf_rnsap_Multiple_RL_InformationResponse_RL_ReconfRspTDD_item,
-      { "RL-InformationResponse-RL-ReconfRspTDD", "rnsap.RL_InformationResponse_RL_ReconfRspTDD",
+      { "RL-InformationResponse-RL-ReconfRspTDD", "rnsap.RL_InformationResponse_RL_ReconfRspTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_rL,
-      { "rL", "rnsap.rL",
+      { "rL", "rnsap.rL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_RL_FailureInd", HFILL }},
     { &hf_rnsap_rL_Set,
-      { "rL-Set", "rnsap.rL_Set",
+      { "rL-Set", "rnsap.rL_Set_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_Set_RL_FailureInd", HFILL }},
     { &hf_rnsap_cCTrCH,
-      { "cCTrCH", "rnsap.cCTrCH",
+      { "cCTrCH", "rnsap.cCTrCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CCTrCH_RL_FailureInd", HFILL }},
     { &hf_rnsap_rL_InformationList_RL_FailureInd,
@@ -53466,7 +53466,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationList_RL_FailureInd_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_rL_Set_InformationList_RL_FailureInd,
@@ -53474,7 +53474,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Set_InformationList_RL_FailureInd_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_cCTrCH_InformationList_RL_FailureInd,
@@ -53482,31 +53482,31 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CCTrCH_InformationList_RL_FailureInd_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationList_RL_PreemptRequiredInd_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSDSCHMacdFlowSpecificInformationList_RL_PreemptRequiredInd_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_EDCH_MacdFlowSpecificInformationList_RL_PreemptRequiredInd_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_rL_01,
-      { "rL", "rnsap.rL",
+      { "rL", "rnsap.rL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_RL_RestoreInd", HFILL }},
     { &hf_rnsap_rL_Set_01,
-      { "rL-Set", "rnsap.rL_Set",
+      { "rL-Set", "rnsap.rL_Set_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_Set_RL_RestoreInd", HFILL }},
     { &hf_rnsap_cCTrCH_01,
-      { "cCTrCH", "rnsap.cCTrCH",
+      { "cCTrCH", "rnsap.cCTrCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CCTrCH_RL_RestoreInd", HFILL }},
     { &hf_rnsap_rL_InformationList_RL_RestoreInd,
@@ -53514,7 +53514,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationList_RL_RestoreInd_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_rL_Set_InformationList_RL_RestoreInd,
@@ -53522,7 +53522,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Set_InformationList_RL_RestoreInd_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_cCTrCH_InformationList_RL_RestoreInd,
@@ -53530,31 +53530,31 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_CCTrCH_InformationList_RL_RestoreInd_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_ReferencePowerInformationList_DL_PC_Rqst_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dl_CodeInformation_03,
-      { "dl-CodeInformation", "rnsap.dl_CodeInformation",
+      { "dl-CodeInformation", "rnsap.dl_CodeInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_CodeInformationList_PhyChReconfRqstFDD", HFILL }},
     { &hf_rnsap_ul_CCTrCH_Information_01,
-      { "ul-CCTrCH-Information", "rnsap.ul_CCTrCH_Information",
+      { "ul-CCTrCH-Information", "rnsap.ul_CCTrCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_CCTrCH_InformationList_PhyChReconfRqstTDD", HFILL }},
     { &hf_rnsap_dl_CCTrCH_Information_01,
-      { "dl-CCTrCH-Information", "rnsap.dl_CCTrCH_Information",
+      { "dl-CCTrCH-Information", "rnsap.dl_CCTrCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_CCTrCH_InformationList_PhyChReconfRqstTDD", HFILL }},
     { &hf_rnsap_UL_CCTrCH_InformationListIE_PhyChReconfRqstTDD_item,
-      { "UL-CCTrCH-InformationItem-PhyChReconfRqstTDD", "rnsap.UL_CCTrCH_InformationItem_PhyChReconfRqstTDD",
+      { "UL-CCTrCH-InformationItem-PhyChReconfRqstTDD", "rnsap.UL_CCTrCH_InformationItem_PhyChReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ul_DPCH_Information_02,
-      { "ul-DPCH-Information", "rnsap.ul_DPCH_Information",
+      { "ul-DPCH-Information", "rnsap.ul_DPCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_InformationList_PhyChReconfRqstTDD", HFILL }},
     { &hf_rnsap_uL_Timeslot_InformationList_PhyChReconfRqstTDD,
@@ -53562,7 +53562,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_TimeslotLCR_InformationList_PhyChReconfRqstTDD_item,
-      { "UL-TimeslotLCR-InformationItem-PhyChReconfRqstTDD", "rnsap.UL_TimeslotLCR_InformationItem_PhyChReconfRqstTDD",
+      { "UL-TimeslotLCR-InformationItem-PhyChReconfRqstTDD", "rnsap.UL_TimeslotLCR_InformationItem_PhyChReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_uL_Code_LCR_Information,
@@ -53570,19 +53570,19 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TDD_UL_Code_LCR_Information", HFILL }},
     { &hf_rnsap_UL_Timeslot_InformationList_PhyChReconfRqstTDD_item,
-      { "UL-Timeslot-InformationItem-PhyChReconfRqstTDD", "rnsap.UL_Timeslot_InformationItem_PhyChReconfRqstTDD",
+      { "UL-Timeslot-InformationItem-PhyChReconfRqstTDD", "rnsap.UL_Timeslot_InformationItem_PhyChReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_UL_Timeslot_InformationList_PhyChReconfRqstTDD768_item,
-      { "UL-Timeslot-InformationItem-PhyChReconfRqstTDD768", "rnsap.UL_Timeslot_InformationItem_PhyChReconfRqstTDD768",
+      { "UL-Timeslot-InformationItem-PhyChReconfRqstTDD768", "rnsap.UL_Timeslot_InformationItem_PhyChReconfRqstTDD768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_CCTrCH_InformationListIE_PhyChReconfRqstTDD_item,
-      { "DL-CCTrCH-InformationItem-PhyChReconfRqstTDD", "rnsap.DL_CCTrCH_InformationItem_PhyChReconfRqstTDD",
+      { "DL-CCTrCH-InformationItem-PhyChReconfRqstTDD", "rnsap.DL_CCTrCH_InformationItem_PhyChReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dl_DPCH_Information_02,
-      { "dl-DPCH-Information", "rnsap.dl_DPCH_Information",
+      { "dl-DPCH-Information", "rnsap.dl_DPCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_InformationList_PhyChReconfRqstTDD", HFILL }},
     { &hf_rnsap_dL_Timeslot_InformationList_PhyChReconfRqstTDD,
@@ -53590,31 +53590,31 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_TimeslotLCR_InformationList_PhyChReconfRqstTDD_item,
-      { "DL-TimeslotLCR-InformationItem-PhyChReconfRqstTDD", "rnsap.DL_TimeslotLCR_InformationItem_PhyChReconfRqstTDD",
+      { "DL-TimeslotLCR-InformationItem-PhyChReconfRqstTDD", "rnsap.DL_TimeslotLCR_InformationItem_PhyChReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_Timeslot_InformationList_PhyChReconfRqstTDD_item,
-      { "DL-Timeslot-InformationItem-PhyChReconfRqstTDD", "rnsap.DL_Timeslot_InformationItem_PhyChReconfRqstTDD",
+      { "DL-Timeslot-InformationItem-PhyChReconfRqstTDD", "rnsap.DL_Timeslot_InformationItem_PhyChReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DL_Timeslot_InformationList_PhyChReconfRqstTDD768_item,
-      { "DL-Timeslot-InformationItem-PhyChReconfRqstTDD768", "rnsap.DL_Timeslot_InformationItem_PhyChReconfRqstTDD768",
+      { "DL-Timeslot-InformationItem-PhyChReconfRqstTDD768", "rnsap.DL_Timeslot_InformationItem_PhyChReconfRqstTDD768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSPDSCH_Timeslot_InformationList_PhyChReconfRqstTDD_item,
-      { "HSPDSCH-Timeslot-InformationItem-PhyChReconfRqstTDD", "rnsap.HSPDSCH_Timeslot_InformationItem_PhyChReconfRqstTDD",
+      { "HSPDSCH-Timeslot-InformationItem-PhyChReconfRqstTDD", "rnsap.HSPDSCH_Timeslot_InformationItem_PhyChReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSPDSCH_Timeslot_InformationListLCR_PhyChReconfRqstTDD_item,
-      { "HSPDSCH-Timeslot-InformationItemLCR-PhyChReconfRqstTDD", "rnsap.HSPDSCH_Timeslot_InformationItemLCR_PhyChReconfRqstTDD",
+      { "HSPDSCH-Timeslot-InformationItemLCR-PhyChReconfRqstTDD", "rnsap.HSPDSCH_Timeslot_InformationItemLCR_PhyChReconfRqstTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSPDSCH_Timeslot_InformationList_PhyChReconfRqstTDD768_item,
-      { "HSPDSCH-Timeslot-InformationItem-PhyChReconfRqstTDD768", "rnsap.HSPDSCH_Timeslot_InformationItem_PhyChReconfRqstTDD768",
+      { "HSPDSCH-Timeslot-InformationItem-PhyChReconfRqstTDD768", "rnsap.HSPDSCH_Timeslot_InformationItem_PhyChReconfRqstTDD768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationList_RL_CongestInd_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dCH_Rate_Information,
@@ -53622,23 +53622,23 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DCH_Rate_Information_RL_CongestInd", HFILL }},
     { &hf_rnsap_DCH_Rate_Information_RL_CongestInd_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_allowed_Rate_Information,
-      { "allowed-Rate-Information", "rnsap.allowed_Rate_Information",
+      { "allowed-Rate-Information", "rnsap.allowed_Rate_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_EDCH_MacdFlowSpecificInformationList_RL_CongestInd_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_uRA,
-      { "uRA", "rnsap.uRA",
+      { "uRA", "rnsap.uRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "URA_PagingRqst", HFILL }},
     { &hf_rnsap_cell,
-      { "cell", "rnsap.cell",
+      { "cell", "rnsap.cell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Cell_PagingRqst", HFILL }},
     { &hf_rnsap_pagingCause,
@@ -53654,19 +53654,19 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_PagingRecordType_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_rL_02,
-      { "rL", "rnsap.rL",
+      { "rL", "rnsap.rL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_DM_Rqst", HFILL }},
     { &hf_rnsap_rLS,
-      { "rLS", "rnsap.rLS",
+      { "rLS", "rnsap.rLS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_Set_DM_Rqst", HFILL }},
     { &hf_rnsap_allRL,
-      { "allRL", "rnsap.allRL",
+      { "allRL", "rnsap.allRL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "All_RL_DM_Rqst", HFILL }},
     { &hf_rnsap_allRLS,
-      { "allRLS", "rnsap.allRLS",
+      { "allRLS", "rnsap.allRLS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "All_RL_Set_DM_Rqst", HFILL }},
     { &hf_rnsap_rL_InformationList_DM_Rqst,
@@ -53674,7 +53674,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationList_DM_Rqst_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_HSSICH_Info_DM_Rqst_item,
@@ -53690,23 +53690,23 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Set_InformationList_DM_Rqst_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_rLs,
-      { "rLs", "rnsap.rLs",
+      { "rLs", "rnsap.rLs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_DM_Rsp", HFILL }},
     { &hf_rnsap_rLS_01,
-      { "rLS", "rnsap.rLS",
+      { "rLS", "rnsap.rLS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_Set_DM_Rsp", HFILL }},
     { &hf_rnsap_allRL_01,
-      { "allRL", "rnsap.allRL",
+      { "allRL", "rnsap.allRL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_DM_Rsp", HFILL }},
     { &hf_rnsap_allRLS_01,
-      { "allRLS", "rnsap.allRLS",
+      { "allRLS", "rnsap.allRLS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_Set_DM_Rsp", HFILL }},
     { &hf_rnsap_rL_InformationList_DM_Rsp,
@@ -53718,7 +53718,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationList_DM_Rsp_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dedicatedMeasurementValue,
@@ -53726,39 +53726,39 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_DedicatedMeasurementValue_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Set_InformationList_DM_Rsp_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Multiple_DedicatedMeasurementValueList_TDD_DM_Rsp_item,
-      { "Multiple-DedicatedMeasurementValueItem-TDD-DM-Rsp", "rnsap.Multiple_DedicatedMeasurementValueItem_TDD_DM_Rsp",
+      { "Multiple-DedicatedMeasurementValueItem-TDD-DM-Rsp", "rnsap.Multiple_DedicatedMeasurementValueItem_TDD_DM_Rsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Multiple_DedicatedMeasurementValueList_LCR_TDD_DM_Rsp_item,
-      { "Multiple-DedicatedMeasurementValueItem-LCR-TDD-DM-Rsp", "rnsap.Multiple_DedicatedMeasurementValueItem_LCR_TDD_DM_Rsp",
+      { "Multiple-DedicatedMeasurementValueItem-LCR-TDD-DM-Rsp", "rnsap.Multiple_DedicatedMeasurementValueItem_LCR_TDD_DM_Rsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Multiple_HSSICHMeasurementValueList_TDD_DM_Rsp_item,
-      { "Multiple-HSSICHMeasurementValueItem-TDD-DM-Rsp", "rnsap.Multiple_HSSICHMeasurementValueItem_TDD_DM_Rsp",
+      { "Multiple-HSSICHMeasurementValueItem-TDD-DM-Rsp", "rnsap.Multiple_HSSICHMeasurementValueItem_TDD_DM_Rsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Multiple_DedicatedMeasurementValueList_TDD768_DM_Rsp_item,
-      { "Multiple-DedicatedMeasurementValueItem-TDD768-DM-Rsp", "rnsap.Multiple_DedicatedMeasurementValueItem_TDD768_DM_Rsp",
+      { "Multiple-DedicatedMeasurementValueItem-TDD768-DM-Rsp", "rnsap.Multiple_DedicatedMeasurementValueItem_TDD768_DM_Rsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_rL_03,
-      { "rL", "rnsap.rL",
+      { "rL", "rnsap.rL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_DM_Fail", HFILL }},
     { &hf_rnsap_rLS_02,
-      { "rLS", "rnsap.rLS",
+      { "rLS", "rnsap.rLS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_Set_DM_Fail", HFILL }},
     { &hf_rnsap_allRL_02,
-      { "allRL", "rnsap.allRL",
+      { "allRL", "rnsap.allRL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_DM_Fail", HFILL }},
     { &hf_rnsap_allRLS_02,
-      { "allRLS", "rnsap.allRLS",
+      { "allRLS", "rnsap.allRLS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_Set_DM_Fail", HFILL }},
     { &hf_rnsap_rL_unsuccessful_InformationRespList_DM_Fail,
@@ -53778,7 +53778,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Unsuccessful_InformationRespList_DM_Fail_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_individualcause,
@@ -53786,31 +53786,31 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_Cause_vals), 0,
         "Cause", HFILL }},
     { &hf_rnsap_RL_Successful_InformationRespList_DM_Fail_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Set_Unsuccessful_InformationRespList_DM_Fail_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Set_Successful_InformationRespList_DM_Fail_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_rLs_01,
-      { "rLs", "rnsap.rLs",
+      { "rLs", "rnsap.rLs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_DM_Rprt", HFILL }},
     { &hf_rnsap_rLS_03,
-      { "rLS", "rnsap.rLS",
+      { "rLS", "rnsap.rLS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_Set_DM_Rprt", HFILL }},
     { &hf_rnsap_allRL_03,
-      { "allRL", "rnsap.allRL",
+      { "allRL", "rnsap.allRL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_DM_Rprt", HFILL }},
     { &hf_rnsap_allRLS_03,
-      { "allRLS", "rnsap.allRLS",
+      { "allRLS", "rnsap.allRLS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_Set_DM_Rprt", HFILL }},
     { &hf_rnsap_rL_InformationList_DM_Rprt,
@@ -53822,7 +53822,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_InformationList_DM_Rprt_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_dedicatedMeasurementValueInformation,
@@ -53830,23 +53830,23 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_DedicatedMeasurementValueInformation_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Set_InformationList_DM_Rprt_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_rL_04,
-      { "rL", "rnsap.rL",
+      { "rL", "rnsap.rL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_DM_Fail_Ind", HFILL }},
     { &hf_rnsap_rLS_04,
-      { "rLS", "rnsap.rLS",
+      { "rLS", "rnsap.rLS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_Set_DM_Fail_Ind", HFILL }},
     { &hf_rnsap_allRL_04,
-      { "allRL", "rnsap.allRL",
+      { "allRL", "rnsap.allRL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_DM_Fail_Ind", HFILL }},
     { &hf_rnsap_allRLS_04,
-      { "allRLS", "rnsap.allRLS",
+      { "allRLS", "rnsap.allRLS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_Set_DM_Fail_Ind", HFILL }},
     { &hf_rnsap_rL_unsuccessful_InformationRespList_DM_Fail_Ind,
@@ -53858,23 +53858,23 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Unsuccessful_InformationRespList_DM_Fail_Ind_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_Set_Unsuccessful_InformationRespList_DM_Fail_Ind_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_fACH_FlowControlInformation,
-      { "fACH-FlowControlInformation", "rnsap.fACH_FlowControlInformation",
+      { "fACH-FlowControlInformation", "rnsap.fACH_FlowControlInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FACH_FlowControlInformation_CTCH_ResourceRspFDD", HFILL }},
     { &hf_rnsap_fACH_FlowControlInformation_01,
-      { "fACH-FlowControlInformation", "rnsap.fACH_FlowControlInformation",
+      { "fACH-FlowControlInformation", "rnsap.fACH_FlowControlInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FACH_FlowControlInformation_CTCH_ResourceRspTDD", HFILL }},
     { &hf_rnsap_cell_01,
-      { "cell", "rnsap.cell",
+      { "cell", "rnsap.cell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Cell_CM_Rqst", HFILL }},
     { &hf_rnsap_neighbouringCellMeasurementInformation,
@@ -53886,27 +53886,27 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_NeighbouringCellMeasurementInfo_item_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_neighbouringFDDCellMeasurementInformation,
-      { "neighbouringFDDCellMeasurementInformation", "rnsap.neighbouringFDDCellMeasurementInformation",
+      { "neighbouringFDDCellMeasurementInformation", "rnsap.neighbouringFDDCellMeasurementInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_neighbouringTDDCellMeasurementInformation,
-      { "neighbouringTDDCellMeasurementInformation", "rnsap.neighbouringTDDCellMeasurementInformation",
+      { "neighbouringTDDCellMeasurementInformation", "rnsap.neighbouringTDDCellMeasurementInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_extension_neighbouringCellMeasurementInformation,
-      { "extension-neighbouringCellMeasurementInformation", "rnsap.extension_neighbouringCellMeasurementInformation",
+      { "extension-neighbouringCellMeasurementInformation", "rnsap.extension_neighbouringCellMeasurementInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_extension_neighbouringCellMeasurementInformation768,
-      { "extension-neighbouringCellMeasurementInformation768", "rnsap.extension_neighbouringCellMeasurementInformation768",
+      { "extension-neighbouringCellMeasurementInformation768", "rnsap.extension_neighbouringCellMeasurementInformation768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_cell_02,
-      { "cell", "rnsap.cell",
+      { "cell", "rnsap.cell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Cell_CM_Rsp", HFILL }},
     { &hf_rnsap_cell_03,
-      { "cell", "rnsap.cell",
+      { "cell", "rnsap.cell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Cell_CM_Rprt", HFILL }},
     { &hf_rnsap_commonMeasurementValueInformation,
@@ -53914,15 +53914,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_CommonMeasurementValueInformation_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_cell_04,
-      { "cell", "rnsap.cell",
+      { "cell", "rnsap.cell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Cell_InfEx_Rqst", HFILL }},
     { &hf_rnsap_extension_InformationExchangeObjectType_InfEx_Rqst,
-      { "extension-InformationExchangeObjectType-InfEx-Rqst", "rnsap.extension_InformationExchangeObjectType_InfEx_Rqst",
+      { "extension-InformationExchangeObjectType-InfEx-Rqst", "rnsap.extension_InformationExchangeObjectType_InfEx_Rqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MBMS_Bearer_Service_in_MBMS_Cell_InfEx_Rqst_item,
-      { "MBMS-Bearer-Service-in-MBMS-Cell-Item-InfEx-Rqst", "rnsap.MBMS_Bearer_Service_in_MBMS_Cell_Item_InfEx_Rqst",
+      { "MBMS-Bearer-Service-in-MBMS-Cell-Item-InfEx-Rqst", "rnsap.MBMS_Bearer_Service_in_MBMS_Cell_Item_InfEx_Rqst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_mBMS_Bearer_Service_List_InfEx_Rqst,
@@ -53930,7 +53930,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MBMS_Bearer_Service_List_InfEx_Rqst_item,
-      { "TMGI", "rnsap.TMGI",
+      { "TMGI", "rnsap.TMGI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MBMS_Cell_InfEx_Rqst_item,
@@ -53938,19 +53938,19 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_cell_05,
-      { "cell", "rnsap.cell",
+      { "cell", "rnsap.cell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Cell_InfEx_Rsp", HFILL }},
     { &hf_rnsap_extension_InformationExchangeObjectType_InfEx_Rsp,
-      { "extension-InformationExchangeObjectType-InfEx-Rsp", "rnsap.extension_InformationExchangeObjectType_InfEx_Rsp",
+      { "extension-InformationExchangeObjectType-InfEx-Rsp", "rnsap.extension_InformationExchangeObjectType_InfEx_Rsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MBMS_Bearer_Service_List_InfEx_Rsp_item,
-      { "MBMS-Bearer-ServiceItemIEs-InfEx-Rsp", "rnsap.MBMS_Bearer_ServiceItemIEs_InfEx_Rsp",
+      { "MBMS-Bearer-ServiceItemIEs-InfEx-Rsp", "rnsap.MBMS_Bearer_ServiceItemIEs_InfEx_Rsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MBMS_Bearer_Service_in_MBMS_Cell_InfEx_Rsp_item,
-      { "MBMS-Bearer-Service-in-MBMS-Cell-Item-InfEx-Rsp", "rnsap.MBMS_Bearer_Service_in_MBMS_Cell_Item_InfEx_Rsp",
+      { "MBMS-Bearer-Service-in-MBMS-Cell-Item-InfEx-Rsp", "rnsap.MBMS_Bearer_Service_in_MBMS_Cell_Item_InfEx_Rsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_mBMS_Bearer_Service_List_InfEx_Rsp,
@@ -53958,15 +53958,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MBMS_Cell_InfEx_Rsp_item,
-      { "MBMS-Cell-Item-InfEx-Rsp", "rnsap.MBMS_Cell_Item_InfEx_Rsp",
+      { "MBMS-Cell-Item-InfEx-Rsp", "rnsap.MBMS_Cell_Item_InfEx_Rsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_cell_06,
-      { "cell", "rnsap.cell",
+      { "cell", "rnsap.cell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Cell_InfEx_Rprt", HFILL }},
     { &hf_rnsap_extension_InformationExchangeObjectType_InfEx_Rprt,
-      { "extension-InformationExchangeObjectType-InfEx-Rprt", "rnsap.extension_InformationExchangeObjectType_InfEx_Rprt",
+      { "extension-InformationExchangeObjectType-InfEx-Rprt", "rnsap.extension_InformationExchangeObjectType_InfEx_Rprt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_requestedDataValueInformation,
@@ -53974,7 +53974,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_RequestedDataValueInformation_vals), 0,
         NULL, HFILL }},
     { &hf_rnsap_MBMS_Bearer_Service_in_MBMS_Cell_InfEx_Rprt_item,
-      { "MBMS-Bearer-Service-in-MBMS-Cell-Item-InfEx-Rprt", "rnsap.MBMS_Bearer_Service_in_MBMS_Cell_Item_InfEx_Rprt",
+      { "MBMS-Bearer-Service-in-MBMS-Cell-Item-InfEx-Rprt", "rnsap.MBMS_Bearer_Service_in_MBMS_Cell_Item_InfEx_Rprt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_mBMS_Bearer_Service_List_InfEx_Rprt,
@@ -53982,23 +53982,23 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MBMS_Bearer_Service_List_InfEx_Rprt_item,
-      { "MBMS-Bearer-Service-List-Item-InfEx-Rprt", "rnsap.MBMS_Bearer_Service_List_Item_InfEx_Rprt",
+      { "MBMS-Bearer-Service-List-Item-InfEx-Rprt", "rnsap.MBMS_Bearer_Service_List_Item_InfEx_Rprt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_MBMS_Cell_InfEx_Rprt_item,
-      { "MBMS-Cell-Item-InfEx-Rprt", "rnsap.MBMS_Cell_Item_InfEx_Rprt",
+      { "MBMS-Cell-Item-InfEx-Rprt", "rnsap.MBMS_Cell_Item_InfEx_Rprt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_context,
-      { "context", "rnsap.context",
+      { "context", "rnsap.context_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ContextList_Reset", HFILL }},
     { &hf_rnsap_all_contexts,
-      { "all-contexts", "rnsap.all_contexts",
+      { "all-contexts", "rnsap.all_contexts_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_contextGroup,
-      { "contextGroup", "rnsap.contextGroup",
+      { "contextGroup", "rnsap.contextGroup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ContextGroupList_Reset", HFILL }},
     { &hf_rnsap_contextInfoList_Reset,
@@ -54006,7 +54006,7 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ContextInfoList_Reset_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_contextType_Reset,
@@ -54022,15 +54022,15 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ContextGroupInfoList_Reset_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_s_RNTI_Group,
-      { "s-RNTI-Group", "rnsap.s_RNTI_Group",
+      { "s-RNTI-Group", "rnsap.s_RNTI_Group_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_DelayedActivationInformationList_RL_ActivationCmdFDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_delayed_activation_update,
@@ -54038,31 +54038,31 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, VALS(rnsap_DelayedActivationUpdate_vals), 0,
         "DelayedActivationUpdate", HFILL }},
     { &hf_rnsap_DelayedActivationInformationList_RL_ActivationCmdTDD_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_RL_ParameterUpdateIndicationFDD_RL_InformationList_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_HS_Cell_Information_RL_Param_Upd_item,
-      { "Additional-HS-Cell-Information-RL-Param-Upd-ItemIEs", "rnsap.Additional_HS_Cell_Information_RL_Param_Upd_ItemIEs",
+      { "Additional-HS-Cell-Information-RL-Param-Upd-ItemIEs", "rnsap.Additional_HS_Cell_Information_RL_Param_Upd_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_hS_DSCH_FDD_Secondary_Serving_Update_Information,
-      { "hS-DSCH-FDD-Secondary-Serving-Update-Information", "rnsap.hS_DSCH_FDD_Secondary_Serving_Update_Information",
+      { "hS-DSCH-FDD-Secondary-Serving-Update-Information", "rnsap.hS_DSCH_FDD_Secondary_Serving_Update_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_Additional_EDCH_Cell_Information_RL_Param_Upd_item,
-      { "Additional-EDCH-Cell-Information-RL-Param-Upd-ItemIEs", "rnsap.Additional_EDCH_Cell_Information_RL_Param_Upd_ItemIEs",
+      { "Additional-EDCH-Cell-Information-RL-Param-Upd-ItemIEs", "rnsap.Additional_EDCH_Cell_Information_RL_Param_Upd_ItemIEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_additional_EDCH_FDD_Update_Information,
-      { "additional-EDCH-FDD-Update-Information", "rnsap.additional_EDCH_FDD_Update_Information",
+      { "additional-EDCH-FDD-Update-Information", "rnsap.additional_EDCH_FDD_Update_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_ListOfInterfacesToTrace_item,
-      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_interface,
@@ -54074,35 +54074,35 @@ void proto_register_rnsap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PrivateIE_Container", HFILL }},
     { &hf_rnsap_initiatingMessage,
-      { "initiatingMessage", "rnsap.initiatingMessage",
+      { "initiatingMessage", "rnsap.initiatingMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_successfulOutcome,
-      { "successfulOutcome", "rnsap.successfulOutcome",
+      { "successfulOutcome", "rnsap.successfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_unsuccessfulOutcome,
-      { "unsuccessfulOutcome", "rnsap.unsuccessfulOutcome",
+      { "unsuccessfulOutcome", "rnsap.unsuccessfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_outcome,
-      { "outcome", "rnsap.outcome",
+      { "outcome", "rnsap.outcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rnsap_value_02,
-      { "value", "rnsap.value",
+      { "value", "rnsap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InitiatingMessage_value", HFILL }},
     { &hf_rnsap_value_03,
-      { "value", "rnsap.value",
+      { "value", "rnsap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SuccessfulOutcome_value", HFILL }},
     { &hf_rnsap_value_04,
-      { "value", "rnsap.value",
+      { "value", "rnsap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UnsuccessfulOutcome_value", HFILL }},
     { &hf_rnsap_value_05,
-      { "value", "rnsap.value",
+      { "value", "rnsap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Outcome_value", HFILL }},
 
diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c
index 8a2cf87cbb..e18dcbc6c1 100644
--- a/epan/dissectors/packet-ros.c
+++ b/epan/dissectors/packet-ros.c
@@ -1135,43 +1135,43 @@ void proto_register_ros(void) {
 /*--- Included file: packet-ros-hfarr.c ---*/
 #line 1 "../../asn1/ros/packet-ros-hfarr.c"
     { &hf_ros_invoke,
-      { "invoke", "ros.invoke",
+      { "invoke", "ros.invoke_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ros_returnResult,
-      { "returnResult", "ros.returnResult",
+      { "returnResult", "ros.returnResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ros_returnError,
-      { "returnError", "ros.returnError",
+      { "returnError", "ros.returnError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ros_reject,
-      { "reject", "ros.reject",
+      { "reject", "ros.reject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ros_bind_invoke,
-      { "bind-invoke", "ros.bind_invoke",
+      { "bind-invoke", "ros.bind_invoke_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ros_bind_result,
-      { "bind-result", "ros.bind_result",
+      { "bind-result", "ros.bind_result_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ros_bind_error,
-      { "bind-error", "ros.bind_error",
+      { "bind-error", "ros.bind_error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ros_unbind_invoke,
-      { "unbind-invoke", "ros.unbind_invoke",
+      { "unbind-invoke", "ros.unbind_invoke_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ros_unbind_result,
-      { "unbind-result", "ros.unbind_result",
+      { "unbind-result", "ros.unbind_result_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ros_unbind_error,
-      { "unbind-error", "ros.unbind_error",
+      { "unbind-error", "ros.unbind_error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ros_invokeId,
@@ -1187,15 +1187,15 @@ void proto_register_ros(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "OperationCode", HFILL }},
     { &hf_ros_argument,
-      { "argument", "ros.argument",
+      { "argument", "ros.argument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ros_result,
-      { "result", "ros.result",
+      { "result", "ros.result_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ros_operationResult,
-      { "result", "ros.result",
+      { "result", "ros.result_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OperationResult", HFILL }},
     { &hf_ros_errcode,
@@ -1203,7 +1203,7 @@ void proto_register_ros(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "ErrorCode", HFILL }},
     { &hf_ros_parameter,
-      { "parameter", "ros.parameter",
+      { "parameter", "ros.parameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ros_problem,
@@ -1231,7 +1231,7 @@ void proto_register_ros(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ros_absent,
-      { "absent", "ros.absent",
+      { "absent", "ros.absent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ros_local,
diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c
index e21677f0c0..2402c8650a 100644
--- a/epan/dissectors/packet-rrc.c
+++ b/epan/dissectors/packet-rrc.c
@@ -143393,47 +143393,47 @@ void proto_register_rrc(void) {
 /*--- Included file: packet-rrc-hfarr.c ---*/
 #line 1 "../../asn1/rrc/packet-rrc-hfarr.c"
     { &hf_rrc_DL_DCCH_Message_PDU,
-      { "DL-DCCH-Message", "rrc.DL_DCCH_Message",
+      { "DL-DCCH-Message", "rrc.DL_DCCH_Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UL_DCCH_Message_PDU,
-      { "UL-DCCH-Message", "rrc.UL_DCCH_Message",
+      { "UL-DCCH-Message", "rrc.UL_DCCH_Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_CCCH_Message_PDU,
-      { "DL-CCCH-Message", "rrc.DL_CCCH_Message",
+      { "DL-CCCH-Message", "rrc.DL_CCCH_Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UL_CCCH_Message_PDU,
-      { "UL-CCCH-Message", "rrc.UL_CCCH_Message",
+      { "UL-CCCH-Message", "rrc.UL_CCCH_Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_PCCH_Message_PDU,
-      { "PCCH-Message", "rrc.PCCH_Message",
+      { "PCCH-Message", "rrc.PCCH_Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_SHCCH_Message_PDU,
-      { "DL-SHCCH-Message", "rrc.DL_SHCCH_Message",
+      { "DL-SHCCH-Message", "rrc.DL_SHCCH_Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UL_SHCCH_Message_PDU,
-      { "UL-SHCCH-Message", "rrc.UL_SHCCH_Message",
+      { "UL-SHCCH-Message", "rrc.UL_SHCCH_Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_BCCH_FACH_Message_PDU,
-      { "BCCH-FACH-Message", "rrc.BCCH_FACH_Message",
+      { "BCCH-FACH-Message", "rrc.BCCH_FACH_Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_BCCH_BCH_Message_PDU,
-      { "BCCH-BCH-Message", "rrc.BCCH_BCH_Message",
+      { "BCCH-BCH-Message", "rrc.BCCH_BCH_Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MCCH_Message_PDU,
-      { "MCCH-Message", "rrc.MCCH_Message",
+      { "MCCH-Message", "rrc.MCCH_Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MSCH_Message_PDU,
-      { "MSCH-Message", "rrc.MSCH_Message",
+      { "MSCH-Message", "rrc.MSCH_Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rrc_HandoverToUTRANCommand_PDU,
@@ -143441,195 +143441,195 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_HandoverToUTRANCommand_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_rrc_InterRATHandoverInfo_PDU,
-      { "InterRATHandoverInfo", "rrc.InterRATHandoverInfo",
+      { "InterRATHandoverInfo", "rrc.InterRATHandoverInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SystemInformation_BCH_PDU,
-      { "SystemInformation-BCH", "rrc.SystemInformation_BCH",
+      { "SystemInformation-BCH", "rrc.SystemInformation_BCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_System_Information_Container_PDU,
-      { "System-Information-Container", "rrc.System_Information_Container",
+      { "System-Information-Container", "rrc.System_Information_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UE_RadioAccessCapabilityInfo_PDU,
-      { "UE-RadioAccessCapabilityInfo", "rrc.UE_RadioAccessCapabilityInfo",
+      { "UE-RadioAccessCapabilityInfo", "rrc.UE_RadioAccessCapabilityInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rrc_MasterInformationBlock_PDU,
-      { "MasterInformationBlock", "rrc.MasterInformationBlock",
+      { "MasterInformationBlock", "rrc.MasterInformationBlock_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rrc_SysInfoType1_PDU,
-      { "SysInfoType1", "rrc.SysInfoType1",
+      { "SysInfoType1", "rrc.SysInfoType1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rrc_SysInfoType2_PDU,
-      { "SysInfoType2", "rrc.SysInfoType2",
+      { "SysInfoType2", "rrc.SysInfoType2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rrc_SysInfoType3_PDU,
-      { "SysInfoType3", "rrc.SysInfoType3",
+      { "SysInfoType3", "rrc.SysInfoType3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType4_PDU,
-      { "SysInfoType4", "rrc.SysInfoType4",
+      { "SysInfoType4", "rrc.SysInfoType4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType5_PDU,
-      { "SysInfoType5", "rrc.SysInfoType5",
+      { "SysInfoType5", "rrc.SysInfoType5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType5bis_PDU,
-      { "SysInfoType5bis", "rrc.SysInfoType5bis",
+      { "SysInfoType5bis", "rrc.SysInfoType5bis_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType6_PDU,
-      { "SysInfoType6", "rrc.SysInfoType6",
+      { "SysInfoType6", "rrc.SysInfoType6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rrc_SysInfoType7_PDU,
-      { "SysInfoType7", "rrc.SysInfoType7",
+      { "SysInfoType7", "rrc.SysInfoType7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType8_PDU,
-      { "SysInfoType8", "rrc.SysInfoType8",
+      { "SysInfoType8", "rrc.SysInfoType8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType9_PDU,
-      { "SysInfoType9", "rrc.SysInfoType9",
+      { "SysInfoType9", "rrc.SysInfoType9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType10_PDU,
-      { "SysInfoType10", "rrc.SysInfoType10",
+      { "SysInfoType10", "rrc.SysInfoType10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType11_PDU,
-      { "SysInfoType11", "rrc.SysInfoType11",
+      { "SysInfoType11", "rrc.SysInfoType11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType11bis_PDU,
-      { "SysInfoType11bis", "rrc.SysInfoType11bis",
+      { "SysInfoType11bis", "rrc.SysInfoType11bis_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rrc_SysInfoType12_PDU,
-      { "SysInfoType12", "rrc.SysInfoType12",
+      { "SysInfoType12", "rrc.SysInfoType12_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType13_PDU,
-      { "SysInfoType13", "rrc.SysInfoType13",
+      { "SysInfoType13", "rrc.SysInfoType13_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType13_1_PDU,
-      { "SysInfoType13-1", "rrc.SysInfoType13_1",
+      { "SysInfoType13-1", "rrc.SysInfoType13_1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType13_2_PDU,
-      { "SysInfoType13-2", "rrc.SysInfoType13_2",
+      { "SysInfoType13-2", "rrc.SysInfoType13_2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType13_3_PDU,
-      { "SysInfoType13-3", "rrc.SysInfoType13_3",
+      { "SysInfoType13-3", "rrc.SysInfoType13_3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType13_4_PDU,
-      { "SysInfoType13-4", "rrc.SysInfoType13_4",
+      { "SysInfoType13-4", "rrc.SysInfoType13_4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType14_PDU,
-      { "SysInfoType14", "rrc.SysInfoType14",
+      { "SysInfoType14", "rrc.SysInfoType14_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType15_PDU,
-      { "SysInfoType15", "rrc.SysInfoType15",
+      { "SysInfoType15", "rrc.SysInfoType15_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType15bis_PDU,
-      { "SysInfoType15bis", "rrc.SysInfoType15bis",
+      { "SysInfoType15bis", "rrc.SysInfoType15bis_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType15_1_PDU,
-      { "SysInfoType15-1", "rrc.SysInfoType15_1",
+      { "SysInfoType15-1", "rrc.SysInfoType15_1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType15_1bis_PDU,
-      { "SysInfoType15-1bis", "rrc.SysInfoType15_1bis",
+      { "SysInfoType15-1bis", "rrc.SysInfoType15_1bis_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType15_2_PDU,
-      { "SysInfoType15-2", "rrc.SysInfoType15_2",
+      { "SysInfoType15-2", "rrc.SysInfoType15_2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType15_2bis_PDU,
-      { "SysInfoType15-2bis", "rrc.SysInfoType15_2bis",
+      { "SysInfoType15-2bis", "rrc.SysInfoType15_2bis_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType15_2ter_PDU,
-      { "SysInfoType15-2ter", "rrc.SysInfoType15_2ter",
+      { "SysInfoType15-2ter", "rrc.SysInfoType15_2ter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType15_3_PDU,
-      { "SysInfoType15-3", "rrc.SysInfoType15_3",
+      { "SysInfoType15-3", "rrc.SysInfoType15_3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType15_3bis_PDU,
-      { "SysInfoType15-3bis", "rrc.SysInfoType15_3bis",
+      { "SysInfoType15-3bis", "rrc.SysInfoType15_3bis_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType15_4_PDU,
-      { "SysInfoType15-4", "rrc.SysInfoType15_4",
+      { "SysInfoType15-4", "rrc.SysInfoType15_4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType15_5_PDU,
-      { "SysInfoType15-5", "rrc.SysInfoType15_5",
+      { "SysInfoType15-5", "rrc.SysInfoType15_5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType15_6_PDU,
-      { "SysInfoType15-6", "rrc.SysInfoType15_6",
+      { "SysInfoType15-6", "rrc.SysInfoType15_6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType15_7_PDU,
-      { "SysInfoType15-7", "rrc.SysInfoType15_7",
+      { "SysInfoType15-7", "rrc.SysInfoType15_7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType15_8_PDU,
-      { "SysInfoType15-8", "rrc.SysInfoType15_8",
+      { "SysInfoType15-8", "rrc.SysInfoType15_8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType16_PDU,
-      { "SysInfoType16", "rrc.SysInfoType16",
+      { "SysInfoType16", "rrc.SysInfoType16_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType17_PDU,
-      { "SysInfoType17", "rrc.SysInfoType17",
+      { "SysInfoType17", "rrc.SysInfoType17_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType18_PDU,
-      { "SysInfoType18", "rrc.SysInfoType18",
+      { "SysInfoType18", "rrc.SysInfoType18_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType19_PDU,
-      { "SysInfoType19", "rrc.SysInfoType19",
+      { "SysInfoType19", "rrc.SysInfoType19_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType20_PDU,
-      { "SysInfoType20", "rrc.SysInfoType20",
+      { "SysInfoType20", "rrc.SysInfoType20_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType21_PDU,
-      { "SysInfoType21", "rrc.SysInfoType21",
+      { "SysInfoType21", "rrc.SysInfoType21_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoType22_PDU,
-      { "SysInfoType22", "rrc.SysInfoType22",
+      { "SysInfoType22", "rrc.SysInfoType22_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoTypeSB1_PDU,
-      { "SysInfoTypeSB1", "rrc.SysInfoTypeSB1",
+      { "SysInfoTypeSB1", "rrc.SysInfoTypeSB1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SysInfoTypeSB2_PDU,
-      { "SysInfoTypeSB2", "rrc.SysInfoTypeSB2",
+      { "SysInfoTypeSB2", "rrc.SysInfoTypeSB2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rrc_ToTargetRNC_Container_PDU,
@@ -143641,59 +143641,59 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TargetRNC_ToSourceRNC_Container_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_CellUpdate_r3_add_ext_IEs_PDU,
-      { "CellUpdate-r3-add-ext-IEs", "rrc.CellUpdate_r3_add_ext_IEs",
+      { "CellUpdate-r3-add-ext-IEs", "rrc.CellUpdate_r3_add_ext_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_CellUpdateConfirm_r7_add_ext_IEs_PDU,
-      { "CellUpdateConfirm-r7-add-ext-IEs", "rrc.CellUpdateConfirm_r7_add_ext_IEs",
+      { "CellUpdateConfirm-r7-add-ext-IEs", "rrc.CellUpdateConfirm_r7_add_ext_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_InitialDirectTransfer_r3_add_ext_IEs_PDU,
-      { "InitialDirectTransfer-r3-add-ext-IEs", "rrc.InitialDirectTransfer_r3_add_ext_IEs",
+      { "InitialDirectTransfer-r3-add-ext-IEs", "rrc.InitialDirectTransfer_r3_add_ext_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_InterRATHandoverInfo_r3_add_ext_IEs_PDU,
-      { "InterRATHandoverInfo-r3-add-ext-IEs", "rrc.InterRATHandoverInfo_r3_add_ext_IEs",
+      { "InterRATHandoverInfo-r3-add-ext-IEs", "rrc.InterRATHandoverInfo_r3_add_ext_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RadioBearerSetup_r7_add_ext_IEs_PDU,
-      { "RadioBearerSetup-r7-add-ext-IEs", "rrc.RadioBearerSetup_r7_add_ext_IEs",
+      { "RadioBearerSetup-r7-add-ext-IEs", "rrc.RadioBearerSetup_r7_add_ext_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RRCConnectionSetupComplete_r3_add_ext_IEs_PDU,
-      { "RRCConnectionSetupComplete-r3-add-ext-IEs", "rrc.RRCConnectionSetupComplete_r3_add_ext_IEs",
+      { "RRCConnectionSetupComplete-r3-add-ext-IEs", "rrc.RRCConnectionSetupComplete_r3_add_ext_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UE_CapabilityContainer_IEs_PDU,
-      { "UE-CapabilityContainer-IEs", "rrc.UE_CapabilityContainer_IEs",
+      { "UE-CapabilityContainer-IEs", "rrc.UE_CapabilityContainer_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UECapabilityInformation_r3_add_ext_IEs_PDU,
-      { "UECapabilityInformation-r3-add-ext-IEs", "rrc.UECapabilityInformation_r3_add_ext_IEs",
+      { "UECapabilityInformation-r3-add-ext-IEs", "rrc.UECapabilityInformation_r3_add_ext_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_URAUpdate_r3_add_ext_IEs_PDU,
-      { "URAUpdate-r3-add-ext-IEs", "rrc.URAUpdate_r3_add_ext_IEs",
+      { "URAUpdate-r3-add-ext-IEs", "rrc.URAUpdate_r3_add_ext_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SRNC_RelocationInfo_v3h0ext_IEs_PDU,
-      { "SRNC-RelocationInfo-v3h0ext-IEs", "rrc.SRNC_RelocationInfo_v3h0ext_IEs",
+      { "SRNC-RelocationInfo-v3h0ext-IEs", "rrc.SRNC_RelocationInfo_v3h0ext_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SRNC_RelocationInfo_r6_add_ext_IEs_PDU,
-      { "SRNC-RelocationInfo-r6-add-ext-IEs", "rrc.SRNC_RelocationInfo_r6_add_ext_IEs",
+      { "SRNC-RelocationInfo-r6-add-ext-IEs", "rrc.SRNC_RelocationInfo_r6_add_ext_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SRNC_RelocationInfo_r7_add_ext_IEs_PDU,
-      { "SRNC-RelocationInfo-r7-add-ext-IEs", "rrc.SRNC_RelocationInfo_r7_add_ext_IEs",
+      { "SRNC-RelocationInfo-r7-add-ext-IEs", "rrc.SRNC_RelocationInfo_r7_add_ext_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MeasurementReport_PDU,
-      { "MeasurementReport", "rrc.MeasurementReport",
+      { "MeasurementReport", "rrc.MeasurementReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_integrityCheckInfo,
-      { "integrityCheckInfo", "rrc.integrityCheckInfo",
+      { "integrityCheckInfo", "rrc.integrityCheckInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_message,
@@ -143737,7 +143737,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MeasurementControl_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_pagingType2,
-      { "pagingType2", "rrc.pagingType2",
+      { "pagingType2", "rrc.pagingType2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_physicalChannelReconfiguration,
@@ -143777,7 +143777,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TransportChannelReconfiguration_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_transportFormatCombinationControl,
-      { "transportFormatCombinationControl", "rrc.transportFormatCombinationControl",
+      { "transportFormatCombinationControl", "rrc.transportFormatCombinationControl_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ueCapabilityEnquiry,
@@ -143801,31 +143801,31 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UTRANMobilityInformation_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_handoverFromUTRANCommand_GERANIu,
-      { "handoverFromUTRANCommand-GERANIu", "rrc.handoverFromUTRANCommand_GERANIu",
+      { "handoverFromUTRANCommand-GERANIu", "rrc.handoverFromUTRANCommand_GERANIu_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mbmsModifiedServicesInformation,
-      { "mbmsModifiedServicesInformation", "rrc.mbmsModifiedServicesInformation",
+      { "mbmsModifiedServicesInformation", "rrc.mbmsModifiedServicesInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_etwsPrimaryNotificationWithSecurity,
-      { "etwsPrimaryNotificationWithSecurity", "rrc.etwsPrimaryNotificationWithSecurity",
+      { "etwsPrimaryNotificationWithSecurity", "rrc.etwsPrimaryNotificationWithSecurity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_handoverFromUTRANCommand_EUTRA,
-      { "handoverFromUTRANCommand-EUTRA", "rrc.handoverFromUTRANCommand_EUTRA",
+      { "handoverFromUTRANCommand-EUTRA", "rrc.handoverFromUTRANCommand_EUTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ueInformationRequest,
-      { "ueInformationRequest", "rrc.ueInformationRequest",
+      { "ueInformationRequest", "rrc.ueInformationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_loggingMeasurementConfiguration,
-      { "loggingMeasurementConfiguration", "rrc.loggingMeasurementConfiguration",
+      { "loggingMeasurementConfiguration", "rrc.loggingMeasurementConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_spare1,
-      { "spare1", "rrc.spare1",
+      { "spare1", "rrc.spare1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_message_01,
@@ -143833,11 +143833,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_UL_DCCH_MessageType_vals_ext, 0,
         "UL_DCCH_MessageType", HFILL }},
     { &hf_rrc_activeSetUpdateComplete,
-      { "activeSetUpdateComplete", "rrc.activeSetUpdateComplete",
+      { "activeSetUpdateComplete", "rrc.activeSetUpdateComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_activeSetUpdateFailure,
-      { "activeSetUpdateFailure", "rrc.activeSetUpdateFailure",
+      { "activeSetUpdateFailure", "rrc.activeSetUpdateFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cellChangeOrderFromUTRANFailure,
@@ -143845,115 +143845,115 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_CellChangeOrderFromUTRANFailure_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_counterCheckResponse,
-      { "counterCheckResponse", "rrc.counterCheckResponse",
+      { "counterCheckResponse", "rrc.counterCheckResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_handoverToUTRANComplete,
-      { "handoverToUTRANComplete", "rrc.handoverToUTRANComplete",
+      { "handoverToUTRANComplete", "rrc.handoverToUTRANComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_initialDirectTransfer,
-      { "initialDirectTransfer", "rrc.initialDirectTransfer",
+      { "initialDirectTransfer", "rrc.initialDirectTransfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_handoverFromUTRANFailure,
-      { "handoverFromUTRANFailure", "rrc.handoverFromUTRANFailure",
+      { "handoverFromUTRANFailure", "rrc.handoverFromUTRANFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_measurementControlFailure,
-      { "measurementControlFailure", "rrc.measurementControlFailure",
+      { "measurementControlFailure", "rrc.measurementControlFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_measurementReport,
-      { "measurementReport", "rrc.measurementReport",
+      { "measurementReport", "rrc.measurementReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_physicalChannelReconfigurationComplete,
-      { "physicalChannelReconfigurationComplete", "rrc.physicalChannelReconfigurationComplete",
+      { "physicalChannelReconfigurationComplete", "rrc.physicalChannelReconfigurationComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_physicalChannelReconfigurationFailure,
-      { "physicalChannelReconfigurationFailure", "rrc.physicalChannelReconfigurationFailure",
+      { "physicalChannelReconfigurationFailure", "rrc.physicalChannelReconfigurationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_radioBearerReconfigurationComplete,
-      { "radioBearerReconfigurationComplete", "rrc.radioBearerReconfigurationComplete",
+      { "radioBearerReconfigurationComplete", "rrc.radioBearerReconfigurationComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_radioBearerReconfigurationFailure,
-      { "radioBearerReconfigurationFailure", "rrc.radioBearerReconfigurationFailure",
+      { "radioBearerReconfigurationFailure", "rrc.radioBearerReconfigurationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_radioBearerReleaseComplete,
-      { "radioBearerReleaseComplete", "rrc.radioBearerReleaseComplete",
+      { "radioBearerReleaseComplete", "rrc.radioBearerReleaseComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_radioBearerReleaseFailure,
-      { "radioBearerReleaseFailure", "rrc.radioBearerReleaseFailure",
+      { "radioBearerReleaseFailure", "rrc.radioBearerReleaseFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_radioBearerSetupComplete,
-      { "radioBearerSetupComplete", "rrc.radioBearerSetupComplete",
+      { "radioBearerSetupComplete", "rrc.radioBearerSetupComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_radioBearerSetupFailure,
-      { "radioBearerSetupFailure", "rrc.radioBearerSetupFailure",
+      { "radioBearerSetupFailure", "rrc.radioBearerSetupFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rrcConnectionReleaseComplete,
-      { "rrcConnectionReleaseComplete", "rrc.rrcConnectionReleaseComplete",
+      { "rrcConnectionReleaseComplete", "rrc.rrcConnectionReleaseComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rrcConnectionSetupComplete,
-      { "rrcConnectionSetupComplete", "rrc.rrcConnectionSetupComplete",
+      { "rrcConnectionSetupComplete", "rrc.rrcConnectionSetupComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rrcStatus,
-      { "rrcStatus", "rrc.rrcStatus",
+      { "rrcStatus", "rrc.rrcStatus_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_securityModeComplete,
-      { "securityModeComplete", "rrc.securityModeComplete",
+      { "securityModeComplete", "rrc.securityModeComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_securityModeFailure,
-      { "securityModeFailure", "rrc.securityModeFailure",
+      { "securityModeFailure", "rrc.securityModeFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_signallingConnectionReleaseIndication,
-      { "signallingConnectionReleaseIndication", "rrc.signallingConnectionReleaseIndication",
+      { "signallingConnectionReleaseIndication", "rrc.signallingConnectionReleaseIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_transportChannelReconfigurationComplete,
-      { "transportChannelReconfigurationComplete", "rrc.transportChannelReconfigurationComplete",
+      { "transportChannelReconfigurationComplete", "rrc.transportChannelReconfigurationComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_transportChannelReconfigurationFailure,
-      { "transportChannelReconfigurationFailure", "rrc.transportChannelReconfigurationFailure",
+      { "transportChannelReconfigurationFailure", "rrc.transportChannelReconfigurationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_transportFormatCombinationControlFailure,
-      { "transportFormatCombinationControlFailure", "rrc.transportFormatCombinationControlFailure",
+      { "transportFormatCombinationControlFailure", "rrc.transportFormatCombinationControlFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ueCapabilityInformation,
-      { "ueCapabilityInformation", "rrc.ueCapabilityInformation",
+      { "ueCapabilityInformation", "rrc.ueCapabilityInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_uplinkDirectTransfer,
-      { "uplinkDirectTransfer", "rrc.uplinkDirectTransfer",
+      { "uplinkDirectTransfer", "rrc.uplinkDirectTransfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_utranMobilityInformationConfirm,
-      { "utranMobilityInformationConfirm", "rrc.utranMobilityInformationConfirm",
+      { "utranMobilityInformationConfirm", "rrc.utranMobilityInformationConfirm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_utranMobilityInformationFailure,
-      { "utranMobilityInformationFailure", "rrc.utranMobilityInformationFailure",
+      { "utranMobilityInformationFailure", "rrc.utranMobilityInformationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mbmsModificationRequest,
-      { "mbmsModificationRequest", "rrc.mbmsModificationRequest",
+      { "mbmsModificationRequest", "rrc.mbmsModificationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_DCCH_MessageType_ext,
@@ -143961,63 +143961,63 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UL_DCCH_MessageType_ext_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_ueInformationResponse,
-      { "ueInformationResponse", "rrc.ueInformationResponse",
+      { "ueInformationResponse", "rrc.ueInformationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_spare15,
-      { "spare15", "rrc.spare15",
+      { "spare15", "rrc.spare15_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_spare14,
-      { "spare14", "rrc.spare14",
+      { "spare14", "rrc.spare14_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_spare13,
-      { "spare13", "rrc.spare13",
+      { "spare13", "rrc.spare13_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_spare12,
-      { "spare12", "rrc.spare12",
+      { "spare12", "rrc.spare12_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_spare11,
-      { "spare11", "rrc.spare11",
+      { "spare11", "rrc.spare11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_spare10,
-      { "spare10", "rrc.spare10",
+      { "spare10", "rrc.spare10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_spare9,
-      { "spare9", "rrc.spare9",
+      { "spare9", "rrc.spare9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_spare8,
-      { "spare8", "rrc.spare8",
+      { "spare8", "rrc.spare8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_spare7,
-      { "spare7", "rrc.spare7",
+      { "spare7", "rrc.spare7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_spare6,
-      { "spare6", "rrc.spare6",
+      { "spare6", "rrc.spare6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_spare5,
-      { "spare5", "rrc.spare5",
+      { "spare5", "rrc.spare5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_spare4,
-      { "spare4", "rrc.spare4",
+      { "spare4", "rrc.spare4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_spare3,
-      { "spare3", "rrc.spare3",
+      { "spare3", "rrc.spare3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_spare2,
-      { "spare2", "rrc.spare2",
+      { "spare2", "rrc.spare2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_message_02,
@@ -144045,7 +144045,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_URAUpdateConfirm_CCCH_vals), 0,
         "URAUpdateConfirm_CCCH", HFILL }},
     { &hf_rrc_dummy,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ETWSPrimaryNotificationWithSecurity", HFILL }},
     { &hf_rrc_message_03,
@@ -144053,15 +144053,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UL_CCCH_MessageType_vals), 0,
         "UL_CCCH_MessageType", HFILL }},
     { &hf_rrc_cellUpdate,
-      { "cellUpdate", "rrc.cellUpdate",
+      { "cellUpdate", "rrc.cellUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rrcConnectionRequest,
-      { "rrcConnectionRequest", "rrc.rrcConnectionRequest",
+      { "rrcConnectionRequest", "rrc.rrcConnectionRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_uraUpdate,
-      { "uraUpdate", "rrc.uraUpdate",
+      { "uraUpdate", "rrc.uraUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_uL_CCCH_MessageType_r11,
@@ -144069,7 +144069,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UL_CCCH_MessageType_r11_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_cellUpdate_01,
-      { "cellUpdate", "rrc.cellUpdate",
+      { "cellUpdate", "rrc.cellUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdateFDD_r11", HFILL }},
     { &hf_rrc_message_04,
@@ -144077,11 +144077,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_PCCH_MessageType_vals), 0,
         "PCCH_MessageType", HFILL }},
     { &hf_rrc_pagingType1,
-      { "pagingType1", "rrc.pagingType1",
+      { "pagingType1", "rrc.pagingType1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_spare,
-      { "spare", "rrc.spare",
+      { "spare", "rrc.spare_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_message_05,
@@ -144093,7 +144093,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UL_SHCCH_MessageType_vals), 0,
         "UL_SHCCH_MessageType", HFILL }},
     { &hf_rrc_puschCapacityRequest,
-      { "puschCapacityRequest", "rrc.puschCapacityRequest",
+      { "puschCapacityRequest", "rrc.puschCapacityRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_message_07,
@@ -144101,15 +144101,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_BCCH_FACH_MessageType_vals), 0,
         "BCCH_FACH_MessageType", HFILL }},
     { &hf_rrc_dummy_01,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformation_FACH", HFILL }},
     { &hf_rrc_systemInformationChangeIndication,
-      { "systemInformationChangeIndication", "rrc.systemInformationChangeIndication",
+      { "systemInformationChangeIndication", "rrc.systemInformationChangeIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_message_08,
-      { "message", "rrc.message",
+      { "message", "rrc.message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformation_BCH", HFILL }},
     { &hf_rrc_message_09,
@@ -144117,27 +144117,27 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MCCH_MessageType_vals), 0,
         "MCCH_MessageType", HFILL }},
     { &hf_rrc_mbmsAccessInformation,
-      { "mbmsAccessInformation", "rrc.mbmsAccessInformation",
+      { "mbmsAccessInformation", "rrc.mbmsAccessInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mbmsCommonPTMRBInformation,
-      { "mbmsCommonPTMRBInformation", "rrc.mbmsCommonPTMRBInformation",
+      { "mbmsCommonPTMRBInformation", "rrc.mbmsCommonPTMRBInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mbmsCurrentCellPTMRBInformation,
-      { "mbmsCurrentCellPTMRBInformation", "rrc.mbmsCurrentCellPTMRBInformation",
+      { "mbmsCurrentCellPTMRBInformation", "rrc.mbmsCurrentCellPTMRBInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mbmsGeneralInformation,
-      { "mbmsGeneralInformation", "rrc.mbmsGeneralInformation",
+      { "mbmsGeneralInformation", "rrc.mbmsGeneralInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mbmsNeighbouringCellPTMRBInformation,
-      { "mbmsNeighbouringCellPTMRBInformation", "rrc.mbmsNeighbouringCellPTMRBInformation",
+      { "mbmsNeighbouringCellPTMRBInformation", "rrc.mbmsNeighbouringCellPTMRBInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mbmsUnmodifiedServicesInformation,
-      { "mbmsUnmodifiedServicesInformation", "rrc.mbmsUnmodifiedServicesInformation",
+      { "mbmsUnmodifiedServicesInformation", "rrc.mbmsUnmodifiedServicesInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_message_10,
@@ -144145,19 +144145,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MSCH_MessageType_vals), 0,
         "MSCH_MessageType", HFILL }},
     { &hf_rrc_mbmsSchedulingInformation,
-      { "mbmsSchedulingInformation", "rrc.mbmsSchedulingInformation",
+      { "mbmsSchedulingInformation", "rrc.mbmsSchedulingInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_r3,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_activeSetUpdate_r3,
-      { "activeSetUpdate-r3", "rrc.activeSetUpdate_r3",
+      { "activeSetUpdate-r3", "rrc.activeSetUpdate_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ActiveSetUpdate_r3_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_activeSetUpdate_r3_add_ext,
@@ -144165,35 +144165,35 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_activeSetUpdate_v4b0ext,
-      { "activeSetUpdate-v4b0ext", "rrc.activeSetUpdate_v4b0ext",
+      { "activeSetUpdate-v4b0ext", "rrc.activeSetUpdate_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ActiveSetUpdate_v4b0ext_IEs", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_activeSetUpdate_v590ext,
-      { "activeSetUpdate-v590ext", "rrc.activeSetUpdate_v590ext",
+      { "activeSetUpdate-v590ext", "rrc.activeSetUpdate_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ActiveSetUpdate_v590ext_IEs", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_activeSetUpdate_v690ext,
-      { "activeSetUpdate-v690ext", "rrc.activeSetUpdate_v690ext",
+      { "activeSetUpdate-v690ext", "rrc.activeSetUpdate_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ActiveSetUpdate_v690ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_later_than_r3,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rrc_TransactionIdentifier,
@@ -144205,11 +144205,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_r6,
-      { "r6", "rrc.r6",
+      { "r6", "rrc.r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_activeSetUpdate_r6,
-      { "activeSetUpdate-r6", "rrc.activeSetUpdate_r6",
+      { "activeSetUpdate-r6", "rrc.activeSetUpdate_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ActiveSetUpdate_r6_IEs", HFILL }},
     { &hf_rrc_activeSetUpdate_r6_add_ext,
@@ -144217,15 +144217,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_activeSetUpdate_v6b0ext,
-      { "activeSetUpdate-v6b0ext", "rrc.activeSetUpdate_v6b0ext",
+      { "activeSetUpdate-v6b0ext", "rrc.activeSetUpdate_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ActiveSetUpdate_v6b0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_01,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_01", HFILL }},
     { &hf_rrc_criticalExtensions_01,
@@ -144233,11 +144233,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_01_vals), 0,
         "T_criticalExtensions_01", HFILL }},
     { &hf_rrc_r7,
-      { "r7", "rrc.r7",
+      { "r7", "rrc.r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_activeSetUpdate_r7,
-      { "activeSetUpdate-r7", "rrc.activeSetUpdate_r7",
+      { "activeSetUpdate-r7", "rrc.activeSetUpdate_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ActiveSetUpdate_r7_IEs", HFILL }},
     { &hf_rrc_activeSetUpdate_r7_add_ext,
@@ -144245,31 +144245,31 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v780NonCriticalExtensions,
-      { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions",
+      { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_activeSetUpdate_v780ext,
-      { "activeSetUpdate-v780ext", "rrc.activeSetUpdate_v780ext",
+      { "activeSetUpdate-v780ext", "rrc.activeSetUpdate_v780ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ActiveSetUpdate_v780ext_IEs", HFILL }},
     { &hf_rrc_v7f0NonCriticalExtensions,
-      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions",
+      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_activeSetUdpate_v7f0ext,
-      { "activeSetUdpate-v7f0ext", "rrc.activeSetUdpate_v7f0ext",
+      { "activeSetUdpate-v7f0ext", "rrc.activeSetUdpate_v7f0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ActiveSetUpdate_v7f0ext_IEs", HFILL }},
     { &hf_rrc_v7g0NonCriticalExtensions,
-      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions",
+      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_activeSetUdpate_v7g0ext,
-      { "activeSetUdpate-v7g0ext", "rrc.activeSetUdpate_v7g0ext",
+      { "activeSetUdpate-v7g0ext", "rrc.activeSetUdpate_v7g0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ActiveSetUpdate_v7g0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_02,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_02", HFILL }},
     { &hf_rrc_criticalExtensions_02,
@@ -144277,11 +144277,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_02_vals), 0,
         "T_criticalExtensions_02", HFILL }},
     { &hf_rrc_r8,
-      { "r8", "rrc.r8",
+      { "r8", "rrc.r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_activeSetUpdate_r8,
-      { "activeSetUpdate-r8", "rrc.activeSetUpdate_r8",
+      { "activeSetUpdate-r8", "rrc.activeSetUpdate_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ActiveSetUpdate_r8_IEs", HFILL }},
     { &hf_rrc_activeSetUpdate_r8_add_ext,
@@ -144289,23 +144289,23 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v890NonCriticalExtensions,
-      { "v890NonCriticalExtensions", "rrc.v890NonCriticalExtensions",
+      { "v890NonCriticalExtensions", "rrc.v890NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_activeSetUpdate_v890ext,
-      { "activeSetUpdate-v890ext", "rrc.activeSetUpdate_v890ext",
+      { "activeSetUpdate-v890ext", "rrc.activeSetUpdate_v890ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ActiveSetUpdate_v890ext_IEs", HFILL }},
     { &hf_rrc_v7g0NonCriticalExtensions_01,
-      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions",
+      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7g0NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_activeSetUpdate_v7g0ext,
-      { "activeSetUpdate-v7g0ext", "rrc.activeSetUpdate_v7g0ext",
+      { "activeSetUpdate-v7g0ext", "rrc.activeSetUpdate_v7g0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ActiveSetUpdate_v7g0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_03,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_03", HFILL }},
     { &hf_rrc_criticalExtensions_03,
@@ -144313,11 +144313,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_03_vals), 0,
         "T_criticalExtensions_03", HFILL }},
     { &hf_rrc_r9,
-      { "r9", "rrc.r9",
+      { "r9", "rrc.r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_activeSetUpdate_r9,
-      { "activeSetUpdate-r9", "rrc.activeSetUpdate_r9",
+      { "activeSetUpdate-r9", "rrc.activeSetUpdate_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ActiveSetUpdate_r9_IEs", HFILL }},
     { &hf_rrc_activeSetUpdate_r9_add_ext,
@@ -144325,15 +144325,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v950NonCriticalExtensions,
-      { "v950NonCriticalExtensions", "rrc.v950NonCriticalExtensions",
+      { "v950NonCriticalExtensions", "rrc.v950NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_activeSetUpdate_v950ext,
-      { "activeSetUpdate-v950ext", "rrc.activeSetUpdate_v950ext",
+      { "activeSetUpdate-v950ext", "rrc.activeSetUpdate_v950ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ActiveSetUpdate_v950ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_04,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_04", HFILL }},
     { &hf_rrc_criticalExtensions_04,
@@ -144341,11 +144341,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_04_vals), 0,
         "T_criticalExtensions_04", HFILL }},
     { &hf_rrc_r10,
-      { "r10", "rrc.r10",
+      { "r10", "rrc.r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_activeSetUpdate_r10,
-      { "activeSetUpdate-r10", "rrc.activeSetUpdate_r10",
+      { "activeSetUpdate-r10", "rrc.activeSetUpdate_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ActiveSetUpdate_r10_IEs", HFILL }},
     { &hf_rrc_activeSetUpdate_r10_add_ext,
@@ -144353,15 +144353,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_activeSetUpdate_vb50ext,
-      { "activeSetUpdate-vb50ext", "rrc.activeSetUpdate_vb50ext",
+      { "activeSetUpdate-vb50ext", "rrc.activeSetUpdate_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ActiveSetUpdate_vb50ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_05,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_05", HFILL }},
     { &hf_rrc_criticalExtensions_05,
@@ -144369,11 +144369,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_05_vals), 0,
         "T_criticalExtensions_05", HFILL }},
     { &hf_rrc_r11,
-      { "r11", "rrc.r11",
+      { "r11", "rrc.r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_activeSetUpdate_r11,
-      { "activeSetUpdate-r11", "rrc.activeSetUpdate_r11",
+      { "activeSetUpdate-r11", "rrc.activeSetUpdate_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ActiveSetUpdate_r11_IEs", HFILL }},
     { &hf_rrc_activeSetUpdate_r11_add_ext,
@@ -144381,19 +144381,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_06,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_06", HFILL }},
     { &hf_rrc_criticalExtensions_06,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_06", HFILL }},
     { &hf_rrc_dummy_02,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntegrityProtectionModeInfo", HFILL }},
     { &hf_rrc_dummy2,
-      { "dummy2", "rrc.dummy2",
+      { "dummy2", "rrc.dummy2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CipheringModeInfo", HFILL }},
     { &hf_rrc_activationTime,
@@ -144401,15 +144401,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_newU_RNTI,
-      { "newU-RNTI", "rrc.newU_RNTI",
+      { "newU-RNTI", "rrc.newU_RNTI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "U_RNTI", HFILL }},
     { &hf_rrc_cn_InformationInfo,
-      { "cn-InformationInfo", "rrc.cn_InformationInfo",
+      { "cn-InformationInfo", "rrc.cn_InformationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dummy3,
-      { "dummy3", "rrc.dummy3",
+      { "dummy3", "rrc.dummy3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_CounterSynchronisationInfo", HFILL }},
     { &hf_rrc_maxAllowedUL_TX_Power,
@@ -144429,7 +144429,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TX_DiversityMode_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_dummy4,
-      { "dummy4", "rrc.dummy4",
+      { "dummy4", "rrc.dummy4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SSDT_Information", HFILL }},
     { &hf_rrc_dummy_03,
@@ -144449,7 +144449,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_primary_plmn_Identity,
-      { "primary-plmn-Identity", "rrc.primary_plmn_Identity",
+      { "primary-plmn-Identity", "rrc.primary_plmn_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PLMN_Identity", HFILL }},
     { &hf_rrc_newH_RNTI,
@@ -144465,7 +144465,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "E_RNTI", HFILL }},
     { &hf_rrc_cn_InformationInfo_01,
-      { "cn-InformationInfo", "rrc.cn_InformationInfo",
+      { "cn-InformationInfo", "rrc.cn_InformationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CN_InformationInfo_r6", HFILL }},
     { &hf_rrc_rl_AdditionInformationList_01,
@@ -144473,11 +144473,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RL_AdditionInformationList_r6", HFILL }},
     { &hf_rrc_serving_HSDSCH_CellInformation,
-      { "serving-HSDSCH-CellInformation", "rrc.serving_HSDSCH_CellInformation",
+      { "serving-HSDSCH-CellInformation", "rrc.serving_HSDSCH_CellInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_e_dch_ReconfigurationInfo,
-      { "e-dch-ReconfigurationInfo", "rrc.e_dch_ReconfigurationInfo",
+      { "e-dch-ReconfigurationInfo", "rrc.e_dch_ReconfigurationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rl_AdditionInformation_list_v6b0ext,
@@ -144485,19 +144485,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dtx_drx_TimingInfo,
-      { "dtx-drx-TimingInfo", "rrc.dtx_drx_TimingInfo",
+      { "dtx-drx-TimingInfo", "rrc.dtx_drx_TimingInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DTX_DRX_TimingInfo_r7", HFILL }},
     { &hf_rrc_dtx_drx_Info,
-      { "dtx-drx-Info", "rrc.dtx_drx_Info",
+      { "dtx-drx-Info", "rrc.dtx_drx_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DTX_DRX_Info_r7", HFILL }},
     { &hf_rrc_hs_scch_LessInfo,
-      { "hs-scch-LessInfo", "rrc.hs_scch_LessInfo",
+      { "hs-scch-LessInfo", "rrc.hs_scch_LessInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_SCCH_LessInfo_r7", HFILL }},
     { &hf_rrc_mimoParameters,
-      { "mimoParameters", "rrc.mimoParameters",
+      { "mimoParameters", "rrc.mimoParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MIMO_Parameters_r7", HFILL }},
     { &hf_rrc_rl_AdditionInformationList_02,
@@ -144505,23 +144505,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RL_AdditionInformationList_r7", HFILL }},
     { &hf_rrc_serving_HSDSCH_CellInformation_01,
-      { "serving-HSDSCH-CellInformation", "rrc.serving_HSDSCH_CellInformation",
+      { "serving-HSDSCH-CellInformation", "rrc.serving_HSDSCH_CellInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Serving_HSDSCH_CellInformation_r7", HFILL }},
     { &hf_rrc_e_dch_ReconfigurationInfo_01,
-      { "e-dch-ReconfigurationInfo", "rrc.e_dch_ReconfigurationInfo",
+      { "e-dch-ReconfigurationInfo", "rrc.e_dch_ReconfigurationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_DCH_ReconfigurationInfo_r7", HFILL }},
     { &hf_rrc_ul_16QAM_Config,
-      { "ul-16QAM-Config", "rrc.ul_16QAM_Config",
+      { "ul-16QAM-Config", "rrc.ul_16QAM_Config_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_e_dch_ReconfInfoSameCell,
-      { "e-dch-ReconfInfoSameCell", "rrc.e_dch_ReconfInfoSameCell",
+      { "e-dch-ReconfInfoSameCell", "rrc.e_dch_ReconfInfoSameCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_DCH_RL_InfoSameServingCell", HFILL }},
     { &hf_rrc_e_TFC_Boost_Info,
-      { "e-TFC-Boost-Info", "rrc.e_TFC_Boost_Info",
+      { "e-TFC-Boost-Info", "rrc.e_TFC_Boost_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_TFC_Boost_Info_r7", HFILL }},
     { &hf_rrc_e_DPDCH_PowerInterpolation,
@@ -144533,15 +144533,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_HS_DSCH_TBSizeTable_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_mimoParameters_01,
-      { "mimoParameters", "rrc.mimoParameters",
+      { "mimoParameters", "rrc.mimoParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MIMO_Parameters_v7f0ext", HFILL }},
     { &hf_rrc_mimoParameters_02,
-      { "mimoParameters", "rrc.mimoParameters",
+      { "mimoParameters", "rrc.mimoParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MIMO_Parameters_v7g0ext", HFILL }},
     { &hf_rrc_mimoParameters_03,
-      { "mimoParameters", "rrc.mimoParameters",
+      { "mimoParameters", "rrc.mimoParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MIMO_Parameters_r8", HFILL }},
     { &hf_rrc_rl_AdditionInformationList_03,
@@ -144549,11 +144549,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RL_AdditionInformationList_r8", HFILL }},
     { &hf_rrc_servingCellChangeParameters,
-      { "servingCellChangeParameters", "rrc.servingCellChangeParameters",
+      { "servingCellChangeParameters", "rrc.servingCellChangeParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_serving_HSDSCH_CellInformation_02,
-      { "serving-HSDSCH-CellInformation", "rrc.serving_HSDSCH_CellInformation",
+      { "serving-HSDSCH-CellInformation", "rrc.serving_HSDSCH_CellInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Serving_HSDSCH_CellInformation_r8", HFILL }},
     { &hf_rrc_dl_SecondaryCellInfoFDD,
@@ -144561,7 +144561,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_DL_SecondaryCellInfoFDD_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_dl_SecondaryCellInfoFDD_v890ext,
-      { "dl-SecondaryCellInfoFDD-v890ext", "rrc.dl_SecondaryCellInfoFDD_v890ext",
+      { "dl-SecondaryCellInfoFDD-v890ext", "rrc.dl_SecondaryCellInfoFDD_v890ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rl_AdditionInformationList_04,
@@ -144569,7 +144569,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RL_AdditionInformationList_v890ext", HFILL }},
     { &hf_rrc_mimoParameters_04,
-      { "mimoParameters", "rrc.mimoParameters",
+      { "mimoParameters", "rrc.mimoParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MIMO_Parameters_r9", HFILL }},
     { &hf_rrc_ul_SecondaryCellInfoFDD,
@@ -144577,7 +144577,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UL_SecondaryCellInfoFDD_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_e_dch_ReconfigurationInfo_SecULFrequency,
-      { "e-dch-ReconfigurationInfo-SecULFrequency", "rrc.e_dch_ReconfigurationInfo_SecULFrequency",
+      { "e-dch-ReconfigurationInfo-SecULFrequency", "rrc.e_dch_ReconfigurationInfo_SecULFrequency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rl_AdditionInformationList_05,
@@ -144593,15 +144593,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_serving_HSDSCH_CellInformation_03,
-      { "serving-HSDSCH-CellInformation", "rrc.serving_HSDSCH_CellInformation",
+      { "serving-HSDSCH-CellInformation", "rrc.serving_HSDSCH_CellInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Serving_HSDSCH_CellInformation_r9", HFILL }},
     { &hf_rrc_dl_SecondaryCellInfoFDD_01,
-      { "dl-SecondaryCellInfoFDD", "rrc.dl_SecondaryCellInfoFDD",
+      { "dl-SecondaryCellInfoFDD", "rrc.dl_SecondaryCellInfoFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_SecondaryCellInfoFDD_r9", HFILL }},
     { &hf_rrc_secondaryCellMimoParameters,
-      { "secondaryCellMimoParameters", "rrc.secondaryCellMimoParameters",
+      { "secondaryCellMimoParameters", "rrc.secondaryCellMimoParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecondaryCellMIMOparametersFDD_v950ext", HFILL }},
     { &hf_rrc_rl_AdditionInformationList_06,
@@ -144613,7 +144613,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RL_AdditionInformationList_r10", HFILL }},
     { &hf_rrc_dl_SecondaryCellInfoFDD_02,
-      { "dl-SecondaryCellInfoFDD", "rrc.dl_SecondaryCellInfoFDD",
+      { "dl-SecondaryCellInfoFDD", "rrc.dl_SecondaryCellInfoFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_SecondaryCellInfoFDD_r10", HFILL }},
     { &hf_rrc_additionalDLSecCellInfoListFDD,
@@ -144621,7 +144621,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ulOLTDInfoFDD,
-      { "ulOLTDInfoFDD", "rrc.ulOLTDInfoFDD",
+      { "ulOLTDInfoFDD", "rrc.ulOLTDInfoFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_OLTD_InfoFDD", HFILL }},
     { &hf_rrc_rl_AdditionInformationList_08,
@@ -144629,19 +144629,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RL_AdditionInformationList_vb50ext", HFILL }},
     { &hf_rrc_mimo4x4Parameters,
-      { "mimo4x4Parameters", "rrc.mimo4x4Parameters",
+      { "mimo4x4Parameters", "rrc.mimo4x4Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MIMO4x4_Parameters", HFILL }},
     { &hf_rrc_ul_CLTD_InfoFDD,
-      { "ul-CLTD-InfoFDD", "rrc.ul_CLTD_InfoFDD",
+      { "ul-CLTD-InfoFDD", "rrc.ul_CLTD_InfoFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_f_tpich_ReconfigurationInfo,
-      { "f-tpich-ReconfigurationInfo", "rrc.f_tpich_ReconfigurationInfo",
+      { "f-tpich-ReconfigurationInfo", "rrc.f_tpich_ReconfigurationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_OLTD_InfoFDD,
-      { "ul-OLTD-InfoFDD", "rrc.ul_OLTD_InfoFDD",
+      { "ul-OLTD-InfoFDD", "rrc.ul_OLTD_InfoFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rl_AdditionInformationList_09,
@@ -144649,23 +144649,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RL_AdditionInformationList_r11", HFILL }},
     { &hf_rrc_serving_HSDSCH_CellInformation_04,
-      { "serving-HSDSCH-CellInformation", "rrc.serving_HSDSCH_CellInformation",
+      { "serving-HSDSCH-CellInformation", "rrc.serving_HSDSCH_CellInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Serving_HSDSCH_CellInformation_r11", HFILL }},
     { &hf_rrc_e_dch_ReconfigurationInfo_02,
-      { "e-dch-ReconfigurationInfo", "rrc.e_dch_ReconfigurationInfo",
+      { "e-dch-ReconfigurationInfo", "rrc.e_dch_ReconfigurationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_DCH_ReconfigurationInfo_r11", HFILL }},
     { &hf_rrc_ul_64QAM_Config,
-      { "ul-64QAM-Config", "rrc.ul_64QAM_Config",
+      { "ul-64QAM-Config", "rrc.ul_64QAM_Config_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_MIMO_InfoFDD,
-      { "ul-MIMO-InfoFDD", "rrc.ul_MIMO_InfoFDD",
+      { "ul-MIMO-InfoFDD", "rrc.ul_MIMO_InfoFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_SecondaryCellInfoFDD_03,
-      { "dl-SecondaryCellInfoFDD", "rrc.dl_SecondaryCellInfoFDD",
+      { "dl-SecondaryCellInfoFDD", "rrc.dl_SecondaryCellInfoFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_SecondaryCellInfoFDD_r11", HFILL }},
     { &hf_rrc_additionalDLSecCellInfoListFDD_01,
@@ -144677,7 +144677,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dummy_04,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntegrityProtActivationInfo", HFILL }},
     { &hf_rrc_dummy2_01,
@@ -144685,11 +144685,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RB_ActivationTimeInfoList", HFILL }},
     { &hf_rrc_dummy3_01,
-      { "dummy3", "rrc.dummy3",
+      { "dummy3", "rrc.dummy3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_CounterSynchronisationInfo", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_01,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_01", HFILL }},
     { &hf_rrc_activeSetUpdateComplete_r3_add_ext,
@@ -144697,7 +144697,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_07,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_07", HFILL }},
     { &hf_rrc_failureCause,
@@ -144705,7 +144705,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_FailureCauseWithProtErr_vals), 0,
         "FailureCauseWithProtErr", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_02,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_02", HFILL }},
     { &hf_rrc_activeSetUpdateFailure_r3_add_ext,
@@ -144713,27 +144713,27 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_08,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_08", HFILL }},
     { &hf_rrc_r3_01,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_01", HFILL }},
     { &hf_rrc_assistanceDataDelivery_r3,
-      { "assistanceDataDelivery-r3", "rrc.assistanceDataDelivery_r3",
+      { "assistanceDataDelivery-r3", "rrc.assistanceDataDelivery_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AssistanceDataDelivery_r3_IEs", HFILL }},
     { &hf_rrc_v3a0NonCriticalExtensions,
-      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions",
+      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_assistanceDataDelivery_v3a0ext,
-      { "assistanceDataDelivery-v3a0ext", "rrc.assistanceDataDelivery_v3a0ext",
+      { "assistanceDataDelivery-v3a0ext", "rrc.assistanceDataDelivery_v3a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_03,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_03", HFILL }},
     { &hf_rrc_assistanceDataDelivery_r3_add_ext,
@@ -144741,63 +144741,63 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_01,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_assistanceDataDelivery_v4b0ext,
-      { "assistanceDataDelivery-v4b0ext", "rrc.assistanceDataDelivery_v4b0ext",
+      { "assistanceDataDelivery-v4b0ext", "rrc.assistanceDataDelivery_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AssistanceDataDelivery_v4b0ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtension,
-      { "v770NonCriticalExtension", "rrc.v770NonCriticalExtension",
+      { "v770NonCriticalExtension", "rrc.v770NonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_assistanceDataDelivery_v770ext,
-      { "assistanceDataDelivery-v770ext", "rrc.assistanceDataDelivery_v770ext",
+      { "assistanceDataDelivery-v770ext", "rrc.assistanceDataDelivery_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AssistanceDataDelivery_v770ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtension,
-      { "v860NonCriticalExtension", "rrc.v860NonCriticalExtension",
+      { "v860NonCriticalExtension", "rrc.v860NonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_assistanceDataDelivery_v860ext,
-      { "assistanceDataDelivery-v860ext", "rrc.assistanceDataDelivery_v860ext",
+      { "assistanceDataDelivery-v860ext", "rrc.assistanceDataDelivery_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AssistanceDataDelivery_v860ext_IEs", HFILL }},
     { &hf_rrc_v920NonCriticalExtension,
-      { "v920NonCriticalExtension", "rrc.v920NonCriticalExtension",
+      { "v920NonCriticalExtension", "rrc.v920NonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_assistanceDataDelivery_v920ext,
-      { "assistanceDataDelivery-v920ext", "rrc.assistanceDataDelivery_v920ext",
+      { "assistanceDataDelivery-v920ext", "rrc.assistanceDataDelivery_v920ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AssistanceDataDelivery_v920ext_IEs", HFILL }},
     { &hf_rrc_va40NonCriticalExtension,
-      { "va40NonCriticalExtension", "rrc.va40NonCriticalExtension",
+      { "va40NonCriticalExtension", "rrc.va40NonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_assistanceDataDelivery_va40ext,
-      { "assistanceDataDelivery-va40ext", "rrc.assistanceDataDelivery_va40ext",
+      { "assistanceDataDelivery-va40ext", "rrc.assistanceDataDelivery_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AssistanceDataDelivery_va40ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_09,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_09", HFILL }},
     { &hf_rrc_later_than_r3_01,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_01", HFILL }},
     { &hf_rrc_criticalExtensions_07,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_07", HFILL }},
     { &hf_rrc_ue_positioning_GPS_AssistanceData,
-      { "ue-positioning-GPS-AssistanceData", "rrc.ue_positioning_GPS_AssistanceData",
+      { "ue-positioning-GPS-AssistanceData", "rrc.ue_positioning_GPS_AssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_OTDOA_AssistanceData_UEB,
-      { "ue-positioning-OTDOA-AssistanceData-UEB", "rrc.ue_positioning_OTDOA_AssistanceData_UEB",
+      { "ue-positioning-OTDOA-AssistanceData-UEB", "rrc.ue_positioning_OTDOA_AssistanceData_UEB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sfn_Offset_Validity,
@@ -144805,51 +144805,51 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_SFN_Offset_Validity_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_ue_Positioning_OTDOA_AssistanceData_r4ext,
-      { "ue-Positioning-OTDOA-AssistanceData-r4ext", "rrc.ue_Positioning_OTDOA_AssistanceData_r4ext",
+      { "ue-Positioning-OTDOA-AssistanceData-r4ext", "rrc.ue_Positioning_OTDOA_AssistanceData_r4ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_Positioning_OTDOA_AssistanceData_UEB_ext,
-      { "ue-Positioning-OTDOA-AssistanceData-UEB-ext", "rrc.ue_Positioning_OTDOA_AssistanceData_UEB_ext",
+      { "ue-Positioning-OTDOA-AssistanceData-UEB-ext", "rrc.ue_Positioning_OTDOA_AssistanceData_UEB_ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_Positioning_GPS_AssistanceData,
-      { "ue-Positioning-GPS-AssistanceData", "rrc.ue_Positioning_GPS_AssistanceData",
+      { "ue-Positioning-GPS-AssistanceData", "rrc.ue_Positioning_GPS_AssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GPS_AssistanceData_v770ext", HFILL }},
     { &hf_rrc_ue_positioning_GANSS_AssistanceData,
-      { "ue-positioning-GANSS-AssistanceData", "rrc.ue_positioning_GANSS_AssistanceData",
+      { "ue-positioning-GANSS-AssistanceData", "rrc.ue_positioning_GANSS_AssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_GANSS_AssistanceData_v860ext,
-      { "ue-positioning-GANSS-AssistanceData-v860ext", "rrc.ue_positioning_GANSS_AssistanceData_v860ext",
+      { "ue-positioning-GANSS-AssistanceData-v860ext", "rrc.ue_positioning_GANSS_AssistanceData_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_GPS_AssistanceData_v920ext,
-      { "ue-positioning-GPS-AssistanceData-v920ext", "rrc.ue_positioning_GPS_AssistanceData_v920ext",
+      { "ue-positioning-GPS-AssistanceData-v920ext", "rrc.ue_positioning_GPS_AssistanceData_v920ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_GANSS_AssistanceData_v920ext,
-      { "ue-positioning-GANSS-AssistanceData-v920ext", "rrc.ue_positioning_GANSS_AssistanceData_v920ext",
+      { "ue-positioning-GANSS-AssistanceData-v920ext", "rrc.ue_positioning_GANSS_AssistanceData_v920ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_GPS_AssistanceData_va40ext,
-      { "ue-positioning-GPS-AssistanceData-va40ext", "rrc.ue_positioning_GPS_AssistanceData_va40ext",
+      { "ue-positioning-GPS-AssistanceData-va40ext", "rrc.ue_positioning_GPS_AssistanceData_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_GANSS_AssistanceData_va40ext,
-      { "ue-positioning-GANSS-AssistanceData-va40ext", "rrc.ue_positioning_GANSS_AssistanceData_va40ext",
+      { "ue-positioning-GANSS-AssistanceData-va40ext", "rrc.ue_positioning_GANSS_AssistanceData_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_r3_02,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_02", HFILL }},
     { &hf_rrc_cellChangeOrderFromUTRAN_IEs,
-      { "cellChangeOrderFromUTRAN-IEs", "rrc.cellChangeOrderFromUTRAN_IEs",
+      { "cellChangeOrderFromUTRAN-IEs", "rrc.cellChangeOrderFromUTRAN_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellChangeOrderFromUTRAN_r3_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_04,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_04", HFILL }},
     { &hf_rrc_cellChangeOrderFromUTRAN_r3_add_ext,
@@ -144857,23 +144857,23 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_01,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_cellChangeOrderFromUTRAN_v590ext,
-      { "cellChangeOrderFromUTRAN-v590ext", "rrc.cellChangeOrderFromUTRAN_v590ext",
+      { "cellChangeOrderFromUTRAN-v590ext", "rrc.cellChangeOrderFromUTRAN_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellChangeOrderFromUTRAN_v590ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_10,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_10", HFILL }},
     { &hf_rrc_later_than_r3_02,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_02", HFILL }},
     { &hf_rrc_criticalExtensions_08,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_08", HFILL }},
     { &hf_rrc_rab_InformationList,
@@ -144881,7 +144881,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interRAT_TargetCellDescription,
-      { "interRAT-TargetCellDescription", "rrc.interRAT_TargetCellDescription",
+      { "interRAT-TargetCellDescription", "rrc.interRAT_TargetCellDescription_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_geran_SystemInfoType,
@@ -144897,15 +144897,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GERAN_SystemInformation", HFILL }},
     { &hf_rrc_r3_03,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_03", HFILL }},
     { &hf_rrc_cellChangeOrderFromUTRANFailure_r3,
-      { "cellChangeOrderFromUTRANFailure-r3", "rrc.cellChangeOrderFromUTRANFailure_r3",
+      { "cellChangeOrderFromUTRANFailure-r3", "rrc.cellChangeOrderFromUTRANFailure_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellChangeOrderFromUTRANFailure_r3_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_05,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_05", HFILL }},
     { &hf_rrc_cellChangeOrderFromUTRANFailure_r3_add_ext,
@@ -144913,15 +144913,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_11,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_11", HFILL }},
     { &hf_rrc_dummy_05,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_criticalExtensions_09,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_09", HFILL }},
     { &hf_rrc_interRAT_ChangeFailureCause,
@@ -144929,7 +144929,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_InterRAT_ChangeFailureCause_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_u_RNTI,
-      { "u-RNTI", "rrc.u_RNTI",
+      { "u-RNTI", "rrc.u_RNTI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_startList,
@@ -144949,19 +144949,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_CellUpdateCause_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_failureCause_01,
-      { "failureCause", "rrc.failureCause",
+      { "failureCause", "rrc.failureCause_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FailureCauseWithProtErrTrId", HFILL }},
     { &hf_rrc_rb_timer_indicator,
-      { "rb-timer-indicator", "rrc.rb_timer_indicator",
+      { "rb-timer-indicator", "rrc.rb_timer_indicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_measuredResultsOnRACH,
-      { "measuredResultsOnRACH", "rrc.measuredResultsOnRACH",
+      { "measuredResultsOnRACH", "rrc.measuredResultsOnRACH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_06,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_06", HFILL }},
     { &hf_rrc_cellUpdate_r3_add_ext,
@@ -144969,79 +144969,79 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_02,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_cellUpdate_v590ext,
-      { "cellUpdate-v590ext", "rrc.cellUpdate_v590ext",
+      { "cellUpdate-v590ext", "rrc.cellUpdate_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_01,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_cellUpdate_v690ext,
-      { "cellUpdate-v690ext", "rrc.cellUpdate_v690ext",
+      { "cellUpdate-v690ext", "rrc.cellUpdate_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdate_v690ext_IEs", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_01,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6b0NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_cellUpdate_v6b0ext,
-      { "cellUpdate-v6b0ext", "rrc.cellUpdate_v6b0ext",
+      { "cellUpdate-v6b0ext", "rrc.cellUpdate_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdate_v6b0ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cellUpdate_v770ext,
-      { "cellUpdate-v770ext", "rrc.cellUpdate_v770ext",
+      { "cellUpdate-v770ext", "rrc.cellUpdate_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdate_v770ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cellUpdate_v860ext,
-      { "cellUpdate-v860ext", "rrc.cellUpdate_v860ext",
+      { "cellUpdate-v860ext", "rrc.cellUpdate_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdate_v860ext_IEs", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cellUpdate_va40ext,
-      { "cellUpdate-va40ext", "rrc.cellUpdate_va40ext",
+      { "cellUpdate-va40ext", "rrc.cellUpdate_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdate_va40ext_IEs", HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions_01,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vb50NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_cellUpdate_vb50ext,
-      { "cellUpdate-vb50ext", "rrc.cellUpdate_vb50ext",
+      { "cellUpdate-vb50ext", "rrc.cellUpdate_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdate_vb50ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_12,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_12", HFILL }},
     { &hf_rrc_cellUpdate_v7e0ext,
-      { "cellUpdate-v7e0ext", "rrc.cellUpdate_v7e0ext",
+      { "cellUpdate-v7e0ext", "rrc.cellUpdate_v7e0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdate_v7e0ext_IEs", HFILL }},
     { &hf_rrc_v7g0NonCriticalExtensions_02,
-      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions",
+      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7g0NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_cellUpdate_v7g0ext,
-      { "cellUpdate-v7g0ext", "rrc.cellUpdate_v7g0ext",
+      { "cellUpdate-v7g0ext", "rrc.cellUpdate_v7g0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdate_v7g0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_13,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_13", HFILL }},
     { &hf_rrc_establishmentCause,
@@ -145057,7 +145057,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_trafficVolumeIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_measuredResultsOnRACHinterFreq,
-      { "measuredResultsOnRACHinterFreq", "rrc.measuredResultsOnRACHinterFreq",
+      { "measuredResultsOnRACHinterFreq", "rrc.measuredResultsOnRACHinterFreq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_reconfigurationStatusIndicator,
@@ -145065,7 +145065,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_reconfigurationStatusIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_mbmsSelectedServices,
-      { "mbmsSelectedServices", "rrc.mbmsSelectedServices",
+      { "mbmsSelectedServices", "rrc.mbmsSelectedServices_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMS_SelectedServicesShort", HFILL }},
     { &hf_rrc_csCallType,
@@ -145089,7 +145089,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_supportForTwoDRXSchemesInPCH_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_measuredResultsOnRACH_v7g0ext,
-      { "measuredResultsOnRACH-v7g0ext", "rrc.measuredResultsOnRACH_v7g0ext",
+      { "measuredResultsOnRACH-v7g0ext", "rrc.measuredResultsOnRACH_v7g0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_supportOfCommonEDCH,
@@ -145177,7 +145177,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_spare1_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_measuredResultsOnRACH_01,
-      { "measuredResultsOnRACH", "rrc.measuredResultsOnRACH",
+      { "measuredResultsOnRACH", "rrc.measuredResultsOnRACH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasuredResultsOnRACHFDD_r11", HFILL }},
     { &hf_rrc_loggedMeasAvailable_01,
@@ -145189,27 +145189,27 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_loggedANRResultsAvailable_01_vals), 0,
         "T_loggedANRResultsAvailable_01", HFILL }},
     { &hf_rrc_measuredResultsOnRACHEUTRAFreq,
-      { "measuredResultsOnRACHEUTRAFreq", "rrc.measuredResultsOnRACHEUTRAFreq",
+      { "measuredResultsOnRACHEUTRAFreq", "rrc.measuredResultsOnRACHEUTRAFreq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasuredResultsOnRACH_EUTRAFreq", HFILL }},
     { &hf_rrc_r3_04,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_04", HFILL }},
     { &hf_rrc_cellUpdateConfirm_r3,
-      { "cellUpdateConfirm-r3", "rrc.cellUpdateConfirm_r3",
+      { "cellUpdateConfirm-r3", "rrc.cellUpdateConfirm_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdateConfirm_r3_IEs", HFILL }},
     { &hf_rrc_v3a0NonCriticalExtensions_01,
-      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions",
+      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v3a0NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_cellUpdateConfirm_v3a0ext,
-      { "cellUpdateConfirm-v3a0ext", "rrc.cellUpdateConfirm_v3a0ext",
+      { "cellUpdateConfirm-v3a0ext", "rrc.cellUpdateConfirm_v3a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_07,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_07", HFILL }},
     { &hf_rrc_cellUpdateConfirm_r3_add_ext,
@@ -145217,43 +145217,43 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_02,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_cellUpdateConfirm_v4b0ext,
-      { "cellUpdateConfirm-v4b0ext", "rrc.cellUpdateConfirm_v4b0ext",
+      { "cellUpdateConfirm-v4b0ext", "rrc.cellUpdateConfirm_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdateConfirm_v4b0ext_IEs", HFILL }},
     { &hf_rrc_v590NonCriticalExtenstions,
-      { "v590NonCriticalExtenstions", "rrc.v590NonCriticalExtenstions",
+      { "v590NonCriticalExtenstions", "rrc.v590NonCriticalExtenstions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cellUpdateConfirm_v590ext,
-      { "cellUpdateConfirm-v590ext", "rrc.cellUpdateConfirm_v590ext",
+      { "cellUpdateConfirm-v590ext", "rrc.cellUpdateConfirm_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdateConfirm_v590ext_IEs", HFILL }},
     { &hf_rrc_v5d0NonCriticalExtenstions,
-      { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions",
+      { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cellUpdateConfirm_v5d0ext,
-      { "cellUpdateConfirm-v5d0ext", "rrc.cellUpdateConfirm_v5d0ext",
+      { "cellUpdateConfirm-v5d0ext", "rrc.cellUpdateConfirm_v5d0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdateConfirm_v5d0ext_IEs", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_02,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_cellUpdateConfirm_v690ext,
-      { "cellUpdateConfirm-v690ext", "rrc.cellUpdateConfirm_v690ext",
+      { "cellUpdateConfirm-v690ext", "rrc.cellUpdateConfirm_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdateConfirm_v690ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_14,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_14", HFILL }},
     { &hf_rrc_later_than_r3_03,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_03", HFILL }},
     { &hf_rrc_criticalExtensions_10,
@@ -145261,15 +145261,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_10_vals), 0,
         "T_criticalExtensions_10", HFILL }},
     { &hf_rrc_r4,
-      { "r4", "rrc.r4",
+      { "r4", "rrc.r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cellUpdateConfirm_r4,
-      { "cellUpdateConfirm-r4", "rrc.cellUpdateConfirm_r4",
+      { "cellUpdateConfirm-r4", "rrc.cellUpdateConfirm_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdateConfirm_r4_IEs", HFILL }},
     { &hf_rrc_v4d0NonCriticalExtensions,
-      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions",
+      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cellUpdateConfirm_r4_add_ext,
@@ -145277,19 +145277,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtenstions_01,
-      { "v590NonCriticalExtenstions", "rrc.v590NonCriticalExtenstions",
+      { "v590NonCriticalExtenstions", "rrc.v590NonCriticalExtenstions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtenstions_01", HFILL }},
     { &hf_rrc_v5d0NonCriticalExtenstions_01,
-      { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions",
+      { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v5d0NonCriticalExtenstions_01", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_03,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_nonCriticalExtensions_15,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_15", HFILL }},
     { &hf_rrc_criticalExtensions_11,
@@ -145297,11 +145297,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_11_vals), 0,
         "T_criticalExtensions_11", HFILL }},
     { &hf_rrc_r5,
-      { "r5", "rrc.r5",
+      { "r5", "rrc.r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cellUpdateConfirm_r5,
-      { "cellUpdateConfirm-r5", "rrc.cellUpdateConfirm_r5",
+      { "cellUpdateConfirm-r5", "rrc.cellUpdateConfirm_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdateConfirm_r5_IEs", HFILL }},
     { &hf_rrc_cellUpdateConfirm_r5_add_ext,
@@ -145309,15 +145309,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v5d0NonCriticalExtenstions_02,
-      { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions",
+      { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v5d0NonCriticalExtenstions_02", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_04,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_nonCriticalExtensions_16,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_16", HFILL }},
     { &hf_rrc_criticalExtensions_12,
@@ -145325,11 +145325,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_12_vals), 0,
         "T_criticalExtensions_12", HFILL }},
     { &hf_rrc_r6_01,
-      { "r6", "rrc.r6",
+      { "r6", "rrc.r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r6_01", HFILL }},
     { &hf_rrc_cellUpdateConfirm_r6,
-      { "cellUpdateConfirm-r6", "rrc.cellUpdateConfirm_r6",
+      { "cellUpdateConfirm-r6", "rrc.cellUpdateConfirm_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdateConfirm_r6_IEs", HFILL }},
     { &hf_rrc_cellUpdateConfirm_r6_add_ext,
@@ -145337,15 +145337,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_02,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6b0NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_cellUpdateConfirm_v6b0ext,
-      { "cellUpdateConfirm-v6b0ext", "rrc.cellUpdateConfirm_v6b0ext",
+      { "cellUpdateConfirm-v6b0ext", "rrc.cellUpdateConfirm_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdateConfirm_v6b0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_17,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_17", HFILL }},
     { &hf_rrc_criticalExtensions_13,
@@ -145353,11 +145353,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_13_vals), 0,
         "T_criticalExtensions_13", HFILL }},
     { &hf_rrc_r7_01,
-      { "r7", "rrc.r7",
+      { "r7", "rrc.r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r7_01", HFILL }},
     { &hf_rrc_cellUpdateConfirm_r7,
-      { "cellUpdateConfirm-r7", "rrc.cellUpdateConfirm_r7",
+      { "cellUpdateConfirm-r7", "rrc.cellUpdateConfirm_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdateConfirm_r7_IEs", HFILL }},
     { &hf_rrc_cellUpdateConfirm_r7_add_ext,
@@ -145365,23 +145365,23 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v780NonCriticalExtensions_01,
-      { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions",
+      { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v780NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_cellUpdateConfirm_v780ext,
-      { "cellUpdateConfirm-v780ext", "rrc.cellUpdateConfirm_v780ext",
+      { "cellUpdateConfirm-v780ext", "rrc.cellUpdateConfirm_v780ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdateConfirm_v780ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_01,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_cellUpdateConfirm_v860ext,
-      { "cellUpdateConfirm-v860ext", "rrc.cellUpdateConfirm_v860ext",
+      { "cellUpdateConfirm-v860ext", "rrc.cellUpdateConfirm_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdateConfirm_v860ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_18,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_18", HFILL }},
     { &hf_rrc_criticalExtensions_14,
@@ -145389,11 +145389,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_14_vals), 0,
         "T_criticalExtensions_14", HFILL }},
     { &hf_rrc_r8_01,
-      { "r8", "rrc.r8",
+      { "r8", "rrc.r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r8_01", HFILL }},
     { &hf_rrc_cellUpdateConfirm_r8,
-      { "cellUpdateConfirm-r8", "rrc.cellUpdateConfirm_r8",
+      { "cellUpdateConfirm-r8", "rrc.cellUpdateConfirm_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdateConfirm_r8_IEs", HFILL }},
     { &hf_rrc_cellUpdateConfirm_r8_add_ext,
@@ -145401,47 +145401,47 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v7d0NonCriticalExtensions,
-      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions",
+      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cellUpdateConfirm_v7d0ext,
-      { "cellUpdateConfirm-v7d0ext", "rrc.cellUpdateConfirm_v7d0ext",
+      { "cellUpdateConfirm-v7d0ext", "rrc.cellUpdateConfirm_v7d0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdateConfirm_v7d0ext_IEs", HFILL }},
     { &hf_rrc_v7f0NonCriticalExtensions_01,
-      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions",
+      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7f0NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_cellUpdateConfirm_v7f0ext,
-      { "cellUpdateConfirm-v7f0ext", "rrc.cellUpdateConfirm_v7f0ext",
+      { "cellUpdateConfirm-v7f0ext", "rrc.cellUpdateConfirm_v7f0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdateConfirm_v7f0ext_IEs", HFILL }},
     { &hf_rrc_v890NonCriticalExtensions_01,
-      { "v890NonCriticalExtensions", "rrc.v890NonCriticalExtensions",
+      { "v890NonCriticalExtensions", "rrc.v890NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v890NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_cellUpdateConfirm_v890ext,
-      { "cellUpdateConfirm-v890ext", "rrc.cellUpdateConfirm_v890ext",
+      { "cellUpdateConfirm-v890ext", "rrc.cellUpdateConfirm_v890ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdateConfirm_v890ext_IEs", HFILL }},
     { &hf_rrc_v7g0NonCriticalExtensions_03,
-      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions",
+      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7g0NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_cellUpdateConfirm_v7g0ext,
-      { "cellUpdateConfirm-v7g0ext", "rrc.cellUpdateConfirm_v7g0ext",
+      { "cellUpdateConfirm-v7g0ext", "rrc.cellUpdateConfirm_v7g0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdateConfirm_v7g0ext_IEs", HFILL }},
     { &hf_rrc_v8a0NonCriticalExtensions,
-      { "v8a0NonCriticalExtensions", "rrc.v8a0NonCriticalExtensions",
+      { "v8a0NonCriticalExtensions", "rrc.v8a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cellUpdateConfirm_v8a0ext,
-      { "cellUpdateConfirm-v8a0ext", "rrc.cellUpdateConfirm_v8a0ext",
+      { "cellUpdateConfirm-v8a0ext", "rrc.cellUpdateConfirm_v8a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdateConfirm_v8a0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_19,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_19", HFILL }},
     { &hf_rrc_criticalExtensions_15,
@@ -145449,11 +145449,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_15_vals), 0,
         "T_criticalExtensions_15", HFILL }},
     { &hf_rrc_r9_01,
-      { "r9", "rrc.r9",
+      { "r9", "rrc.r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r9_01", HFILL }},
     { &hf_rrc_cellUpdateConfirm_r9,
-      { "cellUpdateConfirm-r9", "rrc.cellUpdateConfirm_r9",
+      { "cellUpdateConfirm-r9", "rrc.cellUpdateConfirm_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdateConfirm_r9_IEs", HFILL }},
     { &hf_rrc_cellUpdateConfirm_r9_add_ext,
@@ -145461,23 +145461,23 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v950NonCriticalExtensions_01,
-      { "v950NonCriticalExtensions", "rrc.v950NonCriticalExtensions",
+      { "v950NonCriticalExtensions", "rrc.v950NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v950NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_cellUpdateConfirm_v950ext,
-      { "cellUpdateConfirm-v950ext", "rrc.cellUpdateConfirm_v950ext",
+      { "cellUpdateConfirm-v950ext", "rrc.cellUpdateConfirm_v950ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdateConfirm_v950ext_IEs", HFILL }},
     { &hf_rrc_v9c0NonCriticalExtensions,
-      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions",
+      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cellUpdateConfirm_v9c0ext,
-      { "cellUpdateConfirm-v9c0ext", "rrc.cellUpdateConfirm_v9c0ext",
+      { "cellUpdateConfirm-v9c0ext", "rrc.cellUpdateConfirm_v9c0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdateConfirm_v9c0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_20,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_20", HFILL }},
     { &hf_rrc_criticalExtensions_16,
@@ -145485,11 +145485,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_16_vals), 0,
         "T_criticalExtensions_16", HFILL }},
     { &hf_rrc_r10_01,
-      { "r10", "rrc.r10",
+      { "r10", "rrc.r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r10_01", HFILL }},
     { &hf_rrc_cellUpdateConfirm_r10,
-      { "cellUpdateConfirm-r10", "rrc.cellUpdateConfirm_r10",
+      { "cellUpdateConfirm-r10", "rrc.cellUpdateConfirm_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdateConfirm_r10_IEs", HFILL }},
     { &hf_rrc_cellUpdateConfirm_r10_add_ext,
@@ -145497,19 +145497,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v9c0NonCriticalExtensions_01,
-      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions",
+      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v9c0NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions_02,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vb50NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_cellUpdateConfirm_vb50ext,
-      { "cellUpdateConfirm-vb50ext", "rrc.cellUpdateConfirm_vb50ext",
+      { "cellUpdateConfirm-vb50ext", "rrc.cellUpdateConfirm_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdateConfirm_vb50ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_21,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_21", HFILL }},
     { &hf_rrc_criticalExtensions_17,
@@ -145517,11 +145517,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_17_vals), 0,
         "T_criticalExtensions_17", HFILL }},
     { &hf_rrc_r11_01,
-      { "r11", "rrc.r11",
+      { "r11", "rrc.r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r11_01", HFILL }},
     { &hf_rrc_cellUpdateConfirm_r11,
-      { "cellUpdateConfirm-r11", "rrc.cellUpdateConfirm_r11",
+      { "cellUpdateConfirm-r11", "rrc.cellUpdateConfirm_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellUpdateConfirm_r11_IEs", HFILL }},
     { &hf_rrc_cellUpdateConfirm_r11_add_ext,
@@ -145529,23 +145529,23 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_22,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_22", HFILL }},
     { &hf_rrc_criticalExtensions_18,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_18", HFILL }},
     { &hf_rrc_integrityProtectionModeInfo,
-      { "integrityProtectionModeInfo", "rrc.integrityProtectionModeInfo",
+      { "integrityProtectionModeInfo", "rrc.integrityProtectionModeInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cipheringModeInfo,
-      { "cipheringModeInfo", "rrc.cipheringModeInfo",
+      { "cipheringModeInfo", "rrc.cipheringModeInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_new_U_RNTI,
-      { "new-U-RNTI", "rrc.new_U_RNTI",
+      { "new-U-RNTI", "rrc.new_U_RNTI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "U_RNTI", HFILL }},
     { &hf_rrc_new_C_RNTI,
@@ -145585,11 +145585,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_CounterSynchronisationInfo,
-      { "dl-CounterSynchronisationInfo", "rrc.dl_CounterSynchronisationInfo",
+      { "dl-CounterSynchronisationInfo", "rrc.dl_CounterSynchronisationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_CommonTransChInfo,
-      { "ul-CommonTransChInfo", "rrc.ul_CommonTransChInfo",
+      { "ul-CommonTransChInfo", "rrc.ul_CommonTransChInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_deletedTransChInfoList,
@@ -145605,7 +145605,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificTransChInfo_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_fdd,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dummy_06,
@@ -145617,11 +145617,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DRAC_StaticInformationList", HFILL }},
     { &hf_rrc_tdd,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_CommonTransChInfo,
-      { "dl-CommonTransChInfo", "rrc.dl_CommonTransChInfo",
+      { "dl-CommonTransChInfo", "rrc.dl_CommonTransChInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_DeletedTransChInfoList,
@@ -145633,7 +145633,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_frequencyInfo,
-      { "frequencyInfo", "rrc.frequencyInfo",
+      { "frequencyInfo", "rrc.frequencyInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_ChannelRequirement,
@@ -145645,15 +145645,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificPhysChInfo_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_fdd_01,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_01", HFILL }},
     { &hf_rrc_dummy_07,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_PDSCH_Information", HFILL }},
     { &hf_rrc_dl_CommonInformation,
-      { "dl-CommonInformation", "rrc.dl_CommonInformation",
+      { "dl-CommonInformation", "rrc.dl_CommonInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_InformationPerRL_List,
@@ -145673,7 +145673,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RB_InformationReconfigList_r4", HFILL }},
     { &hf_rrc_ul_CommonTransChInfo_01,
-      { "ul-CommonTransChInfo", "rrc.ul_CommonTransChInfo",
+      { "ul-CommonTransChInfo", "rrc.ul_CommonTransChInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_CommonTransChInfo_r4", HFILL }},
     { &hf_rrc_modeSpecificTransChInfo_01,
@@ -145681,11 +145681,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificTransChInfo_01_vals), 0,
         "T_modeSpecificTransChInfo_01", HFILL }},
     { &hf_rrc_fdd_02,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_02", HFILL }},
     { &hf_rrc_dl_CommonTransChInfo_01,
-      { "dl-CommonTransChInfo", "rrc.dl_CommonTransChInfo",
+      { "dl-CommonTransChInfo", "rrc.dl_CommonTransChInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_CommonTransChInfo_r4", HFILL }},
     { &hf_rrc_dl_AddReconfTransChInfoList_01,
@@ -145701,11 +145701,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificPhysChInfo_01_vals), 0,
         "T_modeSpecificPhysChInfo_01", HFILL }},
     { &hf_rrc_fdd_03,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_03", HFILL }},
     { &hf_rrc_dl_CommonInformation_01,
-      { "dl-CommonInformation", "rrc.dl_CommonInformation",
+      { "dl-CommonInformation", "rrc.dl_CommonInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_CommonInformation_r4", HFILL }},
     { &hf_rrc_dl_InformationPerRL_List_01,
@@ -145725,7 +145725,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RB_InformationAffectedList_r5", HFILL }},
     { &hf_rrc_dl_CounterSynchronisationInfo_01,
-      { "dl-CounterSynchronisationInfo", "rrc.dl_CounterSynchronisationInfo",
+      { "dl-CounterSynchronisationInfo", "rrc.dl_CounterSynchronisationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_CounterSynchronisationInfo_r5", HFILL }},
     { &hf_rrc_modeSpecificTransChInfo_02,
@@ -145733,7 +145733,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificTransChInfo_02_vals), 0,
         "T_modeSpecificTransChInfo_02", HFILL }},
     { &hf_rrc_fdd_04,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_04", HFILL }},
     { &hf_rrc_dl_DeletedTransChInfoList_01,
@@ -145753,15 +145753,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificPhysChInfo_02_vals), 0,
         "T_modeSpecificPhysChInfo_02", HFILL }},
     { &hf_rrc_fdd_05,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_05", HFILL }},
     { &hf_rrc_dl_HSPDSCH_Information,
-      { "dl-HSPDSCH-Information", "rrc.dl_HSPDSCH_Information",
+      { "dl-HSPDSCH-Information", "rrc.dl_HSPDSCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_CommonInformation_02,
-      { "dl-CommonInformation", "rrc.dl_CommonInformation",
+      { "dl-CommonInformation", "rrc.dl_CommonInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_CommonInformation_r5", HFILL }},
     { &hf_rrc_dl_InformationPerRL_List_02,
@@ -145785,19 +145785,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "UL_AddReconfTransChInfoList_r6", HFILL }},
     { &hf_rrc_ul_DPCH_Info,
-      { "ul-DPCH-Info", "rrc.ul_DPCH_Info",
+      { "ul-DPCH-Info", "rrc.ul_DPCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_Info_r6", HFILL }},
     { &hf_rrc_ul_EDCH_Information,
-      { "ul-EDCH-Information", "rrc.ul_EDCH_Information",
+      { "ul-EDCH-Information", "rrc.ul_EDCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_EDCH_Information_r6", HFILL }},
     { &hf_rrc_dl_HSPDSCH_Information_01,
-      { "dl-HSPDSCH-Information", "rrc.dl_HSPDSCH_Information",
+      { "dl-HSPDSCH-Information", "rrc.dl_HSPDSCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_HSPDSCH_Information_r6", HFILL }},
     { &hf_rrc_dl_CommonInformation_03,
-      { "dl-CommonInformation", "rrc.dl_CommonInformation",
+      { "dl-CommonInformation", "rrc.dl_CommonInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_CommonInformation_r6", HFILL }},
     { &hf_rrc_dl_InformationPerRL_List_03,
@@ -145829,15 +145829,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_integrityProtectionModeInfo_01,
-      { "integrityProtectionModeInfo", "rrc.integrityProtectionModeInfo",
+      { "integrityProtectionModeInfo", "rrc.integrityProtectionModeInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntegrityProtectionModeInfo_r7", HFILL }},
     { &hf_rrc_cipheringModeInfo_01,
-      { "cipheringModeInfo", "rrc.cipheringModeInfo",
+      { "cipheringModeInfo", "rrc.cipheringModeInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CipheringModeInfo_r7", HFILL }},
     { &hf_rrc_utran_DRX_CycleLengthCoeff_01,
-      { "utran-DRX-CycleLengthCoeff", "rrc.utran_DRX_CycleLengthCoeff",
+      { "utran-DRX-CycleLengthCoeff", "rrc.utran_DRX_CycleLengthCoeff_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTRAN_DRX_CycleLengthCoefficient_r7", HFILL }},
     { &hf_rrc_waitTime,
@@ -145869,23 +145869,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DL_AddReconfTransChInfoList_r7", HFILL }},
     { &hf_rrc_multi_frequencyInfo,
-      { "multi-frequencyInfo", "rrc.multi_frequencyInfo",
+      { "multi-frequencyInfo", "rrc.multi_frequencyInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Multi_frequencyInfo_LCR_r7", HFILL }},
     { &hf_rrc_ul_DPCH_Info_01,
-      { "ul-DPCH-Info", "rrc.ul_DPCH_Info",
+      { "ul-DPCH-Info", "rrc.ul_DPCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_Info_r7", HFILL }},
     { &hf_rrc_ul_EDCH_Information_01,
-      { "ul-EDCH-Information", "rrc.ul_EDCH_Information",
+      { "ul-EDCH-Information", "rrc.ul_EDCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_EDCH_Information_r7", HFILL }},
     { &hf_rrc_dl_HSPDSCH_Information_02,
-      { "dl-HSPDSCH-Information", "rrc.dl_HSPDSCH_Information",
+      { "dl-HSPDSCH-Information", "rrc.dl_HSPDSCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_HSPDSCH_Information_r7", HFILL }},
     { &hf_rrc_dl_CommonInformation_04,
-      { "dl-CommonInformation", "rrc.dl_CommonInformation",
+      { "dl-CommonInformation", "rrc.dl_CommonInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_CommonInformation_r7", HFILL }},
     { &hf_rrc_dl_InformationPerRL_List_04,
@@ -145893,15 +145893,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DL_InformationPerRL_List_r7", HFILL }},
     { &hf_rrc_v7f0NonCriticalExtensions_02,
-      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions",
+      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7f0NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_v7g0NonCriticalExtensions_04,
-      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions",
+      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7g0NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_nonCriticalExtensions_23,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_23", HFILL }},
     { &hf_rrc_ul_EDCH_Information_02,
@@ -145909,11 +145909,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UL_EDCH_Information_ext_vals), 0,
         "UL_EDCH_Information_ext", HFILL }},
     { &hf_rrc_dummy_08,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DefaultConfigForCellFACH", HFILL }},
     { &hf_rrc_rab_InformationSetup,
-      { "rab-InformationSetup", "rrc.rab_InformationSetup",
+      { "rab-InformationSetup", "rrc.rab_InformationSetup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RAB_InformationSetup_r8", HFILL }},
     { &hf_rrc_rb_InformationReconfigList_05,
@@ -145929,15 +145929,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "UL_AddReconfTransChInfoList_r8", HFILL }},
     { &hf_rrc_ul_EDCH_Information_03,
-      { "ul-EDCH-Information", "rrc.ul_EDCH_Information",
+      { "ul-EDCH-Information", "rrc.ul_EDCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_EDCH_Information_r8", HFILL }},
     { &hf_rrc_dl_HSPDSCH_Information_03,
-      { "dl-HSPDSCH-Information", "rrc.dl_HSPDSCH_Information",
+      { "dl-HSPDSCH-Information", "rrc.dl_HSPDSCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_HSPDSCH_Information_r8", HFILL }},
     { &hf_rrc_dl_CommonInformation_05,
-      { "dl-CommonInformation", "rrc.dl_CommonInformation",
+      { "dl-CommonInformation", "rrc.dl_CommonInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_CommonInformation_r8", HFILL }},
     { &hf_rrc_dl_InformationPerRL_List_05,
@@ -145945,31 +145945,31 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DL_InformationPerRL_List_r8", HFILL }},
     { &hf_rrc_controlChannelDRXInfo_TDD128,
-      { "controlChannelDRXInfo-TDD128", "rrc.controlChannelDRXInfo_TDD128",
+      { "controlChannelDRXInfo-TDD128", "rrc.controlChannelDRXInfo_TDD128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ControlChannelDRXInfo_TDD128_r8", HFILL }},
     { &hf_rrc_sps_Information_TDD128,
-      { "sps-Information-TDD128", "rrc.sps_Information_TDD128",
+      { "sps-Information-TDD128", "rrc.sps_Information_TDD128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SPS_Information_TDD128_r8", HFILL }},
     { &hf_rrc_rab_InformationSetup_01,
-      { "rab-InformationSetup", "rrc.rab_InformationSetup",
+      { "rab-InformationSetup", "rrc.rab_InformationSetup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rab_InformationSetup_r7,
-      { "rab-InformationSetup-r7", "rrc.rab_InformationSetup_r7",
+      { "rab-InformationSetup-r7", "rrc.rab_InformationSetup_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rab_InformationSetup_v820ext,
-      { "rab-InformationSetup-v820ext", "rrc.rab_InformationSetup_v820ext",
+      { "rab-InformationSetup-v820ext", "rrc.rab_InformationSetup_v820ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_HSPDSCH_Information_04,
-      { "dl-HSPDSCH-Information", "rrc.dl_HSPDSCH_Information",
+      { "dl-HSPDSCH-Information", "rrc.dl_HSPDSCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_HSPDSCH_Information_r8_ext", HFILL }},
     { &hf_rrc_dl_HSPDSCH_Information_05,
-      { "dl-HSPDSCH-Information", "rrc.dl_HSPDSCH_Information",
+      { "dl-HSPDSCH-Information", "rrc.dl_HSPDSCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_HSPDSCH_Information_r8_ext2", HFILL }},
     { &hf_rrc_dl_AddReconfTransChInfoList_04,
@@ -145977,15 +145977,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DL_AddReconfTransChInfoList_r9", HFILL }},
     { &hf_rrc_ul_EDCH_Information_04,
-      { "ul-EDCH-Information", "rrc.ul_EDCH_Information",
+      { "ul-EDCH-Information", "rrc.ul_EDCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_EDCH_Information_r9", HFILL }},
     { &hf_rrc_dl_HSPDSCH_Information_06,
-      { "dl-HSPDSCH-Information", "rrc.dl_HSPDSCH_Information",
+      { "dl-HSPDSCH-Information", "rrc.dl_HSPDSCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_HSPDSCH_Information_r9", HFILL }},
     { &hf_rrc_cellDCHMeasOccasionInfo_TDD128,
-      { "cellDCHMeasOccasionInfo-TDD128", "rrc.cellDCHMeasOccasionInfo_TDD128",
+      { "cellDCHMeasOccasionInfo-TDD128", "rrc.cellDCHMeasOccasionInfo_TDD128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellDCHMeasOccasionInfo_TDD128_r9", HFILL }},
     { &hf_rrc_dl_AddReconfTransChInfoList_05,
@@ -145993,15 +145993,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DL_AddReconfTransChInfoList_TDD128_v9c0ext", HFILL }},
     { &hf_rrc_dummy2_03,
-      { "dummy2", "rrc.dummy2",
+      { "dummy2", "rrc.dummy2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SR_VCC_Info", HFILL }},
     { &hf_rrc_ul_MulticarrierEDCHInfo_TDD128,
-      { "ul-MulticarrierEDCHInfo-TDD128", "rrc.ul_MulticarrierEDCHInfo_TDD128",
+      { "ul-MulticarrierEDCHInfo-TDD128", "rrc.ul_MulticarrierEDCHInfo_TDD128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_CommonInformation_06,
-      { "dl-CommonInformation", "rrc.dl_CommonInformation",
+      { "dl-CommonInformation", "rrc.dl_CommonInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_CommonInformation_r10", HFILL }},
     { &hf_rrc_mu_MIMO_Info_TDD128,
@@ -146017,19 +146017,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DL_AddReconfTransChInfoList_r11", HFILL }},
     { &hf_rrc_ul_DPCH_Info_02,
-      { "ul-DPCH-Info", "rrc.ul_DPCH_Info",
+      { "ul-DPCH-Info", "rrc.ul_DPCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_Info_r11", HFILL }},
     { &hf_rrc_ul_EDCH_Information_05,
-      { "ul-EDCH-Information", "rrc.ul_EDCH_Information",
+      { "ul-EDCH-Information", "rrc.ul_EDCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_EDCH_Information_r11", HFILL }},
     { &hf_rrc_dl_HSPDSCH_Information_07,
-      { "dl-HSPDSCH-Information", "rrc.dl_HSPDSCH_Information",
+      { "dl-HSPDSCH-Information", "rrc.dl_HSPDSCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_HSPDSCH_Information_r11", HFILL }},
     { &hf_rrc_dl_CommonInformation_07,
-      { "dl-CommonInformation", "rrc.dl_CommonInformation",
+      { "dl-CommonInformation", "rrc.dl_CommonInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_CommonInformation_r11", HFILL }},
     { &hf_rrc_dl_InformationPerRL_List_06,
@@ -146037,15 +146037,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DL_InformationPerRL_List_r11", HFILL }},
     { &hf_rrc_commonERGCHInfoFDD,
-      { "commonERGCHInfoFDD", "rrc.commonERGCHInfoFDD",
+      { "commonERGCHInfoFDD", "rrc.commonERGCHInfoFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_r3_05,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_05", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_08,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_08", HFILL }},
     { &hf_rrc_cellUpdateConfirm_CCCH_r3_add_ext,
@@ -146053,27 +146053,27 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_03,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_03,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_v5d0NonCriticalExtenstions_03,
-      { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions",
+      { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v5d0NonCriticalExtenstions_03", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_05,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_05", HFILL }},
     { &hf_rrc_nonCriticalExtensions_24,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_24", HFILL }},
     { &hf_rrc_later_than_r3_04,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_04", HFILL }},
     { &hf_rrc_criticalExtensions_19,
@@ -146081,11 +146081,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_19_vals), 0,
         "T_criticalExtensions_19", HFILL }},
     { &hf_rrc_r4_01,
-      { "r4", "rrc.r4",
+      { "r4", "rrc.r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r4_01", HFILL }},
     { &hf_rrc_v4d0NonCriticalExtensions_01,
-      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions",
+      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4d0NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_cellUpdateConfirm_CCCH_r4_add_ext,
@@ -146093,19 +146093,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_04,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_v5d0NonCriticalExtenstions_04,
-      { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions",
+      { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v5d0NonCriticalExtenstions_04", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_06,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_06", HFILL }},
     { &hf_rrc_nonCriticalExtensions_25,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_25", HFILL }},
     { &hf_rrc_criticalExtensions_20,
@@ -146113,7 +146113,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_20_vals), 0,
         "T_criticalExtensions_20", HFILL }},
     { &hf_rrc_r5_01,
-      { "r5", "rrc.r5",
+      { "r5", "rrc.r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r5_01", HFILL }},
     { &hf_rrc_cellUpdateConfirm_CCCH_r5_add_ext,
@@ -146121,15 +146121,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v5d0NonCriticalExtenstions_05,
-      { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions",
+      { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v5d0NonCriticalExtenstions_05", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_07,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_07", HFILL }},
     { &hf_rrc_nonCriticalExtensions_26,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_26", HFILL }},
     { &hf_rrc_criticalExtensions_21,
@@ -146137,15 +146137,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_21_vals), 0,
         "T_criticalExtensions_21", HFILL }},
     { &hf_rrc_r6_02,
-      { "r6", "rrc.r6",
+      { "r6", "rrc.r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r6_02", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_03,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6b0NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_nonCriticalExtensions_27,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_27", HFILL }},
     { &hf_rrc_criticalExtensions_22,
@@ -146153,7 +146153,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_22_vals), 0,
         "T_criticalExtensions_22", HFILL }},
     { &hf_rrc_r7_02,
-      { "r7", "rrc.r7",
+      { "r7", "rrc.r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r7_02", HFILL }},
     { &hf_rrc_cellUpdateConfirm_r7_add_ext_01,
@@ -146161,15 +146161,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "T_cellUpdateConfirm_r7_add_ext_01", HFILL }},
     { &hf_rrc_v780NonCriticalExtensions_02,
-      { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions",
+      { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v780NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_02,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_nonCriticalExtensions_28,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_28", HFILL }},
     { &hf_rrc_criticalExtensions_23,
@@ -146177,31 +146177,31 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_23_vals), 0,
         "T_criticalExtensions_23", HFILL }},
     { &hf_rrc_r8_02,
-      { "r8", "rrc.r8",
+      { "r8", "rrc.r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r8_02", HFILL }},
     { &hf_rrc_v7d0NonCriticalExtensions_01,
-      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions",
+      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7d0NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_v890NonCriticalExtensions_02,
-      { "v890NonCriticalExtensions", "rrc.v890NonCriticalExtensions",
+      { "v890NonCriticalExtensions", "rrc.v890NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v890NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_v8a0NonCriticalExtensions_01,
-      { "v8a0NonCriticalExtensions", "rrc.v8a0NonCriticalExtensions",
+      { "v8a0NonCriticalExtensions", "rrc.v8a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v8a0NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_v7f0NonCriticalExtensions_03,
-      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions",
+      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7f0NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_v7g0NonCriticalExtensions_05,
-      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions",
+      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7g0NonCriticalExtensions_05", HFILL }},
     { &hf_rrc_nonCriticalExtensions_29,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_29", HFILL }},
     { &hf_rrc_criticalExtensions_24,
@@ -146209,11 +146209,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_24_vals), 0,
         "T_criticalExtensions_24", HFILL }},
     { &hf_rrc_r9_02,
-      { "r9", "rrc.r9",
+      { "r9", "rrc.r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r9_02", HFILL }},
     { &hf_rrc_nonCriticalExtensions_30,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_30", HFILL }},
     { &hf_rrc_criticalExtensions_25,
@@ -146221,15 +146221,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_25_vals), 0,
         "T_criticalExtensions_25", HFILL }},
     { &hf_rrc_r10_02,
-      { "r10", "rrc.r10",
+      { "r10", "rrc.r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r10_02", HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions_03,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vb50NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_nonCriticalExtensions_31,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_31", HFILL }},
     { &hf_rrc_criticalExtensions_26,
@@ -146237,27 +146237,27 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_26_vals), 0,
         "T_criticalExtensions_26", HFILL }},
     { &hf_rrc_r11_02,
-      { "r11", "rrc.r11",
+      { "r11", "rrc.r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r11_02", HFILL }},
     { &hf_rrc_nonCriticalExtensions_32,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_32", HFILL }},
     { &hf_rrc_criticalExtensions_27,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_27", HFILL }},
     { &hf_rrc_r3_06,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_06", HFILL }},
     { &hf_rrc_counterCheck_r3,
-      { "counterCheck-r3", "rrc.counterCheck_r3",
+      { "counterCheck-r3", "rrc.counterCheck_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CounterCheck_r3_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_09,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_09", HFILL }},
     { &hf_rrc_counterCheck_r3_add_ext,
@@ -146265,15 +146265,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_33,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_33", HFILL }},
     { &hf_rrc_later_than_r3_05,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_05", HFILL }},
     { &hf_rrc_criticalExtensions_28,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_28", HFILL }},
     { &hf_rrc_rb_COUNT_C_MSB_InformationList,
@@ -146285,7 +146285,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_10,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_10", HFILL }},
     { &hf_rrc_counterCheckResponse_r3_add_ext,
@@ -146293,19 +146293,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_34,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_34", HFILL }},
     { &hf_rrc_r3_07,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_07", HFILL }},
     { &hf_rrc_downlinkDirectTransfer_r3,
-      { "downlinkDirectTransfer-r3", "rrc.downlinkDirectTransfer_r3",
+      { "downlinkDirectTransfer-r3", "rrc.downlinkDirectTransfer_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DownlinkDirectTransfer_r3_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_11,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_11", HFILL }},
     { &hf_rrc_downlinkDirectTransfer_r3_add_ext,
@@ -146313,15 +146313,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_35,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_35", HFILL }},
     { &hf_rrc_later_than_r3_06,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_06", HFILL }},
     { &hf_rrc_criticalExtensions_29,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_29", HFILL }},
     { &hf_rrc_cn_DomainIdentity,
@@ -146333,7 +146333,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_etws_Information,
-      { "etws-Information", "rrc.etws_Information",
+      { "etws-Information", "rrc.etws_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dummy_09,
@@ -146341,19 +146341,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "ETWS_WarningSecurityInfo", HFILL }},
     { &hf_rrc_nonCriticalExtensions_36,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_36", HFILL }},
     { &hf_rrc_r3_08,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_08", HFILL }},
     { &hf_rrc_handoverToUTRANCommand_r3,
-      { "handoverToUTRANCommand-r3", "rrc.handoverToUTRANCommand_r3",
+      { "handoverToUTRANCommand-r3", "rrc.handoverToUTRANCommand_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverToUTRANCommand_r3_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_37,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_37", HFILL }},
     { &hf_rrc_criticalExtensions_30,
@@ -146361,15 +146361,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_30_vals), 0,
         "T_criticalExtensions_30", HFILL }},
     { &hf_rrc_r4_02,
-      { "r4", "rrc.r4",
+      { "r4", "rrc.r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r4_02", HFILL }},
     { &hf_rrc_handoverToUTRANCommand_r4,
-      { "handoverToUTRANCommand-r4", "rrc.handoverToUTRANCommand_r4",
+      { "handoverToUTRANCommand-r4", "rrc.handoverToUTRANCommand_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverToUTRANCommand_r4_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_38,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_38", HFILL }},
     { &hf_rrc_criticalExtensions_31,
@@ -146377,15 +146377,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_31_vals), 0,
         "T_criticalExtensions_31", HFILL }},
     { &hf_rrc_r5_02,
-      { "r5", "rrc.r5",
+      { "r5", "rrc.r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r5_02", HFILL }},
     { &hf_rrc_handoverToUTRANCommand_r5,
-      { "handoverToUTRANCommand-r5", "rrc.handoverToUTRANCommand_r5",
+      { "handoverToUTRANCommand-r5", "rrc.handoverToUTRANCommand_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverToUTRANCommand_r5_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_39,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_39", HFILL }},
     { &hf_rrc_criticalExtensions_32,
@@ -146393,23 +146393,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_32_vals), 0,
         "T_criticalExtensions_32", HFILL }},
     { &hf_rrc_r6_03,
-      { "r6", "rrc.r6",
+      { "r6", "rrc.r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r6_03", HFILL }},
     { &hf_rrc_handoverToUTRANCommand_r6,
-      { "handoverToUTRANCommand-r6", "rrc.handoverToUTRANCommand_r6",
+      { "handoverToUTRANCommand-r6", "rrc.handoverToUTRANCommand_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverToUTRANCommand_r6_IEs", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_04,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6b0NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_handoverToUTRANCommand_v6b0ext,
-      { "handoverToUTRANCommand-v6b0ext", "rrc.handoverToUTRANCommand_v6b0ext",
+      { "handoverToUTRANCommand-v6b0ext", "rrc.handoverToUTRANCommand_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverToUTRANCommand_v6b0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_40,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_40", HFILL }},
     { &hf_rrc_criticalExtensions_33,
@@ -146417,39 +146417,39 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_33_vals), 0,
         "T_criticalExtensions_33", HFILL }},
     { &hf_rrc_r7_03,
-      { "r7", "rrc.r7",
+      { "r7", "rrc.r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r7_03", HFILL }},
     { &hf_rrc_handoverToUTRANCommand_r7,
-      { "handoverToUTRANCommand-r7", "rrc.handoverToUTRANCommand_r7",
+      { "handoverToUTRANCommand-r7", "rrc.handoverToUTRANCommand_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverToUTRANCommand_r7_IEs", HFILL }},
     { &hf_rrc_v780NonCriticalExtensions_03,
-      { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions",
+      { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v780NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_handoverToUTRANCommand_v780ext,
-      { "handoverToUTRANCommand-v780ext", "rrc.handoverToUTRANCommand_v780ext",
+      { "handoverToUTRANCommand-v780ext", "rrc.handoverToUTRANCommand_v780ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverToUTRANCommand_v780ext_IEs", HFILL }},
     { &hf_rrc_v820NonCriticalExtensions,
-      { "v820NonCriticalExtensions", "rrc.v820NonCriticalExtensions",
+      { "v820NonCriticalExtensions", "rrc.v820NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_handoverToUTRANCommand_v820ext,
-      { "handoverToUTRANCommand-v820ext", "rrc.handoverToUTRANCommand_v820ext",
+      { "handoverToUTRANCommand-v820ext", "rrc.handoverToUTRANCommand_v820ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverToUTRANCommand_v820ext_IEs", HFILL }},
     { &hf_rrc_v7d0NonCriticalExtensions_02,
-      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions",
+      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7d0NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_handoverToUTRANCommand_v7d0ext,
-      { "handoverToUTRANCommand-v7d0ext", "rrc.handoverToUTRANCommand_v7d0ext",
+      { "handoverToUTRANCommand-v7d0ext", "rrc.handoverToUTRANCommand_v7d0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverToUTRANCommand_v7d0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_41,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_41", HFILL }},
     { &hf_rrc_criticalExtensions_34,
@@ -146457,35 +146457,35 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_34_vals), 0,
         "T_criticalExtensions_34", HFILL }},
     { &hf_rrc_r8_03,
-      { "r8", "rrc.r8",
+      { "r8", "rrc.r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r8_03", HFILL }},
     { &hf_rrc_handoverToUTRANCommand_r8,
-      { "handoverToUTRANCommand-r8", "rrc.handoverToUTRANCommand_r8",
+      { "handoverToUTRANCommand-r8", "rrc.handoverToUTRANCommand_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverToUTRANCommand_r8_IEs", HFILL }},
     { &hf_rrc_v7d0NonCriticalExtensions_03,
-      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions",
+      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7d0NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_v890NonCriticalExtensions_03,
-      { "v890NonCriticalExtensions", "rrc.v890NonCriticalExtensions",
+      { "v890NonCriticalExtensions", "rrc.v890NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v890NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_handoverToUTRANCommand_v890ext,
-      { "handoverToUTRANCommand-v890ext", "rrc.handoverToUTRANCommand_v890ext",
+      { "handoverToUTRANCommand-v890ext", "rrc.handoverToUTRANCommand_v890ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverToUTRANCommand_v890ext_IEs", HFILL }},
     { &hf_rrc_v8a0NonCriticalExtensions_02,
-      { "v8a0NonCriticalExtensions", "rrc.v8a0NonCriticalExtensions",
+      { "v8a0NonCriticalExtensions", "rrc.v8a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v8a0NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_handoverToUTRANCommand_v8a0ext,
-      { "handoverToUTRANCommand-v8a0ext", "rrc.handoverToUTRANCommand_v8a0ext",
+      { "handoverToUTRANCommand-v8a0ext", "rrc.handoverToUTRANCommand_v8a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverToUTRANCommand_v8a0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_42,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_42", HFILL }},
     { &hf_rrc_criticalExtensions_35,
@@ -146493,23 +146493,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_35_vals), 0,
         "T_criticalExtensions_35", HFILL }},
     { &hf_rrc_r9_03,
-      { "r9", "rrc.r9",
+      { "r9", "rrc.r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r9_03", HFILL }},
     { &hf_rrc_handoverToUTRANCommand_r9,
-      { "handoverToUTRANCommand-r9", "rrc.handoverToUTRANCommand_r9",
+      { "handoverToUTRANCommand-r9", "rrc.handoverToUTRANCommand_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverToUTRANCommand_r9_IEs", HFILL }},
     { &hf_rrc_v9c0NonCriticalExtensions_02,
-      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions",
+      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v9c0NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_handoverToUTRANCommand_v9c0ext,
-      { "handoverToUTRANCommand-v9c0ext", "rrc.handoverToUTRANCommand_v9c0ext",
+      { "handoverToUTRANCommand-v9c0ext", "rrc.handoverToUTRANCommand_v9c0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverToUTRANCommand_v9c0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_43,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_43", HFILL }},
     { &hf_rrc_criticalExtensions_36,
@@ -146517,7 +146517,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_HandoverToUTRANCommand_LaterCriticalExtensions_vals), 0,
         "HandoverToUTRANCommand_LaterCriticalExtensions", HFILL }},
     { &hf_rrc_new_U_RNTI_01,
-      { "new-U-RNTI", "rrc.new_U_RNTI",
+      { "new-U-RNTI", "rrc.new_U_RNTI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "U_RNTI_Short", HFILL }},
     { &hf_rrc_dummy_10,
@@ -146533,7 +146533,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_complete,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_srb_InformationSetupList,
@@ -146545,7 +146545,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_DPCH_Info_03,
-      { "ul-DPCH-Info", "rrc.ul_DPCH_Info",
+      { "ul-DPCH-Info", "rrc.ul_DPCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo,
@@ -146553,15 +146553,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_fdd_06,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_06", HFILL }},
     { &hf_rrc_dummy2_04,
-      { "dummy2", "rrc.dummy2",
+      { "dummy2", "rrc.dummy2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CPCH_SetInfo", HFILL }},
     { &hf_rrc_preconfiguration,
-      { "preconfiguration", "rrc.preconfiguration",
+      { "preconfiguration", "rrc.preconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_preConfigMode,
@@ -146573,7 +146573,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_defaultConfig,
-      { "defaultConfig", "rrc.defaultConfig",
+      { "defaultConfig", "rrc.defaultConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_defaultConfigMode,
@@ -146585,7 +146585,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rab_Info,
-      { "rab-Info", "rrc.rab_Info",
+      { "rab-Info", "rrc.rab_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RAB_Info_Post", HFILL }},
     { &hf_rrc_modeSpecificInfo_01,
@@ -146593,15 +146593,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_01_vals), 0,
         "T_modeSpecificInfo_01", HFILL }},
     { &hf_rrc_fdd_07,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_07", HFILL }},
     { &hf_rrc_ul_DPCH_Info_04,
-      { "ul-DPCH-Info", "rrc.ul_DPCH_Info",
+      { "ul-DPCH-Info", "rrc.ul_DPCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_InfoPostFDD", HFILL }},
     { &hf_rrc_dl_CommonInformationPost,
-      { "dl-CommonInformationPost", "rrc.dl_CommonInformationPost",
+      { "dl-CommonInformationPost", "rrc.dl_CommonInformationPost_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_InformationPerRL_List_07,
@@ -146609,23 +146609,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DL_InformationPerRL_ListPostFDD", HFILL }},
     { &hf_rrc_frequencyInfo_01,
-      { "frequencyInfo", "rrc.frequencyInfo",
+      { "frequencyInfo", "rrc.frequencyInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FrequencyInfoFDD", HFILL }},
     { &hf_rrc_tdd_01,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_DPCH_Info_05,
-      { "ul-DPCH-Info", "rrc.ul_DPCH_Info",
+      { "ul-DPCH-Info", "rrc.ul_DPCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_InfoPostTDD", HFILL }},
     { &hf_rrc_dl_InformationPerRL,
-      { "dl-InformationPerRL", "rrc.dl_InformationPerRL",
+      { "dl-InformationPerRL", "rrc.dl_InformationPerRL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_InformationPerRL_PostTDD", HFILL }},
     { &hf_rrc_frequencyInfo_02,
-      { "frequencyInfo", "rrc.frequencyInfo",
+      { "frequencyInfo", "rrc.frequencyInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FrequencyInfoTDD", HFILL }},
     { &hf_rrc_primaryCCPCH_TX_Power,
@@ -146637,7 +146637,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_01_vals), 0,
         "T_specificationMode_01", HFILL }},
     { &hf_rrc_complete_01,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_complete_01", HFILL }},
     { &hf_rrc_rab_InformationSetupList_01,
@@ -146645,7 +146645,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RAB_InformationSetupList_r4", HFILL }},
     { &hf_rrc_ul_DPCH_Info_06,
-      { "ul-DPCH-Info", "rrc.ul_DPCH_Info",
+      { "ul-DPCH-Info", "rrc.ul_DPCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_Info_r4", HFILL }},
     { &hf_rrc_modeSpecificInfo_02,
@@ -146653,11 +146653,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_02_vals), 0,
         "T_modeSpecificInfo_02", HFILL }},
     { &hf_rrc_fdd_08,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_08", HFILL }},
     { &hf_rrc_preconfiguration_01,
-      { "preconfiguration", "rrc.preconfiguration",
+      { "preconfiguration", "rrc.preconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_preconfiguration_01", HFILL }},
     { &hf_rrc_preConfigMode_01,
@@ -146665,7 +146665,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_preConfigMode_01_vals), 0,
         "T_preConfigMode_01", HFILL }},
     { &hf_rrc_defaultConfig_01,
-      { "defaultConfig", "rrc.defaultConfig",
+      { "defaultConfig", "rrc.defaultConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_defaultConfig_01", HFILL }},
     { &hf_rrc_defaultConfigIdentity_01,
@@ -146677,7 +146677,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_03_vals), 0,
         "T_modeSpecificInfo_03", HFILL }},
     { &hf_rrc_fdd_09,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_09", HFILL }},
     { &hf_rrc_tdd_02,
@@ -146685,19 +146685,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_01_vals), 0,
         "T_tdd_01", HFILL }},
     { &hf_rrc_tdd384,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd128,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_DPCH_Info_07,
-      { "ul-DPCH-Info", "rrc.ul_DPCH_Info",
+      { "ul-DPCH-Info", "rrc.ul_DPCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_InfoPostTDD_LCR_r4", HFILL }},
     { &hf_rrc_dl_InformationPerRL_01,
-      { "dl-InformationPerRL", "rrc.dl_InformationPerRL",
+      { "dl-InformationPerRL", "rrc.dl_InformationPerRL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_InformationPerRL_PostTDD_LCR_r4", HFILL }},
     { &hf_rrc_specificationMode_02,
@@ -146705,7 +146705,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_02_vals), 0,
         "T_specificationMode_02", HFILL }},
     { &hf_rrc_complete_02,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_complete_02", HFILL }},
     { &hf_rrc_srb_InformationSetupList_01,
@@ -146717,7 +146717,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RAB_InformationSetupList_r5", HFILL }},
     { &hf_rrc_ul_DPCH_Info_08,
-      { "ul-DPCH-Info", "rrc.ul_DPCH_Info",
+      { "ul-DPCH-Info", "rrc.ul_DPCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_Info_r5", HFILL }},
     { &hf_rrc_modeSpecificInfo_04,
@@ -146725,11 +146725,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_04_vals), 0,
         "T_modeSpecificInfo_04", HFILL }},
     { &hf_rrc_fdd_10,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_10", HFILL }},
     { &hf_rrc_preconfiguration_02,
-      { "preconfiguration", "rrc.preconfiguration",
+      { "preconfiguration", "rrc.preconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_preconfiguration_02", HFILL }},
     { &hf_rrc_preConfigMode_02,
@@ -146737,7 +146737,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_preConfigMode_02_vals), 0,
         "T_preConfigMode_02", HFILL }},
     { &hf_rrc_defaultConfig_02,
-      { "defaultConfig", "rrc.defaultConfig",
+      { "defaultConfig", "rrc.defaultConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_defaultConfig_02", HFILL }},
     { &hf_rrc_defaultConfigIdentity_02,
@@ -146749,7 +146749,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_05_vals), 0,
         "T_modeSpecificInfo_05", HFILL }},
     { &hf_rrc_fdd_11,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_11", HFILL }},
     { &hf_rrc_tdd_03,
@@ -146757,11 +146757,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_02_vals), 0,
         "T_tdd_02", HFILL }},
     { &hf_rrc_tdd384_01,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_01", HFILL }},
     { &hf_rrc_tdd128_01,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_01", HFILL }},
     { &hf_rrc_specificationMode_03,
@@ -146769,7 +146769,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_03_vals), 0,
         "T_specificationMode_03", HFILL }},
     { &hf_rrc_complete_03,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_complete_03", HFILL }},
     { &hf_rrc_srb_InformationSetupList_02,
@@ -146781,7 +146781,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RAB_InformationSetupList_r6", HFILL }},
     { &hf_rrc_preconfiguration_03,
-      { "preconfiguration", "rrc.preconfiguration",
+      { "preconfiguration", "rrc.preconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_preconfiguration_03", HFILL }},
     { &hf_rrc_preConfigMode_03,
@@ -146789,7 +146789,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_preConfigMode_03_vals), 0,
         "T_preConfigMode_03", HFILL }},
     { &hf_rrc_defaultConfig_03,
-      { "defaultConfig", "rrc.defaultConfig",
+      { "defaultConfig", "rrc.defaultConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_defaultConfig_03", HFILL }},
     { &hf_rrc_defaultConfigIdentity_03,
@@ -146801,7 +146801,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_06_vals), 0,
         "T_modeSpecificInfo_06", HFILL }},
     { &hf_rrc_fdd_12,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_12", HFILL }},
     { &hf_rrc_tdd_04,
@@ -146809,15 +146809,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_03_vals), 0,
         "T_tdd_03", HFILL }},
     { &hf_rrc_tdd384_02,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_02", HFILL }},
     { &hf_rrc_tdd128_02,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_02", HFILL }},
     { &hf_rrc_ue_hspa_identities,
-      { "ue-hspa-identities", "rrc.ue_hspa_identities",
+      { "ue-hspa-identities", "rrc.ue_hspa_identities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_HSPA_Identities_r6", HFILL }},
     { &hf_rrc_cipheringAlgorithm_01,
@@ -146829,7 +146829,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_04_vals), 0,
         "T_specificationMode_04", HFILL }},
     { &hf_rrc_complete_04,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_complete_04", HFILL }},
     { &hf_rrc_srb_InformationSetupList_03,
@@ -146841,7 +146841,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RAB_InformationSetupList_r7", HFILL }},
     { &hf_rrc_preconfiguration_04,
-      { "preconfiguration", "rrc.preconfiguration",
+      { "preconfiguration", "rrc.preconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_preconfiguration_04", HFILL }},
     { &hf_rrc_preConfigMode_04,
@@ -146849,7 +146849,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_preConfigMode_04_vals), 0,
         "T_preConfigMode_04", HFILL }},
     { &hf_rrc_defaultConfig_04,
-      { "defaultConfig", "rrc.defaultConfig",
+      { "defaultConfig", "rrc.defaultConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_defaultConfig_04", HFILL }},
     { &hf_rrc_modeSpecificInfo_07,
@@ -146857,7 +146857,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_07_vals), 0,
         "T_modeSpecificInfo_07", HFILL }},
     { &hf_rrc_fdd_13,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_13", HFILL }},
     { &hf_rrc_tdd_05,
@@ -146865,15 +146865,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_04_vals), 0,
         "T_tdd_04", HFILL }},
     { &hf_rrc_tdd384_03,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_03", HFILL }},
     { &hf_rrc_tdd128_03,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_03", HFILL }},
     { &hf_rrc_tdd768,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_InformationPerRL_02,
@@ -146885,7 +146885,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_05_vals), 0,
         "T_specificationMode_05", HFILL }},
     { &hf_rrc_complete_05,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_complete_05", HFILL }},
     { &hf_rrc_srb_InformationSetupList_04,
@@ -146897,7 +146897,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RAB_InformationSetupList_r8", HFILL }},
     { &hf_rrc_preconfiguration_05,
-      { "preconfiguration", "rrc.preconfiguration",
+      { "preconfiguration", "rrc.preconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_preconfiguration_05", HFILL }},
     { &hf_rrc_preConfigMode_05,
@@ -146905,11 +146905,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_preConfigMode_05_vals), 0,
         "T_preConfigMode_05", HFILL }},
     { &hf_rrc_defaultConfig_05,
-      { "defaultConfig", "rrc.defaultConfig",
+      { "defaultConfig", "rrc.defaultConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_defaultConfig_05", HFILL }},
     { &hf_rrc_dummy_11,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DLUL_HSPA_Information_r8", HFILL }},
     { &hf_rrc_modeSpecificInfo_08,
@@ -146917,7 +146917,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_08_vals), 0,
         "T_modeSpecificInfo_08", HFILL }},
     { &hf_rrc_fdd_14,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_14", HFILL }},
     { &hf_rrc_tdd_06,
@@ -146925,15 +146925,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_05_vals), 0,
         "T_tdd_05", HFILL }},
     { &hf_rrc_tdd384_04,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_04", HFILL }},
     { &hf_rrc_tdd128_04,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_04", HFILL }},
     { &hf_rrc_tdd768_01,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd768_01", HFILL }},
     { &hf_rrc_rab_InformationSetupList_06,
@@ -146941,7 +146941,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RAB_InformationSetupList_v820ext", HFILL }},
     { &hf_rrc_defaultConfigForCellFACH,
-      { "defaultConfigForCellFACH", "rrc.defaultConfigForCellFACH",
+      { "defaultConfigForCellFACH", "rrc.defaultConfigForCellFACH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_specificationMode_06,
@@ -146949,11 +146949,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_06_vals), 0,
         "T_specificationMode_06", HFILL }},
     { &hf_rrc_complete_06,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_complete_06", HFILL }},
     { &hf_rrc_preconfiguration_06,
-      { "preconfiguration", "rrc.preconfiguration",
+      { "preconfiguration", "rrc.preconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_preconfiguration_06", HFILL }},
     { &hf_rrc_preConfigMode_06,
@@ -146961,11 +146961,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_preConfigMode_06_vals), 0,
         "T_preConfigMode_06", HFILL }},
     { &hf_rrc_defaultConfig_06,
-      { "defaultConfig", "rrc.defaultConfig",
+      { "defaultConfig", "rrc.defaultConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_defaultConfig_06", HFILL }},
     { &hf_rrc_dummy_12,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DLUL_HSPA_Information_r9", HFILL }},
     { &hf_rrc_modeSpecificInfo_09,
@@ -146973,7 +146973,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_09_vals), 0,
         "T_modeSpecificInfo_09", HFILL }},
     { &hf_rrc_fdd_15,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_15", HFILL }},
     { &hf_rrc_tdd_07,
@@ -146981,31 +146981,31 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_06_vals), 0,
         "T_tdd_06", HFILL }},
     { &hf_rrc_tdd384_05,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_05", HFILL }},
     { &hf_rrc_tdd128_05,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_05", HFILL }},
     { &hf_rrc_tdd768_02,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd768_02", HFILL }},
     { &hf_rrc_r10_03,
-      { "r10", "rrc.r10",
+      { "r10", "rrc.r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r10_03", HFILL }},
     { &hf_rrc_handoverToUTRANCommand_r10,
-      { "handoverToUTRANCommand-r10", "rrc.handoverToUTRANCommand_r10",
+      { "handoverToUTRANCommand-r10", "rrc.handoverToUTRANCommand_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverToUTRANCommand_r10_IEs", HFILL }},
     { &hf_rrc_v9c0NonCriticalExtensions_03,
-      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions",
+      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v9c0NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_nonCriticalExtensions_44,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_44", HFILL }},
     { &hf_rrc_criticalExtensions_37,
@@ -147013,11 +147013,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_36_vals), 0,
         "T_criticalExtensions_36", HFILL }},
     { &hf_rrc_r11_03,
-      { "r11", "rrc.r11",
+      { "r11", "rrc.r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r11_03", HFILL }},
     { &hf_rrc_handoverToUTRANCommand_r11,
-      { "handoverToUTRANCommand-r11", "rrc.handoverToUTRANCommand_r11",
+      { "handoverToUTRANCommand-r11", "rrc.handoverToUTRANCommand_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverToUTRANCommand_r11_IEs", HFILL }},
     { &hf_rrc_handoverToUTRANCommand_r11_add_ext,
@@ -147025,11 +147025,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_45,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_45", HFILL }},
     { &hf_rrc_criticalExtensions_38,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_37", HFILL }},
     { &hf_rrc_specificationMode_07,
@@ -147037,11 +147037,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_07_vals), 0,
         "T_specificationMode_07", HFILL }},
     { &hf_rrc_complete_07,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_complete_07", HFILL }},
     { &hf_rrc_preconfiguration_07,
-      { "preconfiguration", "rrc.preconfiguration",
+      { "preconfiguration", "rrc.preconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_preconfiguration_07", HFILL }},
     { &hf_rrc_preConfigMode_07,
@@ -147049,11 +147049,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_preConfigMode_07_vals), 0,
         "T_preConfigMode_07", HFILL }},
     { &hf_rrc_defaultConfig_07,
-      { "defaultConfig", "rrc.defaultConfig",
+      { "defaultConfig", "rrc.defaultConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_defaultConfig_07", HFILL }},
     { &hf_rrc_dummy_13,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DLUL_HSPA_Information_r10", HFILL }},
     { &hf_rrc_modeSpecificInfo_10,
@@ -147061,7 +147061,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_10_vals), 0,
         "T_modeSpecificInfo_10", HFILL }},
     { &hf_rrc_fdd_16,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_16", HFILL }},
     { &hf_rrc_tdd_08,
@@ -147069,15 +147069,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_07_vals), 0,
         "T_tdd_07", HFILL }},
     { &hf_rrc_tdd384_06,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_06", HFILL }},
     { &hf_rrc_tdd128_06,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_06", HFILL }},
     { &hf_rrc_tdd768_03,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd768_03", HFILL }},
     { &hf_rrc_specificationMode_08,
@@ -147085,11 +147085,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_08_vals), 0,
         "T_specificationMode_08", HFILL }},
     { &hf_rrc_complete_08,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_complete_08", HFILL }},
     { &hf_rrc_preconfiguration_08,
-      { "preconfiguration", "rrc.preconfiguration",
+      { "preconfiguration", "rrc.preconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_preconfiguration_08", HFILL }},
     { &hf_rrc_preConfigMode_08,
@@ -147097,7 +147097,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_preConfigMode_08_vals), 0,
         "T_preConfigMode_08", HFILL }},
     { &hf_rrc_defaultConfig_08,
-      { "defaultConfig", "rrc.defaultConfig",
+      { "defaultConfig", "rrc.defaultConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_defaultConfig_08", HFILL }},
     { &hf_rrc_modeSpecificInfo_11,
@@ -147105,7 +147105,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_11_vals), 0,
         "T_modeSpecificInfo_11", HFILL }},
     { &hf_rrc_fdd_17,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_17", HFILL }},
     { &hf_rrc_tdd_09,
@@ -147113,15 +147113,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_08_vals), 0,
         "T_tdd_08", HFILL }},
     { &hf_rrc_tdd384_07,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_07", HFILL }},
     { &hf_rrc_tdd128_07,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_07", HFILL }},
     { &hf_rrc_tdd768_04,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd768_04", HFILL }},
     { &hf_rrc_count_C_ActivationTime,
@@ -147129,7 +147129,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ActivationTime", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_12,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_12", HFILL }},
     { &hf_rrc_handoverToUTRANComplete_r3_add_ext,
@@ -147137,23 +147137,23 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions_01,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va40NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_handoverToUTRANComplete_va40ext,
-      { "handoverToUTRANComplete-va40ext", "rrc.handoverToUTRANComplete_va40ext",
+      { "handoverToUTRANComplete-va40ext", "rrc.handoverToUTRANComplete_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions_04,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vb50NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_handoverToUTRANComplete_vb50ext,
-      { "handoverToUTRANComplete-vb50ext", "rrc.handoverToUTRANComplete_vb50ext",
+      { "handoverToUTRANComplete-vb50ext", "rrc.handoverToUTRANComplete_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverToUTRANComplete_vb50ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_46,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_46", HFILL }},
     { &hf_rrc_loggedMeasAvailable_02,
@@ -147165,19 +147165,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_connEstFailInfoAvailable_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_intraDomainNasNodeSelector,
-      { "intraDomainNasNodeSelector", "rrc.intraDomainNasNodeSelector",
+      { "intraDomainNasNodeSelector", "rrc.intraDomainNasNodeSelector_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v3a0NonCriticalExtensions_02,
-      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions",
+      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v3a0NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_initialDirectTransfer_v3a0ext,
-      { "initialDirectTransfer-v3a0ext", "rrc.initialDirectTransfer_v3a0ext",
+      { "initialDirectTransfer-v3a0ext", "rrc.initialDirectTransfer_v3a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_13,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_13", HFILL }},
     { &hf_rrc_initialDirectTransfer_r3_add_ext,
@@ -147185,47 +147185,47 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_05,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_05", HFILL }},
     { &hf_rrc_initialDirectTransfer_v590ext,
-      { "initialDirectTransfer-v590ext", "rrc.initialDirectTransfer_v590ext",
+      { "initialDirectTransfer-v590ext", "rrc.initialDirectTransfer_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_08,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_08", HFILL }},
     { &hf_rrc_initialDirectTransfer_v690ext,
-      { "initialDirectTransfer-v690ext", "rrc.initialDirectTransfer_v690ext",
+      { "initialDirectTransfer-v690ext", "rrc.initialDirectTransfer_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InitialDirectTransfer_v690ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_01,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_initialDirectTransfer_v770ext,
-      { "initialDirectTransfer-v770ext", "rrc.initialDirectTransfer_v770ext",
+      { "initialDirectTransfer-v770ext", "rrc.initialDirectTransfer_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InitialDirectTransfer_v770ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_03,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_initialDirectTransfer_v860ext,
-      { "initialDirectTransfer-v860ext", "rrc.initialDirectTransfer_v860ext",
+      { "initialDirectTransfer-v860ext", "rrc.initialDirectTransfer_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InitialDirectTransfer_v860ext_IEs", HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions_05,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vb50NonCriticalExtensions_05", HFILL }},
     { &hf_rrc_initialDirectTransfer_vb50ext,
-      { "initialDirectTransfer-vb50ext", "rrc.initialDirectTransfer_vb50ext",
+      { "initialDirectTransfer-vb50ext", "rrc.initialDirectTransfer_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InitialDirectTransfer_vb50ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_47,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_47", HFILL }},
     { &hf_rrc_start_Value,
@@ -147233,11 +147233,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_plmn_Identity,
-      { "plmn-Identity", "rrc.plmn_Identity",
+      { "plmn-Identity", "rrc.plmn_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mbms_JoinedInformation,
-      { "mbms-JoinedInformation", "rrc.mbms_JoinedInformation",
+      { "mbms-JoinedInformation", "rrc.mbms_JoinedInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMS_JoinedInformation_r6", HFILL }},
     { &hf_rrc_csCallType_02,
@@ -147249,23 +147249,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_supportOfCSG_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_initialDirectTransfer_v7g0ext,
-      { "initialDirectTransfer-v7g0ext", "rrc.initialDirectTransfer_v7g0ext",
+      { "initialDirectTransfer-v7g0ext", "rrc.initialDirectTransfer_v7g0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InitialDirectTransfer_v7g0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_48,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_48", HFILL }},
     { &hf_rrc_r3_09,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_09", HFILL }},
     { &hf_rrc_handoverFromUTRANCommand_GSM_r3,
-      { "handoverFromUTRANCommand-GSM-r3", "rrc.handoverFromUTRANCommand_GSM_r3",
+      { "handoverFromUTRANCommand-GSM-r3", "rrc.handoverFromUTRANCommand_GSM_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverFromUTRANCommand_GSM_r3_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_14,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_14", HFILL }},
     { &hf_rrc_handoverFromUTRANCommand_GSM_r3_add_ext,
@@ -147273,27 +147273,27 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_09,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_09", HFILL }},
     { &hf_rrc_handoverFromUTRANCommand_GSM_v690ext,
-      { "handoverFromUTRANCommand-GSM-v690ext", "rrc.handoverFromUTRANCommand_GSM_v690ext",
+      { "handoverFromUTRANCommand-GSM-v690ext", "rrc.handoverFromUTRANCommand_GSM_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverFromUTRANCommand_GSM_v690ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_04,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_handoverFromUTRANCommand_GSM_v860ext,
-      { "handoverFromUTRANCommand-GSM-v860ext", "rrc.handoverFromUTRANCommand_GSM_v860ext",
+      { "handoverFromUTRANCommand-GSM-v860ext", "rrc.handoverFromUTRANCommand_GSM_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverFromUTRANCommand_GSM_v860ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_49,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_49", HFILL }},
     { &hf_rrc_later_than_r3_07,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_07", HFILL }},
     { &hf_rrc_criticalExtensions_39,
@@ -147301,11 +147301,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_38_vals), 0,
         "T_criticalExtensions_38", HFILL }},
     { &hf_rrc_r6_04,
-      { "r6", "rrc.r6",
+      { "r6", "rrc.r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r6_04", HFILL }},
     { &hf_rrc_handoverFromUTRANCommand_GSM_r6,
-      { "handoverFromUTRANCommand-GSM-r6", "rrc.handoverFromUTRANCommand_GSM_r6",
+      { "handoverFromUTRANCommand-GSM-r6", "rrc.handoverFromUTRANCommand_GSM_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverFromUTRANCommand_GSM_r6_IEs", HFILL }},
     { &hf_rrc_handoverFromUTRANCommand_GSM_r6_add_ext,
@@ -147313,19 +147313,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_05,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_05", HFILL }},
     { &hf_rrc_nonCriticalExtensions_50,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_50", HFILL }},
     { &hf_rrc_criticalExtensions_40,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_39", HFILL }},
     { &hf_rrc_toHandoverRAB_Info,
-      { "toHandoverRAB-Info", "rrc.toHandoverRAB_Info",
+      { "toHandoverRAB-Info", "rrc.toHandoverRAB_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RAB_Info", HFILL }},
     { &hf_rrc_frequency_band,
@@ -147337,11 +147337,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_gsm_message_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_single_GSM_Message_r3,
-      { "single-GSM-Message", "rrc.single_GSM_Message",
+      { "single-GSM-Message", "rrc.single_GSM_Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_single_GSM_Message_r3", HFILL }},
     { &hf_rrc_gsm_MessageList_r3,
-      { "gsm-MessageList", "rrc.gsm_MessageList",
+      { "gsm-MessageList", "rrc.gsm_MessageList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_gsm_MessageList_r3", HFILL }},
     { &hf_rrc_gsm_Messages,
@@ -147357,11 +147357,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_gsm_message_01_vals), 0,
         "T_gsm_message_01", HFILL }},
     { &hf_rrc_single_GSM_Message_r6,
-      { "single-GSM-Message", "rrc.single_GSM_Message",
+      { "single-GSM-Message", "rrc.single_GSM_Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_single_GSM_Message_r6", HFILL }},
     { &hf_rrc_gsm_MessageList_r6,
-      { "gsm-MessageList", "rrc.gsm_MessageList",
+      { "gsm-MessageList", "rrc.gsm_MessageList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_gsm_MessageList_r6", HFILL }},
     { &hf_rrc_geran_SystemInfoType_01,
@@ -147373,7 +147373,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_geran_SystemInfoType_02_vals), 0,
         "T_geran_SystemInfoType_02", HFILL }},
     { &hf_rrc_sr_vcc_SecurityRABInfo,
-      { "sr-vcc-SecurityRABInfo", "rrc.sr_vcc_SecurityRABInfo",
+      { "sr-vcc-SecurityRABInfo", "rrc.sr_vcc_SecurityRABInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SR_VCC_SecurityRABInfo_v860ext", HFILL }},
     { &hf_rrc_handoverFromUTRANCommand_GERANIu_01,
@@ -147381,23 +147381,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_handoverFromUTRANCommand_GERANIu_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_r5_03,
-      { "r5", "rrc.r5",
+      { "r5", "rrc.r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r5_03", HFILL }},
     { &hf_rrc_handoverFromUTRANCommand_GERANIu_r5,
-      { "handoverFromUTRANCommand-GERANIu-r5", "rrc.handoverFromUTRANCommand_GERANIu_r5",
+      { "handoverFromUTRANCommand-GERANIu-r5", "rrc.handoverFromUTRANCommand_GERANIu_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverFromUTRANCommand_GERANIu_r5_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_51,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_51", HFILL }},
     { &hf_rrc_later_than_r5,
-      { "later-than-r5", "rrc.later_than_r5",
+      { "later-than-r5", "rrc.later_than_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_criticalExtensions_41,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_40", HFILL }},
     { &hf_rrc_frequency_Band,
@@ -147409,11 +147409,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_geranIu_Message_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_single_GERANIu_Message,
-      { "single-GERANIu-Message", "rrc.single_GERANIu_Message",
+      { "single-GERANIu-Message", "rrc.single_GERANIu_Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_geranIu_MessageList,
-      { "geranIu-MessageList", "rrc.geranIu_MessageList",
+      { "geranIu-MessageList", "rrc.geranIu_MessageList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_geranIu_Messages,
@@ -147421,15 +147421,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GERANIu_MessageList", HFILL }},
     { &hf_rrc_r3_10,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_10", HFILL }},
     { &hf_rrc_handoverFromUTRANCommand_CDMA2000_r3,
-      { "handoverFromUTRANCommand-CDMA2000-r3", "rrc.handoverFromUTRANCommand_CDMA2000_r3",
+      { "handoverFromUTRANCommand-CDMA2000-r3", "rrc.handoverFromUTRANCommand_CDMA2000_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverFromUTRANCommand_CDMA2000_r3_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_15,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_15", HFILL }},
     { &hf_rrc_handoverFromUTRANCommand_CDMA2000_r3_add_ext,
@@ -147437,15 +147437,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_52,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_52", HFILL }},
     { &hf_rrc_later_than_r3_08,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_08", HFILL }},
     { &hf_rrc_criticalExtensions_42,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_41", HFILL }},
     { &hf_rrc_cdma2000_MessageList,
@@ -147457,11 +147457,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_42_vals), 0,
         "T_criticalExtensions_42", HFILL }},
     { &hf_rrc_r8_04,
-      { "r8", "rrc.r8",
+      { "r8", "rrc.r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r8_04", HFILL }},
     { &hf_rrc_handoverFromUTRANCommand_EUTRA_r8,
-      { "handoverFromUTRANCommand-EUTRA-r8", "rrc.handoverFromUTRANCommand_EUTRA_r8",
+      { "handoverFromUTRANCommand-EUTRA-r8", "rrc.handoverFromUTRANCommand_EUTRA_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverFromUTRANCommand_EUTRA_r8_IEs", HFILL }},
     { &hf_rrc_handoverFromUTRANCommand_EUTRA_r8_add_ext,
@@ -147469,7 +147469,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_53,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_53", HFILL }},
     { &hf_rrc_criticalExtensions_44,
@@ -147477,11 +147477,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_43_vals), 0,
         "T_criticalExtensions_43", HFILL }},
     { &hf_rrc_r11_04,
-      { "r11", "rrc.r11",
+      { "r11", "rrc.r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r11_04", HFILL }},
     { &hf_rrc_handoverFromUTRANCommand_EUTRA_r11,
-      { "handoverFromUTRANCommand-EUTRA-r11", "rrc.handoverFromUTRANCommand_EUTRA_r11",
+      { "handoverFromUTRANCommand-EUTRA-r11", "rrc.handoverFromUTRANCommand_EUTRA_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverFromUTRANCommand_EUTRA_r11_IEs", HFILL }},
     { &hf_rrc_handoverFromUTRANCommand_EUTRA_r11_add_ext,
@@ -147489,11 +147489,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_54,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_54", HFILL }},
     { &hf_rrc_criticalExtensions_45,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_44", HFILL }},
     { &hf_rrc_toHandoverRAB_Info_02,
@@ -147505,7 +147505,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rsr_vcc_Info,
-      { "rsr-vcc-Info", "rrc.rsr_vcc_Info",
+      { "rsr-vcc-Info", "rrc.rsr_vcc_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_eutra_Message_01,
@@ -147521,7 +147521,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_interRATMessage_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_gsm,
-      { "gsm", "rrc.gsm",
+      { "gsm", "rrc.gsm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_gsm_MessageList_gsm,
@@ -147529,11 +147529,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cdma2000,
-      { "cdma2000", "rrc.cdma2000",
+      { "cdma2000", "rrc.cdma2000_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_16,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_16", HFILL }},
     { &hf_rrc_handoverFromUTRANFailure_r3_add_ext,
@@ -147541,23 +147541,23 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_06,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_06", HFILL }},
     { &hf_rrc_handoverFromUTRANFailure_v590ext,
-      { "handoverFromUTRANFailure-v590ext", "rrc.handoverFromUTRANFailure_v590ext",
+      { "handoverFromUTRANFailure-v590ext", "rrc.handoverFromUTRANFailure_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverFromUtranFailure_v590ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_06,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_06", HFILL }},
     { &hf_rrc_handoverFromUTRANFailure_v860ext,
-      { "handoverFromUTRANFailure-v860ext", "rrc.handoverFromUTRANFailure_v860ext",
+      { "handoverFromUTRANFailure-v860ext", "rrc.handoverFromUTRANFailure_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HandoverFromUtranFailure_v860ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_55,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_55", HFILL }},
     { &hf_rrc_geranIu_MessageList_01,
@@ -147573,7 +147573,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_predefinedConfigStatusList_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_absent,
-      { "absent", "rrc.absent",
+      { "absent", "rrc.absent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_present,
@@ -147585,7 +147585,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_uE_SecurityInformation_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_present_01,
-      { "present", "rrc.present",
+      { "present", "rrc.present_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_SecurityInformation", HFILL }},
     { &hf_rrc_ue_CapabilityContainer,
@@ -147601,27 +147601,27 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_v390NonCriticalExtensions_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_present_03,
-      { "present", "rrc.present",
+      { "present", "rrc.present_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_present_01", HFILL }},
     { &hf_rrc_interRATHandoverInfo_v390ext,
-      { "interRATHandoverInfo-v390ext", "rrc.interRATHandoverInfo_v390ext",
+      { "interRATHandoverInfo-v390ext", "rrc.interRATHandoverInfo_v390ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfo_v390ext_IEs", HFILL }},
     { &hf_rrc_v3a0NonCriticalExtensions_03,
-      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions",
+      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v3a0NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_interRATHandoverInfo_v3a0ext,
-      { "interRATHandoverInfo-v3a0ext", "rrc.interRATHandoverInfo_v3a0ext",
+      { "interRATHandoverInfo-v3a0ext", "rrc.interRATHandoverInfo_v3a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfo_v3a0ext_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_17,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_17", HFILL }},
     { &hf_rrc_interRATHandoverInfo_v3d0ext,
-      { "interRATHandoverInfo-v3d0ext", "rrc.interRATHandoverInfo_v3d0ext",
+      { "interRATHandoverInfo-v3d0ext", "rrc.interRATHandoverInfo_v3d0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfo_v3d0ext_IEs", HFILL }},
     { &hf_rrc_interRATHandoverInfo_r3_add_ext,
@@ -147629,59 +147629,59 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v3g0NonCriticalExtensions,
-      { "v3g0NonCriticalExtensions", "rrc.v3g0NonCriticalExtensions",
+      { "v3g0NonCriticalExtensions", "rrc.v3g0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interRATHandoverInfo_v3g0ext,
-      { "interRATHandoverInfo-v3g0ext", "rrc.interRATHandoverInfo_v3g0ext",
+      { "interRATHandoverInfo-v3g0ext", "rrc.interRATHandoverInfo_v3g0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfo_v3g0ext_IEs", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_04,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_interRATHandoverInfo_v4b0ext,
-      { "interRATHandoverInfo-v4b0ext", "rrc.interRATHandoverInfo_v4b0ext",
+      { "interRATHandoverInfo-v4b0ext", "rrc.interRATHandoverInfo_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfo_v4b0ext_IEs", HFILL }},
     { &hf_rrc_v4d0NonCriticalExtensions_02,
-      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions",
+      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4d0NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_interRATHandoverInfo_v4d0ext,
-      { "interRATHandoverInfo-v4d0ext", "rrc.interRATHandoverInfo_v4d0ext",
+      { "interRATHandoverInfo-v4d0ext", "rrc.interRATHandoverInfo_v4d0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfo_v4d0ext_IEs", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_07,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_07", HFILL }},
     { &hf_rrc_interRATHandoverInfo_v590ext,
-      { "interRATHandoverInfo-v590ext", "rrc.interRATHandoverInfo_v590ext",
+      { "interRATHandoverInfo-v590ext", "rrc.interRATHandoverInfo_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfo_v590ext_IEs", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_10,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_10", HFILL }},
     { &hf_rrc_interRATHandoverInfo_v690ext,
-      { "interRATHandoverInfo-v690ext", "rrc.interRATHandoverInfo_v690ext",
+      { "interRATHandoverInfo-v690ext", "rrc.interRATHandoverInfo_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfo_v690ext_IEs", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_05,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfo_NonCriticalExtension_v6b0_IEs", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_v380ext,
-      { "ue-RadioAccessCapability-v380ext", "rrc.ue_RadioAccessCapability_v380ext",
+      { "ue-RadioAccessCapability-v380ext", "rrc.ue_RadioAccessCapability_v380ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_PhysChCapabilityFDD_v380ext,
-      { "dl-PhysChCapabilityFDD-v380ext", "rrc.dl_PhysChCapabilityFDD_v380ext",
+      { "dl-PhysChCapabilityFDD-v380ext", "rrc.dl_PhysChCapabilityFDD_v380ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_v3a0ext,
-      { "ue-RadioAccessCapability-v3a0ext", "rrc.ue_RadioAccessCapability_v3a0ext",
+      { "ue-RadioAccessCapability-v3a0ext", "rrc.ue_RadioAccessCapability_v3a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_uESpecificBehaviourInformation1interRAT,
@@ -147689,39 +147689,39 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_v3g0ext,
-      { "ue-RadioAccessCapability-v3g0ext", "rrc.ue_RadioAccessCapability_v3g0ext",
+      { "ue-RadioAccessCapability-v3g0ext", "rrc.ue_RadioAccessCapability_v3g0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interRATHandoverInfo_v690ext1,
-      { "interRATHandoverInfo-v690ext1", "rrc.interRATHandoverInfo_v690ext1",
+      { "interRATHandoverInfo-v690ext1", "rrc.interRATHandoverInfo_v690ext1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfo_v690ext1_IEs", HFILL }},
     { &hf_rrc_v7e0NonCriticalExtensions,
-      { "v7e0NonCriticalExtensions", "rrc.v7e0NonCriticalExtensions",
+      { "v7e0NonCriticalExtensions", "rrc.v7e0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interRATHandoverInfo_v7e0ext,
-      { "interRATHandoverInfo-v7e0ext", "rrc.interRATHandoverInfo_v7e0ext",
+      { "interRATHandoverInfo-v7e0ext", "rrc.interRATHandoverInfo_v7e0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfo_v7e0ext_IEs", HFILL }},
     { &hf_rrc_v7f0NonCriticalExtensions_04,
-      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions",
+      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7f0NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_interRATHandoverInfo_v7f0ext,
-      { "interRATHandoverInfo-v7f0ext", "rrc.interRATHandoverInfo_v7f0ext",
+      { "interRATHandoverInfo-v7f0ext", "rrc.interRATHandoverInfo_v7f0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfo_v7f0ext_IEs", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions_02,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va40NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_interRATHandoverInfo_va40ext,
-      { "interRATHandoverInfo-va40ext", "rrc.interRATHandoverInfo_va40ext",
+      { "interRATHandoverInfo-va40ext", "rrc.interRATHandoverInfo_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfoBand_va40ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_56,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_56", HFILL }},
     { &hf_rrc_accessStratumReleaseIndicator,
@@ -147733,123 +147733,123 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_RadioFrequencyBandTDDList_vals), 0,
         "RadioFrequencyBandTDDList", HFILL }},
     { &hf_rrc_predefinedConfigStatusListComp,
-      { "predefinedConfigStatusListComp", "rrc.predefinedConfigStatusListComp",
+      { "predefinedConfigStatusListComp", "rrc.predefinedConfigStatusListComp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_RadioAccessCapabilityComp,
-      { "ue-RadioAccessCapabilityComp", "rrc.ue_RadioAccessCapabilityComp",
+      { "ue-RadioAccessCapabilityComp", "rrc.ue_RadioAccessCapabilityComp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_v650ext,
-      { "ue-RadioAccessCapability-v650ext", "rrc.ue_RadioAccessCapability_v650ext",
+      { "ue-RadioAccessCapability-v650ext", "rrc.ue_RadioAccessCapability_v650ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_SecurityInformation2,
-      { "ue-SecurityInformation2", "rrc.ue_SecurityInformation2",
+      { "ue-SecurityInformation2", "rrc.ue_SecurityInformation2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_RadioAccessCapabilityComp_01,
-      { "ue-RadioAccessCapabilityComp", "rrc.ue_RadioAccessCapabilityComp",
+      { "ue-RadioAccessCapabilityComp", "rrc.ue_RadioAccessCapabilityComp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapabilityComp_ext", HFILL }},
     { &hf_rrc_ue_RadioAccessCapabilityComp2,
-      { "ue-RadioAccessCapabilityComp2", "rrc.ue_RadioAccessCapabilityComp2",
+      { "ue-RadioAccessCapabilityComp2", "rrc.ue_RadioAccessCapabilityComp2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interRATHandoverInfo_v6b0ext,
-      { "interRATHandoverInfo-v6b0ext", "rrc.interRATHandoverInfo_v6b0ext",
+      { "interRATHandoverInfo-v6b0ext", "rrc.interRATHandoverInfo_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfo_v6b0ext_IEs", HFILL }},
     { &hf_rrc_v6e0NonCriticalExtensions,
-      { "v6e0NonCriticalExtensions", "rrc.v6e0NonCriticalExtensions",
+      { "v6e0NonCriticalExtensions", "rrc.v6e0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interRATHandoverInfo_v6e0ext,
-      { "interRATHandoverInfo-v6e0ext", "rrc.interRATHandoverInfo_v6e0ext",
+      { "interRATHandoverInfo-v6e0ext", "rrc.interRATHandoverInfo_v6e0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfo_v6e0ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_02,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_interRATHandoverInfo_v770ext,
-      { "interRATHandoverInfo-v770ext", "rrc.interRATHandoverInfo_v770ext",
+      { "interRATHandoverInfo-v770ext", "rrc.interRATHandoverInfo_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfo_v770ext_IEs", HFILL }},
     { &hf_rrc_v790nonCriticalExtensions,
-      { "v790nonCriticalExtensions", "rrc.v790nonCriticalExtensions",
+      { "v790nonCriticalExtensions", "rrc.v790nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interRATHandoverInfo_v790ext,
-      { "interRATHandoverInfo-v790ext", "rrc.interRATHandoverInfo_v790ext",
+      { "interRATHandoverInfo-v790ext", "rrc.interRATHandoverInfo_v790ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfo_v790ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_07,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_07", HFILL }},
     { &hf_rrc_interRATHandoverInfo_v860ext,
-      { "interRATHandoverInfo-v860ext", "rrc.interRATHandoverInfo_v860ext",
+      { "interRATHandoverInfo-v860ext", "rrc.interRATHandoverInfo_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfo_v860ext_IEs", HFILL }},
     { &hf_rrc_v880NonCriticalExtensions,
-      { "v880NonCriticalExtensions", "rrc.v880NonCriticalExtensions",
+      { "v880NonCriticalExtensions", "rrc.v880NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interRATHandoverInfo_v880ext,
-      { "interRATHandoverInfo-v880ext", "rrc.interRATHandoverInfo_v880ext",
+      { "interRATHandoverInfo-v880ext", "rrc.interRATHandoverInfo_v880ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfo_v880ext_IEs", HFILL }},
     { &hf_rrc_v920NonCriticalExtensions,
-      { "v920NonCriticalExtensions", "rrc.v920NonCriticalExtensions",
+      { "v920NonCriticalExtensions", "rrc.v920NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interRATHandoverInfo_v920ext,
-      { "interRATHandoverInfo-v920ext", "rrc.interRATHandoverInfo_v920ext",
+      { "interRATHandoverInfo-v920ext", "rrc.interRATHandoverInfo_v920ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfo_v920ext_IEs", HFILL }},
     { &hf_rrc_v8b0NonCriticalExtensions,
-      { "v8b0NonCriticalExtensions", "rrc.v8b0NonCriticalExtensions",
+      { "v8b0NonCriticalExtensions", "rrc.v8b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interRATHandoverInfo_v8b0ext,
-      { "interRATHandoverInfo-v8b0ext", "rrc.interRATHandoverInfo_v8b0ext",
+      { "interRATHandoverInfo-v8b0ext", "rrc.interRATHandoverInfo_v8b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfo_v8b0ext_IEs", HFILL }},
     { &hf_rrc_v950NonCriticalExtensions_02,
-      { "v950NonCriticalExtensions", "rrc.v950NonCriticalExtensions",
+      { "v950NonCriticalExtensions", "rrc.v950NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v950NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_interRATHandoverInfo_v950ext,
-      { "interRATHandoverInfo-v950ext", "rrc.interRATHandoverInfo_v950ext",
+      { "interRATHandoverInfo-v950ext", "rrc.interRATHandoverInfo_v950ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfo_v950ext_IEs", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions_03,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va40NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_interRATHandoverInfo_va40ext_01,
-      { "interRATHandoverInfo-va40ext", "rrc.interRATHandoverInfo_va40ext",
+      { "interRATHandoverInfo-va40ext", "rrc.interRATHandoverInfo_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfo_va40ext_IEs", HFILL }},
     { &hf_rrc_va80NonCriticalExtensions,
-      { "va80NonCriticalExtensions", "rrc.va80NonCriticalExtensions",
+      { "va80NonCriticalExtensions", "rrc.va80NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interRATHandoverInfo_va80ext,
-      { "interRATHandoverInfo-va80ext", "rrc.interRATHandoverInfo_va80ext",
+      { "interRATHandoverInfo-va80ext", "rrc.interRATHandoverInfo_va80ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfo_va80ext_IEs", HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions_06,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vb50NonCriticalExtensions_06", HFILL }},
     { &hf_rrc_interRATHandoverInfo_vb50ext,
-      { "interRATHandoverInfo-vb50ext", "rrc.interRATHandoverInfo_vb50ext",
+      { "interRATHandoverInfo-vb50ext", "rrc.interRATHandoverInfo_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfo_vb50ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_57,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_57", HFILL }},
     { &hf_rrc_supportForSIB11bis,
@@ -147861,15 +147861,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_supportForFDPCH_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_ue_RadioAccessCapabilityInfo,
-      { "ue-RadioAccessCapabilityInfo", "rrc.ue_RadioAccessCapabilityInfo",
+      { "ue-RadioAccessCapabilityInfo", "rrc.ue_RadioAccessCapabilityInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapabilityInfo_v770ext", HFILL }},
     { &hf_rrc_ue_RadioAccessCapabilityComp_02,
-      { "ue-RadioAccessCapabilityComp", "rrc.ue_RadioAccessCapabilityComp",
+      { "ue-RadioAccessCapabilityComp", "rrc.ue_RadioAccessCapabilityComp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapabilityComp_v770ext", HFILL }},
     { &hf_rrc_ue_RadioAccessCapabilityComp2_01,
-      { "ue-RadioAccessCapabilityComp2", "rrc.ue_RadioAccessCapabilityComp2",
+      { "ue-RadioAccessCapabilityComp2", "rrc.ue_RadioAccessCapabilityComp2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapabilityComp2_v770ext", HFILL }},
     { &hf_rrc_supportForEDPCCHPowerBoosting,
@@ -147877,59 +147877,59 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_supportForEDPCCHPowerBoosting_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_ue_RadioAccessCapability,
-      { "ue-RadioAccessCapability", "rrc.ue_RadioAccessCapability",
+      { "ue-RadioAccessCapability", "rrc.ue_RadioAccessCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_v7e0ext", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_01,
-      { "ue-RadioAccessCapability", "rrc.ue_RadioAccessCapability",
+      { "ue-RadioAccessCapability", "rrc.ue_RadioAccessCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_v7f0ext", HFILL }},
     { &hf_rrc_ue_RadioAccessCapabilityComp2_02,
-      { "ue-RadioAccessCapabilityComp2", "rrc.ue_RadioAccessCapabilityComp2",
+      { "ue-RadioAccessCapabilityComp2", "rrc.ue_RadioAccessCapabilityComp2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapabilityComp2_v7f0ext", HFILL }},
     { &hf_rrc_ue_RadioAccessCapabilityInfo_01,
-      { "ue-RadioAccessCapabilityInfo", "rrc.ue_RadioAccessCapabilityInfo",
+      { "ue-RadioAccessCapabilityInfo", "rrc.ue_RadioAccessCapabilityInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_v860ext", HFILL }},
     { &hf_rrc_ue_RadioAccessCapabilityComp2_03,
-      { "ue-RadioAccessCapabilityComp2", "rrc.ue_RadioAccessCapabilityComp2",
+      { "ue-RadioAccessCapabilityComp2", "rrc.ue_RadioAccessCapabilityComp2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapabilityComp2_v860ext", HFILL }},
     { &hf_rrc_ue_RadioAccessCapabilityInfo_02,
-      { "ue-RadioAccessCapabilityInfo", "rrc.ue_RadioAccessCapabilityInfo",
+      { "ue-RadioAccessCapabilityInfo", "rrc.ue_RadioAccessCapabilityInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_v880ext", HFILL }},
     { &hf_rrc_ue_RadioAccessCapabilityInfo_TDD128,
-      { "ue-RadioAccessCapabilityInfo-TDD128", "rrc.ue_RadioAccessCapabilityInfo_TDD128",
+      { "ue-RadioAccessCapabilityInfo-TDD128", "rrc.ue_RadioAccessCapabilityInfo_TDD128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapabilityComp_TDD128", HFILL }},
     { &hf_rrc_ue_RadioAccessCapabilityInfo_03,
-      { "ue-RadioAccessCapabilityInfo", "rrc.ue_RadioAccessCapabilityInfo",
+      { "ue-RadioAccessCapabilityInfo", "rrc.ue_RadioAccessCapabilityInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_v920ext", HFILL }},
     { &hf_rrc_ue_RadioAccessCapabilityComp2_04,
-      { "ue-RadioAccessCapabilityComp2", "rrc.ue_RadioAccessCapabilityComp2",
+      { "ue-RadioAccessCapabilityComp2", "rrc.ue_RadioAccessCapabilityComp2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapabilityComp2_v920ext", HFILL }},
     { &hf_rrc_ue_RadioAccessCapabilityInfo_04,
-      { "ue-RadioAccessCapabilityInfo", "rrc.ue_RadioAccessCapabilityInfo",
+      { "ue-RadioAccessCapabilityInfo", "rrc.ue_RadioAccessCapabilityInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapabilityInfo_TDD128_v8b0ext", HFILL }},
     { &hf_rrc_pdcp_Capability,
-      { "pdcp-Capability", "rrc.pdcp_Capability",
+      { "pdcp-Capability", "rrc.pdcp_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PDCP_Capability_r4_ext", HFILL }},
     { &hf_rrc_ue_RadioAccessCapabilityInfo_05,
-      { "ue-RadioAccessCapabilityInfo", "rrc.ue_RadioAccessCapabilityInfo",
+      { "ue-RadioAccessCapabilityInfo", "rrc.ue_RadioAccessCapabilityInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_va40ext", HFILL }},
     { &hf_rrc_ue_RadioAccessCapabilityComp2_05,
-      { "ue-RadioAccessCapabilityComp2", "rrc.ue_RadioAccessCapabilityComp2",
+      { "ue-RadioAccessCapabilityComp2", "rrc.ue_RadioAccessCapabilityComp2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapabilityComp2_va40ext", HFILL }},
     { &hf_rrc_ue_RadioAccessCapabBand,
-      { "ue-RadioAccessCapabBand", "rrc.ue_RadioAccessCapabBand",
+      { "ue-RadioAccessCapabBand", "rrc.ue_RadioAccessCapabBand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapabBand_va40ext", HFILL }},
     { &hf_rrc_rf_CapabilityFDDComp,
@@ -147937,47 +147937,47 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RF_CapabBandListFDDComp_ext2", HFILL }},
     { &hf_rrc_ue_RadioAccessCapabilityInfo_va80ext,
-      { "ue-RadioAccessCapabilityInfo-va80ext", "rrc.ue_RadioAccessCapabilityInfo_va80ext",
+      { "ue-RadioAccessCapabilityInfo-va80ext", "rrc.ue_RadioAccessCapabilityInfo_va80ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_va80ext", HFILL }},
     { &hf_rrc_ue_RadioAccessCapabilityInfo_vb50ext,
-      { "ue-RadioAccessCapabilityInfo-vb50ext", "rrc.ue_RadioAccessCapabilityInfo_vb50ext",
+      { "ue-RadioAccessCapabilityInfo-vb50ext", "rrc.ue_RadioAccessCapabilityInfo_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_vb50ext", HFILL }},
     { &hf_rrc_ue_RadioAccessCapabilityComp2_06,
-      { "ue-RadioAccessCapabilityComp2", "rrc.ue_RadioAccessCapabilityComp2",
+      { "ue-RadioAccessCapabilityComp2", "rrc.ue_RadioAccessCapabilityComp2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapabilityComp2_vb50ext", HFILL }},
     { &hf_rrc_ue_RadioAccessCapabilityInfo_TDD128_01,
-      { "ue-RadioAccessCapabilityInfo-TDD128", "rrc.ue_RadioAccessCapabilityInfo_TDD128",
+      { "ue-RadioAccessCapabilityInfo-TDD128", "rrc.ue_RadioAccessCapabilityInfo_TDD128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapabilityInfo_TDD128_vb50ext", HFILL }},
     { &hf_rrc_r3_11,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_11", HFILL }},
     { &hf_rrc_measurementControl_r3,
-      { "measurementControl-r3", "rrc.measurementControl_r3",
+      { "measurementControl-r3", "rrc.measurementControl_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementControl_r3_IEs", HFILL }},
     { &hf_rrc_v390nonCriticalExtensions,
-      { "v390nonCriticalExtensions", "rrc.v390nonCriticalExtensions",
+      { "v390nonCriticalExtensions", "rrc.v390nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_measurementControl_v390ext,
-      { "measurementControl-v390ext", "rrc.measurementControl_v390ext",
+      { "measurementControl-v390ext", "rrc.measurementControl_v390ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v3a0NonCriticalExtensions_04,
-      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions",
+      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v3a0NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_measurementControl_v3a0ext,
-      { "measurementControl-v3a0ext", "rrc.measurementControl_v3a0ext",
+      { "measurementControl-v3a0ext", "rrc.measurementControl_v3a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_18,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_18", HFILL }},
     { &hf_rrc_measurementControl_r3_add_ext,
@@ -147985,31 +147985,31 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_05,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_05", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_08,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_08", HFILL }},
     { &hf_rrc_measurementControl_v590ext,
-      { "measurementControl-v590ext", "rrc.measurementControl_v590ext",
+      { "measurementControl-v590ext", "rrc.measurementControl_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementControl_v590ext_IEs", HFILL }},
     { &hf_rrc_v5b0NonCriticalExtensions,
-      { "v5b0NonCriticalExtensions", "rrc.v5b0NonCriticalExtensions",
+      { "v5b0NonCriticalExtensions", "rrc.v5b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_measurementControl_v5b0ext,
-      { "measurementControl-v5b0ext", "rrc.measurementControl_v5b0ext",
+      { "measurementControl-v5b0ext", "rrc.measurementControl_v5b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementControl_v5b0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_58,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_58", HFILL }},
     { &hf_rrc_later_than_r3_09,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_09", HFILL }},
     { &hf_rrc_criticalExtensions_46,
@@ -148017,15 +148017,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_45_vals), 0,
         "T_criticalExtensions_45", HFILL }},
     { &hf_rrc_r4_03,
-      { "r4", "rrc.r4",
+      { "r4", "rrc.r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r4_03", HFILL }},
     { &hf_rrc_measurementControl_r4,
-      { "measurementControl-r4", "rrc.measurementControl_r4",
+      { "measurementControl-r4", "rrc.measurementControl_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementControl_r4_IEs", HFILL }},
     { &hf_rrc_v4d0NonCriticalExtensions_03,
-      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions",
+      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4d0NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_measurementControl_r4_add_ext,
@@ -148033,19 +148033,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_09,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_09", HFILL }},
     { &hf_rrc_v5b0NonCriticalExtensions_01,
-      { "v5b0NonCriticalExtensions", "rrc.v5b0NonCriticalExtensions",
+      { "v5b0NonCriticalExtensions", "rrc.v5b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v5b0NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_nonCriticalExtensions_59,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_59", HFILL }},
     { &hf_rrc_later_than_r4,
-      { "later-than-r4", "rrc.later_than_r4",
+      { "later-than-r4", "rrc.later_than_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rrc_TransactionIdentifier_MSP,
@@ -148057,23 +148057,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_46_vals), 0,
         "T_criticalExtensions_46", HFILL }},
     { &hf_rrc_r6_05,
-      { "r6", "rrc.r6",
+      { "r6", "rrc.r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r6_05", HFILL }},
     { &hf_rrc_measurementControl_r6,
-      { "measurementControl-r6", "rrc.measurementControl_r6",
+      { "measurementControl-r6", "rrc.measurementControl_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementControl_r6_IEs", HFILL }},
     { &hf_rrc_v6a0NonCriticalExtensions,
-      { "v6a0NonCriticalExtensions", "rrc.v6a0NonCriticalExtensions",
+      { "v6a0NonCriticalExtensions", "rrc.v6a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_measurementControl_v6a0ext,
-      { "measurementControl-v6a0ext", "rrc.measurementControl_v6a0ext",
+      { "measurementControl-v6a0ext", "rrc.measurementControl_v6a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementControl_v6a0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_60,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_60", HFILL }},
     { &hf_rrc_criticalExtensions_48,
@@ -148081,11 +148081,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_47_vals), 0,
         "T_criticalExtensions_47", HFILL }},
     { &hf_rrc_r7_04,
-      { "r7", "rrc.r7",
+      { "r7", "rrc.r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r7_04", HFILL }},
     { &hf_rrc_measurementControl_r7,
-      { "measurementControl-r7", "rrc.measurementControl_r7",
+      { "measurementControl-r7", "rrc.measurementControl_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementControl_r7_IEs", HFILL }},
     { &hf_rrc_measurementControl_r7_add_ext,
@@ -148093,15 +148093,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v7b0NonCriticalExtensions,
-      { "v7b0NonCriticalExtensions", "rrc.v7b0NonCriticalExtensions",
+      { "v7b0NonCriticalExtensions", "rrc.v7b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_measurementControl_v7b0ext,
-      { "measurementControl-v7b0ext", "rrc.measurementControl_v7b0ext",
+      { "measurementControl-v7b0ext", "rrc.measurementControl_v7b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementControl_v7b0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_61,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_61", HFILL }},
     { &hf_rrc_criticalExtensions_49,
@@ -148109,11 +148109,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_48_vals), 0,
         "T_criticalExtensions_48", HFILL }},
     { &hf_rrc_r8_05,
-      { "r8", "rrc.r8",
+      { "r8", "rrc.r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r8_05", HFILL }},
     { &hf_rrc_measurementControl_r8,
-      { "measurementControl-r8", "rrc.measurementControl_r8",
+      { "measurementControl-r8", "rrc.measurementControl_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementControl_r8_IEs", HFILL }},
     { &hf_rrc_measurementControl_r8_add_ext,
@@ -148121,23 +148121,23 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v8a0NonCriticalExtensions_03,
-      { "v8a0NonCriticalExtensions", "rrc.v8a0NonCriticalExtensions",
+      { "v8a0NonCriticalExtensions", "rrc.v8a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v8a0NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_measurementControl_v8a0ext,
-      { "measurementControl-v8a0ext", "rrc.measurementControl_v8a0ext",
+      { "measurementControl-v8a0ext", "rrc.measurementControl_v8a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementControl_v8a0ext_IEs", HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions_07,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vb50NonCriticalExtensions_07", HFILL }},
     { &hf_rrc_measurementControl_vb50ext,
-      { "measurementControl-vb50ext", "rrc.measurementControl_vb50ext",
+      { "measurementControl-vb50ext", "rrc.measurementControl_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementControl_vb50ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_62,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_62", HFILL }},
     { &hf_rrc_criticalExtensions_50,
@@ -148145,11 +148145,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_49_vals), 0,
         "T_criticalExtensions_49", HFILL }},
     { &hf_rrc_r9_04,
-      { "r9", "rrc.r9",
+      { "r9", "rrc.r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r9_04", HFILL }},
     { &hf_rrc_measurementControl_r9,
-      { "measurementControl-r9", "rrc.measurementControl_r9",
+      { "measurementControl-r9", "rrc.measurementControl_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementControl_r9_IEs", HFILL }},
     { &hf_rrc_measurementControl_r9_add_ext,
@@ -148157,19 +148157,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v970NonCriticalExtensions,
-      { "v970NonCriticalExtensions", "rrc.v970NonCriticalExtensions",
+      { "v970NonCriticalExtensions", "rrc.v970NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_measurementControl_v970ext,
-      { "measurementControl-v970ext", "rrc.measurementControl_v970ext",
+      { "measurementControl-v970ext", "rrc.measurementControl_v970ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementControl_v970ext_IEs", HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions_08,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vb50NonCriticalExtensions_08", HFILL }},
     { &hf_rrc_nonCriticalExtensions_63,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_63", HFILL }},
     { &hf_rrc_criticalExtensions_51,
@@ -148177,11 +148177,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_50_vals), 0,
         "T_criticalExtensions_50", HFILL }},
     { &hf_rrc_r10_04,
-      { "r10", "rrc.r10",
+      { "r10", "rrc.r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r10_04", HFILL }},
     { &hf_rrc_measurementControl_r10,
-      { "measurementControl-r10", "rrc.measurementControl_r10",
+      { "measurementControl-r10", "rrc.measurementControl_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementControl_r10_IEs", HFILL }},
     { &hf_rrc_measurementControl_r10_add_ext,
@@ -148189,27 +148189,27 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_vaa0NonCriticalExtensions,
-      { "vaa0NonCriticalExtensions", "rrc.vaa0NonCriticalExtensions",
+      { "vaa0NonCriticalExtensions", "rrc.vaa0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_measurementControl_vaa0ext,
-      { "measurementControl-vaa0ext", "rrc.measurementControl_vaa0ext",
+      { "measurementControl-vaa0ext", "rrc.measurementControl_vaa0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementControl_vaa0ext_IEs", HFILL }},
     { &hf_rrc_vab0NonCriticalExtensions,
-      { "vab0NonCriticalExtensions", "rrc.vab0NonCriticalExtensions",
+      { "vab0NonCriticalExtensions", "rrc.vab0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_measurementControl_vab0ext,
-      { "measurementControl-vab0ext", "rrc.measurementControl_vab0ext",
+      { "measurementControl-vab0ext", "rrc.measurementControl_vab0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementControl_vab0ext_IEs", HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions_09,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vb50NonCriticalExtensions_09", HFILL }},
     { &hf_rrc_nonCriticalExtensions_64,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_64", HFILL }},
     { &hf_rrc_criticalExtensions_52,
@@ -148217,11 +148217,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_51_vals), 0,
         "T_criticalExtensions_51", HFILL }},
     { &hf_rrc_r11_05,
-      { "r11", "rrc.r11",
+      { "r11", "rrc.r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r11_05", HFILL }},
     { &hf_rrc_measurementControl_r11,
-      { "measurementControl-r11", "rrc.measurementControl_r11",
+      { "measurementControl-r11", "rrc.measurementControl_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementControl_r11_IEs", HFILL }},
     { &hf_rrc_measurementControl_r11_add_ext,
@@ -148229,11 +148229,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_65,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_65", HFILL }},
     { &hf_rrc_criticalExtensions_53,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_52", HFILL }},
     { &hf_rrc_measurementIdentity,
@@ -148245,7 +148245,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MeasurementCommand_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_measurementReportingMode,
-      { "measurementReportingMode", "rrc.measurementReportingMode",
+      { "measurementReportingMode", "rrc.measurementReportingMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_additionalMeasurementList,
@@ -148253,11 +148253,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "AdditionalMeasurementID_List", HFILL }},
     { &hf_rrc_dpch_CompressedModeStatusInfo,
-      { "dpch-CompressedModeStatusInfo", "rrc.dpch_CompressedModeStatusInfo",
+      { "dpch-CompressedModeStatusInfo", "rrc.dpch_CompressedModeStatusInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_Positioning_Measurement_v390ext,
-      { "ue-Positioning-Measurement-v390ext", "rrc.ue_Positioning_Measurement_v390ext",
+      { "ue-Positioning-Measurement-v390ext", "rrc.ue_Positioning_Measurement_v390ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_measurementCommand_01,
@@ -148277,11 +148277,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Inter_FreqEventCriteriaList_v590ext", HFILL }},
     { &hf_rrc_intraFreqReportingCriteria_1b_r5,
-      { "intraFreqReportingCriteria-1b-r5", "rrc.intraFreqReportingCriteria_1b_r5",
+      { "intraFreqReportingCriteria-1b-r5", "rrc.intraFreqReportingCriteria_1b_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_intraFreqEvent_1d_r5,
-      { "intraFreqEvent-1d-r5", "rrc.intraFreqEvent_1d_r5",
+      { "intraFreqEvent-1d-r5", "rrc.intraFreqEvent_1d_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rrc_TransactionIdentifier_MSP_v590ext,
@@ -148333,11 +148333,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MeasurementCommand_r10_vals), 0,
         "MeasurementCommand_r10", HFILL }},
     { &hf_rrc_dpch_CompressedModeStatusInfo_01,
-      { "dpch-CompressedModeStatusInfo", "rrc.dpch_CompressedModeStatusInfo",
+      { "dpch-CompressedModeStatusInfo", "rrc.dpch_CompressedModeStatusInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DPCH_CompressedModeStatusInfo_r10", HFILL }},
     { &hf_rrc_periodicalReportingCriteriaOnSecULFreq,
-      { "periodicalReportingCriteriaOnSecULFreq", "rrc.periodicalReportingCriteriaOnSecULFreq",
+      { "periodicalReportingCriteriaOnSecULFreq", "rrc.periodicalReportingCriteriaOnSecULFreq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PeriodicalWithReportingCellStatusOnSecULFreq", HFILL }},
     { &hf_rrc_measurementCommand_07,
@@ -148345,11 +148345,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MeasurementCommand_r11_vals), 0,
         "MeasurementCommand_r11", HFILL }},
     { &hf_rrc_interRATMeasurement,
-      { "interRATMeasurement", "rrc.interRATMeasurement",
+      { "interRATMeasurement", "rrc.interRATMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATMeasurement_r11", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_19,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_19", HFILL }},
     { &hf_rrc_measurementControlFailure_r3_add_ext,
@@ -148357,15 +148357,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_10,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_10", HFILL }},
     { &hf_rrc_measurementControlFailure_v590ext,
-      { "measurementControlFailure-v590ext", "rrc.measurementControlFailure_v590ext",
+      { "measurementControlFailure-v590ext", "rrc.measurementControlFailure_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementControlFailure_v590ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_66,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_66", HFILL }},
     { &hf_rrc_measuredResults,
@@ -148381,15 +148381,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_EventResults_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_v390nonCriticalExtensions_01,
-      { "v390nonCriticalExtensions", "rrc.v390nonCriticalExtensions",
+      { "v390nonCriticalExtensions", "rrc.v390nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v390nonCriticalExtensions_01", HFILL }},
     { &hf_rrc_measurementReport_v390ext,
-      { "measurementReport-v390ext", "rrc.measurementReport_v390ext",
+      { "measurementReport-v390ext", "rrc.measurementReport_v390ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_20,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_20", HFILL }},
     { &hf_rrc_measurementReport_r3_add_ext,
@@ -148397,95 +148397,95 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_06,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_06", HFILL }},
     { &hf_rrc_measurementReport_v4b0ext,
-      { "measurementReport-v4b0ext", "rrc.measurementReport_v4b0ext",
+      { "measurementReport-v4b0ext", "rrc.measurementReport_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementReport_v4b0ext_IEs", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_11,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_11", HFILL }},
     { &hf_rrc_measurementReport_v590ext,
-      { "measurementReport-v590ext", "rrc.measurementReport_v590ext",
+      { "measurementReport-v590ext", "rrc.measurementReport_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementReport_v590ext_IEs", HFILL }},
     { &hf_rrc_v5b0NonCriticalExtensions_02,
-      { "v5b0NonCriticalExtensions", "rrc.v5b0NonCriticalExtensions",
+      { "v5b0NonCriticalExtensions", "rrc.v5b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v5b0NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_measurementReport_v5b0ext,
-      { "measurementReport-v5b0ext", "rrc.measurementReport_v5b0ext",
+      { "measurementReport-v5b0ext", "rrc.measurementReport_v5b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementReport_v5b0ext_IEs", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_11,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_11", HFILL }},
     { &hf_rrc_measurementReport_v690ext,
-      { "measurementReport-v690ext", "rrc.measurementReport_v690ext",
+      { "measurementReport-v690ext", "rrc.measurementReport_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementReport_v690ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_03,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_measurementReport_v770ext,
-      { "measurementReport-v770ext", "rrc.measurementReport_v770ext",
+      { "measurementReport-v770ext", "rrc.measurementReport_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementReport_v770ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_08,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_08", HFILL }},
     { &hf_rrc_measurementReport_v860ext,
-      { "measurementReport-v860ext", "rrc.measurementReport_v860ext",
+      { "measurementReport-v860ext", "rrc.measurementReport_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementReport_v860ext_IEs", HFILL }},
     { &hf_rrc_v920NonCriticalExtensions_01,
-      { "v920NonCriticalExtensions", "rrc.v920NonCriticalExtensions",
+      { "v920NonCriticalExtensions", "rrc.v920NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v920NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_measurementReport_v920ext,
-      { "measurementReport-v920ext", "rrc.measurementReport_v920ext",
+      { "measurementReport-v920ext", "rrc.measurementReport_v920ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementReport_v920ext_IEs", HFILL }},
     { &hf_rrc_v970NonCriticalExtensions_01,
-      { "v970NonCriticalExtensions", "rrc.v970NonCriticalExtensions",
+      { "v970NonCriticalExtensions", "rrc.v970NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v970NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_measurementReport_v970ext_IE,
-      { "measurementReport-v970ext-IE", "rrc.measurementReport_v970ext_IE",
+      { "measurementReport-v970ext-IE", "rrc.measurementReport_v970ext_IE_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementReport_v970ext_IEs", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions_04,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va40NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_measurementReport_va40ext,
-      { "measurementReport-va40ext", "rrc.measurementReport_va40ext",
+      { "measurementReport-va40ext", "rrc.measurementReport_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementReport_va40ext_IEs", HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions_10,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vb50NonCriticalExtensions_10", HFILL }},
     { &hf_rrc_measurementReport_vb50ext,
-      { "measurementReport-vb50ext", "rrc.measurementReport_vb50ext",
+      { "measurementReport-vb50ext", "rrc.measurementReport_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementReport_vb50ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_67,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_67", HFILL }},
     { &hf_rrc_measuredResults_v390ext,
-      { "measuredResults-v390ext", "rrc.measuredResults_v390ext",
+      { "measuredResults-v390ext", "rrc.measuredResults_v390ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interFreqEventResults_LCR,
-      { "interFreqEventResults-LCR", "rrc.interFreqEventResults_LCR",
+      { "interFreqEventResults-LCR", "rrc.interFreqEventResults_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqEventResults_LCR_r4_ext", HFILL }},
     { &hf_rrc_additionalMeasuredResults_LCR,
@@ -148493,7 +148493,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MeasuredResultsList_LCR_r4_ext", HFILL }},
     { &hf_rrc_dummy_14,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrimaryCPICH_Info", HFILL }},
     { &hf_rrc_measuredResults_v590ext,
@@ -148513,7 +148513,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_EventResults_v770ext_vals), 0,
         "EventResults_v770ext", HFILL }},
     { &hf_rrc_ue_Positioning_OTDOA_MeasuredResults,
-      { "ue-Positioning-OTDOA-MeasuredResults", "rrc.ue_Positioning_OTDOA_MeasuredResults",
+      { "ue-Positioning-OTDOA-MeasuredResults", "rrc.ue_Positioning_OTDOA_MeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_OTDOA_MeasuredResultsTDD_ext", HFILL }},
     { &hf_rrc_measuredResults_02,
@@ -148529,15 +148529,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_EventResults_v860ext_vals), 0,
         "EventResults_v860ext", HFILL }},
     { &hf_rrc_eutra_MeasuredResults,
-      { "eutra-MeasuredResults", "rrc.eutra_MeasuredResults",
+      { "eutra-MeasuredResults", "rrc.eutra_MeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_eutra_EventResults,
-      { "eutra-EventResults", "rrc.eutra_EventResults",
+      { "eutra-EventResults", "rrc.eutra_EventResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cSGProximityIndication,
-      { "cSGProximityIndication", "rrc.cSGProximityIndication",
+      { "cSGProximityIndication", "rrc.cSGProximityIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_measuredResults_03,
@@ -148545,7 +148545,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MeasuredResults_v920ext_vals), 0,
         "MeasuredResults_v920ext", HFILL }},
     { &hf_rrc_measuredResultsOnSecUlFreq,
-      { "measuredResultsOnSecUlFreq", "rrc.measuredResultsOnSecUlFreq",
+      { "measuredResultsOnSecUlFreq", "rrc.measuredResultsOnSecUlFreq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_additionalMeasuredResults_03,
@@ -148557,11 +148557,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MeasuredResultsListOnSecUlFreq", HFILL }},
     { &hf_rrc_eventResultsOnSecUlFreq,
-      { "eventResultsOnSecUlFreq", "rrc.eventResultsOnSecUlFreq",
+      { "eventResultsOnSecUlFreq", "rrc.eventResultsOnSecUlFreq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_eutra_MeasuredResults_01,
-      { "eutra-MeasuredResults", "rrc.eutra_MeasuredResults",
+      { "eutra-MeasuredResults", "rrc.eutra_MeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EUTRA_MeasuredResults_v920ext", HFILL }},
     { &hf_rrc_measurementIdentity_02,
@@ -148581,19 +148581,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_loggedANRResultsAvailable_02_vals), 0,
         "T_loggedANRResultsAvailable_02", HFILL }},
     { &hf_rrc_eutra_EventResultsForCELLFACH,
-      { "eutra-EventResultsForCELLFACH", "rrc.eutra_EventResultsForCELLFACH",
+      { "eutra-EventResultsForCELLFACH", "rrc.eutra_EventResultsForCELLFACH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cSGProximityIndication_01,
-      { "cSGProximityIndication", "rrc.cSGProximityIndication",
+      { "cSGProximityIndication", "rrc.cSGProximityIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CSGProximityIndication_vb50ext", HFILL }},
     { &hf_rrc_eutra_MeasuredResults_02,
-      { "eutra-MeasuredResults", "rrc.eutra_MeasuredResults",
+      { "eutra-MeasuredResults", "rrc.eutra_MeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EUTRA_MeasuredResults_vb50ext", HFILL }},
     { &hf_rrc_eutra_EventResults_01,
-      { "eutra-EventResults", "rrc.eutra_EventResults",
+      { "eutra-EventResults", "rrc.eutra_EventResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EUTRA_EventResults_vb50ext", HFILL }},
     { &hf_rrc_pagingRecordList,
@@ -148601,11 +148601,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_bcch_ModificationInfo,
-      { "bcch-ModificationInfo", "rrc.bcch_ModificationInfo",
+      { "bcch-ModificationInfo", "rrc.bcch_ModificationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_21,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_21", HFILL }},
     { &hf_rrc_pagingType1_r3_add_ext,
@@ -148613,23 +148613,23 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_12,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_12", HFILL }},
     { &hf_rrc_pagingType1_v590ext,
-      { "pagingType1-v590ext", "rrc.pagingType1_v590ext",
+      { "pagingType1-v590ext", "rrc.pagingType1_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PagingType1_v590ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_09,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_09", HFILL }},
     { &hf_rrc_pagingType1_v860ext,
-      { "pagingType1-v860ext", "rrc.pagingType1_v860ext",
+      { "pagingType1-v860ext", "rrc.pagingType1_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PagingType1_v860ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_68,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_68", HFILL }},
     { &hf_rrc_pagingRecord2List,
@@ -148645,7 +148645,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_PagingRecordTypeID_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_22,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_22", HFILL }},
     { &hf_rrc_pagingType2_r3_add_ext,
@@ -148653,27 +148653,27 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_69,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_69", HFILL }},
     { &hf_rrc_r3_12,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_12", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_r3,
-      { "physicalChannelReconfiguration-r3", "rrc.physicalChannelReconfiguration_r3",
+      { "physicalChannelReconfiguration-r3", "rrc.physicalChannelReconfiguration_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelReconfiguration_r3_IEs", HFILL }},
     { &hf_rrc_v3a0NonCriticalExtensions_05,
-      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions",
+      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v3a0NonCriticalExtensions_05", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_v3a0ext,
-      { "physicalChannelReconfiguration-v3a0ext", "rrc.physicalChannelReconfiguration_v3a0ext",
+      { "physicalChannelReconfiguration-v3a0ext", "rrc.physicalChannelReconfiguration_v3a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_23,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_23", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_r3_add_ext,
@@ -148681,43 +148681,43 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtenstions,
-      { "v4b0NonCriticalExtenstions", "rrc.v4b0NonCriticalExtenstions",
+      { "v4b0NonCriticalExtenstions", "rrc.v4b0NonCriticalExtenstions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_v4b0ext,
-      { "physicalChannelReconfiguration-v4b0ext", "rrc.physicalChannelReconfiguration_v4b0ext",
+      { "physicalChannelReconfiguration-v4b0ext", "rrc.physicalChannelReconfiguration_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelReconfiguration_v4b0ext_IEs", HFILL }},
     { &hf_rrc_v590NonCriticalExtenstions_02,
-      { "v590NonCriticalExtenstions", "rrc.v590NonCriticalExtenstions",
+      { "v590NonCriticalExtenstions", "rrc.v590NonCriticalExtenstions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtenstions_02", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_v590ext,
-      { "physicalChannelReconfiguration-v590ext", "rrc.physicalChannelReconfiguration_v590ext",
+      { "physicalChannelReconfiguration-v590ext", "rrc.physicalChannelReconfiguration_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelReconfiguration_v590ext_IEs", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_12,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_12", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_v690ext,
-      { "physicalChannelReconfiguration-v690ext", "rrc.physicalChannelReconfiguration_v690ext",
+      { "physicalChannelReconfiguration-v690ext", "rrc.physicalChannelReconfiguration_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelReconfiguration_v690ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_04,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_v770ext,
-      { "physicalChannelReconfiguration-v770ext", "rrc.physicalChannelReconfiguration_v770ext",
+      { "physicalChannelReconfiguration-v770ext", "rrc.physicalChannelReconfiguration_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelReconfiguration_v770ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_70,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_70", HFILL }},
     { &hf_rrc_later_than_r3_10,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_10", HFILL }},
     { &hf_rrc_criticalExtensions_54,
@@ -148725,15 +148725,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_53_vals), 0,
         "T_criticalExtensions_53", HFILL }},
     { &hf_rrc_r4_04,
-      { "r4", "rrc.r4",
+      { "r4", "rrc.r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r4_04", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_r4,
-      { "physicalChannelReconfiguration-r4", "rrc.physicalChannelReconfiguration_r4",
+      { "physicalChannelReconfiguration-r4", "rrc.physicalChannelReconfiguration_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelReconfiguration_r4_IEs", HFILL }},
     { &hf_rrc_v4d0NonCriticalExtensions_04,
-      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions",
+      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4d0NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_r4_add_ext,
@@ -148741,19 +148741,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtenstions_03,
-      { "v590NonCriticalExtenstions", "rrc.v590NonCriticalExtenstions",
+      { "v590NonCriticalExtenstions", "rrc.v590NonCriticalExtenstions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtenstions_03", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_13,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_13", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_05,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_05", HFILL }},
     { &hf_rrc_nonCriticalExtensions_71,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_71", HFILL }},
     { &hf_rrc_criticalExtensions_55,
@@ -148761,11 +148761,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_54_vals), 0,
         "T_criticalExtensions_54", HFILL }},
     { &hf_rrc_r5_04,
-      { "r5", "rrc.r5",
+      { "r5", "rrc.r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r5_04", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_r5,
-      { "physicalChannelReconfiguration-r5", "rrc.physicalChannelReconfiguration_r5",
+      { "physicalChannelReconfiguration-r5", "rrc.physicalChannelReconfiguration_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelReconfiguration_r5_IEs", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_r5_add_ext,
@@ -148773,15 +148773,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_14,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_14", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_06,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_06", HFILL }},
     { &hf_rrc_nonCriticalExtensions_72,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_72", HFILL }},
     { &hf_rrc_criticalExtensions_56,
@@ -148789,11 +148789,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_55_vals), 0,
         "T_criticalExtensions_55", HFILL }},
     { &hf_rrc_r6_06,
-      { "r6", "rrc.r6",
+      { "r6", "rrc.r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r6_06", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_r6,
-      { "physicalChannelReconfiguration-r6", "rrc.physicalChannelReconfiguration_r6",
+      { "physicalChannelReconfiguration-r6", "rrc.physicalChannelReconfiguration_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelReconfiguration_r6_IEs", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_r6_add_ext,
@@ -148801,19 +148801,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_06,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6b0NonCriticalExtensions_05", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_v6b0ext,
-      { "physicalChannelReconfiguration-v6b0ext", "rrc.physicalChannelReconfiguration_v6b0ext",
+      { "physicalChannelReconfiguration-v6b0ext", "rrc.physicalChannelReconfiguration_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelReconfiguration_v6b0ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_07,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_07", HFILL }},
     { &hf_rrc_nonCriticalExtensions_73,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_73", HFILL }},
     { &hf_rrc_criticalExtensions_57,
@@ -148821,11 +148821,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_56_vals), 0,
         "T_criticalExtensions_56", HFILL }},
     { &hf_rrc_r7_05,
-      { "r7", "rrc.r7",
+      { "r7", "rrc.r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r7_05", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_r7,
-      { "physicalChannelReconfiguration-r7", "rrc.physicalChannelReconfiguration_r7",
+      { "physicalChannelReconfiguration-r7", "rrc.physicalChannelReconfiguration_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelReconfiguration_r7_IEs", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_r7_add_ext,
@@ -148833,39 +148833,39 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v780NonCriticalExtensions_04,
-      { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions",
+      { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v780NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_v780ext,
-      { "physicalChannelReconfiguration-v780ext", "rrc.physicalChannelReconfiguration_v780ext",
+      { "physicalChannelReconfiguration-v780ext", "rrc.physicalChannelReconfiguration_v780ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelReconfiguration_v780ext_IEs", HFILL }},
     { &hf_rrc_v7d0NonCriticalExtensions_04,
-      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions",
+      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7d0NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_v7d0ext,
-      { "physicalChannelReconfiguration-v7d0ext", "rrc.physicalChannelReconfiguration_v7d0ext",
+      { "physicalChannelReconfiguration-v7d0ext", "rrc.physicalChannelReconfiguration_v7d0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelReconfiguration_v7d0ext_IEs", HFILL }},
     { &hf_rrc_v7f0NonCriticalExtensions_05,
-      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions",
+      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7f0NonCriticalExtensions_05", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_v7f0ext,
-      { "physicalChannelReconfiguration-v7f0ext", "rrc.physicalChannelReconfiguration_v7f0ext",
+      { "physicalChannelReconfiguration-v7f0ext", "rrc.physicalChannelReconfiguration_v7f0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelReconfiguration_v7f0ext_IEs", HFILL }},
     { &hf_rrc_v7g0NonCriticalExtensions_06,
-      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions",
+      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7g0NonCriticalExtensions_06", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_v7g0ext,
-      { "physicalChannelReconfiguration-v7g0ext", "rrc.physicalChannelReconfiguration_v7g0ext",
+      { "physicalChannelReconfiguration-v7g0ext", "rrc.physicalChannelReconfiguration_v7g0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelReconfiguration_v7g0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_74,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_74", HFILL }},
     { &hf_rrc_criticalExtensions_58,
@@ -148873,11 +148873,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_57_vals), 0,
         "T_criticalExtensions_57", HFILL }},
     { &hf_rrc_r8_06,
-      { "r8", "rrc.r8",
+      { "r8", "rrc.r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r8_06", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_r8,
-      { "physicalChannelReconfiguration-r8", "rrc.physicalChannelReconfiguration_r8",
+      { "physicalChannelReconfiguration-r8", "rrc.physicalChannelReconfiguration_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelReconfiguration_r8_IEs", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_r8_add_ext,
@@ -148885,35 +148885,35 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v7d0NonCriticalExtensions_05,
-      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions",
+      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7d0NonCriticalExtensions_05", HFILL }},
     { &hf_rrc_v7f0NonCriticalExtensions_06,
-      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions",
+      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7f0NonCriticalExtensions_06", HFILL }},
     { &hf_rrc_v890NonCriticalExtensions_04,
-      { "v890NonCriticalExtensions", "rrc.v890NonCriticalExtensions",
+      { "v890NonCriticalExtensions", "rrc.v890NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v890NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_v890ext,
-      { "physicalChannelReconfiguration-v890ext", "rrc.physicalChannelReconfiguration_v890ext",
+      { "physicalChannelReconfiguration-v890ext", "rrc.physicalChannelReconfiguration_v890ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelReconfiguration_v890ext_IEs", HFILL }},
     { &hf_rrc_v7g0NonCriticalExtensions_07,
-      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions",
+      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7g0NonCriticalExtensions_07", HFILL }},
     { &hf_rrc_v8a0NonCriticalExtensions_04,
-      { "v8a0NonCriticalExtensions", "rrc.v8a0NonCriticalExtensions",
+      { "v8a0NonCriticalExtensions", "rrc.v8a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v8a0NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_v8a0ext,
-      { "physicalChannelReconfiguration-v8a0ext", "rrc.physicalChannelReconfiguration_v8a0ext",
+      { "physicalChannelReconfiguration-v8a0ext", "rrc.physicalChannelReconfiguration_v8a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelReconfiguration_v8a0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_75,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_75", HFILL }},
     { &hf_rrc_criticalExtensions_59,
@@ -148921,11 +148921,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_58_vals), 0,
         "T_criticalExtensions_58", HFILL }},
     { &hf_rrc_r9_05,
-      { "r9", "rrc.r9",
+      { "r9", "rrc.r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r9_05", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_r9,
-      { "physicalChannelReconfiguration-r9", "rrc.physicalChannelReconfiguration_r9",
+      { "physicalChannelReconfiguration-r9", "rrc.physicalChannelReconfiguration_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelReconfiguration_r9_IEs", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_r9_add_ext,
@@ -148933,15 +148933,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v950NonCriticalExtensions_03,
-      { "v950NonCriticalExtensions", "rrc.v950NonCriticalExtensions",
+      { "v950NonCriticalExtensions", "rrc.v950NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v950NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_v950ext,
-      { "physicalChannelReconfiguration-v950ext", "rrc.physicalChannelReconfiguration_v950ext",
+      { "physicalChannelReconfiguration-v950ext", "rrc.physicalChannelReconfiguration_v950ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelReconfiguration_v950ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_76,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_76", HFILL }},
     { &hf_rrc_criticalExtensions_60,
@@ -148949,11 +148949,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_59_vals), 0,
         "T_criticalExtensions_59", HFILL }},
     { &hf_rrc_r10_05,
-      { "r10", "rrc.r10",
+      { "r10", "rrc.r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r10_05", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_r10,
-      { "physicalChannelReconfiguration-r10", "rrc.physicalChannelReconfiguration_r10",
+      { "physicalChannelReconfiguration-r10", "rrc.physicalChannelReconfiguration_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelReconfiguration_r10_IEs", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_r10_add_ext,
@@ -148961,15 +148961,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions_11,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vb50NonCriticalExtensions_11", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_vb50ext,
-      { "physicalChannelReconfiguration-vb50ext", "rrc.physicalChannelReconfiguration_vb50ext",
+      { "physicalChannelReconfiguration-vb50ext", "rrc.physicalChannelReconfiguration_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelReconfiguration_vb50ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_77,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_77", HFILL }},
     { &hf_rrc_criticalExtensions_61,
@@ -148977,11 +148977,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_60_vals), 0,
         "T_criticalExtensions_60", HFILL }},
     { &hf_rrc_r11_06,
-      { "r11", "rrc.r11",
+      { "r11", "rrc.r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r11_06", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_r11,
-      { "physicalChannelReconfiguration-r11", "rrc.physicalChannelReconfiguration_r11",
+      { "physicalChannelReconfiguration-r11", "rrc.physicalChannelReconfiguration_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelReconfiguration_r11_IEs", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_r11_add_ext,
@@ -148989,11 +148989,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_78,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_78", HFILL }},
     { &hf_rrc_criticalExtensions_62,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_61", HFILL }},
     { &hf_rrc_ul_ChannelRequirement_03,
@@ -149005,7 +149005,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_12_vals), 0,
         "T_modeSpecificInfo_12", HFILL }},
     { &hf_rrc_fdd_18,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_18", HFILL }},
     { &hf_rrc_ul_ChannelRequirement_04,
@@ -149017,7 +149017,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_13_vals), 0,
         "T_modeSpecificInfo_13", HFILL }},
     { &hf_rrc_fdd_19,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_19", HFILL }},
     { &hf_rrc_ul_ChannelRequirement_05,
@@ -149029,7 +149029,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_14_vals), 0,
         "T_modeSpecificInfo_14", HFILL }},
     { &hf_rrc_fdd_20,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_20", HFILL }},
     { &hf_rrc_delayRestrictionFlag,
@@ -149049,7 +149049,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_responseToChangeOfUE_Capability_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_harqInfo,
-      { "harqInfo", "rrc.harqInfo",
+      { "harqInfo", "rrc.harqInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HARQ_Info_r7", HFILL }},
     { &hf_rrc_responseToChangeOfUE_Capability_01,
@@ -149069,11 +149069,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_responseToChangeOfUE_Capability_04_vals), 0,
         "T_responseToChangeOfUE_Capability_04", HFILL }},
     { &hf_rrc_harqInfo_01,
-      { "harqInfo", "rrc.harqInfo",
+      { "harqInfo", "rrc.harqInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HARQ_Info_r11", HFILL }},
     { &hf_rrc_ul_IntegProtActivationInfo,
-      { "ul-IntegProtActivationInfo", "rrc.ul_IntegProtActivationInfo",
+      { "ul-IntegProtActivationInfo", "rrc.ul_IntegProtActivationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntegrityProtActivationInfo", HFILL }},
     { &hf_rrc_ul_TimingAdvance,
@@ -149085,11 +149085,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RB_ActivationTimeInfoList", HFILL }},
     { &hf_rrc_ul_CounterSynchronisationInfo,
-      { "ul-CounterSynchronisationInfo", "rrc.ul_CounterSynchronisationInfo",
+      { "ul-CounterSynchronisationInfo", "rrc.ul_CounterSynchronisationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_24,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_24", HFILL }},
     { &hf_rrc_physicalChannelReconfigurationComplete_r3_add_ext,
@@ -149097,19 +149097,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_08,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_08", HFILL }},
     { &hf_rrc_physicalChannelReconfigurationComplete_v770ext,
-      { "physicalChannelReconfigurationComplete-v770ext", "rrc.physicalChannelReconfigurationComplete_v770ext",
+      { "physicalChannelReconfigurationComplete-v770ext", "rrc.physicalChannelReconfigurationComplete_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelReconfigurationComplete_v770ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_79,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_79", HFILL }},
     { &hf_rrc_ext_UL_TimingAdvance,
-      { "ext-UL-TimingAdvance", "rrc.ext_UL_TimingAdvance",
+      { "ext-UL-TimingAdvance", "rrc.ext_UL_TimingAdvance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_deferredMeasurementControlReading,
@@ -149117,7 +149117,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_deferredMeasurementControlReading_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_25,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_25", HFILL }},
     { &hf_rrc_physicalChannelReconfigurationFailure_r3_add_ext,
@@ -149125,19 +149125,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_80,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_80", HFILL }},
     { &hf_rrc_r3_13,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_13", HFILL }},
     { &hf_rrc_physicalSharedChannelAllocation_r3,
-      { "physicalSharedChannelAllocation-r3", "rrc.physicalSharedChannelAllocation_r3",
+      { "physicalSharedChannelAllocation-r3", "rrc.physicalSharedChannelAllocation_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalSharedChannelAllocation_r3_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_26,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_26", HFILL }},
     { &hf_rrc_physicalSharedChannelAllocation_r3_add_ext,
@@ -149145,11 +149145,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_81,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_81", HFILL }},
     { &hf_rrc_later_than_r3_11,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_11", HFILL }},
     { &hf_rrc_dsch_RNTI,
@@ -149161,15 +149161,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_62_vals), 0,
         "T_criticalExtensions_62", HFILL }},
     { &hf_rrc_r4_05,
-      { "r4", "rrc.r4",
+      { "r4", "rrc.r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r4_05", HFILL }},
     { &hf_rrc_physicalSharedChannelAllocation_r4,
-      { "physicalSharedChannelAllocation-r4", "rrc.physicalSharedChannelAllocation_r4",
+      { "physicalSharedChannelAllocation-r4", "rrc.physicalSharedChannelAllocation_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalSharedChannelAllocation_r4_IEs", HFILL }},
     { &hf_rrc_v4d0NonCriticalExtensions_05,
-      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions",
+      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4d0NonCriticalExtensions_05", HFILL }},
     { &hf_rrc_physicalSharedChannelAllocation_r4_add_ext,
@@ -149177,27 +149177,27 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_15,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_15", HFILL }},
     { &hf_rrc_physicalSharedChannelAllocation_v690ext,
-      { "physicalSharedChannelAllocation-v690ext", "rrc.physicalSharedChannelAllocation_v690ext",
+      { "physicalSharedChannelAllocation-v690ext", "rrc.physicalSharedChannelAllocation_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalSharedChannelAllocation_v690ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_09,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_09", HFILL }},
     { &hf_rrc_physicalSharedChannelAllocation_v770ext,
-      { "physicalSharedChannelAllocation-v770ext", "rrc.physicalSharedChannelAllocation_v770ext",
+      { "physicalSharedChannelAllocation-v770ext", "rrc.physicalSharedChannelAllocation_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalSharedChannelAllocation_v770ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_82,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_82", HFILL }},
     { &hf_rrc_criticalExtensions_64,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_63", HFILL }},
     { &hf_rrc_ul_TimingAdvance_01,
@@ -149205,11 +149205,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UL_TimingAdvanceControl_vals), 0,
         "UL_TimingAdvanceControl", HFILL }},
     { &hf_rrc_pusch_CapacityAllocationInfo,
-      { "pusch-CapacityAllocationInfo", "rrc.pusch_CapacityAllocationInfo",
+      { "pusch-CapacityAllocationInfo", "rrc.pusch_CapacityAllocationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_pdsch_CapacityAllocationInfo,
-      { "pdsch-CapacityAllocationInfo", "rrc.pdsch_CapacityAllocationInfo",
+      { "pdsch-CapacityAllocationInfo", "rrc.pdsch_CapacityAllocationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_confirmRequest,
@@ -149233,11 +149233,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UL_TimingAdvanceControl_r4_vals), 0,
         "UL_TimingAdvanceControl_r4", HFILL }},
     { &hf_rrc_pusch_CapacityAllocationInfo_01,
-      { "pusch-CapacityAllocationInfo", "rrc.pusch_CapacityAllocationInfo",
+      { "pusch-CapacityAllocationInfo", "rrc.pusch_CapacityAllocationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PUSCH_CapacityAllocationInfo_r4", HFILL }},
     { &hf_rrc_pdsch_CapacityAllocationInfo_01,
-      { "pdsch-CapacityAllocationInfo", "rrc.pdsch_CapacityAllocationInfo",
+      { "pdsch-CapacityAllocationInfo", "rrc.pdsch_CapacityAllocationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PDSCH_CapacityAllocationInfo_r4", HFILL }},
     { &hf_rrc_confirmRequest_01,
@@ -149253,11 +149253,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UL_TimingAdvanceControl_r7_vals), 0,
         "UL_TimingAdvanceControl_r7", HFILL }},
     { &hf_rrc_pusch_CapacityAllocationInfo_02,
-      { "pusch-CapacityAllocationInfo", "rrc.pusch_CapacityAllocationInfo",
+      { "pusch-CapacityAllocationInfo", "rrc.pusch_CapacityAllocationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PUSCH_CapacityAllocationInfo_r7", HFILL }},
     { &hf_rrc_pdsch_CapacityAllocationInfo_02,
-      { "pdsch-CapacityAllocationInfo", "rrc.pdsch_CapacityAllocationInfo",
+      { "pdsch-CapacityAllocationInfo", "rrc.pdsch_CapacityAllocationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PDSCH_CapacityAllocationInfo_r7", HFILL }},
     { &hf_rrc_trafficVolume,
@@ -149289,7 +149289,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_ProtocolErrorIndicatorWithMoreInfo_vals), 0,
         "ProtocolErrorIndicatorWithMoreInfo", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_27,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_27", HFILL }},
     { &hf_rrc_puschCapacityRequest_r3_add_ext,
@@ -149297,15 +149297,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_13,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_13", HFILL }},
     { &hf_rrc_puschCapacityRequest_v590ext,
-      { "puschCapacityRequest-v590ext", "rrc.puschCapacityRequest_v590ext",
+      { "puschCapacityRequest-v590ext", "rrc.puschCapacityRequest_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_nonCriticalExtensions_83,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_83", HFILL }},
     { &hf_rrc_primaryCCPCH_RSCP_delta,
@@ -149313,23 +149313,23 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "DeltaRSCP", HFILL }},
     { &hf_rrc_r3_14,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_14", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_r3,
-      { "radioBearerReconfiguration-r3", "rrc.radioBearerReconfiguration_r3",
+      { "radioBearerReconfiguration-r3", "rrc.radioBearerReconfiguration_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_r3_IEs", HFILL }},
     { &hf_rrc_v3aoNonCriticalExtensions,
-      { "v3aoNonCriticalExtensions", "rrc.v3aoNonCriticalExtensions",
+      { "v3aoNonCriticalExtensions", "rrc.v3aoNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_radioBearerReconfiguration_v3a0ext,
-      { "radioBearerReconfiguration-v3a0ext", "rrc.radioBearerReconfiguration_v3a0ext",
+      { "radioBearerReconfiguration-v3a0ext", "rrc.radioBearerReconfiguration_v3a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_28,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_28", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_r3_add_ext,
@@ -149337,51 +149337,51 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_07,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_07", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_v4b0ext,
-      { "radioBearerReconfiguration-v4b0ext", "rrc.radioBearerReconfiguration_v4b0ext",
+      { "radioBearerReconfiguration-v4b0ext", "rrc.radioBearerReconfiguration_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_v4b0ext_IEs", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_14,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_14", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_v590ext,
-      { "radioBearerReconfiguration-v590ext", "rrc.radioBearerReconfiguration_v590ext",
+      { "radioBearerReconfiguration-v590ext", "rrc.radioBearerReconfiguration_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_v590ext_IEs", HFILL }},
     { &hf_rrc_v5d0NonCriticalExtenstions_06,
-      { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions",
+      { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v5d0NonCriticalExtenstions_06", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_v5d0ext,
-      { "radioBearerReconfiguration-v5d0ext", "rrc.radioBearerReconfiguration_v5d0ext",
+      { "radioBearerReconfiguration-v5d0ext", "rrc.radioBearerReconfiguration_v5d0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_v5d0ext_IEs", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_16,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_16", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_v690ext,
-      { "radioBearerReconfiguration-v690ext", "rrc.radioBearerReconfiguration_v690ext",
+      { "radioBearerReconfiguration-v690ext", "rrc.radioBearerReconfiguration_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_v690ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_10,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_10", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_v770ext,
-      { "radioBearerReconfiguration-v770ext", "rrc.radioBearerReconfiguration_v770ext",
+      { "radioBearerReconfiguration-v770ext", "rrc.radioBearerReconfiguration_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_v770ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_84,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_84", HFILL }},
     { &hf_rrc_later_than_r3_12,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_12", HFILL }},
     { &hf_rrc_criticalExtensions_65,
@@ -149389,15 +149389,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_64_vals), 0,
         "T_criticalExtensions_64", HFILL }},
     { &hf_rrc_r4_06,
-      { "r4", "rrc.r4",
+      { "r4", "rrc.r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r4_06", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_r4,
-      { "radioBearerReconfiguration-r4", "rrc.radioBearerReconfiguration_r4",
+      { "radioBearerReconfiguration-r4", "rrc.radioBearerReconfiguration_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_r4_IEs", HFILL }},
     { &hf_rrc_v4d0NonCriticalExtensions_06,
-      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions",
+      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4d0NonCriticalExtensions_06", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_r4_add_ext,
@@ -149405,23 +149405,23 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_15,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_15", HFILL }},
     { &hf_rrc_v5d0NonCriticalExtenstions_07,
-      { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions",
+      { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v5d0NonCriticalExtenstions_07", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_17,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_17", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_11,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_11", HFILL }},
     { &hf_rrc_nonCriticalExtensions_85,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_85", HFILL }},
     { &hf_rrc_criticalExtensions_66,
@@ -149429,11 +149429,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_65_vals), 0,
         "T_criticalExtensions_65", HFILL }},
     { &hf_rrc_r5_05,
-      { "r5", "rrc.r5",
+      { "r5", "rrc.r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r5_05", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_r5,
-      { "radioBearerReconfiguration-r5", "rrc.radioBearerReconfiguration_r5",
+      { "radioBearerReconfiguration-r5", "rrc.radioBearerReconfiguration_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_r5_IEs", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_r5_add_ext,
@@ -149441,19 +149441,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v5d0NonCriticalExtenstions_08,
-      { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions",
+      { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v5d0NonCriticalExtenstions_08", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_18,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_18", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_12,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_12", HFILL }},
     { &hf_rrc_nonCriticalExtensions_86,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_86", HFILL }},
     { &hf_rrc_criticalExtensions_67,
@@ -149461,11 +149461,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_66_vals), 0,
         "T_criticalExtensions_66", HFILL }},
     { &hf_rrc_r6_07,
-      { "r6", "rrc.r6",
+      { "r6", "rrc.r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r6_07", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_r6,
-      { "radioBearerReconfiguration-r6", "rrc.radioBearerReconfiguration_r6",
+      { "radioBearerReconfiguration-r6", "rrc.radioBearerReconfiguration_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_r6_IEs", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_r6_add_ext,
@@ -149473,27 +149473,27 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_07,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6b0NonCriticalExtensions_06", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_v6b0ext,
-      { "radioBearerReconfiguration-v6b0ext", "rrc.radioBearerReconfiguration_v6b0ext",
+      { "radioBearerReconfiguration-v6b0ext", "rrc.radioBearerReconfiguration_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_v6b0ext_IEs", HFILL }},
     { &hf_rrc_v6f0NonCriticalExtensions,
-      { "v6f0NonCriticalExtensions", "rrc.v6f0NonCriticalExtensions",
+      { "v6f0NonCriticalExtensions", "rrc.v6f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_radioBearerRconfiguration_v6f0ext,
-      { "radioBearerRconfiguration-v6f0ext", "rrc.radioBearerRconfiguration_v6f0ext",
+      { "radioBearerRconfiguration-v6f0ext", "rrc.radioBearerRconfiguration_v6f0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_v6f0ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_13,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_13", HFILL }},
     { &hf_rrc_nonCriticalExtensions_87,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_87", HFILL }},
     { &hf_rrc_criticalExtensions_68,
@@ -149501,55 +149501,55 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_67_vals), 0,
         "T_criticalExtensions_67", HFILL }},
     { &hf_rrc_r7_06,
-      { "r7", "rrc.r7",
+      { "r7", "rrc.r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r7_06", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_r7,
-      { "radioBearerReconfiguration-r7", "rrc.radioBearerReconfiguration_r7",
+      { "radioBearerReconfiguration-r7", "rrc.radioBearerReconfiguration_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_r7_IEs", HFILL }},
     { &hf_rrc_v780NonCriticalExtensions_05,
-      { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions",
+      { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v780NonCriticalExtensions_05", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_v780ext,
-      { "radioBearerReconfiguration-v780ext", "rrc.radioBearerReconfiguration_v780ext",
+      { "radioBearerReconfiguration-v780ext", "rrc.radioBearerReconfiguration_v780ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_v780ext_IEs", HFILL }},
     { &hf_rrc_v790NonCriticalExtensions,
-      { "v790NonCriticalExtensions", "rrc.v790NonCriticalExtensions",
+      { "v790NonCriticalExtensions", "rrc.v790NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_radioBearerReconfiguration_v790ext,
-      { "radioBearerReconfiguration-v790ext", "rrc.radioBearerReconfiguration_v790ext",
+      { "radioBearerReconfiguration-v790ext", "rrc.radioBearerReconfiguration_v790ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_v790ext_IEs", HFILL }},
     { &hf_rrc_v7d0NonCriticalExtensions_06,
-      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions",
+      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7d0NonCriticalExtensions_06", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_v7d0ext,
-      { "radioBearerReconfiguration-v7d0ext", "rrc.radioBearerReconfiguration_v7d0ext",
+      { "radioBearerReconfiguration-v7d0ext", "rrc.radioBearerReconfiguration_v7d0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_v7d0ext_IEs", HFILL }},
     { &hf_rrc_v7f0NonCriticalExtensions_07,
-      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions",
+      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7f0NonCriticalExtensions_07", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_v7f0ext,
-      { "radioBearerReconfiguration-v7f0ext", "rrc.radioBearerReconfiguration_v7f0ext",
+      { "radioBearerReconfiguration-v7f0ext", "rrc.radioBearerReconfiguration_v7f0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_v7f0ext_IEs", HFILL }},
     { &hf_rrc_v7g0NonCriticalExtensions_08,
-      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions",
+      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7g0NonCriticalExtensions_08", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_v7g0ext,
-      { "radioBearerReconfiguration-v7g0ext", "rrc.radioBearerReconfiguration_v7g0ext",
+      { "radioBearerReconfiguration-v7g0ext", "rrc.radioBearerReconfiguration_v7g0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_v7g0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_88,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_88", HFILL }},
     { &hf_rrc_criticalExtensions_69,
@@ -149557,11 +149557,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_68_vals), 0,
         "T_criticalExtensions_68", HFILL }},
     { &hf_rrc_r8_07,
-      { "r8", "rrc.r8",
+      { "r8", "rrc.r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r8_07", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_r8,
-      { "radioBearerReconfiguration-r8", "rrc.radioBearerReconfiguration_r8",
+      { "radioBearerReconfiguration-r8", "rrc.radioBearerReconfiguration_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_r8_IEs", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_r8_add_ext,
@@ -149569,35 +149569,35 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v7d0NonCriticalExtensions_07,
-      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions",
+      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7d0NonCriticalExtensions_07", HFILL }},
     { &hf_rrc_v7f0NonCriticalExtensions_08,
-      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions",
+      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7f0NonCriticalExtensions_08", HFILL }},
     { &hf_rrc_v890NonCriticalExtensions_05,
-      { "v890NonCriticalExtensions", "rrc.v890NonCriticalExtensions",
+      { "v890NonCriticalExtensions", "rrc.v890NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v890NonCriticalExtensions_05", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_v890ext,
-      { "radioBearerReconfiguration-v890ext", "rrc.radioBearerReconfiguration_v890ext",
+      { "radioBearerReconfiguration-v890ext", "rrc.radioBearerReconfiguration_v890ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_v890ext_IEs", HFILL }},
     { &hf_rrc_v7g0NonCriticalExtensions_09,
-      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions",
+      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7g0NonCriticalExtensions_09", HFILL }},
     { &hf_rrc_v8a0NonCriticalExtensions_05,
-      { "v8a0NonCriticalExtensions", "rrc.v8a0NonCriticalExtensions",
+      { "v8a0NonCriticalExtensions", "rrc.v8a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v8a0NonCriticalExtensions_05", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_v8a0ext,
-      { "radioBearerReconfiguration-v8a0ext", "rrc.radioBearerReconfiguration_v8a0ext",
+      { "radioBearerReconfiguration-v8a0ext", "rrc.radioBearerReconfiguration_v8a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_v8a0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_89,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_89", HFILL }},
     { &hf_rrc_criticalExtensions_70,
@@ -149605,11 +149605,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_69_vals), 0,
         "T_criticalExtensions_69", HFILL }},
     { &hf_rrc_r9_06,
-      { "r9", "rrc.r9",
+      { "r9", "rrc.r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r9_06", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_r9,
-      { "radioBearerReconfiguration-r9", "rrc.radioBearerReconfiguration_r9",
+      { "radioBearerReconfiguration-r9", "rrc.radioBearerReconfiguration_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_r9_IEs", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_r9_add_ext,
@@ -149617,23 +149617,23 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v950NonCriticalExtensions_04,
-      { "v950NonCriticalExtensions", "rrc.v950NonCriticalExtensions",
+      { "v950NonCriticalExtensions", "rrc.v950NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v950NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_v950ext,
-      { "radioBearerReconfiguration-v950ext", "rrc.radioBearerReconfiguration_v950ext",
+      { "radioBearerReconfiguration-v950ext", "rrc.radioBearerReconfiguration_v950ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_v950ext_IEs", HFILL }},
     { &hf_rrc_v9c0NonCriticalExtensions_04,
-      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions",
+      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v9c0NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_v9c0ext,
-      { "radioBearerReconfiguration-v9c0ext", "rrc.radioBearerReconfiguration_v9c0ext",
+      { "radioBearerReconfiguration-v9c0ext", "rrc.radioBearerReconfiguration_v9c0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_v9c0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_90,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_90", HFILL }},
     { &hf_rrc_criticalExtensions_71,
@@ -149641,11 +149641,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_70_vals), 0,
         "T_criticalExtensions_70", HFILL }},
     { &hf_rrc_r10_06,
-      { "r10", "rrc.r10",
+      { "r10", "rrc.r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r10_06", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_r10,
-      { "radioBearerReconfiguration-r10", "rrc.radioBearerReconfiguration_r10",
+      { "radioBearerReconfiguration-r10", "rrc.radioBearerReconfiguration_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_r10_IEs", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_r10_add_ext,
@@ -149653,27 +149653,27 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v9c0NonCriticalExtensions_05,
-      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions",
+      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v9c0NonCriticalExtensions_05", HFILL }},
     { &hf_rrc_vaa0NonCriticalExtensions_01,
-      { "vaa0NonCriticalExtensions", "rrc.vaa0NonCriticalExtensions",
+      { "vaa0NonCriticalExtensions", "rrc.vaa0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vaa0NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_vaa0ext,
-      { "radioBearerReconfiguration-vaa0ext", "rrc.radioBearerReconfiguration_vaa0ext",
+      { "radioBearerReconfiguration-vaa0ext", "rrc.radioBearerReconfiguration_vaa0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_vaa0ext_IEs", HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions_12,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vb50NonCriticalExtensions_12", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_vb50ext,
-      { "radioBearerReconfiguration-vb50ext", "rrc.radioBearerReconfiguration_vb50ext",
+      { "radioBearerReconfiguration-vb50ext", "rrc.radioBearerReconfiguration_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_vb50ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_91,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_91", HFILL }},
     { &hf_rrc_criticalExtensions_72,
@@ -149681,11 +149681,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_71_vals), 0,
         "T_criticalExtensions_71", HFILL }},
     { &hf_rrc_r11_07,
-      { "r11", "rrc.r11",
+      { "r11", "rrc.r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r11_07", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_r11,
-      { "radioBearerReconfiguration-r11", "rrc.radioBearerReconfiguration_r11",
+      { "radioBearerReconfiguration-r11", "rrc.radioBearerReconfiguration_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfiguration_r11_IEs", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_r11_add_ext,
@@ -149693,11 +149693,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_92,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_92", HFILL }},
     { &hf_rrc_criticalExtensions_73,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_72", HFILL }},
     { &hf_rrc_um_RLC_ReEstablishmentRBList,
@@ -149713,7 +149713,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dummy_01_vals), 0,
         "T_dummy_01", HFILL }},
     { &hf_rrc_fdd_21,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_21", HFILL }},
     { &hf_rrc_dummy1,
@@ -149729,7 +149729,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificPhysChInfo_03_vals), 0,
         "T_modeSpecificPhysChInfo_03", HFILL }},
     { &hf_rrc_fdd_22,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_22", HFILL }},
     { &hf_rrc_dummy_17,
@@ -149737,7 +149737,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dummy_02_vals), 0,
         "T_dummy_02", HFILL }},
     { &hf_rrc_fdd_23,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_23", HFILL }},
     { &hf_rrc_modeSpecificPhysChInfo_04,
@@ -149745,7 +149745,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificPhysChInfo_04_vals), 0,
         "T_modeSpecificPhysChInfo_04", HFILL }},
     { &hf_rrc_fdd_24,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_24", HFILL }},
     { &hf_rrc_specificationMode_09,
@@ -149753,7 +149753,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_09_vals), 0,
         "T_specificationMode_09", HFILL }},
     { &hf_rrc_complete_09,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_complete_09", HFILL }},
     { &hf_rrc_rb_PDCPContextRelocationList,
@@ -149765,11 +149765,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dummy_03_vals), 0,
         "T_dummy_03", HFILL }},
     { &hf_rrc_fdd_25,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_25", HFILL }},
     { &hf_rrc_preconfiguration_09,
-      { "preconfiguration", "rrc.preconfiguration",
+      { "preconfiguration", "rrc.preconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_preconfiguration_09", HFILL }},
     { &hf_rrc_preConfigMode_09,
@@ -149777,7 +149777,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_preConfigMode_09_vals), 0,
         "T_preConfigMode_09", HFILL }},
     { &hf_rrc_defaultConfig_09,
-      { "defaultConfig", "rrc.defaultConfig",
+      { "defaultConfig", "rrc.defaultConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_defaultConfig_09", HFILL }},
     { &hf_rrc_modeSpecificPhysChInfo_05,
@@ -149785,7 +149785,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificPhysChInfo_05_vals), 0,
         "T_modeSpecificPhysChInfo_05", HFILL }},
     { &hf_rrc_fdd_26,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_26", HFILL }},
     { &hf_rrc_specificationMode_10,
@@ -149793,11 +149793,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_10_vals), 0,
         "T_specificationMode_10", HFILL }},
     { &hf_rrc_complete_10,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_complete_10", HFILL }},
     { &hf_rrc_preconfiguration_10,
-      { "preconfiguration", "rrc.preconfiguration",
+      { "preconfiguration", "rrc.preconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_preconfiguration_10", HFILL }},
     { &hf_rrc_preConfigMode_10,
@@ -149805,7 +149805,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_preConfigMode_10_vals), 0,
         "T_preConfigMode_10", HFILL }},
     { &hf_rrc_defaultConfig_10,
-      { "defaultConfig", "rrc.defaultConfig",
+      { "defaultConfig", "rrc.defaultConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_defaultConfig_10", HFILL }},
     { &hf_rrc_postVerificationPeriod_02,
@@ -149817,7 +149817,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_11_vals), 0,
         "T_specificationMode_11", HFILL }},
     { &hf_rrc_complete_11,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_complete_11", HFILL }},
     { &hf_rrc_rab_InformationMBMSPtpList,
@@ -149833,11 +149833,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_12_vals), 0,
         "T_specificationMode_12", HFILL }},
     { &hf_rrc_complete_12,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_complete_12", HFILL }},
     { &hf_rrc_preconfiguration_11,
-      { "preconfiguration", "rrc.preconfiguration",
+      { "preconfiguration", "rrc.preconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_preconfiguration_11", HFILL }},
     { &hf_rrc_preConfigMode_11,
@@ -149845,7 +149845,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_preConfigMode_11_vals), 0,
         "T_preConfigMode_11", HFILL }},
     { &hf_rrc_defaultConfig_11,
-      { "defaultConfig", "rrc.defaultConfig",
+      { "defaultConfig", "rrc.defaultConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_defaultConfig_11", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_r7_add_ext,
@@ -149861,7 +149861,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_13_vals), 0,
         "T_specificationMode_13", HFILL }},
     { &hf_rrc_complete_13,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_complete_13", HFILL }},
     { &hf_rrc_rab_InformationReconfigList_01,
@@ -149869,7 +149869,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RAB_InformationReconfigList_r8", HFILL }},
     { &hf_rrc_preconfiguration_12,
-      { "preconfiguration", "rrc.preconfiguration",
+      { "preconfiguration", "rrc.preconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_preconfiguration_12", HFILL }},
     { &hf_rrc_preConfigMode_12,
@@ -149877,7 +149877,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_preConfigMode_12_vals), 0,
         "T_preConfigMode_12", HFILL }},
     { &hf_rrc_defaultConfig_12,
-      { "defaultConfig", "rrc.defaultConfig",
+      { "defaultConfig", "rrc.defaultConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_defaultConfig_12", HFILL }},
     { &hf_rrc_responseToChangeOfUE_Capability_07,
@@ -149889,11 +149889,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_14_vals), 0,
         "T_specificationMode_14", HFILL }},
     { &hf_rrc_complete_14,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_complete_14", HFILL }},
     { &hf_rrc_preconfiguration_13,
-      { "preconfiguration", "rrc.preconfiguration",
+      { "preconfiguration", "rrc.preconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_preconfiguration_13", HFILL }},
     { &hf_rrc_preConfigMode_13,
@@ -149901,7 +149901,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_preConfigMode_13_vals), 0,
         "T_preConfigMode_13", HFILL }},
     { &hf_rrc_defaultConfig_13,
-      { "defaultConfig", "rrc.defaultConfig",
+      { "defaultConfig", "rrc.defaultConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_defaultConfig_13", HFILL }},
     { &hf_rrc_responseToChangeOfUE_Capability_08,
@@ -149913,11 +149913,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_15_vals), 0,
         "T_specificationMode_15", HFILL }},
     { &hf_rrc_complete_15,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_complete_15", HFILL }},
     { &hf_rrc_preconfiguration_14,
-      { "preconfiguration", "rrc.preconfiguration",
+      { "preconfiguration", "rrc.preconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_preconfiguration_14", HFILL }},
     { &hf_rrc_preConfigMode_14,
@@ -149925,7 +149925,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_preConfigMode_14_vals), 0,
         "T_preConfigMode_14", HFILL }},
     { &hf_rrc_defaultConfig_14,
-      { "defaultConfig", "rrc.defaultConfig",
+      { "defaultConfig", "rrc.defaultConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_defaultConfig_14", HFILL }},
     { &hf_rrc_responseToChangeOfUE_Capability_09,
@@ -149937,7 +149937,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_16_vals), 0,
         "T_specificationMode_16", HFILL }},
     { &hf_rrc_complete_16,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_complete_16", HFILL }},
     { &hf_rrc_umRlc_ReEstablishmentRBList,
@@ -149945,7 +149945,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RB_IdentityList", HFILL }},
     { &hf_rrc_preconfiguration_15,
-      { "preconfiguration", "rrc.preconfiguration",
+      { "preconfiguration", "rrc.preconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_preconfiguration_15", HFILL }},
     { &hf_rrc_preConfigMode_15,
@@ -149953,11 +149953,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_preConfigMode_15_vals), 0,
         "T_preConfigMode_15", HFILL }},
     { &hf_rrc_defaultConfig_15,
-      { "defaultConfig", "rrc.defaultConfig",
+      { "defaultConfig", "rrc.defaultConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_defaultConfig_15", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_29,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_29", HFILL }},
     { &hf_rrc_radioBearerReconfigurationComplete_r3_add_ext,
@@ -149965,15 +149965,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_14,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_14", HFILL }},
     { &hf_rrc_radioBearerReconfigurationComplete_v770ext,
-      { "radioBearerReconfigurationComplete-v770ext", "rrc.radioBearerReconfigurationComplete_v770ext",
+      { "radioBearerReconfigurationComplete-v770ext", "rrc.radioBearerReconfigurationComplete_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReconfigurationComplete_v770ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_93,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_93", HFILL }},
     { &hf_rrc_deferredMeasurementControlReading_01,
@@ -149985,7 +149985,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RB_IdentityList", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_30,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_30", HFILL }},
     { &hf_rrc_radioBearerReconfigurationFailure_r3_add_ext,
@@ -149993,27 +149993,27 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_94,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_94", HFILL }},
     { &hf_rrc_r3_15,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_15", HFILL }},
     { &hf_rrc_radioBearerRelease_r3,
-      { "radioBearerRelease-r3", "rrc.radioBearerRelease_r3",
+      { "radioBearerRelease-r3", "rrc.radioBearerRelease_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerRelease_r3_IEs", HFILL }},
     { &hf_rrc_v3a0NonCriticalExtensions_06,
-      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions",
+      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v3a0NonCriticalExtensions_06", HFILL }},
     { &hf_rrc_radioBearerRelease_v3a0ext,
-      { "radioBearerRelease-v3a0ext", "rrc.radioBearerRelease_v3a0ext",
+      { "radioBearerRelease-v3a0ext", "rrc.radioBearerRelease_v3a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_31,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_31", HFILL }},
     { &hf_rrc_radioBearerRelease_r3_add_ext,
@@ -150021,43 +150021,43 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_08,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_08", HFILL }},
     { &hf_rrc_radioBearerRelease_v4b0ext,
-      { "radioBearerRelease-v4b0ext", "rrc.radioBearerRelease_v4b0ext",
+      { "radioBearerRelease-v4b0ext", "rrc.radioBearerRelease_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerRelease_v4b0ext_IEs", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_16,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_16", HFILL }},
     { &hf_rrc_radioBearerRelease_v590ext,
-      { "radioBearerRelease-v590ext", "rrc.radioBearerRelease_v590ext",
+      { "radioBearerRelease-v590ext", "rrc.radioBearerRelease_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerRelease_v590ext_IEs", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_19,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_19", HFILL }},
     { &hf_rrc_radioBearerRelease_v690ext,
-      { "radioBearerRelease-v690ext", "rrc.radioBearerRelease_v690ext",
+      { "radioBearerRelease-v690ext", "rrc.radioBearerRelease_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerRelease_v690ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_15,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_15", HFILL }},
     { &hf_rrc_radioBearerRelease_v770ext,
-      { "radioBearerRelease-v770ext", "rrc.radioBearerRelease_v770ext",
+      { "radioBearerRelease-v770ext", "rrc.radioBearerRelease_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerRelease_v770ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_95,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_95", HFILL }},
     { &hf_rrc_later_than_r3_13,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_13", HFILL }},
     { &hf_rrc_criticalExtensions_74,
@@ -150065,15 +150065,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_73_vals), 0,
         "T_criticalExtensions_73", HFILL }},
     { &hf_rrc_r4_07,
-      { "r4", "rrc.r4",
+      { "r4", "rrc.r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r4_07", HFILL }},
     { &hf_rrc_radioBearerRelease_r4,
-      { "radioBearerRelease-r4", "rrc.radioBearerRelease_r4",
+      { "radioBearerRelease-r4", "rrc.radioBearerRelease_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerRelease_r4_IEs", HFILL }},
     { &hf_rrc_v4d0NonCriticalExtensions_07,
-      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions",
+      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4d0NonCriticalExtensions_07", HFILL }},
     { &hf_rrc_radioBearerRelease_r4_add_ext,
@@ -150081,19 +150081,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_17,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_17", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_20,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_20", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_16,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_16", HFILL }},
     { &hf_rrc_nonCriticalExtensions_96,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_96", HFILL }},
     { &hf_rrc_criticalExtensions_75,
@@ -150101,11 +150101,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_74_vals), 0,
         "T_criticalExtensions_74", HFILL }},
     { &hf_rrc_r5_06,
-      { "r5", "rrc.r5",
+      { "r5", "rrc.r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r5_06", HFILL }},
     { &hf_rrc_radioBearerRelease_r5,
-      { "radioBearerRelease-r5", "rrc.radioBearerRelease_r5",
+      { "radioBearerRelease-r5", "rrc.radioBearerRelease_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerRelease_r5_IEs", HFILL }},
     { &hf_rrc_radioBearerRelease_r5_add_ext,
@@ -150113,15 +150113,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_21,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_21", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_17,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_17", HFILL }},
     { &hf_rrc_nonCriticalExtensions_97,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_97", HFILL }},
     { &hf_rrc_criticalExtensions_76,
@@ -150129,11 +150129,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_75_vals), 0,
         "T_criticalExtensions_75", HFILL }},
     { &hf_rrc_r6_08,
-      { "r6", "rrc.r6",
+      { "r6", "rrc.r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r6_08", HFILL }},
     { &hf_rrc_radioBearerRelease_r6,
-      { "radioBearerRelease-r6", "rrc.radioBearerRelease_r6",
+      { "radioBearerRelease-r6", "rrc.radioBearerRelease_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerRelease_r6_IEs", HFILL }},
     { &hf_rrc_radioBearerRelease_r6_add_ext,
@@ -150141,19 +150141,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_08,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6b0NonCriticalExtensions_07", HFILL }},
     { &hf_rrc_radioBearerRelease_v6b0ext,
-      { "radioBearerRelease-v6b0ext", "rrc.radioBearerRelease_v6b0ext",
+      { "radioBearerRelease-v6b0ext", "rrc.radioBearerRelease_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerRelease_v6b0ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_18,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_18", HFILL }},
     { &hf_rrc_nonCriticalExtensions_98,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_98", HFILL }},
     { &hf_rrc_criticalExtensions_77,
@@ -150161,11 +150161,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_76_vals), 0,
         "T_criticalExtensions_76", HFILL }},
     { &hf_rrc_r7_07,
-      { "r7", "rrc.r7",
+      { "r7", "rrc.r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r7_07", HFILL }},
     { &hf_rrc_radioBearerRelease_r7,
-      { "radioBearerRelease-r7", "rrc.radioBearerRelease_r7",
+      { "radioBearerRelease-r7", "rrc.radioBearerRelease_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerRelease_r7_IEs", HFILL }},
     { &hf_rrc_radioBearerRelease_r7_add_ext,
@@ -150173,39 +150173,39 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v780NonCriticalExtensions_06,
-      { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions",
+      { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v780NonCriticalExtensions_06", HFILL }},
     { &hf_rrc_radioBearerRelease_v780ext,
-      { "radioBearerRelease-v780ext", "rrc.radioBearerRelease_v780ext",
+      { "radioBearerRelease-v780ext", "rrc.radioBearerRelease_v780ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerRelease_v780ext_IEs", HFILL }},
     { &hf_rrc_v7d0NonCriticalExtensions_08,
-      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions",
+      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7d0NonCriticalExtensions_08", HFILL }},
     { &hf_rrc_radioBearerRelease_v7d0ext,
-      { "radioBearerRelease-v7d0ext", "rrc.radioBearerRelease_v7d0ext",
+      { "radioBearerRelease-v7d0ext", "rrc.radioBearerRelease_v7d0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerRelease_v7d0ext_IEs", HFILL }},
     { &hf_rrc_v7f0NonCriticalExtensions_09,
-      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions",
+      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7f0NonCriticalExtensions_09", HFILL }},
     { &hf_rrc_radioBearerRelease_v7f0ext,
-      { "radioBearerRelease-v7f0ext", "rrc.radioBearerRelease_v7f0ext",
+      { "radioBearerRelease-v7f0ext", "rrc.radioBearerRelease_v7f0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerRelease_v7f0ext_IEs", HFILL }},
     { &hf_rrc_v7g0NonCriticalExtensions_10,
-      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions",
+      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7g0NonCriticalExtensions_10", HFILL }},
     { &hf_rrc_radioBearerRelease_v7g0ext,
-      { "radioBearerRelease-v7g0ext", "rrc.radioBearerRelease_v7g0ext",
+      { "radioBearerRelease-v7g0ext", "rrc.radioBearerRelease_v7g0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerRelease_v7g0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_99,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_99", HFILL }},
     { &hf_rrc_criticalExtensions_78,
@@ -150213,11 +150213,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_77_vals), 0,
         "T_criticalExtensions_77", HFILL }},
     { &hf_rrc_r8_08,
-      { "r8", "rrc.r8",
+      { "r8", "rrc.r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r8_08", HFILL }},
     { &hf_rrc_radioBearerRelease_r8,
-      { "radioBearerRelease-r8", "rrc.radioBearerRelease_r8",
+      { "radioBearerRelease-r8", "rrc.radioBearerRelease_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerRelease_r8_IEs", HFILL }},
     { &hf_rrc_radioBearerRelease_r8_add_ext,
@@ -150225,35 +150225,35 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v7d0NonCriticalExtensions_09,
-      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions",
+      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7d0NonCriticalExtensions_09", HFILL }},
     { &hf_rrc_v7f0NonCriticalExtensions_10,
-      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions",
+      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7f0NonCriticalExtensions_10", HFILL }},
     { &hf_rrc_v890NonCriticalExtensions_06,
-      { "v890NonCriticalExtensions", "rrc.v890NonCriticalExtensions",
+      { "v890NonCriticalExtensions", "rrc.v890NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v890NonCriticalExtensions_06", HFILL }},
     { &hf_rrc_radioBearerRelease_v890ext,
-      { "radioBearerRelease-v890ext", "rrc.radioBearerRelease_v890ext",
+      { "radioBearerRelease-v890ext", "rrc.radioBearerRelease_v890ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerRelease_v890ext_IEs", HFILL }},
     { &hf_rrc_v7g0NonCriticalExtensions_11,
-      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions",
+      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7g0NonCriticalExtensions_11", HFILL }},
     { &hf_rrc_v8a0NonCriticalExtensions_06,
-      { "v8a0NonCriticalExtensions", "rrc.v8a0NonCriticalExtensions",
+      { "v8a0NonCriticalExtensions", "rrc.v8a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v8a0NonCriticalExtensions_06", HFILL }},
     { &hf_rrc_radioBearerRelease_v8a0ext,
-      { "radioBearerRelease-v8a0ext", "rrc.radioBearerRelease_v8a0ext",
+      { "radioBearerRelease-v8a0ext", "rrc.radioBearerRelease_v8a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerRelease_v8a0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_100,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_100", HFILL }},
     { &hf_rrc_criticalExtensions_79,
@@ -150261,11 +150261,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_78_vals), 0,
         "T_criticalExtensions_78", HFILL }},
     { &hf_rrc_r9_07,
-      { "r9", "rrc.r9",
+      { "r9", "rrc.r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r9_07", HFILL }},
     { &hf_rrc_radioBearerRelease_r9,
-      { "radioBearerRelease-r9", "rrc.radioBearerRelease_r9",
+      { "radioBearerRelease-r9", "rrc.radioBearerRelease_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerRelease_r9_IEs", HFILL }},
     { &hf_rrc_radioBearerRelease_r9_add_ext,
@@ -150273,31 +150273,31 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v950NonCriticalExtensions_05,
-      { "v950NonCriticalExtensions", "rrc.v950NonCriticalExtensions",
+      { "v950NonCriticalExtensions", "rrc.v950NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v950NonCriticalExtensions_05", HFILL }},
     { &hf_rrc_radioBearerRelease_v950ext,
-      { "radioBearerRelease-v950ext", "rrc.radioBearerRelease_v950ext",
+      { "radioBearerRelease-v950ext", "rrc.radioBearerRelease_v950ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerRelease_v950ext_IEs", HFILL }},
     { &hf_rrc_v970NonCriticalExtensions_02,
-      { "v970NonCriticalExtensions", "rrc.v970NonCriticalExtensions",
+      { "v970NonCriticalExtensions", "rrc.v970NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v970NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_radioBearerRelease_v970ext,
-      { "radioBearerRelease-v970ext", "rrc.radioBearerRelease_v970ext",
+      { "radioBearerRelease-v970ext", "rrc.radioBearerRelease_v970ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerRelease_v970ext_IEs", HFILL }},
     { &hf_rrc_v9c0NonCriticalExtensions_06,
-      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions",
+      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v9c0NonCriticalExtensions_06", HFILL }},
     { &hf_rrc_radioBearerRelease_v9c0ext,
-      { "radioBearerRelease-v9c0ext", "rrc.radioBearerRelease_v9c0ext",
+      { "radioBearerRelease-v9c0ext", "rrc.radioBearerRelease_v9c0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerRelease_v9c0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_101,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_101", HFILL }},
     { &hf_rrc_criticalExtensions_80,
@@ -150305,11 +150305,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_79_vals), 0,
         "T_criticalExtensions_79", HFILL }},
     { &hf_rrc_r10_07,
-      { "r10", "rrc.r10",
+      { "r10", "rrc.r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r10_07", HFILL }},
     { &hf_rrc_radioBearerRelease_r10,
-      { "radioBearerRelease-r10", "rrc.radioBearerRelease_r10",
+      { "radioBearerRelease-r10", "rrc.radioBearerRelease_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerRelease_r10_IEs", HFILL }},
     { &hf_rrc_radioBearerRelease_r10_add_ext,
@@ -150317,19 +150317,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v9c0NonCriticalExtensions_07,
-      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions",
+      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v9c0NonCriticalExtensions_07", HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions_13,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vb50NonCriticalExtensions_13", HFILL }},
     { &hf_rrc_radioBearerRelease_vb50ext,
-      { "radioBearerRelease-vb50ext", "rrc.radioBearerRelease_vb50ext",
+      { "radioBearerRelease-vb50ext", "rrc.radioBearerRelease_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerRelease_vb50ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_102,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_102", HFILL }},
     { &hf_rrc_criticalExtensions_81,
@@ -150337,11 +150337,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_80_vals), 0,
         "T_criticalExtensions_80", HFILL }},
     { &hf_rrc_r11_08,
-      { "r11", "rrc.r11",
+      { "r11", "rrc.r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r11_08", HFILL }},
     { &hf_rrc_radioBearerRelease_r11,
-      { "radioBearerRelease-r11", "rrc.radioBearerRelease_r11",
+      { "radioBearerRelease-r11", "rrc.radioBearerRelease_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerRelease_r11_IEs", HFILL }},
     { &hf_rrc_radioBearerRelease_r11_add_ext,
@@ -150349,11 +150349,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_103,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_103", HFILL }},
     { &hf_rrc_criticalExtensions_82,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_81", HFILL }},
     { &hf_rrc_signallingConnectionRelIndication,
@@ -150365,7 +150365,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dummy_04_vals), 0,
         "T_dummy_04", HFILL }},
     { &hf_rrc_fdd_27,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_27", HFILL }},
     { &hf_rrc_modeSpecificPhysChInfo_06,
@@ -150373,7 +150373,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificPhysChInfo_06_vals), 0,
         "T_modeSpecificPhysChInfo_06", HFILL }},
     { &hf_rrc_fdd_28,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_28", HFILL }},
     { &hf_rrc_dummy_20,
@@ -150381,7 +150381,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dummy_05_vals), 0,
         "T_dummy_05", HFILL }},
     { &hf_rrc_fdd_29,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_29", HFILL }},
     { &hf_rrc_modeSpecificPhysChInfo_07,
@@ -150389,7 +150389,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificPhysChInfo_07_vals), 0,
         "T_modeSpecificPhysChInfo_07", HFILL }},
     { &hf_rrc_fdd_30,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_30", HFILL }},
     { &hf_rrc_dummy_21,
@@ -150397,7 +150397,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dummy_06_vals), 0,
         "T_dummy_06", HFILL }},
     { &hf_rrc_fdd_31,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_31", HFILL }},
     { &hf_rrc_modeSpecificPhysChInfo_08,
@@ -150405,7 +150405,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificPhysChInfo_08_vals), 0,
         "T_modeSpecificPhysChInfo_08", HFILL }},
     { &hf_rrc_fdd_32,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_32", HFILL }},
     { &hf_rrc_postVerificationPeriod_03,
@@ -150417,7 +150417,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RB_InformationReleaseList", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_32,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_32", HFILL }},
     { &hf_rrc_radioBearerReleaseComplete_r3_add_ext,
@@ -150425,15 +150425,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_19,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_19", HFILL }},
     { &hf_rrc_radioBearerReleaseComplete_v770ext,
-      { "radioBearerReleaseComplete-v770ext", "rrc.radioBearerReleaseComplete_v770ext",
+      { "radioBearerReleaseComplete-v770ext", "rrc.radioBearerReleaseComplete_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerReleaseComplete_v770ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_104,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_104", HFILL }},
     { &hf_rrc_deferredMeasurementControlReading_02,
@@ -150441,7 +150441,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_deferredMeasurementControlReading_02_vals), 0,
         "T_deferredMeasurementControlReading_02", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_33,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_33", HFILL }},
     { &hf_rrc_radioBearerReleaseFailure_r3_add_ext,
@@ -150449,27 +150449,27 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_105,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_105", HFILL }},
     { &hf_rrc_r3_16,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_16", HFILL }},
     { &hf_rrc_radioBearerSetup_r3,
-      { "radioBearerSetup-r3", "rrc.radioBearerSetup_r3",
+      { "radioBearerSetup-r3", "rrc.radioBearerSetup_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerSetup_r3_IEs", HFILL }},
     { &hf_rrc_v3a0NonCriticalExtensions_07,
-      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions",
+      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v3a0NonCriticalExtensions_07", HFILL }},
     { &hf_rrc_radioBearerSetup_v3a0ext,
-      { "radioBearerSetup-v3a0ext", "rrc.radioBearerSetup_v3a0ext",
+      { "radioBearerSetup-v3a0ext", "rrc.radioBearerSetup_v3a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_34,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_34", HFILL }},
     { &hf_rrc_radioBearerSetup_r3_add_ext,
@@ -150477,43 +150477,43 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_09,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_09", HFILL }},
     { &hf_rrc_radioBearerSetup_v4b0ext,
-      { "radioBearerSetup-v4b0ext", "rrc.radioBearerSetup_v4b0ext",
+      { "radioBearerSetup-v4b0ext", "rrc.radioBearerSetup_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerSetup_v4b0ext_IEs", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_18,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_18", HFILL }},
     { &hf_rrc_radioBearerSetup_v590ext,
-      { "radioBearerSetup-v590ext", "rrc.radioBearerSetup_v590ext",
+      { "radioBearerSetup-v590ext", "rrc.radioBearerSetup_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerSetup_v590ext_IEs", HFILL }},
     { &hf_rrc_v5d0NonCriticalExtenstions_09,
-      { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions",
+      { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v5d0NonCriticalExtenstions_09", HFILL }},
     { &hf_rrc_radioBearerSetup_v5d0ext,
-      { "radioBearerSetup-v5d0ext", "rrc.radioBearerSetup_v5d0ext",
+      { "radioBearerSetup-v5d0ext", "rrc.radioBearerSetup_v5d0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerSetup_v5d0ext_IEs", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_22,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_22", HFILL }},
     { &hf_rrc_radioBearerSetup_v690ext,
-      { "radioBearerSetup-v690ext", "rrc.radioBearerSetup_v690ext",
+      { "radioBearerSetup-v690ext", "rrc.radioBearerSetup_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerSetup_v690ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_106,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_106", HFILL }},
     { &hf_rrc_later_than_r3_14,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_14", HFILL }},
     { &hf_rrc_criticalExtensions_83,
@@ -150521,15 +150521,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_82_vals), 0,
         "T_criticalExtensions_82", HFILL }},
     { &hf_rrc_r4_08,
-      { "r4", "rrc.r4",
+      { "r4", "rrc.r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r4_08", HFILL }},
     { &hf_rrc_radioBearerSetup_r4,
-      { "radioBearerSetup-r4", "rrc.radioBearerSetup_r4",
+      { "radioBearerSetup-r4", "rrc.radioBearerSetup_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerSetup_r4_IEs", HFILL }},
     { &hf_rrc_v4d0NonCriticalExtensions_08,
-      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions",
+      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4d0NonCriticalExtensions_08", HFILL }},
     { &hf_rrc_radioBearerSetup_r4_add_ext,
@@ -150537,19 +150537,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_19,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_19", HFILL }},
     { &hf_rrc_v5d0NonCriticalExtenstions_10,
-      { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions",
+      { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v5d0NonCriticalExtenstions_10", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_23,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_23", HFILL }},
     { &hf_rrc_nonCriticalExtensions_107,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_107", HFILL }},
     { &hf_rrc_criticalExtensions_84,
@@ -150557,11 +150557,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_83_vals), 0,
         "T_criticalExtensions_83", HFILL }},
     { &hf_rrc_r5_07,
-      { "r5", "rrc.r5",
+      { "r5", "rrc.r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r5_07", HFILL }},
     { &hf_rrc_radioBearerSetup_r5,
-      { "radioBearerSetup-r5", "rrc.radioBearerSetup_r5",
+      { "radioBearerSetup-r5", "rrc.radioBearerSetup_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerSetup_r5_IEs", HFILL }},
     { &hf_rrc_radioBearerSetup_r5_add_ext,
@@ -150569,15 +150569,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v5d0NonCriticalExtenstions_11,
-      { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions",
+      { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v5d0NonCriticalExtenstions_11", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_24,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_24", HFILL }},
     { &hf_rrc_nonCriticalExtensions_108,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_108", HFILL }},
     { &hf_rrc_criticalExtensions_85,
@@ -150585,11 +150585,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_84_vals), 0,
         "T_criticalExtensions_84", HFILL }},
     { &hf_rrc_r6_09,
-      { "r6", "rrc.r6",
+      { "r6", "rrc.r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r6_09", HFILL }},
     { &hf_rrc_radioBearerSetup_r6,
-      { "radioBearerSetup-r6", "rrc.radioBearerSetup_r6",
+      { "radioBearerSetup-r6", "rrc.radioBearerSetup_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerSetup_r6_IEs", HFILL }},
     { &hf_rrc_radioBearerSetup_r6_add_ext,
@@ -150597,15 +150597,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_09,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6b0NonCriticalExtensions_08", HFILL }},
     { &hf_rrc_radioBearerSetup_v6b0ext,
-      { "radioBearerSetup-v6b0ext", "rrc.radioBearerSetup_v6b0ext",
+      { "radioBearerSetup-v6b0ext", "rrc.radioBearerSetup_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerSetup_v6b0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_109,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_109", HFILL }},
     { &hf_rrc_criticalExtensions_86,
@@ -150613,11 +150613,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_85_vals), 0,
         "T_criticalExtensions_85", HFILL }},
     { &hf_rrc_r7_08,
-      { "r7", "rrc.r7",
+      { "r7", "rrc.r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r7_08", HFILL }},
     { &hf_rrc_radioBearerSetup_r7,
-      { "radioBearerSetup-r7", "rrc.radioBearerSetup_r7",
+      { "radioBearerSetup-r7", "rrc.radioBearerSetup_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerSetup_r7_IEs", HFILL }},
     { &hf_rrc_radioBearerSetup_r7_add_ext,
@@ -150625,23 +150625,23 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v780NonCriticalExtensions_07,
-      { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions",
+      { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v780NonCriticalExtensions_07", HFILL }},
     { &hf_rrc_radioBearerSetup_v780ext,
-      { "radioBearerSetup-v780ext", "rrc.radioBearerSetup_v780ext",
+      { "radioBearerSetup-v780ext", "rrc.radioBearerSetup_v780ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerSetup_v780ext_IEs", HFILL }},
     { &hf_rrc_v820NonCriticalExtensions_01,
-      { "v820NonCriticalExtensions", "rrc.v820NonCriticalExtensions",
+      { "v820NonCriticalExtensions", "rrc.v820NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v820NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_radioBearerSetup_v820ext,
-      { "radioBearerSetup-v820ext", "rrc.radioBearerSetup_v820ext",
+      { "radioBearerSetup-v820ext", "rrc.radioBearerSetup_v820ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerSetup_v820ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_110,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_110", HFILL }},
     { &hf_rrc_criticalExtensions_87,
@@ -150649,11 +150649,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_86_vals), 0,
         "T_criticalExtensions_86", HFILL }},
     { &hf_rrc_r8_09,
-      { "r8", "rrc.r8",
+      { "r8", "rrc.r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r8_09", HFILL }},
     { &hf_rrc_radioBearerSetup_r8,
-      { "radioBearerSetup-r8", "rrc.radioBearerSetup_r8",
+      { "radioBearerSetup-r8", "rrc.radioBearerSetup_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerSetup_r8_IEs", HFILL }},
     { &hf_rrc_radioBearerSetup_r8_add_ext,
@@ -150661,47 +150661,47 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v7d0NonCriticalExtensions_10,
-      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions",
+      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7d0NonCriticalExtensions_10", HFILL }},
     { &hf_rrc_radioBearerSetup_v7d0ext,
-      { "radioBearerSetup-v7d0ext", "rrc.radioBearerSetup_v7d0ext",
+      { "radioBearerSetup-v7d0ext", "rrc.radioBearerSetup_v7d0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerSetup_v7d0ext_IEs", HFILL }},
     { &hf_rrc_v7f0NonCriticalExtensions_11,
-      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions",
+      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7f0NonCriticalExtensions_11", HFILL }},
     { &hf_rrc_radioBearerSetup_v7f0ext,
-      { "radioBearerSetup-v7f0ext", "rrc.radioBearerSetup_v7f0ext",
+      { "radioBearerSetup-v7f0ext", "rrc.radioBearerSetup_v7f0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerSetup_v7f0ext_IEs", HFILL }},
     { &hf_rrc_v890NonCriticalExtensions_07,
-      { "v890NonCriticalExtensions", "rrc.v890NonCriticalExtensions",
+      { "v890NonCriticalExtensions", "rrc.v890NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v890NonCriticalExtensions_07", HFILL }},
     { &hf_rrc_radioBearerSetup_v890ext,
-      { "radioBearerSetup-v890ext", "rrc.radioBearerSetup_v890ext",
+      { "radioBearerSetup-v890ext", "rrc.radioBearerSetup_v890ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerSetup_v890ext_IEs", HFILL }},
     { &hf_rrc_v7g0NonCriticalExtensions_12,
-      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions",
+      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7g0NonCriticalExtensions_12", HFILL }},
     { &hf_rrc_radioBearerSetup_v7g0ext,
-      { "radioBearerSetup-v7g0ext", "rrc.radioBearerSetup_v7g0ext",
+      { "radioBearerSetup-v7g0ext", "rrc.radioBearerSetup_v7g0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerSetup_v7g0ext_IEs", HFILL }},
     { &hf_rrc_v8a0NonCriticalExtensions_07,
-      { "v8a0NonCriticalExtensions", "rrc.v8a0NonCriticalExtensions",
+      { "v8a0NonCriticalExtensions", "rrc.v8a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v8a0NonCriticalExtensions_07", HFILL }},
     { &hf_rrc_radioBearerSetup_v8a0ext,
-      { "radioBearerSetup-v8a0ext", "rrc.radioBearerSetup_v8a0ext",
+      { "radioBearerSetup-v8a0ext", "rrc.radioBearerSetup_v8a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerSetup_v8a0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_111,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_111", HFILL }},
     { &hf_rrc_criticalExtensions_88,
@@ -150709,11 +150709,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_87_vals), 0,
         "T_criticalExtensions_87", HFILL }},
     { &hf_rrc_r9_08,
-      { "r9", "rrc.r9",
+      { "r9", "rrc.r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r9_08", HFILL }},
     { &hf_rrc_radioBearerSetup_r9,
-      { "radioBearerSetup-r9", "rrc.radioBearerSetup_r9",
+      { "radioBearerSetup-r9", "rrc.radioBearerSetup_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerSetup_r9_IEs", HFILL }},
     { &hf_rrc_radioBearerSetup_r9_add_ext,
@@ -150721,23 +150721,23 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v950NonCriticalExtensions_06,
-      { "v950NonCriticalExtensions", "rrc.v950NonCriticalExtensions",
+      { "v950NonCriticalExtensions", "rrc.v950NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v950NonCriticalExtensions_06", HFILL }},
     { &hf_rrc_radioBearerSetup_v950ext,
-      { "radioBearerSetup-v950ext", "rrc.radioBearerSetup_v950ext",
+      { "radioBearerSetup-v950ext", "rrc.radioBearerSetup_v950ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerSetup_v950ext_IEs", HFILL }},
     { &hf_rrc_v9c0NonCriticalExtensions_08,
-      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions",
+      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v9c0NonCriticalExtensions_08", HFILL }},
     { &hf_rrc_radioBearerSetup_v9c0ext,
-      { "radioBearerSetup-v9c0ext", "rrc.radioBearerSetup_v9c0ext",
+      { "radioBearerSetup-v9c0ext", "rrc.radioBearerSetup_v9c0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerSetup_v9c0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_112,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_112", HFILL }},
     { &hf_rrc_criticalExtensions_89,
@@ -150745,11 +150745,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_88_vals), 0,
         "T_criticalExtensions_88", HFILL }},
     { &hf_rrc_r10_08,
-      { "r10", "rrc.r10",
+      { "r10", "rrc.r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r10_08", HFILL }},
     { &hf_rrc_radioBearerSetup_r10,
-      { "radioBearerSetup-r10", "rrc.radioBearerSetup_r10",
+      { "radioBearerSetup-r10", "rrc.radioBearerSetup_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerSetup_r10_IEs", HFILL }},
     { &hf_rrc_radioBearerSetup_r10_add_ext,
@@ -150757,19 +150757,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v9c0NonCriticalExtensions_09,
-      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions",
+      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v9c0NonCriticalExtensions_09", HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions_14,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vb50NonCriticalExtensions_14", HFILL }},
     { &hf_rrc_radioBearerSetup_vb50ext,
-      { "radioBearerSetup-vb50ext", "rrc.radioBearerSetup_vb50ext",
+      { "radioBearerSetup-vb50ext", "rrc.radioBearerSetup_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerSetup_vb50ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_113,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_113", HFILL }},
     { &hf_rrc_criticalExtensions_90,
@@ -150777,11 +150777,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_89_vals), 0,
         "T_criticalExtensions_89", HFILL }},
     { &hf_rrc_r11_09,
-      { "r11", "rrc.r11",
+      { "r11", "rrc.r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r11_09", HFILL }},
     { &hf_rrc_radioBearerSetup_r11,
-      { "radioBearerSetup-r11", "rrc.radioBearerSetup_r11",
+      { "radioBearerSetup-r11", "rrc.radioBearerSetup_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerSetup_r11_IEs", HFILL }},
     { &hf_rrc_radioBearerSetup_r11_add_ext,
@@ -150789,11 +150789,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_114,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_114", HFILL }},
     { &hf_rrc_criticalExtensions_91,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_90", HFILL }},
     { &hf_rrc_dummy_22,
@@ -150801,7 +150801,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dummy_07_vals), 0,
         "T_dummy_07", HFILL }},
     { &hf_rrc_fdd_33,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_33", HFILL }},
     { &hf_rrc_modeSpecificPhysChInfo_09,
@@ -150809,7 +150809,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificPhysChInfo_09_vals), 0,
         "T_modeSpecificPhysChInfo_09", HFILL }},
     { &hf_rrc_fdd_34,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_34", HFILL }},
     { &hf_rrc_dummy_23,
@@ -150817,7 +150817,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dummy_08_vals), 0,
         "T_dummy_08", HFILL }},
     { &hf_rrc_fdd_35,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_35", HFILL }},
     { &hf_rrc_modeSpecificPhysChInfo_10,
@@ -150825,7 +150825,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificPhysChInfo_10_vals), 0,
         "T_modeSpecificPhysChInfo_10", HFILL }},
     { &hf_rrc_fdd_36,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_36", HFILL }},
     { &hf_rrc_dummy_24,
@@ -150833,7 +150833,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dummy_09_vals), 0,
         "T_dummy_09", HFILL }},
     { &hf_rrc_fdd_37,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_37", HFILL }},
     { &hf_rrc_modeSpecificPhysChInfo_11,
@@ -150841,7 +150841,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificPhysChInfo_11_vals), 0,
         "T_modeSpecificPhysChInfo_11", HFILL }},
     { &hf_rrc_fdd_38,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_38", HFILL }},
     { &hf_rrc_postVerificationPeriod_04,
@@ -150857,15 +150857,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_17_vals), 0,
         "T_specificationMode_17", HFILL }},
     { &hf_rrc_complete_17,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_complete_17", HFILL }},
     { &hf_rrc_dummy_25,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_dummy_10", HFILL }},
     { &hf_rrc_rab_Info_01,
-      { "rab-Info", "rrc.rab_Info",
+      { "rab-Info", "rrc.rab_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RAB_Info_r6", HFILL }},
     { &hf_rrc_rb_InformationChangedList,
@@ -150873,7 +150873,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RB_InformationChangedList_r6", HFILL }},
     { &hf_rrc_powerOffsetInfoShort,
-      { "powerOffsetInfoShort", "rrc.powerOffsetInfoShort",
+      { "powerOffsetInfoShort", "rrc.powerOffsetInfoShort_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rab_InformationSetupListExt,
@@ -150885,27 +150885,27 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_18_vals), 0,
         "T_specificationMode_18", HFILL }},
     { &hf_rrc_complete_18,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_complete_18", HFILL }},
     { &hf_rrc_dummy_26,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v7f0NonCriticalExtensions_12,
-      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions",
+      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7f0NonCriticalExtensions_12", HFILL }},
     { &hf_rrc_v7g0NonCriticalExtensions_13,
-      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions",
+      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7g0NonCriticalExtensions_13", HFILL }},
     { &hf_rrc_nonCriticalExtensions_115,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_115", HFILL }},
     { &hf_rrc_sr_vcc_Info,
-      { "sr-vcc-Info", "rrc.sr_vcc_Info",
+      { "sr-vcc-Info", "rrc.sr_vcc_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_srb_InformationSetupList_05,
@@ -150917,7 +150917,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RAB_InformationSetupList_r11", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_35,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_35", HFILL }},
     { &hf_rrc_radioBearerSetupComplete_r3_add_ext,
@@ -150925,15 +150925,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_20,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_20", HFILL }},
     { &hf_rrc_radioBearerSetupComplete_v770ext,
-      { "radioBearerSetupComplete-v770ext", "rrc.radioBearerSetupComplete_v770ext",
+      { "radioBearerSetupComplete-v770ext", "rrc.radioBearerSetupComplete_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RadioBearerSetupComplete_v770ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_116,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_116", HFILL }},
     { &hf_rrc_deferredMeasurementControlReading_03,
@@ -150941,7 +150941,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_deferredMeasurementControlReading_03_vals), 0,
         "T_deferredMeasurementControlReading_03", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_36,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_36", HFILL }},
     { &hf_rrc_radioBearerSetupFailure_r3_add_ext,
@@ -150949,19 +150949,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_117,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_117", HFILL }},
     { &hf_rrc_r3_17,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_17", HFILL }},
     { &hf_rrc_rrcConnectionReject_r3,
-      { "rrcConnectionReject-r3", "rrc.rrcConnectionReject_r3",
+      { "rrcConnectionReject-r3", "rrc.rrcConnectionReject_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReject_r3_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_37,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_37", HFILL }},
     { &hf_rrc_rrcConnectionReject_r3_add_ext,
@@ -150969,51 +150969,51 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_25,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_25", HFILL }},
     { &hf_rrc_rrcConnectionReject_v690ext,
-      { "rrcConnectionReject-v690ext", "rrc.rrcConnectionReject_v690ext",
+      { "rrcConnectionReject-v690ext", "rrc.rrcConnectionReject_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReject_v690ext_IEs", HFILL }},
     { &hf_rrc_v6f0NonCriticalExtensions_01,
-      { "v6f0NonCriticalExtensions", "rrc.v6f0NonCriticalExtensions",
+      { "v6f0NonCriticalExtensions", "rrc.v6f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6f0NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_rrcConnectionReject_v6f0ext,
-      { "rrcConnectionReject-v6f0ext", "rrc.rrcConnectionReject_v6f0ext",
+      { "rrcConnectionReject-v6f0ext", "rrc.rrcConnectionReject_v6f0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReject_v6f0ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_10,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_10", HFILL }},
     { &hf_rrc_rrcConnectionReject_v860ext,
-      { "rrcConnectionReject-v860ext", "rrc.rrcConnectionReject_v860ext",
+      { "rrcConnectionReject-v860ext", "rrc.rrcConnectionReject_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReject_v860ext_IEs", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions_05,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va40NonCriticalExtensions_05", HFILL }},
     { &hf_rrc_rrcConnectionReject_va40ext,
-      { "rrcConnectionReject-va40ext", "rrc.rrcConnectionReject_va40ext",
+      { "rrcConnectionReject-va40ext", "rrc.rrcConnectionReject_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReject_va40ext_IEs", HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions_15,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vb50NonCriticalExtensions_15", HFILL }},
     { &hf_rrc_rrcConnectionReject_vb50ext,
-      { "rrcConnectionReject-vb50ext", "rrc.rrcConnectionReject_vb50ext",
+      { "rrcConnectionReject-vb50ext", "rrc.rrcConnectionReject_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionReject_vb50ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_118,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_118", HFILL }},
     { &hf_rrc_later_than_r3_15,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_15", HFILL }},
     { &hf_rrc_initialUE_Identity,
@@ -151021,7 +151021,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_InitialUE_Identity_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_criticalExtensions_92,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_91", HFILL }},
     { &hf_rrc_rejectionCause,
@@ -151053,15 +151053,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "EUTRA_TargetFreqInfoList_vb50ext", HFILL }},
     { &hf_rrc_r3_18,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_18", HFILL }},
     { &hf_rrc_rrcConnectionRelease_r3,
-      { "rrcConnectionRelease-r3", "rrc.rrcConnectionRelease_r3",
+      { "rrcConnectionRelease-r3", "rrc.rrcConnectionRelease_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRelease_r3_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_38,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_38", HFILL }},
     { &hf_rrc_rrcConnectionRelease_r3_add_ext,
@@ -151069,43 +151069,43 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_26,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_26", HFILL }},
     { &hf_rrc_rrcConnectionRelease_v690ext,
-      { "rrcConnectionRelease-v690ext", "rrc.rrcConnectionRelease_v690ext",
+      { "rrcConnectionRelease-v690ext", "rrc.rrcConnectionRelease_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRelease_v690ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_21,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_21", HFILL }},
     { &hf_rrc_rrcConnectionRelease_v770ext,
-      { "rrcConnectionRelease-v770ext", "rrc.rrcConnectionRelease_v770ext",
+      { "rrcConnectionRelease-v770ext", "rrc.rrcConnectionRelease_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRelease_v770ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_11,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_11", HFILL }},
     { &hf_rrc_rrcConnectionRelease_v860ext,
-      { "rrcConnectionRelease-v860ext", "rrc.rrcConnectionRelease_v860ext",
+      { "rrcConnectionRelease-v860ext", "rrc.rrcConnectionRelease_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRelease_v860ext_IEs", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions_06,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va40NonCriticalExtensions_06", HFILL }},
     { &hf_rrc_rrcConnectionRelease_va40ext,
-      { "rrcConnectionRelease-va40ext", "rrc.rrcConnectionRelease_va40ext",
+      { "rrcConnectionRelease-va40ext", "rrc.rrcConnectionRelease_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRelease_va40ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_119,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_119", HFILL }},
     { &hf_rrc_later_than_r3_16,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_16", HFILL }},
     { &hf_rrc_criticalExtensions_93,
@@ -151113,15 +151113,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_92_vals), 0,
         "T_criticalExtensions_92", HFILL }},
     { &hf_rrc_r4_09,
-      { "r4", "rrc.r4",
+      { "r4", "rrc.r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r4_09", HFILL }},
     { &hf_rrc_rrcConnectionRelease_r4,
-      { "rrcConnectionRelease-r4", "rrc.rrcConnectionRelease_r4",
+      { "rrcConnectionRelease-r4", "rrc.rrcConnectionRelease_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRelease_r4_IEs", HFILL }},
     { &hf_rrc_v4d0NonCriticalExtensions_09,
-      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions",
+      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4d0NonCriticalExtensions_09", HFILL }},
     { &hf_rrc_rrcConnectionRelease_r4_add_ext,
@@ -151129,35 +151129,35 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_27,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_27", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_22,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_22", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_12,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_12", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions_07,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va40NonCriticalExtensions_07", HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions_16,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vb50NonCriticalExtensions_16", HFILL }},
     { &hf_rrc_rrcConnectionRelease_vb50ext,
-      { "rrcConnectionRelease-vb50ext", "rrc.rrcConnectionRelease_vb50ext",
+      { "rrcConnectionRelease-vb50ext", "rrc.rrcConnectionRelease_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRelease_vb50ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_120,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_120", HFILL }},
     { &hf_rrc_criticalExtensions_94,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_93", HFILL }},
     { &hf_rrc_n_308,
@@ -151169,11 +151169,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_ReleaseCause_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_rplmn_information,
-      { "rplmn-information", "rrc.rplmn_information",
+      { "rplmn-information", "rrc.rplmn_information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rplmn_information_01,
-      { "rplmn-information", "rrc.rplmn_information",
+      { "rplmn-information", "rrc.rplmn_information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Rplmn_Information_r4", HFILL }},
     { &hf_rrc_redirectionInfo_v690ext_01,
@@ -151181,15 +151181,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_RedirectionInfo_r6_vals), 0,
         "RedirectionInfo_r6", HFILL }},
     { &hf_rrc_r3_19,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_19", HFILL }},
     { &hf_rrc_rrcConnectionRelease_CCCH_r3,
-      { "rrcConnectionRelease-CCCH-r3", "rrc.rrcConnectionRelease_CCCH_r3",
+      { "rrcConnectionRelease-CCCH-r3", "rrc.rrcConnectionRelease_CCCH_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRelease_CCCH_r3_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_39,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_39", HFILL }},
     { &hf_rrc_rrcConnectionRelease_CCCH_r3_add_ext,
@@ -151197,31 +151197,31 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_28,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_28", HFILL }},
     { &hf_rrc_rrcConnectionRelease_v690ext_01,
-      { "rrcConnectionRelease-v690ext", "rrc.rrcConnectionRelease_v690ext",
+      { "rrcConnectionRelease-v690ext", "rrc.rrcConnectionRelease_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRelease_CCCH_v690ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_13,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_13", HFILL }},
     { &hf_rrc_rrcConnectionRelease_v860ext_01,
-      { "rrcConnectionRelease-v860ext", "rrc.rrcConnectionRelease_v860ext",
+      { "rrcConnectionRelease-v860ext", "rrc.rrcConnectionRelease_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRelease_CCCH_v860ext_IEs", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions_08,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va40NonCriticalExtensions_08", HFILL }},
     { &hf_rrc_nonCriticalExtensions_121,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_121", HFILL }},
     { &hf_rrc_later_than_r3_17,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_17", HFILL }},
     { &hf_rrc_criticalExtensions_95,
@@ -151229,15 +151229,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_94_vals), 0,
         "T_criticalExtensions_94", HFILL }},
     { &hf_rrc_r4_10,
-      { "r4", "rrc.r4",
+      { "r4", "rrc.r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r4_10", HFILL }},
     { &hf_rrc_rrcConnectionRelease_CCCH_r4,
-      { "rrcConnectionRelease-CCCH-r4", "rrc.rrcConnectionRelease_CCCH_r4",
+      { "rrcConnectionRelease-CCCH-r4", "rrc.rrcConnectionRelease_CCCH_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRelease_CCCH_r4_IEs", HFILL }},
     { &hf_rrc_v4d0NonCriticalExtensions_10,
-      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions",
+      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4d0NonCriticalExtensions_10", HFILL }},
     { &hf_rrc_rrcConnectionRelease_CCCH_r4_add_ext,
@@ -151245,23 +151245,23 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_29,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_29", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_14,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_14", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions_09,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va40NonCriticalExtensions_09", HFILL }},
     { &hf_rrc_nonCriticalExtensions_122,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_122", HFILL }},
     { &hf_rrc_criticalExtensions_96,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_95", HFILL }},
     { &hf_rrc_groupIdentity,
@@ -151269,7 +151269,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxURNTI_Group_OF_GroupReleaseInformation", HFILL }},
     { &hf_rrc_groupIdentity_item,
-      { "GroupReleaseInformation", "rrc.GroupReleaseInformation",
+      { "GroupReleaseInformation", "rrc.GroupReleaseInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_criticalExtensions_97,
@@ -151277,11 +151277,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_96_vals), 0,
         "T_criticalExtensions_96", HFILL }},
     { &hf_rrc_r5_08,
-      { "r5", "rrc.r5",
+      { "r5", "rrc.r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r5_08", HFILL }},
     { &hf_rrc_rrcConnectionRelease_CCCH_r5,
-      { "rrcConnectionRelease-CCCH-r5", "rrc.rrcConnectionRelease_CCCH_r5",
+      { "rrcConnectionRelease-CCCH-r5", "rrc.rrcConnectionRelease_CCCH_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRelease_CCCH_r5_IEs", HFILL }},
     { &hf_rrc_rrcConnectionRelease_CCCH_r5_add_ext,
@@ -151289,31 +151289,31 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_30,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_30", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_15,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_15", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions_10,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va40NonCriticalExtensions_10", HFILL }},
     { &hf_rrc_nonCriticalExtensions_123,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_123", HFILL }},
     { &hf_rrc_criticalExtensions_98,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_97", HFILL }},
     { &hf_rrc_rrcConnectionRelease_02,
-      { "rrcConnectionRelease", "rrc.rrcConnectionRelease",
+      { "rrcConnectionRelease", "rrc.rrcConnectionRelease_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRelease_r3_IEs", HFILL }},
     { &hf_rrc_rrcConnectionRelease_03,
-      { "rrcConnectionRelease", "rrc.rrcConnectionRelease",
+      { "rrcConnectionRelease", "rrc.rrcConnectionRelease_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRelease_r4_IEs", HFILL }},
     { &hf_rrc_errorIndication,
@@ -151321,7 +151321,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_FailureCauseWithProtErr_vals), 0,
         "FailureCauseWithProtErr", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_40,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_40", HFILL }},
     { &hf_rrc_rrcConnectionReleaseComplete_r3_add_ext,
@@ -151329,7 +151329,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_124,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_124", HFILL }},
     { &hf_rrc_protocolErrorIndicator_01,
@@ -151337,111 +151337,111 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_ProtocolErrorIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_v3d0NonCriticalExtensions,
-      { "v3d0NonCriticalExtensions", "rrc.v3d0NonCriticalExtensions",
+      { "v3d0NonCriticalExtensions", "rrc.v3d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rRCConnectionRequest_v3d0ext,
-      { "rRCConnectionRequest-v3d0ext", "rrc.rRCConnectionRequest_v3d0ext",
+      { "rRCConnectionRequest-v3d0ext", "rrc.rRCConnectionRequest_v3d0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRequest_v3d0ext_IEs", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_10,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_10", HFILL }},
     { &hf_rrc_rrcConnectionRequest_v4b0ext,
-      { "rrcConnectionRequest-v4b0ext", "rrc.rrcConnectionRequest_v4b0ext",
+      { "rrcConnectionRequest-v4b0ext", "rrc.rrcConnectionRequest_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRequest_v4b0ext_IEs", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_20,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_20", HFILL }},
     { &hf_rrc_rrcConnectionRequest_v590ext,
-      { "rrcConnectionRequest-v590ext", "rrc.rrcConnectionRequest_v590ext",
+      { "rrcConnectionRequest-v590ext", "rrc.rrcConnectionRequest_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRequest_v590ext_IEs", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_31,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_31", HFILL }},
     { &hf_rrc_rrcConnectionRequest_v690ext,
-      { "rrcConnectionRequest-v690ext", "rrc.rrcConnectionRequest_v690ext",
+      { "rrcConnectionRequest-v690ext", "rrc.rrcConnectionRequest_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRequest_v690ext_IEs", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_10,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6b0NonCriticalExtensions_09", HFILL }},
     { &hf_rrc_rrcConnectionRequest_v6b0ext,
-      { "rrcConnectionRequest-v6b0ext", "rrc.rrcConnectionRequest_v6b0ext",
+      { "rrcConnectionRequest-v6b0ext", "rrc.rrcConnectionRequest_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRequest_v6b0ext_IEs", HFILL }},
     { &hf_rrc_v6e0NonCriticalExtensions_01,
-      { "v6e0NonCriticalExtensions", "rrc.v6e0NonCriticalExtensions",
+      { "v6e0NonCriticalExtensions", "rrc.v6e0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6e0NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_rrcConnectionRequest_v6e0ext,
-      { "rrcConnectionRequest-v6e0ext", "rrc.rrcConnectionRequest_v6e0ext",
+      { "rrcConnectionRequest-v6e0ext", "rrc.rrcConnectionRequest_v6e0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRequest_v6e0ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_23,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_23", HFILL }},
     { &hf_rrc_rrcConnectionRequest_v770ext,
-      { "rrcConnectionRequest-v770ext", "rrc.rrcConnectionRequest_v770ext",
+      { "rrcConnectionRequest-v770ext", "rrc.rrcConnectionRequest_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRequest_v770ext_IEs", HFILL }},
     { &hf_rrc_v7b0NonCriticalExtensions_01,
-      { "v7b0NonCriticalExtensions", "rrc.v7b0NonCriticalExtensions",
+      { "v7b0NonCriticalExtensions", "rrc.v7b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7b0NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_rrcConnectionRequest_v7b0ext,
-      { "rrcConnectionRequest-v7b0ext", "rrc.rrcConnectionRequest_v7b0ext",
+      { "rrcConnectionRequest-v7b0ext", "rrc.rrcConnectionRequest_v7b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRequest_v7b0ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_16,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_16", HFILL }},
     { &hf_rrc_rrcConnectionRequest_v860ext,
-      { "rrcConnectionRequest-v860ext", "rrc.rrcConnectionRequest_v860ext",
+      { "rrcConnectionRequest-v860ext", "rrc.rrcConnectionRequest_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRequest_v860ext_IEs", HFILL }},
     { &hf_rrc_v7e0NonCriticalExtensions_01,
-      { "v7e0NonCriticalExtensions", "rrc.v7e0NonCriticalExtensions",
+      { "v7e0NonCriticalExtensions", "rrc.v7e0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7e0NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_rrcConnectionRequest_v7e0ext,
-      { "rrcConnectionRequest-v7e0ext", "rrc.rrcConnectionRequest_v7e0ext",
+      { "rrcConnectionRequest-v7e0ext", "rrc.rrcConnectionRequest_v7e0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRequest_v7e0ext_IEs", HFILL }},
     { &hf_rrc_v7g0NonCriticalExtensions_14,
-      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions",
+      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7g0NonCriticalExtensions_14", HFILL }},
     { &hf_rrc_rrcConnectionRequest_v7g0ext,
-      { "rrcConnectionRequest-v7g0ext", "rrc.rrcConnectionRequest_v7g0ext",
+      { "rrcConnectionRequest-v7g0ext", "rrc.rrcConnectionRequest_v7g0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRequest_v7g0ext_IEs", HFILL }},
     { &hf_rrc_v920NonCriticalExtensions_02,
-      { "v920NonCriticalExtensions", "rrc.v920NonCriticalExtensions",
+      { "v920NonCriticalExtensions", "rrc.v920NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v920NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_rrcConnectionRequest_v920ext,
-      { "rrcConnectionRequest-v920ext", "rrc.rrcConnectionRequest_v920ext",
+      { "rrcConnectionRequest-v920ext", "rrc.rrcConnectionRequest_v920ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRequest_v920ext_IEs", HFILL }},
     { &hf_rrc_v940NonCriticalExtensions,
-      { "v940NonCriticalExtensions", "rrc.v940NonCriticalExtensions",
+      { "v940NonCriticalExtensions", "rrc.v940NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rrcConnectionRequest_v940ext,
-      { "rrcConnectionRequest-v940ext", "rrc.rrcConnectionRequest_v940ext",
+      { "rrcConnectionRequest-v940ext", "rrc.rrcConnectionRequest_v940ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRequest_v940ext_IEs", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions_11,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRequest_NonCriticalExts_va40_IEs", HFILL }},
     { &hf_rrc_uESpecificBehaviourInformation1idle,
@@ -151461,7 +151461,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_domainIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_cs_domain,
-      { "cs-domain", "rrc.cs_domain",
+      { "cs-domain", "rrc.cs_domain_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_csCallType_03,
@@ -151469,7 +151469,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_csCallType_03_vals), 0,
         "T_csCallType_03", HFILL }},
     { &hf_rrc_ps_domain,
-      { "ps-domain", "rrc.ps_domain",
+      { "ps-domain", "rrc.ps_domain_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_supportForFDPCH_01,
@@ -151505,7 +151505,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_multiCellSupport_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_pre_redirectionInfo,
-      { "pre-redirectionInfo", "rrc.pre_redirectionInfo",
+      { "pre-redirectionInfo", "rrc.pre_redirectionInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_supportOfMACiis_02,
@@ -151529,27 +151529,27 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_cSFBIndication_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_rrcConnectionRequest_va40ext,
-      { "rrcConnectionRequest-va40ext", "rrc.rrcConnectionRequest_va40ext",
+      { "rrcConnectionRequest-va40ext", "rrc.rrcConnectionRequest_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRequest_va40ext_IEs", HFILL }},
     { &hf_rrc_v9b0NonCriticalExtensions,
-      { "v9b0NonCriticalExtensions", "rrc.v9b0NonCriticalExtensions",
+      { "v9b0NonCriticalExtensions", "rrc.v9b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rrcConnectionRequest_v9b0ext,
-      { "rrcConnectionRequest-v9b0ext", "rrc.rrcConnectionRequest_v9b0ext",
+      { "rrcConnectionRequest-v9b0ext", "rrc.rrcConnectionRequest_v9b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRequest_v9b0ext_IEs", HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions_17,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vb50NonCriticalExtensions_17", HFILL }},
     { &hf_rrc_rrcConnectionRequest_vb50ext,
-      { "rrcConnectionRequest-vb50ext", "rrc.rrcConnectionRequest_vb50ext",
+      { "rrcConnectionRequest-vb50ext", "rrc.rrcConnectionRequest_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionRequest_vb50ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_125,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_125", HFILL }},
     { &hf_rrc_supportOfMoreThanTwoCellsOrMIMO4x4,
@@ -151565,15 +151565,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_supportOf2ndFrequencyBand_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_r3_20,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_20", HFILL }},
     { &hf_rrc_rrcConnectionSetup_r3,
-      { "rrcConnectionSetup-r3", "rrc.rrcConnectionSetup_r3",
+      { "rrcConnectionSetup-r3", "rrc.rrcConnectionSetup_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetup_r3_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_41,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_41", HFILL }},
     { &hf_rrc_rrcConnectionSetup_r3_add_ext,
@@ -151581,35 +151581,35 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_11,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_11", HFILL }},
     { &hf_rrc_rrcConnectionSetup_v4b0ext,
-      { "rrcConnectionSetup-v4b0ext", "rrc.rrcConnectionSetup_v4b0ext",
+      { "rrcConnectionSetup-v4b0ext", "rrc.rrcConnectionSetup_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetup_v4b0ext_IEs", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_21,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_21", HFILL }},
     { &hf_rrc_rrcConnectionSetup_v590ext,
-      { "rrcConnectionSetup-v590ext", "rrc.rrcConnectionSetup_v590ext",
+      { "rrcConnectionSetup-v590ext", "rrc.rrcConnectionSetup_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetup_v590ext_IEs", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_32,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_32", HFILL }},
     { &hf_rrc_rrcConnectionSetup_v690ext,
-      { "rrcConnectionSetup-v690ext", "rrc.rrcConnectionSetup_v690ext",
+      { "rrcConnectionSetup-v690ext", "rrc.rrcConnectionSetup_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetup_v690ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_126,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_126", HFILL }},
     { &hf_rrc_later_than_r3_18,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_18", HFILL }},
     { &hf_rrc_criticalExtensions_99,
@@ -151617,15 +151617,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_98_vals), 0,
         "T_criticalExtensions_98", HFILL }},
     { &hf_rrc_r4_11,
-      { "r4", "rrc.r4",
+      { "r4", "rrc.r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r4_11", HFILL }},
     { &hf_rrc_rrcConnectionSetup_r4,
-      { "rrcConnectionSetup-r4", "rrc.rrcConnectionSetup_r4",
+      { "rrcConnectionSetup-r4", "rrc.rrcConnectionSetup_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetup_r4_IEs", HFILL }},
     { &hf_rrc_v4d0NonCriticalExtensions_11,
-      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions",
+      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4d0NonCriticalExtensions_11", HFILL }},
     { &hf_rrc_rrcConnectionSetup_r4_add_ext,
@@ -151633,15 +151633,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_22,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_22", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_33,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_33", HFILL }},
     { &hf_rrc_nonCriticalExtensions_127,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_127", HFILL }},
     { &hf_rrc_criticalExtensions_100,
@@ -151649,11 +151649,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_99_vals), 0,
         "T_criticalExtensions_99", HFILL }},
     { &hf_rrc_r5_09,
-      { "r5", "rrc.r5",
+      { "r5", "rrc.r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r5_09", HFILL }},
     { &hf_rrc_rrcConnectionSetup_r5,
-      { "rrcConnectionSetup-r5", "rrc.rrcConnectionSetup_r5",
+      { "rrcConnectionSetup-r5", "rrc.rrcConnectionSetup_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetup_r5_IEs", HFILL }},
     { &hf_rrc_rrcConnectionSetup_r5_add_ext,
@@ -151661,11 +151661,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_34,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_34", HFILL }},
     { &hf_rrc_nonCriticalExtensions_128,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_128", HFILL }},
     { &hf_rrc_criticalExtensions_101,
@@ -151673,11 +151673,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_100_vals), 0,
         "T_criticalExtensions_100", HFILL }},
     { &hf_rrc_r6_10,
-      { "r6", "rrc.r6",
+      { "r6", "rrc.r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r6_10", HFILL }},
     { &hf_rrc_rrcConnectionSetup_r6,
-      { "rrcConnectionSetup-r6", "rrc.rrcConnectionSetup_r6",
+      { "rrcConnectionSetup-r6", "rrc.rrcConnectionSetup_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetup_r6_IEs", HFILL }},
     { &hf_rrc_rrcConnectionSetup_r6_add_ext,
@@ -151685,15 +151685,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_11,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6b0NonCriticalExtensions_10", HFILL }},
     { &hf_rrc_rrcConnectionSetup_v6b0ext,
-      { "rrcConnectionSetup-v6b0ext", "rrc.rrcConnectionSetup_v6b0ext",
+      { "rrcConnectionSetup-v6b0ext", "rrc.rrcConnectionSetup_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetup_v6b0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_129,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_129", HFILL }},
     { &hf_rrc_criticalExtensions_102,
@@ -151701,11 +151701,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_101_vals), 0,
         "T_criticalExtensions_101", HFILL }},
     { &hf_rrc_r7_09,
-      { "r7", "rrc.r7",
+      { "r7", "rrc.r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r7_09", HFILL }},
     { &hf_rrc_rrcConnectionSetup_r7,
-      { "rrcConnectionSetup-r7", "rrc.rrcConnectionSetup_r7",
+      { "rrcConnectionSetup-r7", "rrc.rrcConnectionSetup_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetup_r7_IEs", HFILL }},
     { &hf_rrc_rrcConnectionSetup_r7_add_ext,
@@ -151713,23 +151713,23 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v780NonCriticalExtensions_08,
-      { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions",
+      { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v780NonCriticalExtensions_08", HFILL }},
     { &hf_rrc_rrcConnectionSetup_v780ext,
-      { "rrcConnectionSetup-v780ext", "rrc.rrcConnectionSetup_v780ext",
+      { "rrcConnectionSetup-v780ext", "rrc.rrcConnectionSetup_v780ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetup_v780ext_IEs", HFILL }},
     { &hf_rrc_v7d0NonCriticalExtensions_11,
-      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions",
+      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7d0NonCriticalExtensions_11", HFILL }},
     { &hf_rrc_rrcConnectionSetup_v7d0ext,
-      { "rrcConnectionSetup-v7d0ext", "rrc.rrcConnectionSetup_v7d0ext",
+      { "rrcConnectionSetup-v7d0ext", "rrc.rrcConnectionSetup_v7d0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetup_v7d0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_130,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_130", HFILL }},
     { &hf_rrc_criticalExtensions_103,
@@ -151737,11 +151737,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_102_vals), 0,
         "T_criticalExtensions_102", HFILL }},
     { &hf_rrc_r8_10,
-      { "r8", "rrc.r8",
+      { "r8", "rrc.r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r8_10", HFILL }},
     { &hf_rrc_rrcConnectionSetup_r8,
-      { "rrcConnectionSetup-r8", "rrc.rrcConnectionSetup_r8",
+      { "rrcConnectionSetup-r8", "rrc.rrcConnectionSetup_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetup_r8_IEs", HFILL }},
     { &hf_rrc_rrcConnectionSetup_r8_add_ext,
@@ -151749,27 +151749,27 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v7d0NonCriticalExtensions_12,
-      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions",
+      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7d0NonCriticalExtensions_12", HFILL }},
     { &hf_rrc_v890NonCriticalExtensions_08,
-      { "v890NonCriticalExtensions", "rrc.v890NonCriticalExtensions",
+      { "v890NonCriticalExtensions", "rrc.v890NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v890NonCriticalExtensions_08", HFILL }},
     { &hf_rrc_rrcConnectionSetup_v890ext,
-      { "rrcConnectionSetup-v890ext", "rrc.rrcConnectionSetup_v890ext",
+      { "rrcConnectionSetup-v890ext", "rrc.rrcConnectionSetup_v890ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetup_v890ext_IEs", HFILL }},
     { &hf_rrc_v8a0NonCriticalExtensions_08,
-      { "v8a0NonCriticalExtensions", "rrc.v8a0NonCriticalExtensions",
+      { "v8a0NonCriticalExtensions", "rrc.v8a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v8a0NonCriticalExtensions_08", HFILL }},
     { &hf_rrc_rrcConnectionSetup_v8a0ext,
-      { "rrcConnectionSetup-v8a0ext", "rrc.rrcConnectionSetup_v8a0ext",
+      { "rrcConnectionSetup-v8a0ext", "rrc.rrcConnectionSetup_v8a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetup_v8a0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_131,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_131", HFILL }},
     { &hf_rrc_criticalExtensions_104,
@@ -151777,11 +151777,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_103_vals), 0,
         "T_criticalExtensions_103", HFILL }},
     { &hf_rrc_r9_09,
-      { "r9", "rrc.r9",
+      { "r9", "rrc.r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r9_09", HFILL }},
     { &hf_rrc_rrcConnectionSetup_r9,
-      { "rrcConnectionSetup-r9", "rrc.rrcConnectionSetup_r9",
+      { "rrcConnectionSetup-r9", "rrc.rrcConnectionSetup_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetup_r9_IEs", HFILL }},
     { &hf_rrc_rrcConnectionSetup_r9_add_ext,
@@ -151789,15 +151789,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v950NonCriticalExtensions_07,
-      { "v950NonCriticalExtensions", "rrc.v950NonCriticalExtensions",
+      { "v950NonCriticalExtensions", "rrc.v950NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v950NonCriticalExtensions_07", HFILL }},
     { &hf_rrc_rrcConnectionSetup_v950ext,
-      { "rrcConnectionSetup-v950ext", "rrc.rrcConnectionSetup_v950ext",
+      { "rrcConnectionSetup-v950ext", "rrc.rrcConnectionSetup_v950ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetup_v950ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_132,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_132", HFILL }},
     { &hf_rrc_criticalExtensions_105,
@@ -151805,11 +151805,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_104_vals), 0,
         "T_criticalExtensions_104", HFILL }},
     { &hf_rrc_r10_09,
-      { "r10", "rrc.r10",
+      { "r10", "rrc.r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r10_09", HFILL }},
     { &hf_rrc_rrcConnectionSetup_r10,
-      { "rrcConnectionSetup-r10", "rrc.rrcConnectionSetup_r10",
+      { "rrcConnectionSetup-r10", "rrc.rrcConnectionSetup_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetup_r10_IEs", HFILL }},
     { &hf_rrc_rrcConnectionSetup_r10_add_ext,
@@ -151817,7 +151817,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_133,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_133", HFILL }},
     { &hf_rrc_criticalExtensions_106,
@@ -151825,11 +151825,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_105_vals), 0,
         "T_criticalExtensions_105", HFILL }},
     { &hf_rrc_r11_10,
-      { "r11", "rrc.r11",
+      { "r11", "rrc.r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r11_10", HFILL }},
     { &hf_rrc_rrcConnectionSetup_r11,
-      { "rrcConnectionSetup-r11", "rrc.rrcConnectionSetup_r11",
+      { "rrcConnectionSetup-r11", "rrc.rrcConnectionSetup_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetup_r11_IEs", HFILL }},
     { &hf_rrc_rrcConnectionSetup_r11_add_ext,
@@ -151837,11 +151837,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_134,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_134", HFILL }},
     { &hf_rrc_criticalExtensions_107,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_106", HFILL }},
     { &hf_rrc_new_c_RNTI,
@@ -151849,7 +151849,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "C_RNTI", HFILL }},
     { &hf_rrc_capabilityUpdateRequirement,
-      { "capabilityUpdateRequirement", "rrc.capabilityUpdateRequirement",
+      { "capabilityUpdateRequirement", "rrc.capabilityUpdateRequirement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_srb_InformationSetupList_06,
@@ -151857,7 +151857,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SRB_InformationSetupList2", HFILL }},
     { &hf_rrc_capabilityUpdateRequirement_r4_ext,
-      { "capabilityUpdateRequirement-r4-ext", "rrc.capabilityUpdateRequirement_r4_ext",
+      { "capabilityUpdateRequirement-r4-ext", "rrc.capabilityUpdateRequirement_r4_ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_systemSpecificCapUpdateReq,
@@ -151865,11 +151865,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_SystemSpecificCapUpdateReq_v590ext_vals), 0,
         "SystemSpecificCapUpdateReq_v590ext", HFILL }},
     { &hf_rrc_capabilityUpdateRequirement_01,
-      { "capabilityUpdateRequirement", "rrc.capabilityUpdateRequirement",
+      { "capabilityUpdateRequirement", "rrc.capabilityUpdateRequirement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CapabilityUpdateRequirement_r4", HFILL }},
     { &hf_rrc_capabilityUpdateRequirement_02,
-      { "capabilityUpdateRequirement", "rrc.capabilityUpdateRequirement",
+      { "capabilityUpdateRequirement", "rrc.capabilityUpdateRequirement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CapabilityUpdateRequirement_r5", HFILL }},
     { &hf_rrc_specificationMode_19,
@@ -151877,11 +151877,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_19_vals), 0,
         "T_specificationMode_19", HFILL }},
     { &hf_rrc_complete_19,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_complete_19", HFILL }},
     { &hf_rrc_preconfiguration_16,
-      { "preconfiguration", "rrc.preconfiguration",
+      { "preconfiguration", "rrc.preconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_preconfiguration_16", HFILL }},
     { &hf_rrc_preConfigMode_16,
@@ -151889,7 +151889,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_preConfigMode_16_vals), 0,
         "T_preConfigMode_16", HFILL }},
     { &hf_rrc_defaultConfig_16,
-      { "defaultConfig", "rrc.defaultConfig",
+      { "defaultConfig", "rrc.defaultConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_defaultConfig_16", HFILL }},
     { &hf_rrc_dl_InformationPerRL_List_08,
@@ -151905,7 +151905,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_20_vals), 0,
         "T_specificationMode_20", HFILL }},
     { &hf_rrc_complete_20,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_complete_20", HFILL }},
     { &hf_rrc_srb_InformationSetupList_07,
@@ -151913,7 +151913,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SRB_InformationSetupList2_r6", HFILL }},
     { &hf_rrc_preconfiguration_17,
-      { "preconfiguration", "rrc.preconfiguration",
+      { "preconfiguration", "rrc.preconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_preconfiguration_17", HFILL }},
     { &hf_rrc_preConfigMode_17,
@@ -151921,11 +151921,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_preConfigMode_17_vals), 0,
         "T_preConfigMode_17", HFILL }},
     { &hf_rrc_defaultConfig_17,
-      { "defaultConfig", "rrc.defaultConfig",
+      { "defaultConfig", "rrc.defaultConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_defaultConfig_17", HFILL }},
     { &hf_rrc_capabilityUpdateRequirement_03,
-      { "capabilityUpdateRequirement", "rrc.capabilityUpdateRequirement",
+      { "capabilityUpdateRequirement", "rrc.capabilityUpdateRequirement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CapabilityUpdateRequirement_r7", HFILL }},
     { &hf_rrc_specificationMode_21,
@@ -151933,7 +151933,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_21_vals), 0,
         "T_specificationMode_21", HFILL }},
     { &hf_rrc_complete_21,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_complete_21", HFILL }},
     { &hf_rrc_srb_InformationSetupList_08,
@@ -151941,7 +151941,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SRB_InformationSetupList2_r7", HFILL }},
     { &hf_rrc_preconfiguration_18,
-      { "preconfiguration", "rrc.preconfiguration",
+      { "preconfiguration", "rrc.preconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_preconfiguration_18", HFILL }},
     { &hf_rrc_preConfigMode_18,
@@ -151949,11 +151949,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_preConfigMode_18_vals), 0,
         "T_preConfigMode_18", HFILL }},
     { &hf_rrc_defaultConfig_18,
-      { "defaultConfig", "rrc.defaultConfig",
+      { "defaultConfig", "rrc.defaultConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_defaultConfig_18", HFILL }},
     { &hf_rrc_capabilityUpdateRequirement_04,
-      { "capabilityUpdateRequirement", "rrc.capabilityUpdateRequirement",
+      { "capabilityUpdateRequirement", "rrc.capabilityUpdateRequirement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CapabilityUpdateRequirement_r8", HFILL }},
     { &hf_rrc_specificationMode_22,
@@ -151961,7 +151961,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_22_vals), 0,
         "T_specificationMode_22", HFILL }},
     { &hf_rrc_complete_22,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_complete_22", HFILL }},
     { &hf_rrc_srb_InformationSetupList_09,
@@ -151969,7 +151969,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SRB_InformationSetupList2_r8", HFILL }},
     { &hf_rrc_preconfiguration_19,
-      { "preconfiguration", "rrc.preconfiguration",
+      { "preconfiguration", "rrc.preconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_preconfiguration_19", HFILL }},
     { &hf_rrc_preConfigMode_19,
@@ -151977,7 +151977,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_preConfigMode_19_vals), 0,
         "T_preConfigMode_19", HFILL }},
     { &hf_rrc_defaultConfig_19,
-      { "defaultConfig", "rrc.defaultConfig",
+      { "defaultConfig", "rrc.defaultConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_defaultConfig_19", HFILL }},
     { &hf_rrc_specificationMode_23,
@@ -151985,11 +151985,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_23_vals), 0,
         "T_specificationMode_23", HFILL }},
     { &hf_rrc_complete_23,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_complete_23", HFILL }},
     { &hf_rrc_preconfiguration_20,
-      { "preconfiguration", "rrc.preconfiguration",
+      { "preconfiguration", "rrc.preconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_preconfiguration_20", HFILL }},
     { &hf_rrc_preConfigMode_20,
@@ -151997,7 +151997,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_preConfigMode_20_vals), 0,
         "T_preConfigMode_20", HFILL }},
     { &hf_rrc_defaultConfig_20,
-      { "defaultConfig", "rrc.defaultConfig",
+      { "defaultConfig", "rrc.defaultConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_defaultConfig_20", HFILL }},
     { &hf_rrc_specificationMode_24,
@@ -152005,11 +152005,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_24_vals), 0,
         "T_specificationMode_24", HFILL }},
     { &hf_rrc_complete_24,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_complete_24", HFILL }},
     { &hf_rrc_preconfiguration_21,
-      { "preconfiguration", "rrc.preconfiguration",
+      { "preconfiguration", "rrc.preconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_preconfiguration_21", HFILL }},
     { &hf_rrc_preConfigMode_21,
@@ -152017,7 +152017,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_preConfigMode_21_vals), 0,
         "T_preConfigMode_21", HFILL }},
     { &hf_rrc_defaultConfig_21,
-      { "defaultConfig", "rrc.defaultConfig",
+      { "defaultConfig", "rrc.defaultConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_defaultConfig_21", HFILL }},
     { &hf_rrc_specificationMode_25,
@@ -152025,11 +152025,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_specificationMode_25_vals), 0,
         "T_specificationMode_25", HFILL }},
     { &hf_rrc_complete_25,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_complete_25", HFILL }},
     { &hf_rrc_preconfiguration_22,
-      { "preconfiguration", "rrc.preconfiguration",
+      { "preconfiguration", "rrc.preconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_preconfiguration_22", HFILL }},
     { &hf_rrc_preConfigMode_22,
@@ -152037,11 +152037,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_preConfigMode_22_vals), 0,
         "T_preConfigMode_22", HFILL }},
     { &hf_rrc_defaultConfig_22,
-      { "defaultConfig", "rrc.defaultConfig",
+      { "defaultConfig", "rrc.defaultConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_defaultConfig_22", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_02,
-      { "ue-RadioAccessCapability", "rrc.ue_RadioAccessCapability",
+      { "ue-RadioAccessCapability", "rrc.ue_RadioAccessCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_RATSpecificCapability,
@@ -152049,31 +152049,31 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "InterRAT_UE_RadioAccessCapabilityList", HFILL }},
     { &hf_rrc_v370NonCriticalExtensions,
-      { "v370NonCriticalExtensions", "rrc.v370NonCriticalExtensions",
+      { "v370NonCriticalExtensions", "rrc.v370NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rrcConnectionSetupComplete_v370ext,
-      { "rrcConnectionSetupComplete-v370ext", "rrc.rrcConnectionSetupComplete_v370ext",
+      { "rrcConnectionSetupComplete-v370ext", "rrc.rrcConnectionSetupComplete_v370ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v380NonCriticalExtensions,
-      { "v380NonCriticalExtensions", "rrc.v380NonCriticalExtensions",
+      { "v380NonCriticalExtensions", "rrc.v380NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rrcConnectionSetupComplete_v380ext,
-      { "rrcConnectionSetupComplete-v380ext", "rrc.rrcConnectionSetupComplete_v380ext",
+      { "rrcConnectionSetupComplete-v380ext", "rrc.rrcConnectionSetupComplete_v380ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetupComplete_v380ext_IEs", HFILL }},
     { &hf_rrc_v3a0NonCriticalExtensions_08,
-      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions",
+      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v3a0NonCriticalExtensions_08", HFILL }},
     { &hf_rrc_rrcConnectionSetupComplete_v3a0ext,
-      { "rrcConnectionSetupComplete-v3a0ext", "rrc.rrcConnectionSetupComplete_v3a0ext",
+      { "rrcConnectionSetupComplete-v3a0ext", "rrc.rrcConnectionSetupComplete_v3a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetupComplete_v3a0ext_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_42,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_42", HFILL }},
     { &hf_rrc_rrcConnectionSetupComplete_r3_add_ext,
@@ -152081,135 +152081,135 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v3g0NonCriticalExtensions_01,
-      { "v3g0NonCriticalExtensions", "rrc.v3g0NonCriticalExtensions",
+      { "v3g0NonCriticalExtensions", "rrc.v3g0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v3g0NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_rrcConnectionSetupComplete_v3g0ext,
-      { "rrcConnectionSetupComplete-v3g0ext", "rrc.rrcConnectionSetupComplete_v3g0ext",
+      { "rrcConnectionSetupComplete-v3g0ext", "rrc.rrcConnectionSetupComplete_v3g0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetupComplete_v3g0ext_IEs", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_12,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_12", HFILL }},
     { &hf_rrc_rrcConnectionSetupComplete_v4b0ext,
-      { "rrcConnectionSetupComplete-v4b0ext", "rrc.rrcConnectionSetupComplete_v4b0ext",
+      { "rrcConnectionSetupComplete-v4b0ext", "rrc.rrcConnectionSetupComplete_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetupComplete_v4b0ext_IEs", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_23,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_23", HFILL }},
     { &hf_rrc_rrcConnectionSetupComplete_v590ext,
-      { "rrcConnectionSetupComplete-v590ext", "rrc.rrcConnectionSetupComplete_v590ext",
+      { "rrcConnectionSetupComplete-v590ext", "rrc.rrcConnectionSetupComplete_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetupComplete_v590ext_IEs", HFILL }},
     { &hf_rrc_v5c0NonCriticalExtensions,
-      { "v5c0NonCriticalExtensions", "rrc.v5c0NonCriticalExtensions",
+      { "v5c0NonCriticalExtensions", "rrc.v5c0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rrcConnectionSetupComplete_v5c0ext,
-      { "rrcConnectionSetupComplete-v5c0ext", "rrc.rrcConnectionSetupComplete_v5c0ext",
+      { "rrcConnectionSetupComplete-v5c0ext", "rrc.rrcConnectionSetupComplete_v5c0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetupComplete_v5c0ext_IEs", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_35,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_35", HFILL }},
     { &hf_rrc_rrcConnectionSetupComplete_v690ext,
-      { "rrcConnectionSetupComplete-v690ext", "rrc.rrcConnectionSetupComplete_v690ext",
+      { "rrcConnectionSetupComplete-v690ext", "rrc.rrcConnectionSetupComplete_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetupComplete_v690ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_24,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_24", HFILL }},
     { &hf_rrc_rrcConectionSetupComplete_v770ext,
-      { "rrcConectionSetupComplete-v770ext", "rrc.rrcConectionSetupComplete_v770ext",
+      { "rrcConectionSetupComplete-v770ext", "rrc.rrcConectionSetupComplete_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetupComplete_v770ext_IEs", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions_12,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va40NonCriticalExtensions_11", HFILL }},
     { &hf_rrc_rrcConectionSetupComplete_va40ext,
-      { "rrcConectionSetupComplete-va40ext", "rrc.rrcConectionSetupComplete_va40ext",
+      { "rrcConectionSetupComplete-va40ext", "rrc.rrcConectionSetupComplete_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetupComplete_va40ext_IEs", HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions_18,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vb50NonCriticalExtensions_18", HFILL }},
     { &hf_rrc_rrcConnectionSetupComplete_vb50ext,
-      { "rrcConnectionSetupComplete-vb50ext", "rrc.rrcConnectionSetupComplete_vb50ext",
+      { "rrcConnectionSetupComplete-vb50ext", "rrc.rrcConnectionSetupComplete_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetupComplete_vb50ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_135,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_135", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_v370ext,
-      { "ue-RadioAccessCapability-v370ext", "rrc.ue_RadioAccessCapability_v370ext",
+      { "ue-RadioAccessCapability-v370ext", "rrc.ue_RadioAccessCapability_v370ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rrcConnectionSetupComplete_v650ext,
-      { "rrcConnectionSetupComplete-v650ext", "rrc.rrcConnectionSetupComplete_v650ext",
+      { "rrcConnectionSetupComplete-v650ext", "rrc.rrcConnectionSetupComplete_v650ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetupComplete_v650ext_IEs", HFILL }},
     { &hf_rrc_v680NonCriticalExtensions,
-      { "v680NonCriticalExtensions", "rrc.v680NonCriticalExtensions",
+      { "v680NonCriticalExtensions", "rrc.v680NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rrcConnectionSetupComplete_v680ext,
-      { "rrcConnectionSetupComplete-v680ext", "rrc.rrcConnectionSetupComplete_v680ext",
+      { "rrcConnectionSetupComplete-v680ext", "rrc.rrcConnectionSetupComplete_v680ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetupComplete_v680ext_IEs", HFILL }},
     { &hf_rrc_v7e0NonCriticalExtensions_02,
-      { "v7e0NonCriticalExtensions", "rrc.v7e0NonCriticalExtensions",
+      { "v7e0NonCriticalExtensions", "rrc.v7e0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7e0NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_rrcConnectionSetupComplete_v7e0ext,
-      { "rrcConnectionSetupComplete-v7e0ext", "rrc.rrcConnectionSetupComplete_v7e0ext",
+      { "rrcConnectionSetupComplete-v7e0ext", "rrc.rrcConnectionSetupComplete_v7e0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetupComplete_v7e0ext_IEs", HFILL }},
     { &hf_rrc_v7f0NonCriticalExtensions_13,
-      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions",
+      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7f0NonCriticalExtensions_13", HFILL }},
     { &hf_rrc_rrcConnectionSetupComplete_v7f0ext,
-      { "rrcConnectionSetupComplete-v7f0ext", "rrc.rrcConnectionSetupComplete_v7f0ext",
+      { "rrcConnectionSetupComplete-v7f0ext", "rrc.rrcConnectionSetupComplete_v7f0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetupComplete_v7f0ext_IEs", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions_13,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va40NonCriticalExtensions_12", HFILL }},
     { &hf_rrc_rrcConnectionSetupCompleteBand_va40ext,
-      { "rrcConnectionSetupCompleteBand-va40ext", "rrc.rrcConnectionSetupCompleteBand_va40ext",
+      { "rrcConnectionSetupCompleteBand-va40ext", "rrc.rrcConnectionSetupCompleteBand_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRCConnectionSetupCompleteBand_va40ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_136,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_136", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_v4b0ext,
-      { "ue-RadioAccessCapability-v4b0ext", "rrc.ue_RadioAccessCapability_v4b0ext",
+      { "ue-RadioAccessCapability-v4b0ext", "rrc.ue_RadioAccessCapability_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_v590ext,
-      { "ue-RadioAccessCapability-v590ext", "rrc.ue_RadioAccessCapability_v590ext",
+      { "ue-RadioAccessCapability-v590ext", "rrc.ue_RadioAccessCapability_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_RATSpecificCapability_v590ext,
-      { "ue-RATSpecificCapability-v590ext", "rrc.ue_RATSpecificCapability_v590ext",
+      { "ue-RATSpecificCapability-v590ext", "rrc.ue_RATSpecificCapability_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRAT_UE_RadioAccessCapability_v590ext", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_v5c0ext,
-      { "ue-RadioAccessCapability-v5c0ext", "rrc.ue_RadioAccessCapability_v5c0ext",
+      { "ue-RadioAccessCapability-v5c0ext", "rrc.ue_RadioAccessCapability_v5c0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_v680ext,
-      { "ue-RadioAccessCapability-v680ext", "rrc.ue_RadioAccessCapability_v680ext",
+      { "ue-RadioAccessCapability-v680ext", "rrc.ue_RadioAccessCapability_v680ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ueCapabilityContainer,
@@ -152233,15 +152233,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_connEstFailInfoAvailable_01_vals), 0,
         "T_connEstFailInfoAvailable_01", HFILL }},
     { &hf_rrc_r3_21,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_21", HFILL }},
     { &hf_rrc_rRC_FailureInfo_r3,
-      { "rRC-FailureInfo-r3", "rrc.rRC_FailureInfo_r3",
+      { "rRC-FailureInfo-r3", "rrc.rRC_FailureInfo_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RRC_FailureInfo_r3_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_43,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_43", HFILL }},
     { &hf_rrc_rrc_FailureInfo_r3_add_ext,
@@ -152249,11 +152249,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_137,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_137", HFILL }},
     { &hf_rrc_criticalExtensions_108,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_107", HFILL }},
     { &hf_rrc_failureCauseWithProtErr,
@@ -152261,11 +152261,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_FailureCauseWithProtErr_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_protocolErrorInformation,
-      { "protocolErrorInformation", "rrc.protocolErrorInformation",
+      { "protocolErrorInformation", "rrc.protocolErrorInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProtocolErrorMoreInformation", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_44,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_44", HFILL }},
     { &hf_rrc_rrcStatus_r3_add_ext,
@@ -152273,19 +152273,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_138,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_138", HFILL }},
     { &hf_rrc_r3_22,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_22", HFILL }},
     { &hf_rrc_securityModeCommand_r3,
-      { "securityModeCommand-r3", "rrc.securityModeCommand_r3",
+      { "securityModeCommand-r3", "rrc.securityModeCommand_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecurityModeCommand_r3_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_45,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_45", HFILL }},
     { &hf_rrc_securityModeCommand_r3_add_ext,
@@ -152293,11 +152293,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_139,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_139", HFILL }},
     { &hf_rrc_later_than_r3_19,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_19", HFILL }},
     { &hf_rrc_criticalExtensions_109,
@@ -152305,11 +152305,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_108_vals), 0,
         "T_criticalExtensions_108", HFILL }},
     { &hf_rrc_r7_10,
-      { "r7", "rrc.r7",
+      { "r7", "rrc.r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r7_10", HFILL }},
     { &hf_rrc_securityModeCommand_r7,
-      { "securityModeCommand-r7", "rrc.securityModeCommand_r7",
+      { "securityModeCommand-r7", "rrc.securityModeCommand_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecurityModeCommand_r7_IEs", HFILL }},
     { &hf_rrc_securityModeCommand_r7_add_ext,
@@ -152317,15 +152317,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_140,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_140", HFILL }},
     { &hf_rrc_criticalExtensions_110,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_109", HFILL }},
     { &hf_rrc_securityCapability,
-      { "securityCapability", "rrc.securityCapability",
+      { "securityCapability", "rrc.securityCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_SystemSpecificSecurityCap,
@@ -152337,7 +152337,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RB_ActivationTimeInfoList", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_46,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_46", HFILL }},
     { &hf_rrc_securityModeComplete_r3_add_ext,
@@ -152345,11 +152345,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_141,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_141", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_47,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_47", HFILL }},
     { &hf_rrc_securityModeFailure_r3_add_ext,
@@ -152357,19 +152357,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_142,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_142", HFILL }},
     { &hf_rrc_r3_23,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_23", HFILL }},
     { &hf_rrc_signallingConnectionRelease_r3,
-      { "signallingConnectionRelease-r3", "rrc.signallingConnectionRelease_r3",
+      { "signallingConnectionRelease-r3", "rrc.signallingConnectionRelease_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SignallingConnectionRelease_r3_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_48,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_48", HFILL }},
     { &hf_rrc_signallingConnectionRelease_r3_add_ext,
@@ -152377,27 +152377,27 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions_14,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va40NonCriticalExtensions_13", HFILL }},
     { &hf_rrc_signallingConnectionRelease_va40ext,
-      { "signallingConnectionRelease-va40ext", "rrc.signallingConnectionRelease_va40ext",
+      { "signallingConnectionRelease-va40ext", "rrc.signallingConnectionRelease_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SignallingConnectionRelease_va40ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_143,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_143", HFILL }},
     { &hf_rrc_later_than_r3_20,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_20", HFILL }},
     { &hf_rrc_criticalExtensions_111,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_110", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_49,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_49", HFILL }},
     { &hf_rrc_signallingConnectionReleaseIndication_r3_add_ext,
@@ -152405,15 +152405,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v860nonCriticalExtentions,
-      { "v860nonCriticalExtentions", "rrc.v860nonCriticalExtentions",
+      { "v860nonCriticalExtentions", "rrc.v860nonCriticalExtentions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_signallingConnectionReleaseIndication_v860ext,
-      { "signallingConnectionReleaseIndication-v860ext", "rrc.signallingConnectionReleaseIndication_v860ext",
+      { "signallingConnectionReleaseIndication-v860ext", "rrc.signallingConnectionReleaseIndication_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_nonCriticalExtensions_144,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_144", HFILL }},
     { &hf_rrc_signallingConnectionReleaseIndicationCause,
@@ -152429,31 +152429,31 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_payload_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_noSegment,
-      { "noSegment", "rrc.noSegment",
+      { "noSegment", "rrc.noSegment_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_firstSegment,
-      { "firstSegment", "rrc.firstSegment",
+      { "firstSegment", "rrc.firstSegment_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_subsequentSegment,
-      { "subsequentSegment", "rrc.subsequentSegment",
+      { "subsequentSegment", "rrc.subsequentSegment_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_lastSegmentShort,
-      { "lastSegmentShort", "rrc.lastSegmentShort",
+      { "lastSegmentShort", "rrc.lastSegmentShort_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_lastAndFirst,
-      { "lastAndFirst", "rrc.lastAndFirst",
+      { "lastAndFirst", "rrc.lastAndFirst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_firstSegment_01,
-      { "firstSegment", "rrc.firstSegment",
+      { "firstSegment", "rrc.firstSegment_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FirstSegmentShort", HFILL }},
     { &hf_rrc_lastAndComplete,
-      { "lastAndComplete", "rrc.lastAndComplete",
+      { "lastAndComplete", "rrc.lastAndComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_completeSIB_List,
@@ -152461,19 +152461,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_lastAndCompleteAndFirst,
-      { "lastAndCompleteAndFirst", "rrc.lastAndCompleteAndFirst",
+      { "lastAndCompleteAndFirst", "rrc.lastAndCompleteAndFirst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_completeAndFirst,
-      { "completeAndFirst", "rrc.completeAndFirst",
+      { "completeAndFirst", "rrc.completeAndFirst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_completeSIB,
-      { "completeSIB", "rrc.completeSIB",
+      { "completeSIB", "rrc.completeSIB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_lastSegment,
-      { "lastSegment", "rrc.lastSegment",
+      { "lastSegment", "rrc.lastSegment_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_payload_01,
@@ -152481,19 +152481,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_payload_01_vals), 0,
         "T_payload_01", HFILL }},
     { &hf_rrc_lastAndFirst_01,
-      { "lastAndFirst", "rrc.lastAndFirst",
+      { "lastAndFirst", "rrc.lastAndFirst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_lastAndFirst_01", HFILL }},
     { &hf_rrc_lastAndComplete_01,
-      { "lastAndComplete", "rrc.lastAndComplete",
+      { "lastAndComplete", "rrc.lastAndComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_lastAndComplete_01", HFILL }},
     { &hf_rrc_lastAndCompleteAndFirst_01,
-      { "lastAndCompleteAndFirst", "rrc.lastAndCompleteAndFirst",
+      { "lastAndCompleteAndFirst", "rrc.lastAndCompleteAndFirst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_lastAndCompleteAndFirst_01", HFILL }},
     { &hf_rrc_completeAndFirst_01,
-      { "completeAndFirst", "rrc.completeAndFirst",
+      { "completeAndFirst", "rrc.completeAndFirst_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_completeAndFirst_01", HFILL }},
     { &hf_rrc_sib_Type,
@@ -152517,7 +152517,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_CompleteSIB_List_item,
-      { "CompleteSIBshort", "rrc.CompleteSIBshort",
+      { "CompleteSIBshort", "rrc.CompleteSIBshort_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sib_Data_fixed_01,
@@ -152525,7 +152525,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_226", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_50,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_50", HFILL }},
     { &hf_rrc_systemInformationChangeIndication_r3_add_ext,
@@ -152533,35 +152533,35 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_17,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_17", HFILL }},
     { &hf_rrc_systemInformationChangeIndication_v860ext,
-      { "systemInformationChangeIndication-v860ext", "rrc.systemInformationChangeIndication_v860ext",
+      { "systemInformationChangeIndication-v860ext", "rrc.systemInformationChangeIndication_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SystemInformationChangeIndication_v860ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_145,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_145", HFILL }},
     { &hf_rrc_r3_24,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_24", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_r3,
-      { "transportChannelReconfiguration-r3", "rrc.transportChannelReconfiguration_r3",
+      { "transportChannelReconfiguration-r3", "rrc.transportChannelReconfiguration_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelReconfiguration_r3_IEs", HFILL }},
     { &hf_rrc_v3a0NonCriticalExtensions_09,
-      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions",
+      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v3a0NonCriticalExtensions_09", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_v3a0ext,
-      { "transportChannelReconfiguration-v3a0ext", "rrc.transportChannelReconfiguration_v3a0ext",
+      { "transportChannelReconfiguration-v3a0ext", "rrc.transportChannelReconfiguration_v3a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_51,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_51", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_r3_add_ext,
@@ -152569,43 +152569,43 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_13,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_13", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_v4b0ext,
-      { "transportChannelReconfiguration-v4b0ext", "rrc.transportChannelReconfiguration_v4b0ext",
+      { "transportChannelReconfiguration-v4b0ext", "rrc.transportChannelReconfiguration_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelReconfiguration_v4b0ext_IEs", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_24,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_24", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_v590ext,
-      { "transportChannelReconfiguration-v590ext", "rrc.transportChannelReconfiguration_v590ext",
+      { "transportChannelReconfiguration-v590ext", "rrc.transportChannelReconfiguration_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelReconfiguration_v590ext_IEs", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_36,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_36", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_v690ext,
-      { "transportChannelReconfiguration-v690ext", "rrc.transportChannelReconfiguration_v690ext",
+      { "transportChannelReconfiguration-v690ext", "rrc.transportChannelReconfiguration_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelReconfiguration_v690ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_25,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_25", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_v770ext,
-      { "transportChannelReconfiguration-v770ext", "rrc.transportChannelReconfiguration_v770ext",
+      { "transportChannelReconfiguration-v770ext", "rrc.transportChannelReconfiguration_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelReconfiguration_v770ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_146,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_146", HFILL }},
     { &hf_rrc_later_than_r3_21,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_21", HFILL }},
     { &hf_rrc_criticalExtensions_112,
@@ -152613,15 +152613,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_111_vals), 0,
         "T_criticalExtensions_111", HFILL }},
     { &hf_rrc_r4_12,
-      { "r4", "rrc.r4",
+      { "r4", "rrc.r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r4_12", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_r4,
-      { "transportChannelReconfiguration-r4", "rrc.transportChannelReconfiguration_r4",
+      { "transportChannelReconfiguration-r4", "rrc.transportChannelReconfiguration_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelReconfiguration_r4_IEs", HFILL }},
     { &hf_rrc_v4d0NonCriticalExtensions_12,
-      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions",
+      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4d0NonCriticalExtensions_12", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_r4_add_ext,
@@ -152629,19 +152629,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_25,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_25", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_37,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_37", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_26,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_26", HFILL }},
     { &hf_rrc_nonCriticalExtensions_147,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_147", HFILL }},
     { &hf_rrc_criticalExtensions_113,
@@ -152649,11 +152649,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_112_vals), 0,
         "T_criticalExtensions_112", HFILL }},
     { &hf_rrc_r5_10,
-      { "r5", "rrc.r5",
+      { "r5", "rrc.r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r5_10", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_r5,
-      { "transportChannelReconfiguration-r5", "rrc.transportChannelReconfiguration_r5",
+      { "transportChannelReconfiguration-r5", "rrc.transportChannelReconfiguration_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelReconfiguration_r5_IEs", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_r5_add_ext,
@@ -152661,15 +152661,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_38,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_38", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_27,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_27", HFILL }},
     { &hf_rrc_nonCriticalExtensions_148,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_148", HFILL }},
     { &hf_rrc_criticalExtensions_114,
@@ -152677,11 +152677,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_113_vals), 0,
         "T_criticalExtensions_113", HFILL }},
     { &hf_rrc_r6_11,
-      { "r6", "rrc.r6",
+      { "r6", "rrc.r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r6_11", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_r6,
-      { "transportChannelReconfiguration-r6", "rrc.transportChannelReconfiguration_r6",
+      { "transportChannelReconfiguration-r6", "rrc.transportChannelReconfiguration_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelReconfiguration_r6_IEs", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_r6_add_ext,
@@ -152689,19 +152689,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_12,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6b0NonCriticalExtensions_11", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_v6b0ext,
-      { "transportChannelReconfiguration-v6b0ext", "rrc.transportChannelReconfiguration_v6b0ext",
+      { "transportChannelReconfiguration-v6b0ext", "rrc.transportChannelReconfiguration_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelReconfiguration_v6b0ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_28,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_28", HFILL }},
     { &hf_rrc_nonCriticalExtensions_149,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_149", HFILL }},
     { &hf_rrc_criticalExtensions_115,
@@ -152709,11 +152709,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_114_vals), 0,
         "T_criticalExtensions_114", HFILL }},
     { &hf_rrc_r7_11,
-      { "r7", "rrc.r7",
+      { "r7", "rrc.r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r7_11", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_r7,
-      { "transportChannelReconfiguration-r7", "rrc.transportChannelReconfiguration_r7",
+      { "transportChannelReconfiguration-r7", "rrc.transportChannelReconfiguration_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelReconfiguration_r7_IEs", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_r7_add_ext,
@@ -152721,39 +152721,39 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v780NonCriticalExtensions_09,
-      { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions",
+      { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v780NonCriticalExtensions_09", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_v780ext,
-      { "transportChannelReconfiguration-v780ext", "rrc.transportChannelReconfiguration_v780ext",
+      { "transportChannelReconfiguration-v780ext", "rrc.transportChannelReconfiguration_v780ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelReconfiguration_v780ext_IEs", HFILL }},
     { &hf_rrc_v7d0NonCriticalExtensions_13,
-      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions",
+      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7d0NonCriticalExtensions_13", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_v7d0ext,
-      { "transportChannelReconfiguration-v7d0ext", "rrc.transportChannelReconfiguration_v7d0ext",
+      { "transportChannelReconfiguration-v7d0ext", "rrc.transportChannelReconfiguration_v7d0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelReconfiguration_v7d0ext_IEs", HFILL }},
     { &hf_rrc_v7f0NonCriticalExtensions_14,
-      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions",
+      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7f0NonCriticalExtensions_14", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_v7f0ext,
-      { "transportChannelReconfiguration-v7f0ext", "rrc.transportChannelReconfiguration_v7f0ext",
+      { "transportChannelReconfiguration-v7f0ext", "rrc.transportChannelReconfiguration_v7f0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelReconfiguration_v7f0ext_IEs", HFILL }},
     { &hf_rrc_v7g0NonCriticalExtensions_15,
-      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions",
+      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7g0NonCriticalExtensions_15", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_v7g0ext,
-      { "transportChannelReconfiguration-v7g0ext", "rrc.transportChannelReconfiguration_v7g0ext",
+      { "transportChannelReconfiguration-v7g0ext", "rrc.transportChannelReconfiguration_v7g0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelReconfiguration_v7g0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_150,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_150", HFILL }},
     { &hf_rrc_criticalExtensions_116,
@@ -152761,11 +152761,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_115_vals), 0,
         "T_criticalExtensions_115", HFILL }},
     { &hf_rrc_r8_11,
-      { "r8", "rrc.r8",
+      { "r8", "rrc.r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r8_11", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_r8,
-      { "transportChannelReconfiguration-r8", "rrc.transportChannelReconfiguration_r8",
+      { "transportChannelReconfiguration-r8", "rrc.transportChannelReconfiguration_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelReconfiguration_r8_IEs", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_r8_add_ext,
@@ -152773,35 +152773,35 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v7d0NonCriticalExtensions_14,
-      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions",
+      { "v7d0NonCriticalExtensions", "rrc.v7d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7d0NonCriticalExtensions_14", HFILL }},
     { &hf_rrc_v7f0NonCriticalExtensions_15,
-      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions",
+      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7f0NonCriticalExtensions_15", HFILL }},
     { &hf_rrc_v890NonCriticalExtensions_09,
-      { "v890NonCriticalExtensions", "rrc.v890NonCriticalExtensions",
+      { "v890NonCriticalExtensions", "rrc.v890NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v890NonCriticalExtensions_09", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_v890ext,
-      { "transportChannelReconfiguration-v890ext", "rrc.transportChannelReconfiguration_v890ext",
+      { "transportChannelReconfiguration-v890ext", "rrc.transportChannelReconfiguration_v890ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelReconfiguration_v890ext_IEs", HFILL }},
     { &hf_rrc_v7g0NonCriticalExtensions_16,
-      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions",
+      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7g0NonCriticalExtensions_16", HFILL }},
     { &hf_rrc_v8a0NonCriticalExtensions_09,
-      { "v8a0NonCriticalExtensions", "rrc.v8a0NonCriticalExtensions",
+      { "v8a0NonCriticalExtensions", "rrc.v8a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v8a0NonCriticalExtensions_09", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_v8a0ext,
-      { "transportChannelReconfiguration-v8a0ext", "rrc.transportChannelReconfiguration_v8a0ext",
+      { "transportChannelReconfiguration-v8a0ext", "rrc.transportChannelReconfiguration_v8a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelReconfiguration_v8a0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_151,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_151", HFILL }},
     { &hf_rrc_criticalExtensions_117,
@@ -152809,11 +152809,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_116_vals), 0,
         "T_criticalExtensions_116", HFILL }},
     { &hf_rrc_r9_10,
-      { "r9", "rrc.r9",
+      { "r9", "rrc.r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r9_10", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_r9,
-      { "transportChannelReconfiguration-r9", "rrc.transportChannelReconfiguration_r9",
+      { "transportChannelReconfiguration-r9", "rrc.transportChannelReconfiguration_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelReconfiguration_r9_IEs", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_r9_add_ext,
@@ -152821,23 +152821,23 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v950NonCriticalExtensions_08,
-      { "v950NonCriticalExtensions", "rrc.v950NonCriticalExtensions",
+      { "v950NonCriticalExtensions", "rrc.v950NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v950NonCriticalExtensions_08", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_v950ext,
-      { "transportChannelReconfiguration-v950ext", "rrc.transportChannelReconfiguration_v950ext",
+      { "transportChannelReconfiguration-v950ext", "rrc.transportChannelReconfiguration_v950ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelReconfiguration_v950ext_IEs", HFILL }},
     { &hf_rrc_v9c0NonCriticalExtensions_10,
-      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions",
+      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v9c0NonCriticalExtensions_10", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_v9c0ext,
-      { "transportChannelReconfiguration-v9c0ext", "rrc.transportChannelReconfiguration_v9c0ext",
+      { "transportChannelReconfiguration-v9c0ext", "rrc.transportChannelReconfiguration_v9c0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelReconfiguration_v9c0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_152,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_152", HFILL }},
     { &hf_rrc_criticalExtensions_118,
@@ -152845,11 +152845,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_117_vals), 0,
         "T_criticalExtensions_117", HFILL }},
     { &hf_rrc_r10_10,
-      { "r10", "rrc.r10",
+      { "r10", "rrc.r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r10_10", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_r10,
-      { "transportChannelReconfiguration-r10", "rrc.transportChannelReconfiguration_r10",
+      { "transportChannelReconfiguration-r10", "rrc.transportChannelReconfiguration_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelReconfiguration_r10_IEs", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_r10_add_ext,
@@ -152857,19 +152857,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v9c0NonCriticalExtensions_11,
-      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions",
+      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v9c0NonCriticalExtensions_11", HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions_19,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vb50NonCriticalExtensions_19", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_vb50ext,
-      { "transportChannelReconfiguration-vb50ext", "rrc.transportChannelReconfiguration_vb50ext",
+      { "transportChannelReconfiguration-vb50ext", "rrc.transportChannelReconfiguration_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelReconfiguration_vb50ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_153,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_153", HFILL }},
     { &hf_rrc_criticalExtensions_119,
@@ -152877,11 +152877,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_118_vals), 0,
         "T_criticalExtensions_118", HFILL }},
     { &hf_rrc_r11_11,
-      { "r11", "rrc.r11",
+      { "r11", "rrc.r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r11_11", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_r11,
-      { "transportChannelReconfiguration-r11", "rrc.transportChannelReconfiguration_r11",
+      { "transportChannelReconfiguration-r11", "rrc.transportChannelReconfiguration_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelReconfiguration_r11_IEs", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_r11_add_ext,
@@ -152889,11 +152889,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_154,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_154", HFILL }},
     { &hf_rrc_criticalExtensions_120,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_119", HFILL }},
     { &hf_rrc_dummy_27,
@@ -152901,7 +152901,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dummy_11_vals), 0,
         "T_dummy_11", HFILL }},
     { &hf_rrc_fdd_39,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_39", HFILL }},
     { &hf_rrc_modeSpecificPhysChInfo_12,
@@ -152909,7 +152909,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificPhysChInfo_12_vals), 0,
         "T_modeSpecificPhysChInfo_12", HFILL }},
     { &hf_rrc_fdd_40,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_40", HFILL }},
     { &hf_rrc_dummy_28,
@@ -152917,7 +152917,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dummy_12_vals), 0,
         "T_dummy_12", HFILL }},
     { &hf_rrc_fdd_41,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_41", HFILL }},
     { &hf_rrc_modeSpecificPhysChInfo_13,
@@ -152925,7 +152925,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificPhysChInfo_13_vals), 0,
         "T_modeSpecificPhysChInfo_13", HFILL }},
     { &hf_rrc_fdd_42,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_42", HFILL }},
     { &hf_rrc_dummy_29,
@@ -152933,7 +152933,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dummy_13_vals), 0,
         "T_dummy_13", HFILL }},
     { &hf_rrc_fdd_43,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_43", HFILL }},
     { &hf_rrc_modeSpecificPhysChInfo_14,
@@ -152941,7 +152941,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificPhysChInfo_14_vals), 0,
         "T_modeSpecificPhysChInfo_14", HFILL }},
     { &hf_rrc_fdd_44,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_44", HFILL }},
     { &hf_rrc_postVerificationPeriod_06,
@@ -152969,7 +152969,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_responseToChangeOfUE_Capability_14_vals), 0,
         "T_responseToChangeOfUE_Capability_14", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_52,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_52", HFILL }},
     { &hf_rrc_transportChannelReconfigurationComplete_r3_add_ext,
@@ -152977,15 +152977,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_29,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_29", HFILL }},
     { &hf_rrc_transportChannelReconfigurationComplete_v770ext,
-      { "transportChannelReconfigurationComplete-v770ext", "rrc.transportChannelReconfigurationComplete_v770ext",
+      { "transportChannelReconfigurationComplete-v770ext", "rrc.transportChannelReconfigurationComplete_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelReconfigurationComplete_v770ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_155,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_155", HFILL }},
     { &hf_rrc_deferredMeasurementControlReading_05,
@@ -152993,7 +152993,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_deferredMeasurementControlReading_05_vals), 0,
         "T_deferredMeasurementControlReading_05", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_53,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_53", HFILL }},
     { &hf_rrc_transportChannelReconfigurationFailure_r3_add_ext,
@@ -153001,7 +153001,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_156,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_156", HFILL }},
     { &hf_rrc_modeSpecificInfo_15,
@@ -153009,15 +153009,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_15_vals), 0,
         "T_modeSpecificInfo_15", HFILL }},
     { &hf_rrc_fdd_45,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_10,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_09", HFILL }},
     { &hf_rrc_tfcs_ID,
-      { "tfcs-ID", "rrc.tfcs_ID",
+      { "tfcs-ID", "rrc.tfcs_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TFCS_Identity", HFILL }},
     { &hf_rrc_dpch_TFCS_InUplink,
@@ -153033,7 +153033,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TFC_ControlDuration_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_54,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_54", HFILL }},
     { &hf_rrc_transportFormatCombinationControl_r3_add_ext,
@@ -153041,15 +153041,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v820NonCriticalExtensions_02,
-      { "v820NonCriticalExtensions", "rrc.v820NonCriticalExtensions",
+      { "v820NonCriticalExtensions", "rrc.v820NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v820NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_transportformatcombinationcontrol_v820ext,
-      { "transportformatcombinationcontrol-v820ext", "rrc.transportformatcombinationcontrol_v820ext",
+      { "transportformatcombinationcontrol-v820ext", "rrc.transportformatcombinationcontrol_v820ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportFormatCombinationControl_v820ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_157,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_157", HFILL }},
     { &hf_rrc_ul_AMR_Rate,
@@ -153057,7 +153057,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UL_AMR_Rate_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_55,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_55", HFILL }},
     { &hf_rrc_transportFormatCombinationControlFailure_r3_add_ext,
@@ -153065,19 +153065,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_158,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_158", HFILL }},
     { &hf_rrc_r3_25,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_25", HFILL }},
     { &hf_rrc_ueCapabilityEnquiry_r3,
-      { "ueCapabilityEnquiry-r3", "rrc.ueCapabilityEnquiry_r3",
+      { "ueCapabilityEnquiry-r3", "rrc.ueCapabilityEnquiry_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UECapabilityEnquiry_r3_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_56,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_56", HFILL }},
     { &hf_rrc_ueCapabilityEnquiry_r3_add_ext,
@@ -153085,83 +153085,83 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_14,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_14", HFILL }},
     { &hf_rrc_ueCapabilityEnquiry_v4b0ext,
-      { "ueCapabilityEnquiry-v4b0ext", "rrc.ueCapabilityEnquiry_v4b0ext",
+      { "ueCapabilityEnquiry-v4b0ext", "rrc.ueCapabilityEnquiry_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UECapabilityEnquiry_v4b0ext_IEs", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_26,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_26", HFILL }},
     { &hf_rrc_ueCapabilityEnquiry_v590ext,
-      { "ueCapabilityEnquiry-v590ext", "rrc.ueCapabilityEnquiry_v590ext",
+      { "ueCapabilityEnquiry-v590ext", "rrc.ueCapabilityEnquiry_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UECapabilityEnquiry_v590ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_30,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_30", HFILL }},
     { &hf_rrc_ueCapabilityEnquiry_v770ext,
-      { "ueCapabilityEnquiry-v770ext", "rrc.ueCapabilityEnquiry_v770ext",
+      { "ueCapabilityEnquiry-v770ext", "rrc.ueCapabilityEnquiry_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UECapabilityEnquiry_v770ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_18,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_18", HFILL }},
     { &hf_rrc_ueCapabilityEnquiry_v860ext,
-      { "ueCapabilityEnquiry-v860ext", "rrc.ueCapabilityEnquiry_v860ext",
+      { "ueCapabilityEnquiry-v860ext", "rrc.ueCapabilityEnquiry_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UECapabilityEnquiry_v860ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_159,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_159", HFILL }},
     { &hf_rrc_later_than_r3_22,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_22", HFILL }},
     { &hf_rrc_criticalExtensions_121,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_120", HFILL }},
     { &hf_rrc_capabilityUpdateRequirement_05,
-      { "capabilityUpdateRequirement", "rrc.capabilityUpdateRequirement",
+      { "capabilityUpdateRequirement", "rrc.capabilityUpdateRequirement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CapabilityUpdateRequirement_v770ext", HFILL }},
     { &hf_rrc_capabilityUpdateRequirement_06,
-      { "capabilityUpdateRequirement", "rrc.capabilityUpdateRequirement",
+      { "capabilityUpdateRequirement", "rrc.capabilityUpdateRequirement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CapabilityUpdateRequirement_v860ext", HFILL }},
     { &hf_rrc_v370NonCriticalExtensions_01,
-      { "v370NonCriticalExtensions", "rrc.v370NonCriticalExtensions",
+      { "v370NonCriticalExtensions", "rrc.v370NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v370NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_ueCapabilityInformation_v370ext,
-      { "ueCapabilityInformation-v370ext", "rrc.ueCapabilityInformation_v370ext",
+      { "ueCapabilityInformation-v370ext", "rrc.ueCapabilityInformation_v370ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v380NonCriticalExtensions_01,
-      { "v380NonCriticalExtensions", "rrc.v380NonCriticalExtensions",
+      { "v380NonCriticalExtensions", "rrc.v380NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v380NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_ueCapabilityInformation_v380ext,
-      { "ueCapabilityInformation-v380ext", "rrc.ueCapabilityInformation_v380ext",
+      { "ueCapabilityInformation-v380ext", "rrc.ueCapabilityInformation_v380ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UECapabilityInformation_v380ext_IEs", HFILL }},
     { &hf_rrc_v3a0NonCriticalExtensions_10,
-      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions",
+      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v3a0NonCriticalExtensions_10", HFILL }},
     { &hf_rrc_ueCapabilityInformation_v3a0ext,
-      { "ueCapabilityInformation-v3a0ext", "rrc.ueCapabilityInformation_v3a0ext",
+      { "ueCapabilityInformation-v3a0ext", "rrc.ueCapabilityInformation_v3a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UECapabilityInformation_v3a0ext_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_57,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_57", HFILL }},
     { &hf_rrc_ueCapabilityInformation_r3_add_ext,
@@ -153169,79 +153169,79 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_15,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_15", HFILL }},
     { &hf_rrc_ueCapabilityInformation_v4b0ext,
-      { "ueCapabilityInformation-v4b0ext", "rrc.ueCapabilityInformation_v4b0ext",
+      { "ueCapabilityInformation-v4b0ext", "rrc.ueCapabilityInformation_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_27,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_27", HFILL }},
     { &hf_rrc_ueCapabilityInformation_v590ext,
-      { "ueCapabilityInformation-v590ext", "rrc.ueCapabilityInformation_v590ext",
+      { "ueCapabilityInformation-v590ext", "rrc.ueCapabilityInformation_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v5c0NonCriticalExtensions_01,
-      { "v5c0NonCriticalExtensions", "rrc.v5c0NonCriticalExtensions",
+      { "v5c0NonCriticalExtensions", "rrc.v5c0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v5c0NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_ueCapabilityInformation_v5c0ext,
-      { "ueCapabilityInformation-v5c0ext", "rrc.ueCapabilityInformation_v5c0ext",
+      { "ueCapabilityInformation-v5c0ext", "rrc.ueCapabilityInformation_v5c0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_39,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_39", HFILL }},
     { &hf_rrc_ueCapabilityInformation_v690ext,
-      { "ueCapabilityInformation-v690ext", "rrc.ueCapabilityInformation_v690ext",
+      { "ueCapabilityInformation-v690ext", "rrc.ueCapabilityInformation_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UECapabilityInformation_v690ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_160,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_160", HFILL }},
     { &hf_rrc_ueCapabilityInformation_v650ext,
-      { "ueCapabilityInformation-v650ext", "rrc.ueCapabilityInformation_v650ext",
+      { "ueCapabilityInformation-v650ext", "rrc.ueCapabilityInformation_v650ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UECapabilityInformation_v650ext_IEs", HFILL }},
     { &hf_rrc_v680NonCriticalExtensions_01,
-      { "v680NonCriticalExtensions", "rrc.v680NonCriticalExtensions",
+      { "v680NonCriticalExtensions", "rrc.v680NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v680NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_ueCapabilityInformation_v680ext,
-      { "ueCapabilityInformation-v680ext", "rrc.ueCapabilityInformation_v680ext",
+      { "ueCapabilityInformation-v680ext", "rrc.ueCapabilityInformation_v680ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UECapabilityInformation_v680ext_IEs", HFILL }},
     { &hf_rrc_v7e0NonCriticalExtensions_03,
-      { "v7e0NonCriticalExtensions", "rrc.v7e0NonCriticalExtensions",
+      { "v7e0NonCriticalExtensions", "rrc.v7e0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7e0NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_ueCapabilityInformation_v7e0ext,
-      { "ueCapabilityInformation-v7e0ext", "rrc.ueCapabilityInformation_v7e0ext",
+      { "ueCapabilityInformation-v7e0ext", "rrc.ueCapabilityInformation_v7e0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UECapabilityInformation_v7e0ext_IEs", HFILL }},
     { &hf_rrc_v7f0NonCriticalExtensions_16,
-      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions",
+      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7f0NonCriticalExtensions_16", HFILL }},
     { &hf_rrc_ueCapabilityInformation_v7f0ext,
-      { "ueCapabilityInformation-v7f0ext", "rrc.ueCapabilityInformation_v7f0ext",
+      { "ueCapabilityInformation-v7f0ext", "rrc.ueCapabilityInformation_v7f0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UECapabilityInformation_v7f0ext_IEs", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions_15,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va40NonCriticalExtensions_14", HFILL }},
     { &hf_rrc_ueCapabilityInformation_va40ext,
-      { "ueCapabilityInformation-va40ext", "rrc.ueCapabilityInformation_va40ext",
+      { "ueCapabilityInformation-va40ext", "rrc.ueCapabilityInformation_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UECapabilityInformation_va40ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_161,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_161", HFILL }},
     { &hf_rrc_ueCapabilityContainer_01,
@@ -153249,15 +153249,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "T_ueCapabilityContainer_01", HFILL }},
     { &hf_rrc_r3_26,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_26", HFILL }},
     { &hf_rrc_ueCapabilityInformationConfirm_r3,
-      { "ueCapabilityInformationConfirm-r3", "rrc.ueCapabilityInformationConfirm_r3",
+      { "ueCapabilityInformationConfirm-r3", "rrc.ueCapabilityInformationConfirm_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UECapabilityInformationConfirm_r3_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_58,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_58", HFILL }},
     { &hf_rrc_ueCapabilityInformationConfirm_r3_add_ext,
@@ -153265,23 +153265,23 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_31,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_31", HFILL }},
     { &hf_rrc_ueCapabilityInformationConfirm_v770ext,
-      { "ueCapabilityInformationConfirm-v770ext", "rrc.ueCapabilityInformationConfirm_v770ext",
+      { "ueCapabilityInformationConfirm-v770ext", "rrc.ueCapabilityInformationConfirm_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UECapabilityInformationConfirm_v770ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_162,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_162", HFILL }},
     { &hf_rrc_later_than_r3_23,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_23", HFILL }},
     { &hf_rrc_criticalExtensions_122,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_121", HFILL }},
     { &hf_rrc_acceptanceOfChangeOfCapability,
@@ -153289,7 +153289,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_acceptanceOfChangeOfCapability_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_59,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_59", HFILL }},
     { &hf_rrc_uplinkDirectTransfer_r3_add_ext,
@@ -153297,43 +153297,43 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_40,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_40", HFILL }},
     { &hf_rrc_uplinkDirectTransfer_v690ext,
-      { "uplinkDirectTransfer-v690ext", "rrc.uplinkDirectTransfer_v690ext",
+      { "uplinkDirectTransfer-v690ext", "rrc.uplinkDirectTransfer_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UplinkDirectTransfer_v690ext_IEs", HFILL }},
     { &hf_rrc_v7g0NonCriticalExtensions_17,
-      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions",
+      { "v7g0NonCriticalExtensions", "rrc.v7g0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7g0NonCriticalExtensions_17", HFILL }},
     { &hf_rrc_uplinkDirectTransfer_v7g0ext,
-      { "uplinkDirectTransfer-v7g0ext", "rrc.uplinkDirectTransfer_v7g0ext",
+      { "uplinkDirectTransfer-v7g0ext", "rrc.uplinkDirectTransfer_v7g0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UplinkDirectTransfer_v7g0ext_IEs", HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions_20,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vb50NonCriticalExtensions_20", HFILL }},
     { &hf_rrc_uplinkDirectTransfer_vb50ext,
-      { "uplinkDirectTransfer-vb50ext", "rrc.uplinkDirectTransfer_vb50ext",
+      { "uplinkDirectTransfer-vb50ext", "rrc.uplinkDirectTransfer_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UplinkDirectTransfer_vb50ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_163,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_163", HFILL }},
     { &hf_rrc_r3_27,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_27", HFILL }},
     { &hf_rrc_uplinkPhysicalChannelControl_r3,
-      { "uplinkPhysicalChannelControl-r3", "rrc.uplinkPhysicalChannelControl_r3",
+      { "uplinkPhysicalChannelControl-r3", "rrc.uplinkPhysicalChannelControl_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UplinkPhysicalChannelControl_r3_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_60,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_60", HFILL }},
     { &hf_rrc_uplinkPhysicalChannelControl_r3_add_ext,
@@ -153341,19 +153341,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_16,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_16", HFILL }},
     { &hf_rrc_uplinkPysicalChannelControl_v4b0ext,
-      { "uplinkPysicalChannelControl-v4b0ext", "rrc.uplinkPysicalChannelControl_v4b0ext",
+      { "uplinkPysicalChannelControl-v4b0ext", "rrc.uplinkPysicalChannelControl_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UplinkPhysicalChannelControl_v4b0ext_IEs", HFILL }},
     { &hf_rrc_noncriticalExtensions,
-      { "noncriticalExtensions", "rrc.noncriticalExtensions",
+      { "noncriticalExtensions", "rrc.noncriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_later_than_r3_24,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_24", HFILL }},
     { &hf_rrc_criticalExtensions_123,
@@ -153361,15 +153361,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_122_vals), 0,
         "T_criticalExtensions_122", HFILL }},
     { &hf_rrc_r4_13,
-      { "r4", "rrc.r4",
+      { "r4", "rrc.r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r4_13", HFILL }},
     { &hf_rrc_uplinkPhysicalChannelControl_r4,
-      { "uplinkPhysicalChannelControl-r4", "rrc.uplinkPhysicalChannelControl_r4",
+      { "uplinkPhysicalChannelControl-r4", "rrc.uplinkPhysicalChannelControl_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UplinkPhysicalChannelControl_r4_IEs", HFILL }},
     { &hf_rrc_v4d0NonCriticalExtensions_13,
-      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions",
+      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4d0NonCriticalExtensions_13", HFILL }},
     { &hf_rrc_uplinkPhysicalChannelControl_r4_add_ext,
@@ -153377,15 +153377,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_41,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_41", HFILL }},
     { &hf_rrc_uplinkPhysicalChannelControl_v690ext,
-      { "uplinkPhysicalChannelControl-v690ext", "rrc.uplinkPhysicalChannelControl_v690ext",
+      { "uplinkPhysicalChannelControl-v690ext", "rrc.uplinkPhysicalChannelControl_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UplinkPhysicalChannelControl_v690ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_164,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_164", HFILL }},
     { &hf_rrc_criticalExtensions_124,
@@ -153393,11 +153393,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_123_vals), 0,
         "T_criticalExtensions_123", HFILL }},
     { &hf_rrc_r5_11,
-      { "r5", "rrc.r5",
+      { "r5", "rrc.r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r5_11", HFILL }},
     { &hf_rrc_uplinkPhysicalChannelControl_r5,
-      { "uplinkPhysicalChannelControl-r5", "rrc.uplinkPhysicalChannelControl_r5",
+      { "uplinkPhysicalChannelControl-r5", "rrc.uplinkPhysicalChannelControl_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UplinkPhysicalChannelControl_r5_IEs", HFILL }},
     { &hf_rrc_uplinkPhysicalChannelControl_r5_add_ext,
@@ -153405,19 +153405,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_42,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_42", HFILL }},
     { &hf_rrc_v6a0NonCriticalExtensions_01,
-      { "v6a0NonCriticalExtensions", "rrc.v6a0NonCriticalExtensions",
+      { "v6a0NonCriticalExtensions", "rrc.v6a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6a0NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_uplinkPhysicalChannelControl_v6a0ext,
-      { "uplinkPhysicalChannelControl-v6a0ext", "rrc.uplinkPhysicalChannelControl_v6a0ext",
+      { "uplinkPhysicalChannelControl-v6a0ext", "rrc.uplinkPhysicalChannelControl_v6a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UplinkPhysicalChannelControl_v6a0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_165,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_165", HFILL }},
     { &hf_rrc_criticalExtensions_125,
@@ -153425,11 +153425,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_124_vals), 0,
         "T_criticalExtensions_124", HFILL }},
     { &hf_rrc_r7_12,
-      { "r7", "rrc.r7",
+      { "r7", "rrc.r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r7_12", HFILL }},
     { &hf_rrc_uplinkPhysicalChannelControl_r7,
-      { "uplinkPhysicalChannelControl-r7", "rrc.uplinkPhysicalChannelControl_r7",
+      { "uplinkPhysicalChannelControl-r7", "rrc.uplinkPhysicalChannelControl_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UplinkPhysicalChannelControl_r7_IEs", HFILL }},
     { &hf_rrc_uplinkPhysicalChannelControl_r7_add_ext,
@@ -153437,15 +153437,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_166,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_166", HFILL }},
     { &hf_rrc_criticalExtensions_126,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_125", HFILL }},
     { &hf_rrc_ccTrCH_PowerControlInfo,
-      { "ccTrCH-PowerControlInfo", "rrc.ccTrCH_PowerControlInfo",
+      { "ccTrCH-PowerControlInfo", "rrc.ccTrCH_PowerControlInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_timingAdvance,
@@ -153469,11 +153469,11 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "ConstantValueTdd", HFILL }},
     { &hf_rrc_openLoopPowerControl_IPDL_TDD,
-      { "openLoopPowerControl-IPDL-TDD", "rrc.openLoopPowerControl_IPDL_TDD",
+      { "openLoopPowerControl-IPDL-TDD", "rrc.openLoopPowerControl_IPDL_TDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OpenLoopPowerControl_IPDL_TDD_r4", HFILL }},
     { &hf_rrc_ccTrCH_PowerControlInfo_01,
-      { "ccTrCH-PowerControlInfo", "rrc.ccTrCH_PowerControlInfo",
+      { "ccTrCH-PowerControlInfo", "rrc.ccTrCH_PowerControlInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CCTrCH_PowerControlInfo_r4", HFILL }},
     { &hf_rrc_tddOption,
@@ -153481,7 +153481,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_tdd384_08,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_08", HFILL }},
     { &hf_rrc_timingAdvance_01,
@@ -153489,15 +153489,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UL_TimingAdvanceControl_r4_vals), 0,
         "UL_TimingAdvanceControl_r4", HFILL }},
     { &hf_rrc_tdd128_08,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_08", HFILL }},
     { &hf_rrc_ul_SynchronisationParameters,
-      { "ul-SynchronisationParameters", "rrc.ul_SynchronisationParameters",
+      { "ul-SynchronisationParameters", "rrc.ul_SynchronisationParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_SynchronisationParameters_r4", HFILL }},
     { &hf_rrc_ccTrCH_PowerControlInfo_02,
-      { "ccTrCH-PowerControlInfo", "rrc.ccTrCH_PowerControlInfo",
+      { "ccTrCH-PowerControlInfo", "rrc.ccTrCH_PowerControlInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CCTrCH_PowerControlInfo_r5", HFILL }},
     { &hf_rrc_tddOption_01,
@@ -153505,15 +153505,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_01_vals), 0,
         "T_tddOption_01", HFILL }},
     { &hf_rrc_tdd384_09,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_09", HFILL }},
     { &hf_rrc_hs_SICH_PowerControl,
-      { "hs-SICH-PowerControl", "rrc.hs_SICH_PowerControl",
+      { "hs-SICH-PowerControl", "rrc.hs_SICH_PowerControl_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_SICH_Power_Control_Info_TDD384", HFILL }},
     { &hf_rrc_tdd128_09,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_09", HFILL }},
     { &hf_rrc_desired_HS_SICH_PowerLevel,
@@ -153525,7 +153525,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tpc_Step_Size_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_ccTrCH_PowerControlInfo_03,
-      { "ccTrCH-PowerControlInfo", "rrc.ccTrCH_PowerControlInfo",
+      { "ccTrCH-PowerControlInfo", "rrc.ccTrCH_PowerControlInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CCTrCH_PowerControlInfo_r7", HFILL }},
     { &hf_rrc_tddOption_02,
@@ -153533,11 +153533,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_02_vals), 0,
         "T_tddOption_02", HFILL }},
     { &hf_rrc_tdd384_10,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_10", HFILL }},
     { &hf_rrc_tdd768_05,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd768_05", HFILL }},
     { &hf_rrc_timingAdvance_02,
@@ -153545,11 +153545,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UL_TimingAdvanceControl_r7_vals), 0,
         "UL_TimingAdvanceControl_r7", HFILL }},
     { &hf_rrc_hs_SICH_PowerControl_01,
-      { "hs-SICH-PowerControl", "rrc.hs_SICH_PowerControl",
+      { "hs-SICH-PowerControl", "rrc.hs_SICH_PowerControl_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_SICH_Power_Control_Info_TDD768", HFILL }},
     { &hf_rrc_tdd128_10,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_10", HFILL }},
     { &hf_rrc_tpc_Step_Size_01,
@@ -153561,7 +153561,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_URA_UpdateCause_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_61,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_61", HFILL }},
     { &hf_rrc_uraUpdate_r3_add_ext,
@@ -153569,39 +153569,39 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_32,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_32", HFILL }},
     { &hf_rrc_uraUpdate_v770ext,
-      { "uraUpdate-v770ext", "rrc.uraUpdate_v770ext",
+      { "uraUpdate-v770ext", "rrc.uraUpdate_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UraUpdate_v770ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_19,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_19", HFILL }},
     { &hf_rrc_uraUpdate_v860ext,
-      { "uraUpdate-v860ext", "rrc.uraUpdate_v860ext",
+      { "uraUpdate-v860ext", "rrc.uraUpdate_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "URAUpdate_v860ext_IEs", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions_16,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va40NonCriticalExtensions_15", HFILL }},
     { &hf_rrc_uraUpdate_va40ext,
-      { "uraUpdate-va40ext", "rrc.uraUpdate_va40ext",
+      { "uraUpdate-va40ext", "rrc.uraUpdate_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "URAUpdate_va40ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_167,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_167", HFILL }},
     { &hf_rrc_uraUpdate_v7e0ext,
-      { "uraUpdate-v7e0ext", "rrc.uraUpdate_v7e0ext",
+      { "uraUpdate-v7e0ext", "rrc.uraUpdate_v7e0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "URAUpdate_v7e0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_168,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_168", HFILL }},
     { &hf_rrc_support_hsdschReception_CellUraPch,
@@ -153637,15 +153637,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_loggedANRResultsAvailable_04_vals), 0,
         "T_loggedANRResultsAvailable_04", HFILL }},
     { &hf_rrc_r3_28,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_28", HFILL }},
     { &hf_rrc_uraUpdateConfirm_r3,
-      { "uraUpdateConfirm-r3", "rrc.uraUpdateConfirm_r3",
+      { "uraUpdateConfirm-r3", "rrc.uraUpdateConfirm_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "URAUpdateConfirm_r3_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_62,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_62", HFILL }},
     { &hf_rrc_uraUpdateConfirm_r3_add_ext,
@@ -153653,19 +153653,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_43,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_43", HFILL }},
     { &hf_rrc_uraUpdateConfirm_v690ext,
-      { "uraUpdateConfirm-v690ext", "rrc.uraUpdateConfirm_v690ext",
+      { "uraUpdateConfirm-v690ext", "rrc.uraUpdateConfirm_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "URAUpdateConfirm_v690ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_169,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_169", HFILL }},
     { &hf_rrc_later_than_r3_25,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_25", HFILL }},
     { &hf_rrc_criticalExtensions_127,
@@ -153673,19 +153673,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_126_vals), 0,
         "T_criticalExtensions_126", HFILL }},
     { &hf_rrc_r5_12,
-      { "r5", "rrc.r5",
+      { "r5", "rrc.r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r5_12", HFILL }},
     { &hf_rrc_uraUpdateConfirm_r5,
-      { "uraUpdateConfirm-r5", "rrc.uraUpdateConfirm_r5",
+      { "uraUpdateConfirm-r5", "rrc.uraUpdateConfirm_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "URAUpdateConfirm_r5_IEs", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_44,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_44", HFILL }},
     { &hf_rrc_nonCriticalExtensions_170,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_170", HFILL }},
     { &hf_rrc_criticalExtensions_128,
@@ -153693,11 +153693,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_127_vals), 0,
         "T_criticalExtensions_127", HFILL }},
     { &hf_rrc_r7_13,
-      { "r7", "rrc.r7",
+      { "r7", "rrc.r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r7_13", HFILL }},
     { &hf_rrc_uraUpdateConfirm_r7,
-      { "uraUpdateConfirm-r7", "rrc.uraUpdateConfirm_r7",
+      { "uraUpdateConfirm-r7", "rrc.uraUpdateConfirm_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "URAUpdateConfirm_r7_IEs", HFILL }},
     { &hf_rrc_uraUpdateConfirm_r7_add_ext,
@@ -153705,31 +153705,31 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_20,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_20", HFILL }},
     { &hf_rrc_uraUpdateConfirm_v860ext,
-      { "uraUpdateConfirm-v860ext", "rrc.uraUpdateConfirm_v860ext",
+      { "uraUpdateConfirm-v860ext", "rrc.uraUpdateConfirm_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "URAUpdateConfirm_v860ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_171,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_171", HFILL }},
     { &hf_rrc_criticalExtensions_129,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_128", HFILL }},
     { &hf_rrc_r3_29,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_29", HFILL }},
     { &hf_rrc_uraUpdateConfirm_CCCH_r3,
-      { "uraUpdateConfirm-CCCH-r3", "rrc.uraUpdateConfirm_CCCH_r3",
+      { "uraUpdateConfirm-CCCH-r3", "rrc.uraUpdateConfirm_CCCH_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "URAUpdateConfirm_CCCH_r3_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_63,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_63", HFILL }},
     { &hf_rrc_uraUpdateConfirm_CCCH_r3_add_ext,
@@ -153737,47 +153737,47 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_45,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_45", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_21,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_21", HFILL }},
     { &hf_rrc_nonCriticalExtensions_172,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_172", HFILL }},
     { &hf_rrc_later_than_r3_26,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_26", HFILL }},
     { &hf_rrc_criticalExtensions_130,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_129", HFILL }},
     { &hf_rrc_uraUpdateConfirm_02,
-      { "uraUpdateConfirm", "rrc.uraUpdateConfirm",
+      { "uraUpdateConfirm", "rrc.uraUpdateConfirm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "URAUpdateConfirm_r3_IEs", HFILL }},
     { &hf_rrc_r3_30,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_30", HFILL }},
     { &hf_rrc_utranMobilityInformation_r3,
-      { "utranMobilityInformation-r3", "rrc.utranMobilityInformation_r3",
+      { "utranMobilityInformation-r3", "rrc.utranMobilityInformation_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTRANMobilityInformation_r3_IEs", HFILL }},
     { &hf_rrc_v3a0NonCriticalExtensions_11,
-      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions",
+      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v3a0NonCriticalExtensions_11", HFILL }},
     { &hf_rrc_utranMobilityInformation_v3a0ext,
-      { "utranMobilityInformation-v3a0ext", "rrc.utranMobilityInformation_v3a0ext",
+      { "utranMobilityInformation-v3a0ext", "rrc.utranMobilityInformation_v3a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTRANMobilityInformation_v3a0ext_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_64,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_64", HFILL }},
     { &hf_rrc_utranMobilityInformation_r3_add_ext,
@@ -153785,27 +153785,27 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_46,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_46", HFILL }},
     { &hf_rrc_utranMobilityInformation_v690ext,
-      { "utranMobilityInformation-v690ext", "rrc.utranMobilityInformation_v690ext",
+      { "utranMobilityInformation-v690ext", "rrc.utranMobilityInformation_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UtranMobilityInformation_v690ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtentions,
-      { "v860NonCriticalExtentions", "rrc.v860NonCriticalExtentions",
+      { "v860NonCriticalExtentions", "rrc.v860NonCriticalExtentions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_utranMobilityInformation_v860ext,
-      { "utranMobilityInformation-v860ext", "rrc.utranMobilityInformation_v860ext",
+      { "utranMobilityInformation-v860ext", "rrc.utranMobilityInformation_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTRANMobilityInformation_v860ext1_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_173,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_173", HFILL }},
     { &hf_rrc_later_than_r3_27,
-      { "later-than-r3", "rrc.later_than_r3",
+      { "later-than-r3", "rrc.later_than_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_later_than_r3_27", HFILL }},
     { &hf_rrc_criticalExtensions_131,
@@ -153813,23 +153813,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_130_vals), 0,
         "T_criticalExtensions_130", HFILL }},
     { &hf_rrc_r5_13,
-      { "r5", "rrc.r5",
+      { "r5", "rrc.r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r5_13", HFILL }},
     { &hf_rrc_utranMobilityInformation_r5,
-      { "utranMobilityInformation-r5", "rrc.utranMobilityInformation_r5",
+      { "utranMobilityInformation-r5", "rrc.utranMobilityInformation_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTRANMobilityInformation_r5_IEs", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_47,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_47", HFILL }},
     { &hf_rrc_v860NonCriticalExtentions_01,
-      { "v860NonCriticalExtentions", "rrc.v860NonCriticalExtentions",
+      { "v860NonCriticalExtentions", "rrc.v860NonCriticalExtentions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtentions_01", HFILL }},
     { &hf_rrc_nonCriticalExtensions_174,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_174", HFILL }},
     { &hf_rrc_criticalExtensions_132,
@@ -153837,11 +153837,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_131_vals), 0,
         "T_criticalExtensions_131", HFILL }},
     { &hf_rrc_r7_14,
-      { "r7", "rrc.r7",
+      { "r7", "rrc.r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r7_14", HFILL }},
     { &hf_rrc_utranMobilityInformation_r7,
-      { "utranMobilityInformation-r7", "rrc.utranMobilityInformation_r7",
+      { "utranMobilityInformation-r7", "rrc.utranMobilityInformation_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTRANMobilityInformation_r7_IEs", HFILL }},
     { &hf_rrc_utranMobilityInformation_r7_add_ext,
@@ -153849,23 +153849,23 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_22,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_22", HFILL }},
     { &hf_rrc_utranMobilityInformation_v860ext_01,
-      { "utranMobilityInformation-v860ext", "rrc.utranMobilityInformation_v860ext",
+      { "utranMobilityInformation-v860ext", "rrc.utranMobilityInformation_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTRANMobilityInformation_v860ext2_IEs", HFILL }},
     { &hf_rrc_vb50NonCriticalExtentions,
-      { "vb50NonCriticalExtentions", "rrc.vb50NonCriticalExtentions",
+      { "vb50NonCriticalExtentions", "rrc.vb50NonCriticalExtentions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_utranMobilityInformation_vb50ext,
-      { "utranMobilityInformation-vb50ext", "rrc.utranMobilityInformation_vb50ext",
+      { "utranMobilityInformation-vb50ext", "rrc.utranMobilityInformation_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTRANMobilityInformation_vb50ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_175,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_175", HFILL }},
     { &hf_rrc_criticalExtensions_133,
@@ -153873,11 +153873,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_132_vals), 0,
         "T_criticalExtensions_132", HFILL }},
     { &hf_rrc_r11_12,
-      { "r11", "rrc.r11",
+      { "r11", "rrc.r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r11_12", HFILL }},
     { &hf_rrc_utranMobilityInformation_r11,
-      { "utranMobilityInformation-r11", "rrc.utranMobilityInformation_r11",
+      { "utranMobilityInformation-r11", "rrc.utranMobilityInformation_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTRANMobilityInformation_r11_IEs", HFILL }},
     { &hf_rrc_utranMobilityInformation_r11_add_ext,
@@ -153885,51 +153885,51 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_176,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_176", HFILL }},
     { &hf_rrc_criticalExtensions_134,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_133", HFILL }},
     { &hf_rrc_ue_ConnTimersAndConstants,
-      { "ue-ConnTimersAndConstants", "rrc.ue_ConnTimersAndConstants",
+      { "ue-ConnTimersAndConstants", "rrc.ue_ConnTimersAndConstants_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cn_InformationInfo_02,
-      { "cn-InformationInfo", "rrc.cn_InformationInfo",
+      { "cn-InformationInfo", "rrc.cn_InformationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CN_InformationInfoFull", HFILL }},
     { &hf_rrc_nonCriticalExtensions_177,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_177", HFILL }},
     { &hf_rrc_ue_ConnTimersAndConstants_v3a0ext,
-      { "ue-ConnTimersAndConstants-v3a0ext", "rrc.ue_ConnTimersAndConstants_v3a0ext",
+      { "ue-ConnTimersAndConstants-v3a0ext", "rrc.ue_ConnTimersAndConstants_v3a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_ConnTimersAndConstants_01,
-      { "ue-ConnTimersAndConstants", "rrc.ue_ConnTimersAndConstants",
+      { "ue-ConnTimersAndConstants", "rrc.ue_ConnTimersAndConstants_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_ConnTimersAndConstants_r5", HFILL }},
     { &hf_rrc_ue_ConnTimersAndConstants_02,
-      { "ue-ConnTimersAndConstants", "rrc.ue_ConnTimersAndConstants",
+      { "ue-ConnTimersAndConstants", "rrc.ue_ConnTimersAndConstants_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_ConnTimersAndConstants_v860ext", HFILL }},
     { &hf_rrc_dedicatedPriorityInformation,
-      { "dedicatedPriorityInformation", "rrc.dedicatedPriorityInformation",
+      { "dedicatedPriorityInformation", "rrc.dedicatedPriorityInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dedicatedPriorityInformation_01,
-      { "dedicatedPriorityInformation", "rrc.dedicatedPriorityInformation",
+      { "dedicatedPriorityInformation", "rrc.dedicatedPriorityInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DedicatedPriorityInformation_r11", HFILL }},
     { &hf_rrc_ue_ConnTimersAndConstants_03,
-      { "ue-ConnTimersAndConstants", "rrc.ue_ConnTimersAndConstants",
+      { "ue-ConnTimersAndConstants", "rrc.ue_ConnTimersAndConstants_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_ConnTimersAndConstants_r11", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_65,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_65", HFILL }},
     { &hf_rrc_utranMobilityInformationConfirm_r3_add_ext,
@@ -153937,23 +153937,23 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v770NonCriticalExtension_01,
-      { "v770NonCriticalExtension", "rrc.v770NonCriticalExtension",
+      { "v770NonCriticalExtension", "rrc.v770NonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtension_01", HFILL }},
     { &hf_rrc_utranMobilityInformationConfirm_v770ext,
-      { "utranMobilityInformationConfirm-v770ext", "rrc.utranMobilityInformationConfirm_v770ext",
+      { "utranMobilityInformationConfirm-v770ext", "rrc.utranMobilityInformationConfirm_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTRANMobilityInformationConfirm_v770ext_IEs", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions_17,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va40NonCriticalExtensions_16", HFILL }},
     { &hf_rrc_utranMobilityInformationConfirm_va40ext,
-      { "utranMobilityInformationConfirm-va40ext", "rrc.utranMobilityInformationConfirm_va40ext",
+      { "utranMobilityInformationConfirm-va40ext", "rrc.utranMobilityInformationConfirm_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTRANMobilityInformationConfirm_va40ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_178,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_178", HFILL }},
     { &hf_rrc_deferredMeasurementControlReading_06,
@@ -153965,7 +153965,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_loggedMeasAvailable_06_vals), 0,
         "T_loggedMeasAvailable_06", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_66,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_66", HFILL }},
     { &hf_rrc_utranMobilityInformationFailure_r3_add_ext,
@@ -153973,7 +153973,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_179,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_179", HFILL }},
     { &hf_rrc_mbms_ServiceAccessInfoList,
@@ -153981,7 +153981,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MBMS_ServiceAccessInfoList_r6", HFILL }},
     { &hf_rrc_nonCriticalExtensions_180,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_180", HFILL }},
     { &hf_rrc_mbms_CommonRBInformationList,
@@ -154001,31 +154001,31 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MBMS_PhyChInformationList_r6", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_33,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_33", HFILL }},
     { &hf_rrc_mbmsCommonPTMRBInformation_v770ext,
-      { "mbmsCommonPTMRBInformation-v770ext", "rrc.mbmsCommonPTMRBInformation_v770ext",
+      { "mbmsCommonPTMRBInformation-v770ext", "rrc.mbmsCommonPTMRBInformation_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMSCommonPTMRBInformation_v770ext_IEs", HFILL }},
     { &hf_rrc_v780NonCriticalExtensions_10,
-      { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions",
+      { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v780NonCriticalExtensions_10", HFILL }},
     { &hf_rrc_mbmsCommonPTMRBInformation_v780ext,
-      { "mbmsCommonPTMRBInformation-v780ext", "rrc.mbmsCommonPTMRBInformation_v780ext",
+      { "mbmsCommonPTMRBInformation-v780ext", "rrc.mbmsCommonPTMRBInformation_v780ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMSCommonPTMRBInformation_v780ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_23,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_23", HFILL }},
     { &hf_rrc_mbmsCommonPTMRBInformation_v860ext,
-      { "mbmsCommonPTMRBInformation-v860ext", "rrc.mbmsCommonPTMRBInformation_v860ext",
+      { "mbmsCommonPTMRBInformation-v860ext", "rrc.mbmsCommonPTMRBInformation_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMSCommonPTMRBInformation_v860ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_181,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_181", HFILL }},
     { &hf_rrc_mbms_PhyChInformationList_r7,
@@ -154049,15 +154049,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MBMS_SIBType5_SCCPCHList_r6", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_34,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_34", HFILL }},
     { &hf_rrc_mbmsCurrentCellPTMRBInfo_v770ext,
-      { "mbmsCurrentCellPTMRBInfo-v770ext", "rrc.mbmsCurrentCellPTMRBInfo_v770ext",
+      { "mbmsCurrentCellPTMRBInfo-v770ext", "rrc.mbmsCurrentCellPTMRBInfo_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMSCurrentCellPTMRBInfo_v770ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_182,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_182", HFILL }},
     { &hf_rrc_mbsfn_TDM_Info_List,
@@ -154069,11 +154069,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MBMS_PreferredFrequencyList_r6", HFILL }},
     { &hf_rrc_mbms_TimersAndCounters,
-      { "mbms-TimersAndCounters", "rrc.mbms_TimersAndCounters",
+      { "mbms-TimersAndCounters", "rrc.mbms_TimersAndCounters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMS_TimersAndCounters_r6", HFILL }},
     { &hf_rrc_michConfigurationInfo,
-      { "michConfigurationInfo", "rrc.michConfigurationInfo",
+      { "michConfigurationInfo", "rrc.michConfigurationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMS_MICHConfigurationInfo_r6", HFILL }},
     { &hf_rrc_cellGroupIdentity,
@@ -154081,43 +154081,43 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "MBMS_CellGroupIdentity_r6", HFILL }},
     { &hf_rrc_mschDefaultConfigurationInfo,
-      { "mschDefaultConfigurationInfo", "rrc.mschDefaultConfigurationInfo",
+      { "mschDefaultConfigurationInfo", "rrc.mschDefaultConfigurationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMS_MSCH_ConfigurationInfo_r6", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_13,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6b0NonCriticalExtensions_12", HFILL }},
     { &hf_rrc_mbmsGeneralInformation_v6b0ext,
-      { "mbmsGeneralInformation-v6b0ext", "rrc.mbmsGeneralInformation_v6b0ext",
+      { "mbmsGeneralInformation-v6b0ext", "rrc.mbmsGeneralInformation_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMSGeneralInformation_v6b0ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_35,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_35", HFILL }},
     { &hf_rrc_mbmsGeneralInformation_v770ext,
-      { "mbmsGeneralInformation-v770ext", "rrc.mbmsGeneralInformation_v770ext",
+      { "mbmsGeneralInformation-v770ext", "rrc.mbmsGeneralInformation_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMSGeneralInformation_v770ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_24,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_24", HFILL }},
     { &hf_rrc_mbmsGeneralInformation_v860ext,
-      { "mbmsGeneralInformation-v860ext", "rrc.mbmsGeneralInformation_v860ext",
+      { "mbmsGeneralInformation-v860ext", "rrc.mbmsGeneralInformation_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMSGeneralInformation_v860ext_IEs", HFILL }},
     { &hf_rrc_v890NoncriticalExtensions,
-      { "v890NoncriticalExtensions", "rrc.v890NoncriticalExtensions",
+      { "v890NoncriticalExtensions", "rrc.v890NoncriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mbmsGeneralInformation_v890ext,
-      { "mbmsGeneralInformation-v890ext", "rrc.mbmsGeneralInformation_v890ext",
+      { "mbmsGeneralInformation-v890ext", "rrc.mbmsGeneralInformation_v890ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMSGeneralInformation_v890ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_183,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_183", HFILL }},
     { &hf_rrc_indicateChangeInSelectedServices,
@@ -154125,7 +154125,7 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_mbmsMICHConfiguration,
-      { "mbmsMICHConfiguration", "rrc.mbmsMICHConfiguration",
+      { "mbmsMICHConfiguration", "rrc.mbmsMICHConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMS_MICHConfigurationInfo_v770ext", HFILL }},
     { &hf_rrc_mbsfnInterFrequencyNeighbourList,
@@ -154137,39 +154137,39 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MBSFN_InterFrequencyNeighbourList_v860ext", HFILL }},
     { &hf_rrc_mbmsNetworkStandardTimeInformation_LCR,
-      { "mbmsNetworkStandardTimeInformation-LCR", "rrc.mbmsNetworkStandardTimeInformation_LCR",
+      { "mbmsNetworkStandardTimeInformation-LCR", "rrc.mbmsNetworkStandardTimeInformation_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMS_NetworkStandardTimeInformation_LCR_v890ext", HFILL }},
     { &hf_rrc_mbmsMICHConfiguration_01,
-      { "mbmsMICHConfiguration", "rrc.mbmsMICHConfiguration",
+      { "mbmsMICHConfiguration", "rrc.mbmsMICHConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMS_MICHConfigurationInfo_v890ext", HFILL }},
     { &hf_rrc_mbms_PreferredFreqRequest,
-      { "mbms-PreferredFreqRequest", "rrc.mbms_PreferredFreqRequest",
+      { "mbms-PreferredFreqRequest", "rrc.mbms_PreferredFreqRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMS_ServiceIdentity_r6", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_14,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6b0NonCriticalExtensions_13", HFILL }},
     { &hf_rrc_mbmsModificationRequest_v6b0ext,
-      { "mbmsModificationRequest-v6b0ext", "rrc.mbmsModificationRequest_v6b0ext",
+      { "mbmsModificationRequest-v6b0ext", "rrc.mbmsModificationRequest_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMSModificationRequest_v6b0ext_IEs", HFILL }},
     { &hf_rrc_v6f0NonCriticalExtensions_02,
-      { "v6f0NonCriticalExtensions", "rrc.v6f0NonCriticalExtensions",
+      { "v6f0NonCriticalExtensions", "rrc.v6f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6f0NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_mbmsModificationRequest_v6f0ext,
-      { "mbmsModificationRequest-v6f0ext", "rrc.mbmsModificationRequest_v6f0ext",
+      { "mbmsModificationRequest-v6f0ext", "rrc.mbmsModificationRequest_v6f0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMSModificationRequest_v6f0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_184,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_184", HFILL }},
     { &hf_rrc_mbmsSelectedServiceInfo,
-      { "mbmsSelectedServiceInfo", "rrc.mbmsSelectedServiceInfo",
+      { "mbmsSelectedServiceInfo", "rrc.mbmsSelectedServiceInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMS_SelectedServiceInfo", HFILL }},
     { &hf_rrc_mbmsSupportOfServiceChangeForAPtpRB,
@@ -154205,23 +154205,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MBMS_PTMActivationTime_r6", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_36,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_36", HFILL }},
     { &hf_rrc_mbmsModifiedServicesInformation_v770ext,
-      { "mbmsModifiedServicesInformation-v770ext", "rrc.mbmsModifiedServicesInformation_v770ext",
+      { "mbmsModifiedServicesInformation-v770ext", "rrc.mbmsModifiedServicesInformation_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMSModifiedServicesInformation_v770ext_IEs", HFILL }},
     { &hf_rrc_v7c0NonCriticalExtensions,
-      { "v7c0NonCriticalExtensions", "rrc.v7c0NonCriticalExtensions",
+      { "v7c0NonCriticalExtensions", "rrc.v7c0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mbmsModifiedServicesInformation_v7c0ext,
-      { "mbmsModifiedServicesInformation-v7c0ext", "rrc.mbmsModifiedServicesInformation_v7c0ext",
+      { "mbmsModifiedServicesInformation-v7c0ext", "rrc.mbmsModifiedServicesInformation_v7c0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMSModifiedServicesInformation_v7c0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_185,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_185", HFILL }},
     { &hf_rrc_modifiedServiceList,
@@ -154245,15 +154245,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MBMS_NeighbouringCellSCCPCHList_r6", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_37,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_37", HFILL }},
     { &hf_rrc_mbmsNeighbouringCellPTMRBInformation_v770ext,
-      { "mbmsNeighbouringCellPTMRBInformation-v770ext", "rrc.mbmsNeighbouringCellPTMRBInformation_v770ext",
+      { "mbmsNeighbouringCellPTMRBInformation-v770ext", "rrc.mbmsNeighbouringCellPTMRBInformation_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMSNeighbouringCellPTMRBInformation_v770ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_186,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_186", HFILL }},
     { &hf_rrc_neighbouringCellSCCPCHList_01,
@@ -154265,7 +154265,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MBMS_ServiceSchedulingInfoList_r6", HFILL }},
     { &hf_rrc_nonCriticalExtensions_187,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_187", HFILL }},
     { &hf_rrc_unmodifiedServiceList,
@@ -154273,15 +154273,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MBMS_UnmodifiedServiceList_r6", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_38,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_38", HFILL }},
     { &hf_rrc_mbmsUnmodifiedServicesInformation_v770ext,
-      { "mbmsUnmodifiedServicesInformation-v770ext", "rrc.mbmsUnmodifiedServicesInformation_v770ext",
+      { "mbmsUnmodifiedServicesInformation-v770ext", "rrc.mbmsUnmodifiedServicesInformation_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMSUnmodifiedServicesInformation_v770ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_188,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_188", HFILL }},
     { &hf_rrc_unmodifiedServiceList_01,
@@ -154329,15 +154329,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions_21,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vb50NonCriticalExtensions_21", HFILL }},
     { &hf_rrc_system_Information_Container_vb50ext,
-      { "system-Information-Container-vb50ext", "rrc.system_Information_Container_vb50ext",
+      { "system-Information-Container-vb50ext", "rrc.system_Information_Container_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "System_Information_Container_vb50ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_189,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_189", HFILL }},
     { &hf_rrc_sysInfoType22,
@@ -154349,11 +154349,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_134_vals), 0,
         "T_criticalExtensions_134", HFILL }},
     { &hf_rrc_r10_11,
-      { "r10", "rrc.r10",
+      { "r10", "rrc.r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r10_11", HFILL }},
     { &hf_rrc_loggingMeasurementConfiguration_r10_IEs,
-      { "loggingMeasurementConfiguration-r10-IEs", "rrc.loggingMeasurementConfiguration_r10_IEs",
+      { "loggingMeasurementConfiguration-r10-IEs", "rrc.loggingMeasurementConfiguration_r10_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_loggingMeasurementConfiguration_r10_add_ext,
@@ -154361,7 +154361,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_190,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_190", HFILL }},
     { &hf_rrc_criticalExtensions_136,
@@ -154369,11 +154369,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_135_vals), 0,
         "T_criticalExtensions_135", HFILL }},
     { &hf_rrc_r11_13,
-      { "r11", "rrc.r11",
+      { "r11", "rrc.r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r11_13", HFILL }},
     { &hf_rrc_loggingMeasurementConfiguration_r11_IEs,
-      { "loggingMeasurementConfiguration-r11-IEs", "rrc.loggingMeasurementConfiguration_r11_IEs",
+      { "loggingMeasurementConfiguration-r11-IEs", "rrc.loggingMeasurementConfiguration_r11_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_loggingMeasurementConfiguration_r11_add_ext,
@@ -154381,27 +154381,27 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_191,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_191", HFILL }},
     { &hf_rrc_criticalExtensions_137,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_136", HFILL }},
     { &hf_rrc_loggedMeasurementsConfigurationInfo,
-      { "loggedMeasurementsConfigurationInfo", "rrc.loggedMeasurementsConfigurationInfo",
+      { "loggedMeasurementsConfigurationInfo", "rrc.loggedMeasurementsConfigurationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_loggedANRConfigurationInfo,
-      { "loggedANRConfigurationInfo", "rrc.loggedANRConfigurationInfo",
+      { "loggedANRConfigurationInfo", "rrc.loggedANRConfigurationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_loggedMeasurementsConfigurationInfo_01,
-      { "loggedMeasurementsConfigurationInfo", "rrc.loggedMeasurementsConfigurationInfo",
+      { "loggedMeasurementsConfigurationInfo", "rrc.loggedMeasurementsConfigurationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LoggedMeasurementsConfigurationInfo_r11", HFILL }},
     { &hf_rrc_loggedMeasReport,
-      { "loggedMeasReport", "rrc.loggedMeasReport",
+      { "loggedMeasReport", "rrc.loggedMeasReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_loggedANRReportInfoList,
@@ -154409,23 +154409,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions_22,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vb50NonCriticalExtensions_22", HFILL }},
     { &hf_rrc_ueInformationResponse_vb50ext,
-      { "ueInformationResponse-vb50ext", "rrc.ueInformationResponse_vb50ext",
+      { "ueInformationResponse-vb50ext", "rrc.ueInformationResponse_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UEInformationResponse_vb50ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_192,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_192", HFILL }},
     { &hf_rrc_loggedMeasReport_01,
-      { "loggedMeasReport", "rrc.loggedMeasReport",
+      { "loggedMeasReport", "rrc.loggedMeasReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LoggedMeasReport_vb50ext", HFILL }},
     { &hf_rrc_connectionEstablishmentFailureReport,
-      { "connectionEstablishmentFailureReport", "rrc.connectionEstablishmentFailureReport",
+      { "connectionEstablishmentFailureReport", "rrc.connectionEstablishmentFailureReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_loggedANRReportInfoList_01,
@@ -154437,11 +154437,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_137_vals), 0,
         "T_criticalExtensions_137", HFILL }},
     { &hf_rrc_r10_12,
-      { "r10", "rrc.r10",
+      { "r10", "rrc.r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r10_12", HFILL }},
     { &hf_rrc_ueInformationRequest_r10,
-      { "ueInformationRequest-r10", "rrc.ueInformationRequest_r10",
+      { "ueInformationRequest-r10", "rrc.ueInformationRequest_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UEInformationRequest_r10_IEs", HFILL }},
     { &hf_rrc_ueInformationRequest_r10_add_ext,
@@ -154449,7 +154449,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_193,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_193", HFILL }},
     { &hf_rrc_criticalExtensions_139,
@@ -154457,11 +154457,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_138_vals), 0,
         "T_criticalExtensions_138", HFILL }},
     { &hf_rrc_r11_14,
-      { "r11", "rrc.r11",
+      { "r11", "rrc.r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r11_14", HFILL }},
     { &hf_rrc_ueInformationRequest_r11,
-      { "ueInformationRequest-r11", "rrc.ueInformationRequest_r11",
+      { "ueInformationRequest-r11", "rrc.ueInformationRequest_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UEInformationRequest_r11_IEs", HFILL }},
     { &hf_rrc_ueInformationRequest_r11_add_ext,
@@ -154469,11 +154469,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_194,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_194", HFILL }},
     { &hf_rrc_criticalExtensions_140,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_139", HFILL }},
     { &hf_rrc_loggedMeasReportRequest,
@@ -154505,11 +154505,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CN_DRX_CycleLengthCoefficient", HFILL }},
     { &hf_rrc_CN_DomainInformationList_item,
-      { "CN-DomainInformation", "rrc.CN_DomainInformation",
+      { "CN-DomainInformation", "rrc.CN_DomainInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_CN_DomainInformationListFull_item,
-      { "CN-DomainInformationFull", "rrc.CN_DomainInformationFull",
+      { "CN-DomainInformationFull", "rrc.CN_DomainInformationFull_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cn_Type,
@@ -154525,7 +154525,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "NAS_SystemInformationANSI_41", HFILL }},
     { &hf_rrc_CN_DomainSysInfoList_item,
-      { "CN-DomainSysInfo", "rrc.CN_DomainSysInfo",
+      { "CN-DomainSysInfo", "rrc.CN_DomainSysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cn_CommonGSM_MAP_NAS_SysInfo,
@@ -154549,15 +154549,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cs_DomainSpecificEAB_Parameters,
-      { "cs-DomainSpecificEAB-Parameters", "rrc.cs_DomainSpecificEAB_Parameters",
+      { "cs-DomainSpecificEAB-Parameters", "rrc.cs_DomainSpecificEAB_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EAB_Configuration", HFILL }},
     { &hf_rrc_ps_DomainSpecificEAB_Parameters,
-      { "ps-DomainSpecificEAB-Parameters", "rrc.ps_DomainSpecificEAB_Parameters",
+      { "ps-DomainSpecificEAB-Parameters", "rrc.ps_DomainSpecificEAB_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EAB_Configuration", HFILL }},
     { &hf_rrc_commonEAB_Parameters,
-      { "commonEAB-Parameters", "rrc.commonEAB_Parameters",
+      { "commonEAB-Parameters", "rrc.commonEAB_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EAB_Configuration", HFILL }},
     { &hf_rrc_EAB_AccessClassBarredList_item,
@@ -154577,15 +154577,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_eab_ParametersForAll,
-      { "eab-ParametersForAll", "rrc.eab_ParametersForAll",
+      { "eab-ParametersForAll", "rrc.eab_ParametersForAll_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DomainSpecificEAB_Parameters", HFILL }},
     { &hf_rrc_domainSpecificEAB_Parameters,
-      { "domainSpecificEAB-Parameters", "rrc.domainSpecificEAB_Parameters",
+      { "domainSpecificEAB-Parameters", "rrc.domainSpecificEAB_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_EAB_ParametersPerPLMN_List_item,
-      { "EAB-ParametersPerPLMN", "rrc.EAB_ParametersPerPLMN",
+      { "EAB-ParametersPerPLMN", "rrc.EAB_ParametersPerPLMN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ec_N0,
@@ -154597,7 +154597,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_routingbasis_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_localPTMSI,
-      { "localPTMSI", "rrc.localPTMSI",
+      { "localPTMSI", "rrc.localPTMSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_routingparameter,
@@ -154605,31 +154605,31 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tMSIofsamePLMN,
-      { "tMSIofsamePLMN", "rrc.tMSIofsamePLMN",
+      { "tMSIofsamePLMN", "rrc.tMSIofsamePLMN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tMSIofdifferentPLMN,
-      { "tMSIofdifferentPLMN", "rrc.tMSIofdifferentPLMN",
+      { "tMSIofdifferentPLMN", "rrc.tMSIofdifferentPLMN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_iMSIresponsetopaging,
-      { "iMSIresponsetopaging", "rrc.iMSIresponsetopaging",
+      { "iMSIresponsetopaging", "rrc.iMSIresponsetopaging_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_iMSIcauseUEinitiatedEvent,
-      { "iMSIcauseUEinitiatedEvent", "rrc.iMSIcauseUEinitiatedEvent",
+      { "iMSIcauseUEinitiatedEvent", "rrc.iMSIcauseUEinitiatedEvent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_iMEI,
-      { "iMEI", "rrc.iMEI",
+      { "iMEI", "rrc.iMEI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_spare2_02,
-      { "spare2", "rrc.spare2",
+      { "spare2", "rrc.spare2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_spare2_01", HFILL }},
     { &hf_rrc_spare1_02,
-      { "spare1", "rrc.spare1",
+      { "spare1", "rrc.spare1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_spare1_01", HFILL }},
     { &hf_rrc_dummy_30,
@@ -154649,7 +154649,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_version_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_release99,
-      { "release99", "rrc.release99",
+      { "release99", "rrc.release99_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cn_Type_01,
@@ -154657,7 +154657,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_cn_Type_01_vals), 0,
         "T_cn_Type_01", HFILL }},
     { &hf_rrc_gsm_Map_IDNNS,
-      { "gsm-Map-IDNNS", "rrc.gsm_Map_IDNNS",
+      { "gsm-Map-IDNNS", "rrc.gsm_Map_IDNNS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ansi_41_IDNNS,
@@ -154665,7 +154665,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_later,
-      { "later", "rrc.later",
+      { "later", "rrc.later_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_futurecoding,
@@ -154681,7 +154681,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_AccessClassBarred_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_noRestriction,
-      { "noRestriction", "rrc.noRestriction",
+      { "noRestriction", "rrc.noRestriction_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_restriction,
@@ -154705,35 +154705,35 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_5_OF_PLMN_IdentityWithOptionalMCC_r6", HFILL }},
     { &hf_rrc_multiplePLMNs_item,
-      { "PLMN-IdentityWithOptionalMCC-r6", "rrc.PLMN_IdentityWithOptionalMCC_r6",
+      { "PLMN-IdentityWithOptionalMCC-r6", "rrc.PLMN_IdentityWithOptionalMCC_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_pagingPermissionWithAccessControlList,
-      { "pagingPermissionWithAccessControlList", "rrc.pagingPermissionWithAccessControlList",
+      { "pagingPermissionWithAccessControlList", "rrc.pagingPermissionWithAccessControlList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_pagingPermissionWithAccessControlForAll,
-      { "pagingPermissionWithAccessControlForAll", "rrc.pagingPermissionWithAccessControlForAll",
+      { "pagingPermissionWithAccessControlForAll", "rrc.pagingPermissionWithAccessControlForAll_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PagingPermissionWithAccessControlParameters", HFILL }},
     { &hf_rrc_pagingPermissionWithAccessControlParametersForOperator1,
-      { "pagingPermissionWithAccessControlParametersForOperator1", "rrc.pagingPermissionWithAccessControlParametersForOperator1",
+      { "pagingPermissionWithAccessControlParametersForOperator1", "rrc.pagingPermissionWithAccessControlParametersForOperator1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PagingPermissionWithAccessControlParameters", HFILL }},
     { &hf_rrc_pagingPermissionWithAccessControlParametersForOperator2,
-      { "pagingPermissionWithAccessControlParametersForOperator2", "rrc.pagingPermissionWithAccessControlParametersForOperator2",
+      { "pagingPermissionWithAccessControlParametersForOperator2", "rrc.pagingPermissionWithAccessControlParametersForOperator2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PagingPermissionWithAccessControlParameters", HFILL }},
     { &hf_rrc_pagingPermissionWithAccessControlParametersForOperator3,
-      { "pagingPermissionWithAccessControlParametersForOperator3", "rrc.pagingPermissionWithAccessControlParametersForOperator3",
+      { "pagingPermissionWithAccessControlParametersForOperator3", "rrc.pagingPermissionWithAccessControlParametersForOperator3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PagingPermissionWithAccessControlParameters", HFILL }},
     { &hf_rrc_pagingPermissionWithAccessControlParametersForOperator4,
-      { "pagingPermissionWithAccessControlParametersForOperator4", "rrc.pagingPermissionWithAccessControlParametersForOperator4",
+      { "pagingPermissionWithAccessControlParametersForOperator4", "rrc.pagingPermissionWithAccessControlParametersForOperator4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PagingPermissionWithAccessControlParameters", HFILL }},
     { &hf_rrc_pagingPermissionWithAccessControlParametersForOperator5,
-      { "pagingPermissionWithAccessControlParametersForOperator5", "rrc.pagingPermissionWithAccessControlParametersForOperator5",
+      { "pagingPermissionWithAccessControlParametersForOperator5", "rrc.pagingPermissionWithAccessControlParametersForOperator5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PagingPermissionWithAccessControlParameters", HFILL }},
     { &hf_rrc_pagingResponseRestrictionIndicator,
@@ -154757,11 +154757,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_gsm_MAP_01,
-      { "gsm-MAP", "rrc.gsm_MAP",
+      { "gsm-MAP", "rrc.gsm_MAP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ansi_41_01,
-      { "ansi-41", "rrc.ansi_41",
+      { "ansi-41", "rrc.ansi_41_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_p_REV,
@@ -154781,7 +154781,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_gsm_MAP_and_ANSI_41,
-      { "gsm-MAP-and-ANSI-41", "rrc.gsm_MAP_and_ANSI_41",
+      { "gsm-MAP-and-ANSI-41", "rrc.gsm_MAP_and_ANSI_41_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_gsm_MAP_RAB_Identity,
@@ -154793,7 +154793,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_lai,
-      { "lai", "rrc.lai",
+      { "lai", "rrc.lai_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rac,
@@ -154825,7 +154825,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_cellReservedForCSG_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_barred,
-      { "barred", "rrc.barred",
+      { "barred", "rrc.barred_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_intraFreqCellReselectionInd,
@@ -154837,7 +154837,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_Barred_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_notBarred,
-      { "notBarred", "rrc.notBarred",
+      { "notBarred", "rrc.notBarred_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_CellIdentity_PerRL_List_item,
@@ -154857,7 +154857,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_cellSelectQualityMeasure_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_cpich_Ec_N0,
-      { "cpich-Ec-N0", "rrc.cpich_Ec_N0",
+      { "cpich-Ec-N0", "rrc.cpich_Ec_N0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_q_HYST_2_S,
@@ -154865,7 +154865,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Q_Hyst_S", HFILL }},
     { &hf_rrc_cpich_RSCP,
-      { "cpich-RSCP", "rrc.cpich_RSCP",
+      { "cpich-RSCP", "rrc.cpich_RSCP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_16,
@@ -154873,7 +154873,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_16_vals), 0,
         "T_modeSpecificInfo_16", HFILL }},
     { &hf_rrc_fdd_46,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_45", HFILL }},
     { &hf_rrc_s_Intrasearch,
@@ -154901,7 +154901,7 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_11,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_10", HFILL }},
     { &hf_rrc_s_Intrasearch_01,
@@ -154925,11 +154925,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_hcs_ServingCellInformation,
-      { "hcs-ServingCellInformation", "rrc.hcs_ServingCellInformation",
+      { "hcs-ServingCellInformation", "rrc.hcs_ServingCellInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_CSG_DedicatedFrequencyInfoList_item,
-      { "FrequencyInfo", "rrc.FrequencyInfo",
+      { "FrequencyInfo", "rrc.FrequencyInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_startPSC,
@@ -154945,31 +154945,31 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_63", HFILL }},
     { &hf_rrc_domainSpecificAccessRestictionList,
-      { "domainSpecificAccessRestictionList", "rrc.domainSpecificAccessRestictionList",
+      { "domainSpecificAccessRestictionList", "rrc.domainSpecificAccessRestictionList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DomainSpecificAccessRestrictionList_v670ext", HFILL }},
     { &hf_rrc_domainSpecificAccessRestictionParametersForAll,
-      { "domainSpecificAccessRestictionParametersForAll", "rrc.domainSpecificAccessRestictionParametersForAll",
+      { "domainSpecificAccessRestictionParametersForAll", "rrc.domainSpecificAccessRestictionParametersForAll_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DomainSpecificAccessRestrictionParam_v670ext", HFILL }},
     { &hf_rrc_domainSpecificAccessRestrictionParametersForOperator1,
-      { "domainSpecificAccessRestrictionParametersForOperator1", "rrc.domainSpecificAccessRestrictionParametersForOperator1",
+      { "domainSpecificAccessRestrictionParametersForOperator1", "rrc.domainSpecificAccessRestrictionParametersForOperator1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DomainSpecificAccessRestrictionParam_v670ext", HFILL }},
     { &hf_rrc_domainSpecificAccessRestrictionParametersForOperator2,
-      { "domainSpecificAccessRestrictionParametersForOperator2", "rrc.domainSpecificAccessRestrictionParametersForOperator2",
+      { "domainSpecificAccessRestrictionParametersForOperator2", "rrc.domainSpecificAccessRestrictionParametersForOperator2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DomainSpecificAccessRestrictionParam_v670ext", HFILL }},
     { &hf_rrc_domainSpecificAccessRestrictionParametersForOperator3,
-      { "domainSpecificAccessRestrictionParametersForOperator3", "rrc.domainSpecificAccessRestrictionParametersForOperator3",
+      { "domainSpecificAccessRestrictionParametersForOperator3", "rrc.domainSpecificAccessRestrictionParametersForOperator3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DomainSpecificAccessRestrictionParam_v670ext", HFILL }},
     { &hf_rrc_domainSpecificAccessRestrictionParametersForOperator4,
-      { "domainSpecificAccessRestrictionParametersForOperator4", "rrc.domainSpecificAccessRestrictionParametersForOperator4",
+      { "domainSpecificAccessRestrictionParametersForOperator4", "rrc.domainSpecificAccessRestrictionParametersForOperator4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DomainSpecificAccessRestrictionParam_v670ext", HFILL }},
     { &hf_rrc_domainSpecificAccessRestrictionParametersForOperator5,
-      { "domainSpecificAccessRestrictionParametersForOperator5", "rrc.domainSpecificAccessRestrictionParametersForOperator5",
+      { "domainSpecificAccessRestrictionParametersForOperator5", "rrc.domainSpecificAccessRestrictionParametersForOperator5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DomainSpecificAccessRestrictionParam_v670ext", HFILL }},
     { &hf_rrc_cSDomainSpecificAccessRestriction,
@@ -154981,7 +154981,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_DomainSpecificAccessRestriction_v670ext_vals), 0,
         "DomainSpecificAccessRestriction_v670ext", HFILL }},
     { &hf_rrc_restriction_01,
-      { "restriction", "rrc.restriction",
+      { "restriction", "rrc.restriction_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_domainSpecficAccessClassBarredList,
@@ -155013,11 +155013,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MappingFunctionParameterList_item,
-      { "MappingFunctionParameter", "rrc.MappingFunctionParameter",
+      { "MappingFunctionParameter", "rrc.MappingFunctionParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MappingInfo_item,
-      { "Mapping", "rrc.Mapping",
+      { "Mapping", "rrc.Mapping_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_action,
@@ -155025,11 +155025,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_action_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_clearDedicatedPriorities,
-      { "clearDedicatedPriorities", "rrc.clearDedicatedPriorities",
+      { "clearDedicatedPriorities", "rrc.clearDedicatedPriorities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_configureDedicatedPriorities,
-      { "configureDedicatedPriorities", "rrc.configureDedicatedPriorities",
+      { "configureDedicatedPriorities", "rrc.configureDedicatedPriorities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_t_322,
@@ -155049,7 +155049,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_action_01_vals), 0,
         "T_action_01", HFILL }},
     { &hf_rrc_configureDedicatedPriorities_01,
-      { "configureDedicatedPriorities", "rrc.configureDedicatedPriorities",
+      { "configureDedicatedPriorities", "rrc.configureDedicatedPriorities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_configureDedicatedPriorities_01", HFILL }},
     { &hf_rrc_priorityLevelList_01,
@@ -155069,7 +155069,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_utraFDD_item,
-      { "utraFDD item", "rrc.utraFDD_item",
+      { "utraFDD item", "rrc.utraFDD_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_uarfcn,
@@ -155081,7 +155081,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_utraTDD_item,
-      { "utraTDD item", "rrc.utraTDD_item",
+      { "utraTDD item", "rrc.utraTDD_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_eutra,
@@ -155089,7 +155089,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_eutra_item,
-      { "eutra item", "rrc.eutra_item",
+      { "eutra item", "rrc.eutra_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_earfcn,
@@ -155097,11 +155097,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_gsm_01,
-      { "gsm", "rrc.gsm",
+      { "gsm", "rrc.gsm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_gsm_01", HFILL }},
     { &hf_rrc_gsm_CellGroup,
-      { "gsm-CellGroup", "rrc.gsm_CellGroup",
+      { "gsm-CellGroup", "rrc.gsm_CellGroup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_radioAccessTechnology_01,
@@ -155113,7 +155113,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_utraFDD_01", HFILL }},
     { &hf_rrc_utraFDD_item_01,
-      { "utraFDD item", "rrc.utraFDD_item",
+      { "utraFDD item", "rrc.utraFDD_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_utraFDD_item_01", HFILL }},
     { &hf_rrc_utraTDD_01,
@@ -155121,7 +155121,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_utraTDD_01", HFILL }},
     { &hf_rrc_utraTDD_item_01,
-      { "utraTDD item", "rrc.utraTDD_item",
+      { "utraTDD item", "rrc.utraTDD_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_utraTDD_item_01", HFILL }},
     { &hf_rrc_eutra_01,
@@ -155129,19 +155129,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxNumEUTRAFreqs_OF_EARFCNRange", HFILL }},
     { &hf_rrc_eutra_item_01,
-      { "EARFCNRange", "rrc.EARFCNRange",
+      { "EARFCNRange", "rrc.EARFCNRange_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_gsm_02,
-      { "gsm", "rrc.gsm",
+      { "gsm", "rrc.gsm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_gsm_02", HFILL }},
     { &hf_rrc_PriorityLevelList_item,
-      { "PriorityLevel", "rrc.PriorityLevel",
+      { "PriorityLevel", "rrc.PriorityLevel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_PriorityLevelList_r11_item,
-      { "PriorityLevel-r11", "rrc.PriorityLevel_r11",
+      { "PriorityLevel-r11", "rrc.PriorityLevel_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rat_Identifier,
@@ -155161,7 +155161,7 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "S_SearchQual", HFILL }},
     { &hf_rrc_RAT_FDD_InfoList_item,
-      { "RAT-FDD-Info", "rrc.RAT_FDD_Info",
+      { "RAT-FDD-Info", "rrc.RAT_FDD_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_s_SearchRAT_01,
@@ -155173,7 +155173,7 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "S_SearchRXLEV", HFILL }},
     { &hf_rrc_RAT_TDD_InfoList_item,
-      { "RAT-TDD-Info", "rrc.RAT_TDD_Info",
+      { "RAT-TDD-Info", "rrc.RAT_TDD_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_URA_IdentityList_item,
@@ -155269,7 +155269,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RB_ActivationTimeInfoList", HFILL }},
     { &hf_rrc_cipheringModeCommand_01,
-      { "cipheringModeCommand", "rrc.cipheringModeCommand",
+      { "cipheringModeCommand", "rrc.cipheringModeCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CipheringModeCommand_r7", HFILL }},
     { &hf_rrc_imsi_GSM_MAP,
@@ -155301,7 +155301,7 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_gsm_Measurements,
-      { "gsm-Measurements", "rrc.gsm_Measurements",
+      { "gsm-Measurements", "rrc.gsm_Measurements_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_multiCarrierMeasurements,
@@ -155341,27 +155341,27 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RadioFrequencyBandEUTRAExt", HFILL }},
     { &hf_rrc_CompressedModeMeasCapabEUTRAList_item,
-      { "CompressedModeMeasCapabEUTRA", "rrc.CompressedModeMeasCapabEUTRA",
+      { "CompressedModeMeasCapabEUTRA", "rrc.CompressedModeMeasCapabEUTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_CompressedModeMeasCapabEUTRAList2_item,
-      { "CompressedModeMeasCapabEUTRAExt", "rrc.CompressedModeMeasCapabEUTRAExt",
+      { "CompressedModeMeasCapabEUTRAExt", "rrc.CompressedModeMeasCapabEUTRAExt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_CompressedModeMeasCapabFDDList_item,
-      { "CompressedModeMeasCapabFDD", "rrc.CompressedModeMeasCapabFDD",
+      { "CompressedModeMeasCapabFDD", "rrc.CompressedModeMeasCapabFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_CompressedModeMeasCapabFDDList2_item,
-      { "CompressedModeMeasCapabFDD2", "rrc.CompressedModeMeasCapabFDD2",
+      { "CompressedModeMeasCapabFDD2", "rrc.CompressedModeMeasCapabFDD2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_CompressedModeMeasCapabFDDList3_item,
-      { "CompressedModeMeasCapabFDD3", "rrc.CompressedModeMeasCapabFDD3",
+      { "CompressedModeMeasCapabFDD3", "rrc.CompressedModeMeasCapabFDD3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_CompressedModeMeasCapabFDDList_ext_item,
-      { "CompressedModeMeasCapabFDD-ext", "rrc.CompressedModeMeasCapabFDD_ext",
+      { "CompressedModeMeasCapabFDD-ext", "rrc.CompressedModeMeasCapabFDD_ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_radioFrequencyBandFDD,
@@ -155385,7 +155385,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_RadioFrequencyBandFDD3_vals_ext, 0,
         NULL, HFILL }},
     { &hf_rrc_CompressedModeMeasCapabTDDList_item,
-      { "CompressedModeMeasCapabTDD", "rrc.CompressedModeMeasCapabTDD",
+      { "CompressedModeMeasCapabTDD", "rrc.CompressedModeMeasCapabTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_radioFrequencyBandTDD,
@@ -155401,7 +155401,7 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_CompressedModeMeasCapabGSMList_item,
-      { "CompressedModeMeasCapabGSM", "rrc.CompressedModeMeasCapabGSM",
+      { "CompressedModeMeasCapabGSM", "rrc.CompressedModeMeasCapabGSM_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_radioFrequencyBandGSM,
@@ -155429,7 +155429,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_backoffControlParams,
-      { "backoffControlParams", "rrc.backoffControlParams",
+      { "backoffControlParams", "rrc.backoffControlParams_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_powerControlAlgorithm,
@@ -155453,11 +155453,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_supportOfE_UtraProximityIndication_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_DL_InformationPerSecondaryRL_List_item,
-      { "DL-InformationPerSecondaryRL", "rrc.DL_InformationPerSecondaryRL",
+      { "DL-InformationPerSecondaryRL", "rrc.DL_InformationPerSecondaryRL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_primaryCPICH_Info,
-      { "primaryCPICH-Info", "rrc.primaryCPICH_Info",
+      { "primaryCPICH-Info", "rrc.primaryCPICH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cell_id,
@@ -155465,15 +155465,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "CellIdentity", HFILL }},
     { &hf_rrc_dl_FDPCHInfoPerRL_SecULFreq,
-      { "dl-FDPCHInfoPerRL-SecULFreq", "rrc.dl_FDPCHInfoPerRL_SecULFreq",
+      { "dl-FDPCHInfoPerRL-SecULFreq", "rrc.dl_FDPCHInfoPerRL_SecULFreq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_FDPCH_InfoPerRL_r7", HFILL }},
     { &hf_rrc_e_AGCH_Information,
-      { "e-AGCH-Information", "rrc.e_AGCH_Information",
+      { "e-AGCH-Information", "rrc.e_AGCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_e_HICH_Information,
-      { "e-HICH-Information", "rrc.e_HICH_Information",
+      { "e-HICH-Information", "rrc.e_HICH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_e_RGCH_Info,
@@ -155481,11 +155481,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_e_RGCH_Info_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_e_RGCH_Information,
-      { "e-RGCH-Information", "rrc.e_RGCH_Information",
+      { "e-RGCH-Information", "rrc.e_RGCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_releaseIndicator,
-      { "releaseIndicator", "rrc.releaseIndicator",
+      { "releaseIndicator", "rrc.releaseIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_maxNoDPCH_PDSCH_Codes,
@@ -155649,7 +155649,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "HSDSCH_physical_layer_category", HFILL }},
     { &hf_rrc_unsupported,
-      { "unsupported", "rrc.unsupported",
+      { "unsupported", "rrc.unsupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_maxPhysChPerTS_01,
@@ -155697,19 +155697,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DRAC_SysInfoList_item,
-      { "DRAC-SysInfo", "rrc.DRAC_SysInfo",
+      { "DRAC-SysInfo", "rrc.DRAC_SysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_configurationUnsupported,
-      { "configurationUnsupported", "rrc.configurationUnsupported",
+      { "configurationUnsupported", "rrc.configurationUnsupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_physicalChannelFailure,
-      { "physicalChannelFailure", "rrc.physicalChannelFailure",
+      { "physicalChannelFailure", "rrc.physicalChannelFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_incompatibleSimultaneousReconfiguration,
-      { "incompatibleSimultaneousReconfiguration", "rrc.incompatibleSimultaneousReconfiguration",
+      { "incompatibleSimultaneousReconfiguration", "rrc.incompatibleSimultaneousReconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_compressedModeRuntimeError,
@@ -155717,31 +155717,31 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TGPSI", HFILL }},
     { &hf_rrc_protocolError,
-      { "protocolError", "rrc.protocolError",
+      { "protocolError", "rrc.protocolError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProtocolErrorInformation", HFILL }},
     { &hf_rrc_cellUpdateOccurred,
-      { "cellUpdateOccurred", "rrc.cellUpdateOccurred",
+      { "cellUpdateOccurred", "rrc.cellUpdateOccurred_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_invalidConfiguration,
-      { "invalidConfiguration", "rrc.invalidConfiguration",
+      { "invalidConfiguration", "rrc.invalidConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_configurationIncomplete,
-      { "configurationIncomplete", "rrc.configurationIncomplete",
+      { "configurationIncomplete", "rrc.configurationIncomplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_unsupportedMeasurement,
-      { "unsupportedMeasurement", "rrc.unsupportedMeasurement",
+      { "unsupportedMeasurement", "rrc.unsupportedMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mbmsSessionAlreadyReceivedCorrectly,
-      { "mbmsSessionAlreadyReceivedCorrectly", "rrc.mbmsSessionAlreadyReceivedCorrectly",
+      { "mbmsSessionAlreadyReceivedCorrectly", "rrc.mbmsSessionAlreadyReceivedCorrectly_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_lowerPriorityMBMSService,
-      { "lowerPriorityMBMSService", "rrc.lowerPriorityMBMSService",
+      { "lowerPriorityMBMSService", "rrc.lowerPriorityMBMSService_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_17,
@@ -155749,7 +155749,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_17_vals), 0,
         "T_modeSpecificInfo_17", HFILL }},
     { &hf_rrc_fdd_47,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_46", HFILL }},
     { &hf_rrc_frequencyBandsSupportFDD,
@@ -155757,7 +155757,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "FrequencyBandsRedirectionFDD", HFILL }},
     { &hf_rrc_tdd_12,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_11", HFILL }},
     { &hf_rrc_frequencyBandsSupportTDD128,
@@ -155765,7 +155765,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "FrequencyBandsIndicatorTDD128", HFILL }},
     { &hf_rrc_FrequencyBandsIndicatorTDD128_item,
-      { "FrequencyBandsIndicatorSupportTDD128", "rrc.FrequencyBandsIndicatorSupportTDD128",
+      { "FrequencyBandsIndicatorSupportTDD128", "rrc.FrequencyBandsIndicatorSupportTDD128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_frequencyBandsIndicatorTDD,
@@ -155793,7 +155793,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_RRC_ConnectionReleaseInformation_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_groupReleaseInformation,
-      { "groupReleaseInformation", "rrc.groupReleaseInformation",
+      { "groupReleaseInformation", "rrc.groupReleaseInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_uRNTI_Group,
@@ -155829,7 +155829,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_3", HFILL }},
     { &hf_rrc_MultiflowCapabBandCombList_item,
-      { "MultiflowCapabBandCombination", "rrc.MultiflowCapabBandCombination",
+      { "MultiflowCapabBandCombination", "rrc.MultiflowCapabBandCombination_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mimoInDifferentBands,
@@ -155853,7 +155853,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MultiflowMIMOCapability_vals), 0,
         "MultiflowMIMOCapability", HFILL }},
     { &hf_rrc_nonContiguousCapability,
-      { "nonContiguousCapability", "rrc.nonContiguousCapability",
+      { "nonContiguousCapability", "rrc.nonContiguousCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MultiflowNonContiguousCapability", HFILL }},
     { &hf_rrc_gapSize,
@@ -155865,11 +155865,11 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_IdleIntervalMeasCapabEUTRAList_item,
-      { "IdleIntervalMeasCapabEUTRA", "rrc.IdleIntervalMeasCapabEUTRA",
+      { "IdleIntervalMeasCapabEUTRA", "rrc.IdleIntervalMeasCapabEUTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_IdleIntervalMeasCapabEUTRAExtensionList_item,
-      { "IdleIntervalMeasCapabEUTRAExtension", "rrc.IdleIntervalMeasCapabEUTRAExtension",
+      { "IdleIntervalMeasCapabEUTRAExtension", "rrc.IdleIntervalMeasCapabEUTRAExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_esn_DS_41,
@@ -155885,11 +155885,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "IMSI_GSM_MAP", HFILL }},
     { &hf_rrc_tmsi_and_LAI,
-      { "tmsi-and-LAI", "rrc.tmsi_and_LAI",
+      { "tmsi-and-LAI", "rrc.tmsi_and_LAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TMSI_and_LAI_GSM_MAP", HFILL }},
     { &hf_rrc_p_TMSI_and_RAI,
-      { "p-TMSI-and-RAI", "rrc.p_TMSI_and_RAI",
+      { "p-TMSI-and-RAI", "rrc.p_TMSI_and_RAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "P_TMSI_and_RAI_GSM_MAP", HFILL }},
     { &hf_rrc_imei,
@@ -155897,7 +155897,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_imsi_and_ESN_DS_41,
-      { "imsi-and-ESN-DS-41", "rrc.imsi_and_ESN_DS_41",
+      { "imsi-and-ESN-DS-41", "rrc.imsi_and_ESN_DS_41_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_messageAuthenticationCode,
@@ -155913,7 +155913,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_startIntegrityProtection,
-      { "startIntegrityProtection", "rrc.startIntegrityProtection",
+      { "startIntegrityProtection", "rrc.startIntegrityProtection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_integrityProtInitNumber,
@@ -155921,11 +155921,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modify,
-      { "modify", "rrc.modify",
+      { "modify", "rrc.modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_IntegrityProtActivationInfo,
-      { "dl-IntegrityProtActivationInfo", "rrc.dl_IntegrityProtActivationInfo",
+      { "dl-IntegrityProtActivationInfo", "rrc.dl_IntegrityProtActivationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntegrityProtActivationInfo", HFILL }},
     { &hf_rrc_integrityProtectionModeCommand,
@@ -155941,11 +155941,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_IntegrityProtectionAlgorithm_r7_vals), 0,
         "IntegrityProtectionAlgorithm_r7", HFILL }},
     { &hf_rrc_downlinkCompressedMode,
-      { "downlinkCompressedMode", "rrc.downlinkCompressedMode",
+      { "downlinkCompressedMode", "rrc.downlinkCompressedMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CompressedModeMeasCapability", HFILL }},
     { &hf_rrc_uplinkCompressedMode,
-      { "uplinkCompressedMode", "rrc.uplinkCompressedMode",
+      { "uplinkCompressedMode", "rrc.uplinkCompressedMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CompressedModeMeasCapability", HFILL }},
     { &hf_rrc_compressedModeMeasCapabFDDList,
@@ -155961,7 +155961,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_compressedModeMeasCapabMC,
-      { "compressedModeMeasCapabMC", "rrc.compressedModeMeasCapabMC",
+      { "compressedModeMeasCapabMC", "rrc.compressedModeMeasCapabMC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_compressedModeMeasCapabFDDList_01,
@@ -155985,19 +155985,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CompressedModeMeasCapabEUTRAList2", HFILL }},
     { &hf_rrc_downlinkCompressedMode_LCR,
-      { "downlinkCompressedMode-LCR", "rrc.downlinkCompressedMode_LCR",
+      { "downlinkCompressedMode-LCR", "rrc.downlinkCompressedMode_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CompressedModeMeasCapability_LCR_r4", HFILL }},
     { &hf_rrc_uplinkCompressedMode_LCR,
-      { "uplinkCompressedMode-LCR", "rrc.uplinkCompressedMode_LCR",
+      { "uplinkCompressedMode-LCR", "rrc.uplinkCompressedMode_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CompressedModeMeasCapability_LCR_r4", HFILL }},
     { &hf_rrc_downlinkCompressedMode_01,
-      { "downlinkCompressedMode", "rrc.downlinkCompressedMode",
+      { "downlinkCompressedMode", "rrc.downlinkCompressedMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CompressedModeMeasCapability_v860ext", HFILL }},
     { &hf_rrc_downlinkCompressedMode_02,
-      { "downlinkCompressedMode", "rrc.downlinkCompressedMode",
+      { "downlinkCompressedMode", "rrc.downlinkCompressedMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CompressedModeMeasCapability_v920ext", HFILL }},
     { &hf_rrc_interFrequencyDetectedSetMeasurements,
@@ -156005,7 +156005,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_interFrequencyDetectedSetMeasurements_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_downlinkCompressedMode_03,
-      { "downlinkCompressedMode", "rrc.downlinkCompressedMode",
+      { "downlinkCompressedMode", "rrc.downlinkCompressedMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CompressedModeMeasCapability_va40ext", HFILL }},
     { &hf_rrc_interFrequencyMeasOnConfigCarriersWithoutCompMode,
@@ -156025,7 +156025,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "IdleIntervalMeasCapabEUTRAExtensionList", HFILL }},
     { &hf_rrc_NonContiguousMultiCellCombinationList_item,
-      { "NonContiguousMultiCell", "rrc.NonContiguousMultiCell",
+      { "NonContiguousMultiCell", "rrc.NonContiguousMultiCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_aggregatedCells,
@@ -156105,7 +156105,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_supportOfE_UtraSIAcquisitionForHO_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_NetworkAssistedGANSS_Supported_List_item,
-      { "NetworkAssistedGANSS-Supported-List item", "rrc.NetworkAssistedGANSS_Supported_List_item",
+      { "NetworkAssistedGANSS-Supported-List item", "rrc.NetworkAssistedGANSS_Supported_List_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_gANSS_Id,
@@ -156129,7 +156129,7 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_NetworkAssistedGANSS_Supported_List_v860ext_item,
-      { "NetworkAssistedGANSS-Supported-List-v860ext item", "rrc.NetworkAssistedGANSS_Supported_List_v860ext_item",
+      { "NetworkAssistedGANSS-Supported-List-v860ext item", "rrc.NetworkAssistedGANSS_Supported_List_v860ext_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sbas_Ids,
@@ -156149,11 +156149,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "P_TMSI_GSM_MAP", HFILL }},
     { &hf_rrc_rai,
-      { "rai", "rrc.rai",
+      { "rai", "rrc.rai_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cn_Identity,
-      { "cn-Identity", "rrc.cn_Identity",
+      { "cn-Identity", "rrc.cn_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cn_pagedUE_Identity,
@@ -156161,19 +156161,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_CN_PagedUE_Identity_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_utran_Identity,
-      { "utran-Identity", "rrc.utran_Identity",
+      { "utran-Identity", "rrc.utran_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cn_OriginatedPage_connectedMode_UE,
-      { "cn-OriginatedPage-connectedMode-UE", "rrc.cn_OriginatedPage_connectedMode_UE",
+      { "cn-OriginatedPage-connectedMode-UE", "rrc.cn_OriginatedPage_connectedMode_UE_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_utran_SingleUE_Identity,
-      { "utran-SingleUE-Identity", "rrc.utran_SingleUE_Identity",
+      { "utran-SingleUE-Identity", "rrc.utran_SingleUE_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cn_OriginatedPage_connectedMode_UE_01,
-      { "cn-OriginatedPage-connectedMode-UE", "rrc.cn_OriginatedPage_connectedMode_UE",
+      { "cn-OriginatedPage-connectedMode-UE", "rrc.cn_OriginatedPage_connectedMode_UE_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_cn_OriginatedPage_connectedMode_UE_01", HFILL }},
     { &hf_rrc_utran_GroupIdentity,
@@ -156181,7 +156181,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxURNTI_Group_OF_GroupIdentityWithReleaseInformation", HFILL }},
     { &hf_rrc_utran_GroupIdentity_item,
-      { "GroupIdentityWithReleaseInformation", "rrc.GroupIdentityWithReleaseInformation",
+      { "GroupIdentityWithReleaseInformation", "rrc.GroupIdentityWithReleaseInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_PagingRecordList_item,
@@ -156201,7 +156201,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_supportForRfc2507_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_notSupported,
-      { "notSupported", "rrc.notSupported",
+      { "notSupported", "rrc.notSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_supported_01,
@@ -156213,7 +156213,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_supportForRfc3095_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_supported_02,
-      { "supported", "rrc.supported",
+      { "supported", "rrc.supported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_maxROHC_ContextSessions,
@@ -156241,159 +156241,159 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_supportForCSVoiceoverHSPA_01_vals), 0,
         "T_supportForCSVoiceoverHSPA_01", HFILL }},
     { &hf_rrc_fddPhysChCapability,
-      { "fddPhysChCapability", "rrc.fddPhysChCapability",
+      { "fddPhysChCapability", "rrc.fddPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_downlinkPhysChCapability,
-      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability",
+      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_PhysChCapabilityFDD", HFILL }},
     { &hf_rrc_uplinkPhysChCapability,
-      { "uplinkPhysChCapability", "rrc.uplinkPhysChCapability",
+      { "uplinkPhysChCapability", "rrc.uplinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_PhysChCapabilityFDD", HFILL }},
     { &hf_rrc_tddPhysChCapability,
-      { "tddPhysChCapability", "rrc.tddPhysChCapability",
+      { "tddPhysChCapability", "rrc.tddPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_downlinkPhysChCapability_01,
-      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability",
+      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_PhysChCapabilityTDD", HFILL }},
     { &hf_rrc_uplinkPhysChCapability_01,
-      { "uplinkPhysChCapability", "rrc.uplinkPhysChCapability",
+      { "uplinkPhysChCapability", "rrc.uplinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_PhysChCapabilityTDD", HFILL }},
     { &hf_rrc_fddPhysChCapability_01,
-      { "fddPhysChCapability", "rrc.fddPhysChCapability",
+      { "fddPhysChCapability", "rrc.fddPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fddPhysChCapability_01", HFILL }},
     { &hf_rrc_downlinkPhysChCapability_02,
-      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability",
+      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_PhysChCapabilityFDD_v770ext", HFILL }},
     { &hf_rrc_uplinkPhysChCapability_02,
-      { "uplinkPhysChCapability", "rrc.uplinkPhysChCapability",
+      { "uplinkPhysChCapability", "rrc.uplinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_PhysChCapabilityFDD_v770ext", HFILL }},
     { &hf_rrc_tddPhysChCapability_384,
-      { "tddPhysChCapability-384", "rrc.tddPhysChCapability_384",
+      { "tddPhysChCapability-384", "rrc.tddPhysChCapability_384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_uplinkPhysChCapability_03,
-      { "uplinkPhysChCapability", "rrc.uplinkPhysChCapability",
+      { "uplinkPhysChCapability", "rrc.uplinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_PhysChCapabilityTDD_384_v770ext", HFILL }},
     { &hf_rrc_tddPhysChCapability_768,
-      { "tddPhysChCapability-768", "rrc.tddPhysChCapability_768",
+      { "tddPhysChCapability-768", "rrc.tddPhysChCapability_768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_downlinkPhysChCapability_03,
-      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability",
+      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_PhysChCapabilityTDD_768", HFILL }},
     { &hf_rrc_uplinkPhysChCapability_04,
-      { "uplinkPhysChCapability", "rrc.uplinkPhysChCapability",
+      { "uplinkPhysChCapability", "rrc.uplinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_PhysChCapabilityTDD_768", HFILL }},
     { &hf_rrc_tddPhysChCapability_128,
-      { "tddPhysChCapability-128", "rrc.tddPhysChCapability_128",
+      { "tddPhysChCapability-128", "rrc.tddPhysChCapability_128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_downlinkPhysChCapability_04,
-      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability",
+      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_PhysChCapabilityTDD_128_v770ext", HFILL }},
     { &hf_rrc_uplinkPhysChCapability_05,
-      { "uplinkPhysChCapability", "rrc.uplinkPhysChCapability",
+      { "uplinkPhysChCapability", "rrc.uplinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_PhysChCapabilityTDD_128_v770ext", HFILL }},
     { &hf_rrc_fddPhysChCapability_02,
-      { "fddPhysChCapability", "rrc.fddPhysChCapability",
+      { "fddPhysChCapability", "rrc.fddPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fddPhysChCapability_02", HFILL }},
     { &hf_rrc_downlinkPhysChCapability_05,
-      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability",
+      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_PhysChCapabilityFDD_v860ext", HFILL }},
     { &hf_rrc_tddPhysChCapability_128_01,
-      { "tddPhysChCapability-128", "rrc.tddPhysChCapability_128",
+      { "tddPhysChCapability-128", "rrc.tddPhysChCapability_128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tddPhysChCapability_128_01", HFILL }},
     { &hf_rrc_downlinkPhysChCapability_06,
-      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability",
+      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_PhysChCapabilityTDD_128_v860ext", HFILL }},
     { &hf_rrc_fddPhysChCapability_03,
-      { "fddPhysChCapability", "rrc.fddPhysChCapability",
+      { "fddPhysChCapability", "rrc.fddPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fddPhysChCapability_03", HFILL }},
     { &hf_rrc_downlinkPhysChCapability_07,
-      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability",
+      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_PhysChCapabilityFDD_v920ext", HFILL }},
     { &hf_rrc_uplinkPhysChCapability_06,
-      { "uplinkPhysChCapability", "rrc.uplinkPhysChCapability",
+      { "uplinkPhysChCapability", "rrc.uplinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_PhysChCapabilityFDD_v920ext", HFILL }},
     { &hf_rrc_fddPhysChCapability_04,
-      { "fddPhysChCapability", "rrc.fddPhysChCapability",
+      { "fddPhysChCapability", "rrc.fddPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fddPhysChCapability_04", HFILL }},
     { &hf_rrc_downlinkPhysChCapability_08,
-      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability",
+      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_PhysChCapabilityFDD_va40ext", HFILL }},
     { &hf_rrc_tddPhysChCapability_128_02,
-      { "tddPhysChCapability-128", "rrc.tddPhysChCapability_128",
+      { "tddPhysChCapability-128", "rrc.tddPhysChCapability_128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tddPhysChCapability_128_02", HFILL }},
     { &hf_rrc_downlinkPhysChCapability_09,
-      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability",
+      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_PhysChCapabilityInfoTDD_128_va40ext", HFILL }},
     { &hf_rrc_uplinkPhysChCapability_07,
-      { "uplinkPhysChCapability", "rrc.uplinkPhysChCapability",
+      { "uplinkPhysChCapability", "rrc.uplinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_PhysChCapabilityInfoTDD_128_va40ext", HFILL }},
     { &hf_rrc_fddPhysChCapability_05,
-      { "fddPhysChCapability", "rrc.fddPhysChCapability",
+      { "fddPhysChCapability", "rrc.fddPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fddPhysChCapability_05", HFILL }},
     { &hf_rrc_downlinkPhysChCapability_10,
-      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability",
+      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_PhysChCapabilityFDD_vb50ext", HFILL }},
     { &hf_rrc_uplinkPhysChCapability_08,
-      { "uplinkPhysChCapability", "rrc.uplinkPhysChCapability",
+      { "uplinkPhysChCapability", "rrc.uplinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_PhysChCapabilityFDD_vb50ext", HFILL }},
     { &hf_rrc_tddPhysChCapability_768_01,
-      { "tddPhysChCapability-768", "rrc.tddPhysChCapability_768",
+      { "tddPhysChCapability-768", "rrc.tddPhysChCapability_768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tddPhysChCapability_768_01", HFILL }},
     { &hf_rrc_downlinkPhysChCapability_11,
-      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability",
+      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_PhysChCapabilityInfoTDD_768", HFILL }},
     { &hf_rrc_tddPhysChCapability_128_03,
-      { "tddPhysChCapability-128", "rrc.tddPhysChCapability_128",
+      { "tddPhysChCapability-128", "rrc.tddPhysChCapability_128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tddPhysChCapability_128_03", HFILL }},
     { &hf_rrc_uplinkPhysChCapability_09,
-      { "uplinkPhysChCapability", "rrc.uplinkPhysChCapability",
+      { "uplinkPhysChCapability", "rrc.uplinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_PhysChCapabilityInfoTDD_128_v770ext", HFILL }},
     { &hf_rrc_tdd128_PhysChCapability,
-      { "tdd128-PhysChCapability", "rrc.tdd128_PhysChCapability",
+      { "tdd128-PhysChCapability", "rrc.tdd128_PhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_downlinkPhysChCapability_12,
-      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability",
+      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_PhysChCapabilityTDD_LCR_r4", HFILL }},
     { &hf_rrc_uplinkPhysChCapability_10,
-      { "uplinkPhysChCapability", "rrc.uplinkPhysChCapability",
+      { "uplinkPhysChCapability", "rrc.uplinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_PhysChCapabilityTDD_LCR_r4", HFILL }},
     { &hf_rrc_fdd_hspdsch,
@@ -156401,7 +156401,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_fdd_hspdsch_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_supported_03,
-      { "supported", "rrc.supported",
+      { "supported", "rrc.supported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_supported_01", HFILL }},
     { &hf_rrc_hsdsch_physical_layer_category,
@@ -156433,15 +156433,15 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_noError,
-      { "noError", "rrc.noError",
+      { "noError", "rrc.noError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_errorOccurred,
-      { "errorOccurred", "rrc.errorOccurred",
+      { "errorOccurred", "rrc.errorOccurred_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_protocolErrorInformation_01,
-      { "protocolErrorInformation", "rrc.protocolErrorInformation",
+      { "protocolErrorInformation", "rrc.protocolErrorInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_diagnosticsType,
@@ -156453,27 +156453,27 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_type1_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_asn1_ViolationOrEncodingError,
-      { "asn1-ViolationOrEncodingError", "rrc.asn1_ViolationOrEncodingError",
+      { "asn1-ViolationOrEncodingError", "rrc.asn1_ViolationOrEncodingError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_messageTypeNonexistent,
-      { "messageTypeNonexistent", "rrc.messageTypeNonexistent",
+      { "messageTypeNonexistent", "rrc.messageTypeNonexistent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_messageNotCompatibleWithReceiverState,
-      { "messageNotCompatibleWithReceiverState", "rrc.messageNotCompatibleWithReceiverState",
+      { "messageNotCompatibleWithReceiverState", "rrc.messageNotCompatibleWithReceiverState_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IdentificationOfReceivedMessage", HFILL }},
     { &hf_rrc_ie_ValueNotComprehended,
-      { "ie-ValueNotComprehended", "rrc.ie_ValueNotComprehended",
+      { "ie-ValueNotComprehended", "rrc.ie_ValueNotComprehended_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IdentificationOfReceivedMessage", HFILL }},
     { &hf_rrc_conditionalInformationElementError,
-      { "conditionalInformationElementError", "rrc.conditionalInformationElementError",
+      { "conditionalInformationElementError", "rrc.conditionalInformationElementError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IdentificationOfReceivedMessage", HFILL }},
     { &hf_rrc_messageExtensionNotComprehended,
-      { "messageExtensionNotComprehended", "rrc.messageExtensionNotComprehended",
+      { "messageExtensionNotComprehended", "rrc.messageExtensionNotComprehended_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IdentificationOfReceivedMessage", HFILL }},
     { &hf_rrc_RadioFrequencyBandTDDextList_item,
@@ -156493,11 +156493,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_InterRATInfo_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_interRATInfo_01,
-      { "interRATInfo", "rrc.interRATInfo",
+      { "interRATInfo", "rrc.interRATInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATInfo_r6", HFILL }},
     { &hf_rrc_frequencyInfo_03,
-      { "frequencyInfo", "rrc.frequencyInfo",
+      { "frequencyInfo", "rrc.frequencyInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interRATInfo_02,
@@ -156505,7 +156505,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_InterRATInfo_v860ext_vals), 0,
         "InterRATInfo_v860ext", HFILL }},
     { &hf_rrc_fddRF_Capability,
-      { "fddRF-Capability", "rrc.fddRF_Capability",
+      { "fddRF-Capability", "rrc.fddRF_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_PowerClass,
@@ -156517,7 +156517,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TxRxFrequencySeparation_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_tddRF_Capability,
-      { "tddRF-Capability", "rrc.tddRF_Capability",
+      { "tddRF-Capability", "rrc.tddRF_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_radioFrequencyTDDBandList,
@@ -156529,7 +156529,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_ChipRateCapability_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_tddRF_Capability_01,
-      { "tddRF-Capability", "rrc.tddRF_Capability",
+      { "tddRF-Capability", "rrc.tddRF_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tddRF_Capability_01", HFILL }},
     { &hf_rrc_radioFrequencyBandTDDList,
@@ -156541,7 +156541,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_RadioFrequencyBandTDDList_r7_vals), 0,
         "RadioFrequencyBandTDDList_r7", HFILL }},
     { &hf_rrc_tdd768RF_Capability,
-      { "tdd768RF-Capability", "rrc.tdd768RF_Capability",
+      { "tdd768RF-Capability", "rrc.tdd768RF_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_radioFrequencyBandTDDList_01,
@@ -156601,11 +156601,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TotalRLC_AM_BufferSize_vb50ext_vals), 0,
         "TotalRLC_AM_BufferSize_vb50ext", HFILL }},
     { &hf_rrc_noRelease,
-      { "noRelease", "rrc.noRelease",
+      { "noRelease", "rrc.noRelease_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_release,
-      { "release", "rrc.release",
+      { "release", "rrc.release_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RRC_MessageSequenceNumberList_item,
@@ -156649,7 +156649,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_servingGrant,
-      { "servingGrant", "rrc.servingGrant",
+      { "servingGrant", "rrc.servingGrant_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_primary_Secondary_GrantSelector,
@@ -156681,11 +156681,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_hspdsch_Information,
-      { "dl-hspdsch-Information", "rrc.dl_hspdsch_Information",
+      { "dl-hspdsch-Information", "rrc.dl_hspdsch_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_harqInfo_02,
-      { "harqInfo", "rrc.harqInfo",
+      { "harqInfo", "rrc.harqInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HARQ_Info", HFILL }},
     { &hf_rrc_mac_hsResetIndicator,
@@ -156693,7 +156693,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_mac_hsResetIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_dl_hspdsch_Information_01,
-      { "dl-hspdsch-Information", "rrc.dl_hspdsch_Information",
+      { "dl-hspdsch-Information", "rrc.dl_hspdsch_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_HSPDSCH_Information_r7", HFILL }},
     { &hf_rrc_mac_hsResetIndicator_01,
@@ -156701,7 +156701,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_mac_hsResetIndicator_01_vals), 0,
         "T_mac_hsResetIndicator_01", HFILL }},
     { &hf_rrc_dl_hspdsch_Information_02,
-      { "dl-hspdsch-Information", "rrc.dl_hspdsch_Information",
+      { "dl-hspdsch-Information", "rrc.dl_hspdsch_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_HSPDSCH_Information_r8", HFILL }},
     { &hf_rrc_mac_hsResetIndicator_02,
@@ -156709,7 +156709,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_mac_hsResetIndicator_02_vals), 0,
         "T_mac_hsResetIndicator_02", HFILL }},
     { &hf_rrc_dl_hspdsch_Information_03,
-      { "dl-hspdsch-Information", "rrc.dl_hspdsch_Information",
+      { "dl-hspdsch-Information", "rrc.dl_hspdsch_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_HSPDSCH_Information_r9", HFILL }},
     { &hf_rrc_mac_hsResetIndicator_03,
@@ -156725,7 +156725,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DeltaNACK_r11", HFILL }},
     { &hf_rrc_dl_hspdsch_Information_04,
-      { "dl-hspdsch-Information", "rrc.dl_hspdsch_Information",
+      { "dl-hspdsch-Information", "rrc.dl_hspdsch_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_HSPDSCH_Information_r11", HFILL }},
     { &hf_rrc_mac_hsResetIndicator_04,
@@ -156737,7 +156737,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_mac_hsResetIndicator_assisting_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_supported_04,
-      { "supported", "rrc.supported",
+      { "supported", "rrc.supported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_supported_02", HFILL }},
     { &hf_rrc_maxNoSCCPCH_RL,
@@ -156749,11 +156749,11 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_rab_InfoReplace,
-      { "rab-InfoReplace", "rrc.rab_InfoReplace",
+      { "rab-InfoReplace", "rrc.rab_InfoReplace_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_STARTList_item,
-      { "STARTSingle", "rrc.STARTSingle",
+      { "STARTSingle", "rrc.STARTSingle_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SystemSpecificCapUpdateReqList_item,
@@ -156773,11 +156773,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "TMSI_GSM_MAP", HFILL }},
     { &hf_rrc_dl_TransChCapability,
-      { "dl-TransChCapability", "rrc.dl_TransChCapability",
+      { "dl-TransChCapability", "rrc.dl_TransChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_TransChCapability,
-      { "ul-TransChCapability", "rrc.ul_TransChCapability",
+      { "ul-TransChCapability", "rrc.ul_TransChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_supported_05,
@@ -156793,7 +156793,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_all,
-      { "all", "rrc.all",
+      { "all", "rrc.all_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b1,
@@ -156929,115 +156929,115 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_supportOfLoggedMeasurementsIdlePCH_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_v690ext,
-      { "ue-RadioAccessCapability-v690ext", "rrc.ue_RadioAccessCapability_v690ext",
+      { "ue-RadioAccessCapability-v690ext", "rrc.ue_RadioAccessCapability_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_RATSpecificCapability_v690ext,
-      { "ue-RATSpecificCapability-v690ext", "rrc.ue_RATSpecificCapability_v690ext",
+      { "ue-RATSpecificCapability-v690ext", "rrc.ue_RATSpecificCapability_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRAT_UE_RadioAccessCapability_v690ext", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_15,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6b0NonCriticalExtensions_14", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_v6b0ext,
-      { "ue-RadioAccessCapability-v6b0ext", "rrc.ue_RadioAccessCapability_v6b0ext",
+      { "ue-RadioAccessCapability-v6b0ext", "rrc.ue_RadioAccessCapability_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_v6b0ext_IEs", HFILL }},
     { &hf_rrc_v6e0NonCriticalExtensions_02,
-      { "v6e0NonCriticalExtensions", "rrc.v6e0NonCriticalExtensions",
+      { "v6e0NonCriticalExtensions", "rrc.v6e0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6e0NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_v6e0ext,
-      { "ue-RadioAccessCapability-v6e0ext", "rrc.ue_RadioAccessCapability_v6e0ext",
+      { "ue-RadioAccessCapability-v6e0ext", "rrc.ue_RadioAccessCapability_v6e0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_v6e0ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_39,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_39", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_v770ext,
-      { "ue-RadioAccessCapability-v770ext", "rrc.ue_RadioAccessCapability_v770ext",
+      { "ue-RadioAccessCapability-v770ext", "rrc.ue_RadioAccessCapability_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_v770ext_IEs", HFILL }},
     { &hf_rrc_v790NonCriticalExtensions_01,
-      { "v790NonCriticalExtensions", "rrc.v790NonCriticalExtensions",
+      { "v790NonCriticalExtensions", "rrc.v790NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v790NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_v790ext,
-      { "ue-RadioAccessCapability-v790ext", "rrc.ue_RadioAccessCapability_v790ext",
+      { "ue-RadioAccessCapability-v790ext", "rrc.ue_RadioAccessCapability_v790ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_v790ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_25,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_25", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_v860ext,
-      { "ue-RadioAccessCapability-v860ext", "rrc.ue_RadioAccessCapability_v860ext",
+      { "ue-RadioAccessCapability-v860ext", "rrc.ue_RadioAccessCapability_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_v860ext_IEs", HFILL }},
     { &hf_rrc_ue_RATSpecificCapability_v860ext,
-      { "ue-RATSpecificCapability-v860ext", "rrc.ue_RATSpecificCapability_v860ext",
+      { "ue-RATSpecificCapability-v860ext", "rrc.ue_RATSpecificCapability_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRAT_UE_RadioAccessCapability_v860ext", HFILL }},
     { &hf_rrc_v880NonCriticalExtensions_01,
-      { "v880NonCriticalExtensions", "rrc.v880NonCriticalExtensions",
+      { "v880NonCriticalExtensions", "rrc.v880NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v880NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_v880ext,
-      { "ue-RadioAccessCapability-v880ext", "rrc.ue_RadioAccessCapability_v880ext",
+      { "ue-RadioAccessCapability-v880ext", "rrc.ue_RadioAccessCapability_v880ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_v880ext_IEs", HFILL }},
     { &hf_rrc_v890NonCriticalExtensions_10,
-      { "v890NonCriticalExtensions", "rrc.v890NonCriticalExtensions",
+      { "v890NonCriticalExtensions", "rrc.v890NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v890NonCriticalExtensions_10", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_v890ext,
-      { "ue-RadioAccessCapability-v890ext", "rrc.ue_RadioAccessCapability_v890ext",
+      { "ue-RadioAccessCapability-v890ext", "rrc.ue_RadioAccessCapability_v890ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_v890ext_IEs", HFILL }},
     { &hf_rrc_v920NonCriticalExtensions_03,
-      { "v920NonCriticalExtensions", "rrc.v920NonCriticalExtensions",
+      { "v920NonCriticalExtensions", "rrc.v920NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v920NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_v920ext,
-      { "ue-RadioAccessCapability-v920ext", "rrc.ue_RadioAccessCapability_v920ext",
+      { "ue-RadioAccessCapability-v920ext", "rrc.ue_RadioAccessCapability_v920ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_v920ext_IEs", HFILL }},
     { &hf_rrc_v970NonCriticalExtensions_03,
-      { "v970NonCriticalExtensions", "rrc.v970NonCriticalExtensions",
+      { "v970NonCriticalExtensions", "rrc.v970NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v970NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_v970ext,
-      { "ue-RadioAccessCapability-v970ext", "rrc.ue_RadioAccessCapability_v970ext",
+      { "ue-RadioAccessCapability-v970ext", "rrc.ue_RadioAccessCapability_v970ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_v970ext_IEs", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions_18,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va40NonCriticalExtensions_17", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_va40ext,
-      { "ue-RadioAccessCapability-va40ext", "rrc.ue_RadioAccessCapability_va40ext",
+      { "ue-RadioAccessCapability-va40ext", "rrc.ue_RadioAccessCapability_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_va40ext_IEs", HFILL }},
     { &hf_rrc_va60NonCriticalExtensions,
-      { "va60NonCriticalExtensions", "rrc.va60NonCriticalExtensions",
+      { "va60NonCriticalExtensions", "rrc.va60NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_va60ext,
-      { "ue-RadioAccessCapability-va60ext", "rrc.ue_RadioAccessCapability_va60ext",
+      { "ue-RadioAccessCapability-va60ext", "rrc.ue_RadioAccessCapability_va60ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_va60ext_IEs", HFILL }},
     { &hf_rrc_va80NonCriticalExtensions_01,
-      { "va80NonCriticalExtensions", "rrc.va80NonCriticalExtensions",
+      { "va80NonCriticalExtensions", "rrc.va80NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va80NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_va80ext,
-      { "ue-RadioAccessCapability-va80ext", "rrc.ue_RadioAccessCapability_va80ext",
+      { "ue-RadioAccessCapability-va80ext", "rrc.ue_RadioAccessCapability_va80ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_va80ext_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_67,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_LaterNonCriticalExtensions", HFILL }},
     { &hf_rrc_supportForSIB11bis_01,
@@ -157049,27 +157049,27 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_supportForFDPCH_02_vals), 0,
         "T_supportForFDPCH_02", HFILL }},
     { &hf_rrc_pdcp_Capability_01,
-      { "pdcp-Capability", "rrc.pdcp_Capability",
+      { "pdcp-Capability", "rrc.pdcp_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PDCP_Capability_v770ext", HFILL }},
     { &hf_rrc_rlc_Capability,
-      { "rlc-Capability", "rrc.rlc_Capability",
+      { "rlc-Capability", "rrc.rlc_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLC_Capability_v770ext", HFILL }},
     { &hf_rrc_rf_Capability,
-      { "rf-Capability", "rrc.rf_Capability",
+      { "rf-Capability", "rrc.rf_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RF_Capability_v770ext", HFILL }},
     { &hf_rrc_physicalChannelCapability,
-      { "physicalChannelCapability", "rrc.physicalChannelCapability",
+      { "physicalChannelCapability", "rrc.physicalChannelCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelCapability_v770ext", HFILL }},
     { &hf_rrc_multiModeRAT_Capability,
-      { "multiModeRAT-Capability", "rrc.multiModeRAT_Capability",
+      { "multiModeRAT-Capability", "rrc.multiModeRAT_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MultiModeRAT_Capability_v770ext", HFILL }},
     { &hf_rrc_ue_PositioningCapability,
-      { "ue-PositioningCapability", "rrc.ue_PositioningCapability",
+      { "ue-PositioningCapability", "rrc.ue_PositioningCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_PositioningCapability_v770ext", HFILL }},
     { &hf_rrc_mac_ehsSupport_01,
@@ -157085,27 +157085,27 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_supportForEDPCCHPowerBoosting_01_vals), 0,
         "T_supportForEDPCCHPowerBoosting_01", HFILL }},
     { &hf_rrc_rf_Capability_01,
-      { "rf-Capability", "rrc.rf_Capability",
+      { "rf-Capability", "rrc.rf_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RF_Capability_v860ext", HFILL }},
     { &hf_rrc_physicalChannelCapability_01,
-      { "physicalChannelCapability", "rrc.physicalChannelCapability",
+      { "physicalChannelCapability", "rrc.physicalChannelCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelCapability_v860ext", HFILL }},
     { &hf_rrc_multiModeRAT_Capability_01,
-      { "multiModeRAT-Capability", "rrc.multiModeRAT_Capability",
+      { "multiModeRAT-Capability", "rrc.multiModeRAT_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MultiModeRAT_Capability_v860ext", HFILL }},
     { &hf_rrc_ue_PositioningCapability_01,
-      { "ue-PositioningCapability", "rrc.ue_PositioningCapability",
+      { "ue-PositioningCapability", "rrc.ue_PositioningCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_PositioningCapability_v860ext", HFILL }},
     { &hf_rrc_measurementCapability,
-      { "measurementCapability", "rrc.measurementCapability",
+      { "measurementCapability", "rrc.measurementCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementCapability_v860ext", HFILL }},
     { &hf_rrc_measurementCapabilityTDD,
-      { "measurementCapabilityTDD", "rrc.measurementCapabilityTDD",
+      { "measurementCapabilityTDD", "rrc.measurementCapabilityTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_supportOfCommonEDCH_04,
@@ -157145,11 +157145,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_physicalChannelCapability_02,
-      { "physicalChannelCapability", "rrc.physicalChannelCapability",
+      { "physicalChannelCapability", "rrc.physicalChannelCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelCapability_v920ext", HFILL }},
     { &hf_rrc_rlc_Capability_01,
-      { "rlc-Capability", "rrc.rlc_Capability",
+      { "rlc-Capability", "rrc.rlc_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLC_Capability_v920ext", HFILL }},
     { &hf_rrc_supportOfenhancedTS0,
@@ -157157,15 +157157,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_supportOfenhancedTS0_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_measurementCapability_01,
-      { "measurementCapability", "rrc.measurementCapability",
+      { "measurementCapability", "rrc.measurementCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementCapability_v920ext", HFILL }},
     { &hf_rrc_csgProximityIndicationCapability,
-      { "csgProximityIndicationCapability", "rrc.csgProximityIndicationCapability",
+      { "csgProximityIndicationCapability", "rrc.csgProximityIndicationCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CSG_ProximityIndicationCapability", HFILL }},
     { &hf_rrc_neighCellSI_AcquisitionCapability,
-      { "neighCellSI-AcquisitionCapability", "rrc.neighCellSI_AcquisitionCapability",
+      { "neighCellSI-AcquisitionCapability", "rrc.neighCellSI_AcquisitionCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_ExtendedMeasurementSupport,
@@ -157189,31 +157189,31 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_ue_supportMac_ehsWindowSizeExtension_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_v9c0NonCriticalExtensions_12,
-      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions",
+      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v9c0NonCriticalExtensions_12", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_v9c0ext,
-      { "ue-RadioAccessCapability-v9c0ext", "rrc.ue_RadioAccessCapability_v9c0ext",
+      { "ue-RadioAccessCapability-v9c0ext", "rrc.ue_RadioAccessCapability_v9c0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_v9c0ext_IEs", HFILL }},
     { &hf_rrc_vaa0NonCriticalExtensions_02,
-      { "vaa0NonCriticalExtensions", "rrc.vaa0NonCriticalExtensions",
+      { "vaa0NonCriticalExtensions", "rrc.vaa0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vaa0NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_vaa0ext,
-      { "ue-RadioAccessCapability-vaa0ext", "rrc.ue_RadioAccessCapability_vaa0ext",
+      { "ue-RadioAccessCapability-vaa0ext", "rrc.ue_RadioAccessCapability_vaa0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_vaa0ext_IEs", HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions_23,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vb50NonCriticalExtensions_23", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_vb50ext,
-      { "ue-RadioAccessCapability-vb50ext", "rrc.ue_RadioAccessCapability_vb50ext",
+      { "ue-RadioAccessCapability-vb50ext", "rrc.ue_RadioAccessCapability_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_vb50ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_195,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_195", HFILL }},
     { &hf_rrc_ue_RadioAccessCapabBandCombList_va40ext,
@@ -157221,15 +157221,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_physicalChannelCapability_03,
-      { "physicalChannelCapability", "rrc.physicalChannelCapability",
+      { "physicalChannelCapability", "rrc.physicalChannelCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelCapability_va40ext", HFILL }},
     { &hf_rrc_rlc_Capability_02,
-      { "rlc-Capability", "rrc.rlc_Capability",
+      { "rlc-Capability", "rrc.rlc_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLC_Capability_va40ext", HFILL }},
     { &hf_rrc_measurementCapability_02,
-      { "measurementCapability", "rrc.measurementCapability",
+      { "measurementCapability", "rrc.measurementCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementCapability_va40ext", HFILL }},
     { &hf_rrc_supportOfMUMIMO,
@@ -157241,7 +157241,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_supportForDualCellMimoInDifferentBands_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_ue_BasedNetworkPerformanceMeasurementsParameters,
-      { "ue-BasedNetworkPerformanceMeasurementsParameters", "rrc.ue_BasedNetworkPerformanceMeasurementsParameters",
+      { "ue-BasedNetworkPerformanceMeasurementsParameters", "rrc.ue_BasedNetworkPerformanceMeasurementsParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_supportOfUTRANANR,
@@ -157265,11 +157265,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_supportOfUMRLCre_establish_via_reconfig_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_rf_capability,
-      { "rf-capability", "rrc.rf_capability",
+      { "rf-capability", "rrc.rf_capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RF_Capability_vaa0ext", HFILL }},
     { &hf_rrc_multiModeRAT_Capability_02,
-      { "multiModeRAT-Capability", "rrc.multiModeRAT_Capability",
+      { "multiModeRAT-Capability", "rrc.multiModeRAT_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MultiModeRAT_Capability_vb50ext", HFILL }},
     { &hf_rrc_supportOfCommonERGCHBasedInterferenceControl,
@@ -157297,15 +157297,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_physicalChannelCapability_04,
-      { "physicalChannelCapability", "rrc.physicalChannelCapability",
+      { "physicalChannelCapability", "rrc.physicalChannelCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelCapability_vb50ext", HFILL }},
     { &hf_rrc_rlc_Capability_03,
-      { "rlc-Capability", "rrc.rlc_Capability",
+      { "rlc-Capability", "rrc.rlc_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLC_Capability_vb50ext", HFILL }},
     { &hf_rrc_multiflowCapability,
-      { "multiflowCapability", "rrc.multiflowCapability",
+      { "multiflowCapability", "rrc.multiflowCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_RadioAccessCapabBandFDDList6,
@@ -157313,11 +157313,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_measurementCapability_03,
-      { "measurementCapability", "rrc.measurementCapability",
+      { "measurementCapability", "rrc.measurementCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementCapability_vb50ext", HFILL }},
     { &hf_rrc_measurementCapabilityTDD_01,
-      { "measurementCapabilityTDD", "rrc.measurementCapabilityTDD",
+      { "measurementCapabilityTDD", "rrc.measurementCapabilityTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementCapabilityTDD_vb50ext", HFILL }},
     { &hf_rrc_rsrvcc_SupportFromUTRA_CS_to_EUTRA_FDD,
@@ -157461,7 +157461,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_multiRAT_CapabilityList,
-      { "multiRAT-CapabilityList", "rrc.multiRAT_CapabilityList",
+      { "multiRAT-CapabilityList", "rrc.multiRAT_CapabilityList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MultiRAT_Capability", HFILL }},
     { &hf_rrc_multiModeCapability,
@@ -157469,35 +157469,35 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MultiModeCapability_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_pdcp_Capability_02,
-      { "pdcp-Capability", "rrc.pdcp_Capability",
+      { "pdcp-Capability", "rrc.pdcp_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rlc_Capability_04,
-      { "rlc-Capability", "rrc.rlc_Capability",
+      { "rlc-Capability", "rrc.rlc_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_transportChannelCapability,
-      { "transportChannelCapability", "rrc.transportChannelCapability",
+      { "transportChannelCapability", "rrc.transportChannelCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rf_Capability_02,
-      { "rf-Capability", "rrc.rf_Capability",
+      { "rf-Capability", "rrc.rf_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_physicalChannelCapability_05,
-      { "physicalChannelCapability", "rrc.physicalChannelCapability",
+      { "physicalChannelCapability", "rrc.physicalChannelCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_MultiModeRAT_Capability,
-      { "ue-MultiModeRAT-Capability", "rrc.ue_MultiModeRAT_Capability",
+      { "ue-MultiModeRAT-Capability", "rrc.ue_MultiModeRAT_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_Capability,
-      { "ue-positioning-Capability", "rrc.ue_positioning_Capability",
+      { "ue-positioning-Capability", "rrc.ue_positioning_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_measurementCapability_04,
-      { "measurementCapability", "rrc.measurementCapability",
+      { "measurementCapability", "rrc.measurementCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_RadioAccessCapabBandFDDList,
@@ -157505,15 +157505,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_PositioningCapabilityExt_v380,
-      { "ue-PositioningCapabilityExt-v380", "rrc.ue_PositioningCapabilityExt_v380",
+      { "ue-PositioningCapabilityExt-v380", "rrc.ue_PositioningCapabilityExt_v380_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_PositioningCapabilityExt_v3a0,
-      { "ue-PositioningCapabilityExt-v3a0", "rrc.ue_PositioningCapabilityExt_v3a0",
+      { "ue-PositioningCapabilityExt-v3a0", "rrc.ue_PositioningCapabilityExt_v3a0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_PositioningCapabilityExt_v3g0,
-      { "ue-PositioningCapabilityExt-v3g0", "rrc.ue_PositioningCapabilityExt_v3g0",
+      { "ue-PositioningCapabilityExt-v3g0", "rrc.ue_PositioningCapabilityExt_v3g0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_RadioAccessCapabBandFDDList2,
@@ -157525,7 +157525,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_physicalchannelcapability_edch,
-      { "physicalchannelcapability-edch", "rrc.physicalchannelcapability_edch",
+      { "physicalchannelcapability-edch", "rrc.physicalchannelcapability_edch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelCapability_edch_r6", HFILL }},
     { &hf_rrc_deviceType,
@@ -157545,15 +157545,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_supportofTxDivOnNonMIMOChannel_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_physicalChannelCapability_LCR,
-      { "physicalChannelCapability-LCR", "rrc.physicalChannelCapability_LCR",
+      { "physicalChannelCapability-LCR", "rrc.physicalChannelCapability_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelCapability_LCR_r4", HFILL }},
     { &hf_rrc_ue_RadioAccessCapabilityComp_TDD128,
-      { "ue-RadioAccessCapabilityComp-TDD128", "rrc.ue_RadioAccessCapabilityComp_TDD128",
+      { "ue-RadioAccessCapabilityComp-TDD128", "rrc.ue_RadioAccessCapabilityComp_TDD128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapabilityComp_TDD128_v7f0ext", HFILL }},
     { &hf_rrc_physicalChannelCapability_06,
-      { "physicalChannelCapability", "rrc.physicalChannelCapability",
+      { "physicalChannelCapability", "rrc.physicalChannelCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelCapabilityInfo_v770ext", HFILL }},
     { &hf_rrc_ganssSupportIndication,
@@ -157593,35 +157593,35 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UE_RadioAccessCapabBandFDDList2_item,
-      { "UE-RadioAccessCapabBandFDD2", "rrc.UE_RadioAccessCapabBandFDD2",
+      { "UE-RadioAccessCapabBandFDD2", "rrc.UE_RadioAccessCapabBandFDD2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UE_RadioAccessCapabBandFDDList3_item,
-      { "UE-RadioAccessCapabBandFDD3", "rrc.UE_RadioAccessCapabBandFDD3",
+      { "UE-RadioAccessCapabBandFDD3", "rrc.UE_RadioAccessCapabBandFDD3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UE_RadioAccessCapabBandFDDList4_item,
-      { "UE-RadioAccessCapabBandFDD4", "rrc.UE_RadioAccessCapabBandFDD4",
+      { "UE-RadioAccessCapabBandFDD4", "rrc.UE_RadioAccessCapabBandFDD4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UE_RadioAccessCapabBandFDDList4_va60ext_item,
-      { "UE-RadioAccessCapabBandFDD4-va60ext", "rrc.UE_RadioAccessCapabBandFDD4_va60ext",
+      { "UE-RadioAccessCapabBandFDD4-va60ext", "rrc.UE_RadioAccessCapabBandFDD4_va60ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UE_RadioAccessCapabBandFDDList4_va80ext_item,
-      { "UE-RadioAccessCapabBandFDD4-va80ext", "rrc.UE_RadioAccessCapabBandFDD4_va80ext",
+      { "UE-RadioAccessCapabBandFDD4-va80ext", "rrc.UE_RadioAccessCapabBandFDD4_va80ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UE_RadioAccessCapabBandFDDList5_item,
-      { "UE-RadioAccessCapabBandFDD5", "rrc.UE_RadioAccessCapabBandFDD5",
+      { "UE-RadioAccessCapabBandFDD5", "rrc.UE_RadioAccessCapabBandFDD5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UE_RadioAccessCapabBandFDDList6_item,
-      { "UE-RadioAccessCapabBandFDD6", "rrc.UE_RadioAccessCapabBandFDD6",
+      { "UE-RadioAccessCapabBandFDD6", "rrc.UE_RadioAccessCapabBandFDD6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_fddRF_Capability_01,
-      { "fddRF-Capability", "rrc.fddRF_Capability",
+      { "fddRF-Capability", "rrc.fddRF_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fddRF_Capability_01", HFILL }},
     { &hf_rrc_ue_PowerClass_01,
@@ -157629,11 +157629,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UE_PowerClassExt_vals), 0,
         "UE_PowerClassExt", HFILL }},
     { &hf_rrc_measurementCapability2,
-      { "measurementCapability2", "rrc.measurementCapability2",
+      { "measurementCapability2", "rrc.measurementCapability2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementCapabilityExt2", HFILL }},
     { &hf_rrc_measurementCapability3,
-      { "measurementCapability3", "rrc.measurementCapability3",
+      { "measurementCapability3", "rrc.measurementCapability3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementCapabilityExt3", HFILL }},
     { &hf_rrc_additionalSecondaryCells,
@@ -157657,11 +157657,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_supportofULOLTD_01_vals), 0,
         "T_supportofULOLTD_01", HFILL }},
     { &hf_rrc_fddRF_Capability_02,
-      { "fddRF-Capability", "rrc.fddRF_Capability",
+      { "fddRF-Capability", "rrc.fddRF_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fddRF_Capability_02", HFILL }},
     { &hf_rrc_measurementCapability4,
-      { "measurementCapability4", "rrc.measurementCapability4",
+      { "measurementCapability4", "rrc.measurementCapability4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementCapabilityExt4", HFILL }},
     { &hf_rrc_additionalSecondaryCells2,
@@ -157673,7 +157673,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_supportOfULCLTD_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_multiflowCapability_01,
-      { "multiflowCapability", "rrc.multiflowCapability",
+      { "multiflowCapability", "rrc.multiflowCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MultiflowPerBandCapability", HFILL }},
     { &hf_rrc_mimo4x4CapabilityBand,
@@ -157685,7 +157685,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_supportOfULMIMO_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_measurementCapability5,
-      { "measurementCapability5", "rrc.measurementCapability5",
+      { "measurementCapability5", "rrc.measurementCapability5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementCapabilityExt5", HFILL }},
     { &hf_rrc_freqSpecificCompressedModeForNonContiguous,
@@ -157705,11 +157705,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_sfn_sfnType2Capability_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_ue_GANSSPositioning_Capability,
-      { "ue-GANSSPositioning-Capability", "rrc.ue_GANSSPositioning_Capability",
+      { "ue-GANSSPositioning-Capability", "rrc.ue_GANSSPositioning_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_GANSSPositioning_Capability_v860ext,
-      { "ue-GANSSPositioning-Capability-v860ext", "rrc.ue_GANSSPositioning_Capability_v860ext",
+      { "ue-GANSSPositioning-Capability-v860ext", "rrc.ue_GANSSPositioning_Capability_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_GANSSPositioning_Capability_v860ext_IEs", HFILL }},
     { &hf_rrc_UE_RadioAccessCapabBandCombList_item,
@@ -157717,23 +157717,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UE_RadioAccessCapabBandFDDList_item,
-      { "UE-RadioAccessCapabBandFDD", "rrc.UE_RadioAccessCapabBandFDD",
+      { "UE-RadioAccessCapabBandFDD", "rrc.UE_RadioAccessCapabBandFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UE_RadioAccessCapabBandFDDList_ext_item,
-      { "UE-RadioAccessCapabBandFDD-ext", "rrc.UE_RadioAccessCapabBandFDD_ext",
+      { "UE-RadioAccessCapabBandFDD-ext", "rrc.UE_RadioAccessCapabBandFDD_ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UE_RadioAccessCapabBandFDDList_ext2_item,
-      { "UE-RadioAccessCapabBandFDD-ext2", "rrc.UE_RadioAccessCapabBandFDD_ext2",
+      { "UE-RadioAccessCapabBandFDD-ext2", "rrc.UE_RadioAccessCapabBandFDD_ext2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_fddRF_Capability_03,
-      { "fddRF-Capability", "rrc.fddRF_Capability",
+      { "fddRF-Capability", "rrc.fddRF_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fddRF_Capability_03", HFILL }},
     { &hf_rrc_measurementCapability_05,
-      { "measurementCapability", "rrc.measurementCapability",
+      { "measurementCapability", "rrc.measurementCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementCapabilityExt", HFILL }},
     { &hf_rrc_compressedModeMeasCapabFDDList_ext,
@@ -157741,19 +157741,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_pdcp_Capability_r4_ext,
-      { "pdcp-Capability-r4-ext", "rrc.pdcp_Capability_r4_ext",
+      { "pdcp-Capability-r4-ext", "rrc.pdcp_Capability_r4_ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_CapabilityExt,
-      { "tdd-CapabilityExt", "rrc.tdd_CapabilityExt",
+      { "tdd-CapabilityExt", "rrc.tdd_CapabilityExt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rf_Capability_03,
-      { "rf-Capability", "rrc.rf_Capability",
+      { "rf-Capability", "rrc.rf_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RF_Capability_r4_ext", HFILL }},
     { &hf_rrc_measurementCapability_r4_ext,
-      { "measurementCapability-r4-ext", "rrc.measurementCapability_r4_ext",
+      { "measurementCapability-r4-ext", "rrc.measurementCapability_r4_ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_totalAM_RLCMemoryExceeds10kB,
@@ -157761,7 +157761,7 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_rf_CapabilityComp,
-      { "rf-CapabilityComp", "rrc.rf_CapabilityComp",
+      { "rf-CapabilityComp", "rrc.rf_CapabilityComp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rf_CapabilityFDDComp_01,
@@ -157785,7 +157785,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_supportForCSVoiceoverHSPA_02_vals), 0,
         "T_supportForCSVoiceoverHSPA_02", HFILL }},
     { &hf_rrc_rf_CapabilityComp_01,
-      { "rf-CapabilityComp", "rrc.rf_CapabilityComp",
+      { "rf-CapabilityComp", "rrc.rf_CapabilityComp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RF_CapabilityComp_v770ext", HFILL }},
     { &hf_rrc_securityCapabilityIndication,
@@ -157801,7 +157801,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_mac_ehsSupport_03_vals), 0,
         "T_mac_ehsSupport_03", HFILL }},
     { &hf_rrc_fddPhysicalChannelCapab_hspdsch_edch,
-      { "fddPhysicalChannelCapab-hspdsch-edch", "rrc.fddPhysicalChannelCapab_hspdsch_edch",
+      { "fddPhysicalChannelCapab-hspdsch-edch", "rrc.fddPhysicalChannelCapab_hspdsch_edch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_physicalChannelCapabComp_hspdsch_r6,
@@ -157809,7 +157809,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "HSDSCH_physical_layer_category", HFILL }},
     { &hf_rrc_physicalChannelCapability_edch_r6,
-      { "physicalChannelCapability-edch-r6", "rrc.physicalChannelCapability_edch_r6",
+      { "physicalChannelCapability-edch-r6", "rrc.physicalChannelCapability_edch_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_edch_PhysicalLayerCategory_extension,
@@ -157929,11 +157929,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_RF_CapabBandFDDComp_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_UE_RadioAccessCapabBandCombList_va40ext_item,
-      { "SupportedCarrierCombination", "rrc.SupportedCarrierCombination",
+      { "SupportedCarrierCombination", "rrc.SupportedCarrierCombination_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UE_RadioAccessCapabBandCombList_vb50ext_item,
-      { "SupportedCarrierCombination-ext", "rrc.SupportedCarrierCombination_ext",
+      { "SupportedCarrierCombination-ext", "rrc.SupportedCarrierCombination_ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_carrierCombination12,
@@ -158045,27 +158045,27 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_pdcp_Capability_r5_ext,
-      { "pdcp-Capability-r5-ext", "rrc.pdcp_Capability_r5_ext",
+      { "pdcp-Capability-r5-ext", "rrc.pdcp_Capability_r5_ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rlc_Capability_r5_ext,
-      { "rlc-Capability-r5-ext", "rrc.rlc_Capability_r5_ext",
+      { "rlc-Capability-r5-ext", "rrc.rlc_Capability_r5_ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_physicalChannelCapability_07,
-      { "physicalChannelCapability", "rrc.physicalChannelCapability",
+      { "physicalChannelCapability", "rrc.physicalChannelCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelCapability_hspdsch_r5", HFILL }},
     { &hf_rrc_multiModeRAT_Capability_v590ext,
-      { "multiModeRAT-Capability-v590ext", "rrc.multiModeRAT_Capability_v590ext",
+      { "multiModeRAT-Capability-v590ext", "rrc.multiModeRAT_Capability_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_pdcp_Capability_r5_ext2,
-      { "pdcp-Capability-r5-ext2", "rrc.pdcp_Capability_r5_ext2",
+      { "pdcp-Capability-r5-ext2", "rrc.pdcp_Capability_r5_ext2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_multiModeRAT_Capability_v680ext,
-      { "multiModeRAT-Capability-v680ext", "rrc.multiModeRAT_Capability_v680ext",
+      { "multiModeRAT-Capability-v680ext", "rrc.multiModeRAT_Capability_v680ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ulOLTDActivation,
@@ -158101,7 +158101,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd384_edch_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_supported_09,
-      { "supported", "rrc.supported",
+      { "supported", "rrc.supported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_supported_03", HFILL }},
     { &hf_rrc_tdd_edch_PhysicalLayerCategory_01,
@@ -158117,7 +158117,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd128_edch_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_supported_10,
-      { "supported", "rrc.supported",
+      { "supported", "rrc.supported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_supported_04", HFILL }},
     { &hf_rrc_multiCarrier_EdchPhysicalLayerCategory_128,
@@ -158133,23 +158133,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd384_edch_01_vals), 0,
         "T_tdd384_edch_01", HFILL }},
     { &hf_rrc_supported_11,
-      { "supported", "rrc.supported",
+      { "supported", "rrc.supported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_supported_05", HFILL }},
     { &hf_rrc_continue,
-      { "continue", "rrc.continue",
+      { "continue", "rrc.continue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_newConfiguration,
-      { "newConfiguration", "rrc.newConfiguration",
+      { "newConfiguration", "rrc.newConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_secondaryServingEDCHCell_Info,
-      { "secondaryServingEDCHCell-Info", "rrc.secondaryServingEDCHCell_Info",
+      { "secondaryServingEDCHCell-Info", "rrc.secondaryServingEDCHCell_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_secondaryEDCH_Info_Common,
-      { "secondaryEDCH-Info-Common", "rrc.secondaryEDCH_Info_Common",
+      { "secondaryEDCH-Info-Common", "rrc.secondaryEDCH_Info_Common_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_InformationPerSecondaryRL_List,
@@ -158161,7 +158161,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_fdd_edch_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_supported_12,
-      { "supported", "rrc.supported",
+      { "supported", "rrc.supported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_supported_06", HFILL }},
     { &hf_rrc_edch_PhysicalLayerCategory,
@@ -158189,7 +158189,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_18_vals), 0,
         "T_modeSpecificInfo_18", HFILL }},
     { &hf_rrc_tdd_13,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_12", HFILL }},
     { &hf_rrc_maxTransmittedBlocks,
@@ -158241,11 +158241,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_319_vals), 0,
         "T_319", HFILL }},
     { &hf_rrc_rfc2507_Info,
-      { "rfc2507-Info", "rrc.rfc2507_Info",
+      { "rfc2507-Info", "rrc.rfc2507_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rfc3095_Info,
-      { "rfc3095-Info", "rrc.rfc3095_Info",
+      { "rfc3095-Info", "rrc.rfc3095_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RFC3095_Info_r4", HFILL }},
     { &hf_rrc_logicalChannelIdentity,
@@ -158273,7 +158273,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_ReceivingWindowSize_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_dl_RLC_StatusInfo,
-      { "dl-RLC-StatusInfo", "rrc.dl_RLC_StatusInfo",
+      { "dl-RLC-StatusInfo", "rrc.dl_RLC_StatusInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_RLC_PDU_size,
@@ -158301,7 +158301,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_flexibleSize_01_vals), 0,
         "T_flexibleSize_01", HFILL }},
     { &hf_rrc_dl_RLC_StatusInfo_01,
-      { "dl-RLC-StatusInfo", "rrc.dl_RLC_StatusInfo",
+      { "dl-RLC-StatusInfo", "rrc.dl_RLC_StatusInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_RLC_StatusInfo_r11", HFILL }},
     { &hf_rrc_rB_WithPDCP_InfoList,
@@ -158325,15 +158325,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_DL_TransportChannelType_r7_vals), 0,
         "DL_TransportChannelType_r7", HFILL }},
     { &hf_rrc_DL_LogicalChannelMappingList_item,
-      { "DL-LogicalChannelMapping", "rrc.DL_LogicalChannelMapping",
+      { "DL-LogicalChannelMapping", "rrc.DL_LogicalChannelMapping_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_LogicalChannelMappingList_r5_item,
-      { "DL-LogicalChannelMapping-r5", "rrc.DL_LogicalChannelMapping_r5",
+      { "DL-LogicalChannelMapping-r5", "rrc.DL_LogicalChannelMapping_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_LogicalChannelMappingList_r7_item,
-      { "DL-LogicalChannelMapping-r7", "rrc.DL_LogicalChannelMapping_r7",
+      { "DL-LogicalChannelMapping-r7", "rrc.DL_LogicalChannelMapping_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dummy_32,
@@ -158349,35 +158349,35 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_65535", HFILL }},
     { &hf_rrc_dl_AM_RLC_Mode,
-      { "dl-AM-RLC-Mode", "rrc.dl_AM_RLC_Mode",
+      { "dl-AM-RLC-Mode", "rrc.dl_AM_RLC_Mode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_UM_RLC_Mode,
-      { "dl-UM-RLC-Mode", "rrc.dl_UM_RLC_Mode",
+      { "dl-UM-RLC-Mode", "rrc.dl_UM_RLC_Mode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_TM_RLC_Mode,
-      { "dl-TM-RLC-Mode", "rrc.dl_TM_RLC_Mode",
+      { "dl-TM-RLC-Mode", "rrc.dl_TM_RLC_Mode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_AM_RLC_Mode_01,
-      { "dl-AM-RLC-Mode", "rrc.dl_AM_RLC_Mode",
+      { "dl-AM-RLC-Mode", "rrc.dl_AM_RLC_Mode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_AM_RLC_Mode_r5", HFILL }},
     { &hf_rrc_dl_UM_RLC_Mode_01,
-      { "dl-UM-RLC-Mode", "rrc.dl_UM_RLC_Mode",
+      { "dl-UM-RLC-Mode", "rrc.dl_UM_RLC_Mode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_UM_RLC_Mode_r5", HFILL }},
     { &hf_rrc_dl_UM_RLC_Mode_02,
-      { "dl-UM-RLC-Mode", "rrc.dl_UM_RLC_Mode",
+      { "dl-UM-RLC-Mode", "rrc.dl_UM_RLC_Mode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_UM_RLC_Mode_r6", HFILL }},
     { &hf_rrc_dl_AM_RLC_Mode_02,
-      { "dl-AM-RLC-Mode", "rrc.dl_AM_RLC_Mode",
+      { "dl-AM-RLC-Mode", "rrc.dl_AM_RLC_Mode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_AM_RLC_Mode_r7", HFILL }},
     { &hf_rrc_dl_AM_RLC_Mode_03,
-      { "dl-AM-RLC-Mode", "rrc.dl_AM_RLC_Mode",
+      { "dl-AM-RLC-Mode", "rrc.dl_AM_RLC_Mode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_AM_RLC_Mode_r11", HFILL }},
     { &hf_rrc_timerStatusProhibit,
@@ -158409,7 +158409,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TransportChannelIdentity", HFILL }},
     { &hf_rrc_fach,
-      { "fach", "rrc.fach",
+      { "fach", "rrc.fach_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dsch,
@@ -158417,7 +158417,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TransportChannelIdentity", HFILL }},
     { &hf_rrc_dch_and_dsch,
-      { "dch-and-dsch", "rrc.dch_and_dsch",
+      { "dch-and-dsch", "rrc.dch_and_dsch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TransportChannelIdentityDCHandDSCH", HFILL }},
     { &hf_rrc_hsdsch,
@@ -158425,7 +158425,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MAC_d_FlowIdentity", HFILL }},
     { &hf_rrc_dch_and_hsdsch,
-      { "dch-and-hsdsch", "rrc.dch_and_hsdsch",
+      { "dch-and-hsdsch", "rrc.dch_and_hsdsch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MAC_d_FlowIdentityDCHandHSDSCH", HFILL }},
     { &hf_rrc_hsdsch_01,
@@ -158445,11 +158445,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dch_and_hsdsch_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_mac_hs_01,
-      { "mac-hs", "rrc.mac_hs",
+      { "mac-hs", "rrc.mac_hs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MAC_d_FlowIdentityDCHandHSDSCH", HFILL }},
     { &hf_rrc_mac_ehs_01,
-      { "mac-ehs", "rrc.mac_ehs",
+      { "mac-ehs", "rrc.mac_ehs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MAC_ehs_QueueIdDCHandHSDSCH", HFILL }},
     { &hf_rrc_dl_UM_RLC_LI_size,
@@ -158477,7 +158477,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_AlgorithmSpecificInfo_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_HeaderCompressionInfoList_item,
-      { "HeaderCompressionInfo", "rrc.HeaderCompressionInfo",
+      { "HeaderCompressionInfo", "rrc.HeaderCompressionInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_algorithmSpecificInfo_01,
@@ -158485,7 +158485,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_AlgorithmSpecificInfo_r4_vals), 0,
         "AlgorithmSpecificInfo_r4", HFILL }},
     { &hf_rrc_HeaderCompressionInfoList_r4_item,
-      { "HeaderCompressionInfo-r4", "rrc.HeaderCompressionInfo_r4",
+      { "HeaderCompressionInfo-r4", "rrc.HeaderCompressionInfo_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_supported_13,
@@ -158513,7 +158513,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "HeaderCompressionInfoList_r4", HFILL }},
     { &hf_rrc_pdcp_Info,
-      { "pdcp-Info", "rrc.pdcp_Info",
+      { "pdcp-Info", "rrc.pdcp_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dummy_34,
@@ -158521,7 +158521,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_65535", HFILL }},
     { &hf_rrc_pdcp_Info_01,
-      { "pdcp-Info", "rrc.pdcp_Info",
+      { "pdcp-Info", "rrc.pdcp_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PDCP_Info_r4", HFILL }},
     { &hf_rrc_timerPollProhibit,
@@ -158569,19 +158569,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RB_InformationSetupList", HFILL }},
     { &hf_rrc_predefinedRB_Configuration,
-      { "predefinedRB-Configuration", "rrc.predefinedRB_Configuration",
+      { "predefinedRB-Configuration", "rrc.predefinedRB_Configuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_preDefTransChConfiguration,
-      { "preDefTransChConfiguration", "rrc.preDefTransChConfiguration",
+      { "preDefTransChConfiguration", "rrc.preDefTransChConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_preDefPhyChConfiguration,
-      { "preDefPhyChConfiguration", "rrc.preDefPhyChConfiguration",
+      { "preDefPhyChConfiguration", "rrc.preDefPhyChConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_preDefPhyChConfiguration_01,
-      { "preDefPhyChConfiguration", "rrc.preDefPhyChConfiguration",
+      { "preDefPhyChConfiguration", "rrc.preDefPhyChConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PreDefPhyChConfiguration_v770ext", HFILL }},
     { &hf_rrc_mac_ehsWindowSize,
@@ -158593,7 +158593,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_PredefinedConfigStatusInfo_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_storedWithValueTagSameAsPrevius,
-      { "storedWithValueTagSameAsPrevius", "rrc.storedWithValueTagSameAsPrevius",
+      { "storedWithValueTagSameAsPrevius", "rrc.storedWithValueTagSameAsPrevius_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_other,
@@ -158601,7 +158601,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_other_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_notStored,
-      { "notStored", "rrc.notStored",
+      { "notStored", "rrc.notStored_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_storedWithDifferentValueTag,
@@ -158617,7 +158617,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PredefinedConfigStatusListVarSz", HFILL }},
     { &hf_rrc_PredefinedConfigSetsWithDifferentValueTag_item,
-      { "PredefinedConfigSetWithDifferentValueTag", "rrc.PredefinedConfigSetWithDifferentValueTag",
+      { "PredefinedConfigSetWithDifferentValueTag", "rrc.PredefinedConfigSetWithDifferentValueTag_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_startPosition,
@@ -158653,23 +158653,23 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_3", HFILL }},
     { &hf_rrc_RAB_InformationList_item,
-      { "RAB-Info", "rrc.RAB_Info",
+      { "RAB-Info", "rrc.RAB_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RAB_InformationList_r6_item,
-      { "RAB-Info-r6", "rrc.RAB_Info_r6",
+      { "RAB-Info-r6", "rrc.RAB_Info_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RAB_InformationReconfigList_item,
-      { "RAB-InformationReconfig", "rrc.RAB_InformationReconfig",
+      { "RAB-InformationReconfig", "rrc.RAB_InformationReconfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RAB_InformationReconfigList_r8_item,
-      { "RAB-InformationReconfig-r8", "rrc.RAB_InformationReconfig_r8",
+      { "RAB-InformationReconfig-r8", "rrc.RAB_InformationReconfig_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cs_HSPA_Information,
-      { "cs-HSPA-Information", "rrc.cs_HSPA_Information",
+      { "cs-HSPA-Information", "rrc.cs_HSPA_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rb_Identity,
@@ -158677,11 +158677,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RAB_InformationMBMSPtpList_item,
-      { "RAB-InformationMBMSPtp", "rrc.RAB_InformationMBMSPtp",
+      { "RAB-InformationMBMSPtp", "rrc.RAB_InformationMBMSPtp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rab_Info_02,
-      { "rab-Info", "rrc.rab_Info",
+      { "rab-Info", "rrc.rab_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rb_InformationSetupList,
@@ -158697,7 +158697,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RB_InformationSetupList_r5", HFILL }},
     { &hf_rrc_rab_Info_r6_ext,
-      { "rab-Info-r6-ext", "rrc.rab_Info_r6_ext",
+      { "rab-Info-r6-ext", "rrc.rab_Info_r6_ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rb_InformationSetupList_03,
@@ -158705,11 +158705,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RB_InformationSetupList_r6", HFILL }},
     { &hf_rrc_rab_Info_v6b0ext,
-      { "rab-Info-v6b0ext", "rrc.rab_Info_v6b0ext",
+      { "rab-Info-v6b0ext", "rrc.rab_Info_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rab_Info_03,
-      { "rab-Info", "rrc.rab_Info",
+      { "rab-Info", "rrc.rab_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RAB_Info_r7", HFILL }},
     { &hf_rrc_rb_InformationSetupList_04,
@@ -158725,43 +158725,43 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RB_InformationSetupList_r11", HFILL }},
     { &hf_rrc_RAB_InformationSetupList_item,
-      { "RAB-InformationSetup", "rrc.RAB_InformationSetup",
+      { "RAB-InformationSetup", "rrc.RAB_InformationSetup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RAB_InformationSetupList_r4_item,
-      { "RAB-InformationSetup-r4", "rrc.RAB_InformationSetup_r4",
+      { "RAB-InformationSetup-r4", "rrc.RAB_InformationSetup_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RAB_InformationSetupList_r5_item,
-      { "RAB-InformationSetup-r5", "rrc.RAB_InformationSetup_r5",
+      { "RAB-InformationSetup-r5", "rrc.RAB_InformationSetup_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RAB_InformationSetupList_r6_item,
-      { "RAB-InformationSetup-r6", "rrc.RAB_InformationSetup_r6",
+      { "RAB-InformationSetup-r6", "rrc.RAB_InformationSetup_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RAB_InformationSetupList_r6_ext_item,
-      { "RAB-InformationSetup-r6-ext", "rrc.RAB_InformationSetup_r6_ext",
+      { "RAB-InformationSetup-r6-ext", "rrc.RAB_InformationSetup_r6_ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RAB_InformationSetupList_v6b0ext_item,
-      { "RAB-InformationSetup-v6b0ext", "rrc.RAB_InformationSetup_v6b0ext",
+      { "RAB-InformationSetup-v6b0ext", "rrc.RAB_InformationSetup_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RAB_InformationSetupList_r7_item,
-      { "RAB-InformationSetup-r7", "rrc.RAB_InformationSetup_r7",
+      { "RAB-InformationSetup-r7", "rrc.RAB_InformationSetup_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RAB_InformationSetupList_r8_item,
-      { "RAB-InformationSetup-r8", "rrc.RAB_InformationSetup_r8",
+      { "RAB-InformationSetup-r8", "rrc.RAB_InformationSetup_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RAB_InformationSetupList_v820ext_item,
-      { "RAB-InformationSetup-v820ext", "rrc.RAB_InformationSetup_v820ext",
+      { "RAB-InformationSetup-v820ext", "rrc.RAB_InformationSetup_v820ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RAB_InformationSetupList_r11_item,
-      { "RAB-InformationSetup-r11", "rrc.RAB_InformationSetup_r11",
+      { "RAB-InformationSetup-r11", "rrc.RAB_InformationSetup_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rlc_SequenceNumber,
@@ -158769,7 +158769,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RB_ActivationTimeInfoList_item,
-      { "RB-ActivationTimeInfo", "rrc.RB_ActivationTimeInfo",
+      { "RB-ActivationTimeInfo", "rrc.RB_ActivationTimeInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_count_C_UL,
@@ -158781,7 +158781,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "COUNT_C", HFILL }},
     { &hf_rrc_RB_COUNT_C_InformationList_item,
-      { "RB-COUNT-C-Information", "rrc.RB_COUNT_C_Information",
+      { "RB-COUNT-C-Information", "rrc.RB_COUNT_C_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_count_C_MSB_UL,
@@ -158793,7 +158793,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "COUNT_C_MSB", HFILL }},
     { &hf_rrc_RB_COUNT_C_MSB_InformationList_item,
-      { "RB-COUNT-C-MSB-Information", "rrc.RB_COUNT_C_MSB_Information",
+      { "RB-COUNT-C-MSB-Information", "rrc.RB_COUNT_C_MSB_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RB_IdentityList_item,
@@ -158821,23 +158821,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RB_MappingInfo_r8", HFILL }},
     { &hf_rrc_RB_InformationAffectedList_item,
-      { "RB-InformationAffected", "rrc.RB_InformationAffected",
+      { "RB-InformationAffected", "rrc.RB_InformationAffected_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RB_InformationAffectedList_r5_item,
-      { "RB-InformationAffected-r5", "rrc.RB_InformationAffected_r5",
+      { "RB-InformationAffected-r5", "rrc.RB_InformationAffected_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RB_InformationAffectedList_r6_item,
-      { "RB-InformationAffected-r6", "rrc.RB_InformationAffected_r6",
+      { "RB-InformationAffected-r6", "rrc.RB_InformationAffected_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RB_InformationAffectedList_r7_item,
-      { "RB-InformationAffected-r7", "rrc.RB_InformationAffected_r7",
+      { "RB-InformationAffected-r7", "rrc.RB_InformationAffected_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RB_InformationAffectedList_r8_item,
-      { "RB-InformationAffected-r8", "rrc.RB_InformationAffected_r8",
+      { "RB-InformationAffected-r8", "rrc.RB_InformationAffected_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rb_Change,
@@ -158845,7 +158845,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_rb_Change_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_release_01,
-      { "release", "rrc.release",
+      { "release", "rrc.release_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_re_mapToDefaultRb,
@@ -158853,11 +158853,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RB_Identity", HFILL }},
     { &hf_rrc_RB_InformationChangedList_r6_item,
-      { "RB-InformationChanged-r6", "rrc.RB_InformationChanged_r6",
+      { "RB-InformationChanged-r6", "rrc.RB_InformationChanged_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_pdcp_Info_02,
-      { "pdcp-Info", "rrc.pdcp_Info",
+      { "pdcp-Info", "rrc.pdcp_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PDCP_InfoReconfig", HFILL }},
     { &hf_rrc_pdcp_SN_Info,
@@ -158865,7 +158865,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rlc_Info,
-      { "rlc-Info", "rrc.rlc_Info",
+      { "rlc-Info", "rrc.rlc_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rb_StopContinue,
@@ -158873,51 +158873,51 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_RB_StopContinue_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_pdcp_Info_03,
-      { "pdcp-Info", "rrc.pdcp_Info",
+      { "pdcp-Info", "rrc.pdcp_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PDCP_InfoReconfig_r4", HFILL }},
     { &hf_rrc_rlc_Info_01,
-      { "rlc-Info", "rrc.rlc_Info",
+      { "rlc-Info", "rrc.rlc_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLC_Info_r5", HFILL }},
     { &hf_rrc_rlc_Info_02,
-      { "rlc-Info", "rrc.rlc_Info",
+      { "rlc-Info", "rrc.rlc_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLC_Info_r6", HFILL }},
     { &hf_rrc_rlc_Info_03,
-      { "rlc-Info", "rrc.rlc_Info",
+      { "rlc-Info", "rrc.rlc_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLC_Info_r7", HFILL }},
     { &hf_rrc_rlc_Info_04,
-      { "rlc-Info", "rrc.rlc_Info",
+      { "rlc-Info", "rrc.rlc_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLC_Info_r11", HFILL }},
     { &hf_rrc_RB_InformationReconfigList_item,
-      { "RB-InformationReconfig", "rrc.RB_InformationReconfig",
+      { "RB-InformationReconfig", "rrc.RB_InformationReconfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RB_InformationReconfigList_r4_item,
-      { "RB-InformationReconfig-r4", "rrc.RB_InformationReconfig_r4",
+      { "RB-InformationReconfig-r4", "rrc.RB_InformationReconfig_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RB_InformationReconfigList_r5_item,
-      { "RB-InformationReconfig-r5", "rrc.RB_InformationReconfig_r5",
+      { "RB-InformationReconfig-r5", "rrc.RB_InformationReconfig_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RB_InformationReconfigList_r6_item,
-      { "RB-InformationReconfig-r6", "rrc.RB_InformationReconfig_r6",
+      { "RB-InformationReconfig-r6", "rrc.RB_InformationReconfig_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RB_InformationReconfigList_r7_item,
-      { "RB-InformationReconfig-r7", "rrc.RB_InformationReconfig_r7",
+      { "RB-InformationReconfig-r7", "rrc.RB_InformationReconfig_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RB_InformationReconfigList_r8_item,
-      { "RB-InformationReconfig-r8", "rrc.RB_InformationReconfig_r8",
+      { "RB-InformationReconfig-r8", "rrc.RB_InformationReconfig_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RB_InformationReconfigList_r11_item,
-      { "RB-InformationReconfig-r11", "rrc.RB_InformationReconfig_r11",
+      { "RB-InformationReconfig-r11", "rrc.RB_InformationReconfig_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RB_InformationReleaseList_item,
@@ -158945,51 +158945,51 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_RLC_InfoChoice_r11_vals), 0,
         "RLC_InfoChoice_r11", HFILL }},
     { &hf_rrc_RB_InformationSetupList_item,
-      { "RB-InformationSetup", "rrc.RB_InformationSetup",
+      { "RB-InformationSetup", "rrc.RB_InformationSetup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RB_InformationSetupList_r4_item,
-      { "RB-InformationSetup-r4", "rrc.RB_InformationSetup_r4",
+      { "RB-InformationSetup-r4", "rrc.RB_InformationSetup_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RB_InformationSetupList_r5_item,
-      { "RB-InformationSetup-r5", "rrc.RB_InformationSetup_r5",
+      { "RB-InformationSetup-r5", "rrc.RB_InformationSetup_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RB_InformationSetupList_r6_item,
-      { "RB-InformationSetup-r6", "rrc.RB_InformationSetup_r6",
+      { "RB-InformationSetup-r6", "rrc.RB_InformationSetup_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RB_InformationSetupList_r7_item,
-      { "RB-InformationSetup-r7", "rrc.RB_InformationSetup_r7",
+      { "RB-InformationSetup-r7", "rrc.RB_InformationSetup_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RB_InformationSetupList_r8_item,
-      { "RB-InformationSetup-r8", "rrc.RB_InformationSetup_r8",
+      { "RB-InformationSetup-r8", "rrc.RB_InformationSetup_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RB_InformationSetupList_r11_item,
-      { "RB-InformationSetup-r11", "rrc.RB_InformationSetup_r11",
+      { "RB-InformationSetup-r11", "rrc.RB_InformationSetup_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RB_MappingInfo_item,
-      { "RB-MappingOption", "rrc.RB_MappingOption",
+      { "RB-MappingOption", "rrc.RB_MappingOption_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RB_MappingInfo_r5_item,
-      { "RB-MappingOption-r5", "rrc.RB_MappingOption_r5",
+      { "RB-MappingOption-r5", "rrc.RB_MappingOption_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RB_MappingInfo_r6_item,
-      { "RB-MappingOption-r6", "rrc.RB_MappingOption_r6",
+      { "RB-MappingOption-r6", "rrc.RB_MappingOption_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RB_MappingInfo_r7_item,
-      { "RB-MappingOption-r7", "rrc.RB_MappingOption_r7",
+      { "RB-MappingOption-r7", "rrc.RB_MappingOption_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RB_MappingInfo_r8_item,
-      { "RB-MappingOption-r8", "rrc.RB_MappingOption_r8",
+      { "RB-MappingOption-r8", "rrc.RB_MappingOption_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_LogicalChannelMappings,
@@ -159025,11 +159025,11 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_RB_PDCPContextRelocationList_item,
-      { "RB-PDCPContextRelocation", "rrc.RB_PDCPContextRelocation",
+      { "RB-PDCPContextRelocation", "rrc.RB_PDCPContextRelocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RB_WithPDCP_InfoList_item,
-      { "RB-WithPDCP-Info", "rrc.RB_WithPDCP_Info",
+      { "RB-WithPDCP-Info", "rrc.RB_WithPDCP_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_f_MAX_PERIOD,
@@ -159061,11 +159061,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ROHC_ProfileList_r4", HFILL }},
     { &hf_rrc_ul_RFC3095,
-      { "ul-RFC3095", "rrc.ul_RFC3095",
+      { "ul-RFC3095", "rrc.ul_RFC3095_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_RFC3095_r4", HFILL }},
     { &hf_rrc_dl_RFC3095,
-      { "dl-RFC3095", "rrc.dl_RFC3095",
+      { "dl-RFC3095", "rrc.dl_RFC3095_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_RFC3095_r4", HFILL }},
     { &hf_rrc_ul_RLC_Mode,
@@ -159117,11 +159117,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_useSpecialValueOfHEField_01_vals), 0,
         "T_useSpecialValueOfHEField_01", HFILL }},
     { &hf_rrc_dl_UM_RLC_OutOSeqDelivery_Info,
-      { "dl-UM-RLC-OutOSeqDelivery-Info", "rrc.dl_UM_RLC_OutOSeqDelivery_Info",
+      { "dl-UM-RLC-OutOSeqDelivery-Info", "rrc.dl_UM_RLC_OutOSeqDelivery_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UM_RLC_OutOSeqDelivery_Info_r6", HFILL }},
     { &hf_rrc_dl_UM_RLC_DuplAvoid_Reord_Info,
-      { "dl-UM-RLC-DuplAvoid-Reord-Info", "rrc.dl_UM_RLC_DuplAvoid_Reord_Info",
+      { "dl-UM-RLC-DuplAvoid-Reord-Info", "rrc.dl_UM_RLC_DuplAvoid_Reord_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UM_RLC_DuplAvoid_Reord_Info_r6", HFILL }},
     { &hf_rrc_same_as_RB,
@@ -159149,7 +159149,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_maxTF", HFILL }},
     { &hf_rrc_RLC_SizeExplicitList_item,
-      { "RLC-SizeInfo", "rrc.RLC_SizeInfo",
+      { "RLC-SizeInfo", "rrc.RLC_SizeInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ROHC_ProfileList_r4_item,
@@ -159161,47 +159161,47 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SRB_InformationSetupList_item,
-      { "SRB-InformationSetup", "rrc.SRB_InformationSetup",
+      { "SRB-InformationSetup", "rrc.SRB_InformationSetup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SRB_InformationSetupList_r5_item,
-      { "SRB-InformationSetup-r5", "rrc.SRB_InformationSetup_r5",
+      { "SRB-InformationSetup-r5", "rrc.SRB_InformationSetup_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SRB_InformationSetupList_r6_item,
-      { "SRB-InformationSetup-r6", "rrc.SRB_InformationSetup_r6",
+      { "SRB-InformationSetup-r6", "rrc.SRB_InformationSetup_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SRB_InformationSetupList_r7_item,
-      { "SRB-InformationSetup-r7", "rrc.SRB_InformationSetup_r7",
+      { "SRB-InformationSetup-r7", "rrc.SRB_InformationSetup_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SRB_InformationSetupList_r8_item,
-      { "SRB-InformationSetup-r8", "rrc.SRB_InformationSetup_r8",
+      { "SRB-InformationSetup-r8", "rrc.SRB_InformationSetup_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SRB_InformationSetupList_r11_item,
-      { "SRB-InformationSetup-r11", "rrc.SRB_InformationSetup_r11",
+      { "SRB-InformationSetup-r11", "rrc.SRB_InformationSetup_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SRB_InformationSetupList2_item,
-      { "SRB-InformationSetup", "rrc.SRB_InformationSetup",
+      { "SRB-InformationSetup", "rrc.SRB_InformationSetup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SRB_InformationSetupList2_r6_item,
-      { "SRB-InformationSetup-r6", "rrc.SRB_InformationSetup_r6",
+      { "SRB-InformationSetup-r6", "rrc.SRB_InformationSetup_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SRB_InformationSetupList2_r7_item,
-      { "SRB-InformationSetup-r7", "rrc.SRB_InformationSetup_r7",
+      { "SRB-InformationSetup-r7", "rrc.SRB_InformationSetup_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SRB_InformationSetupList2_r8_item,
-      { "SRB-InformationSetup-r8", "rrc.SRB_InformationSetup_r8",
+      { "SRB-InformationSetup-r8", "rrc.SRB_InformationSetup_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_timerBasedExplicit,
-      { "timerBasedExplicit", "rrc.timerBasedExplicit",
+      { "timerBasedExplicit", "rrc.timerBasedExplicit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ExplicitDiscard", HFILL }},
     { &hf_rrc_timerBasedNoExplicit,
@@ -159209,7 +159209,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_NoExplicitDiscard_vals), 0,
         "NoExplicitDiscard", HFILL }},
     { &hf_rrc_maxDAT_Retransmissions,
-      { "maxDAT-Retransmissions", "rrc.maxDAT_Retransmissions",
+      { "maxDAT-Retransmissions", "rrc.maxDAT_Retransmissions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_noDiscard,
@@ -159233,7 +159233,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MaxRST_vals), 0,
         "MaxRST", HFILL }},
     { &hf_rrc_pollingInfo,
-      { "pollingInfo", "rrc.pollingInfo",
+      { "pollingInfo", "rrc.pollingInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_TransportChannelType,
@@ -159245,11 +159245,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_rlc_SizeList_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_allSizes,
-      { "allSizes", "rrc.allSizes",
+      { "allSizes", "rrc.allSizes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_configured,
-      { "configured", "rrc.configured",
+      { "configured", "rrc.configured_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_explicitList,
@@ -159265,7 +159265,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_ul_TrCH_Type_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_dch_rach_usch,
-      { "dch-rach-usch", "rrc.dch_rach_usch",
+      { "dch-rach-usch", "rrc.dch_rach_usch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rlc_SizeList_01,
@@ -159273,7 +159273,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_rlc_SizeList_01_vals), 0,
         "T_rlc_SizeList_01", HFILL }},
     { &hf_rrc_e_dch,
-      { "e-dch", "rrc.e_dch",
+      { "e-dch", "rrc.e_dch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_e_DCH_MAC_d_FlowIdentity,
@@ -159297,7 +159297,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_ul_TrCH_Type_01_vals), 0,
         "T_ul_TrCH_Type_01", HFILL }},
     { &hf_rrc_dch_rach_usch_01,
-      { "dch-rach-usch", "rrc.dch_rach_usch",
+      { "dch-rach-usch", "rrc.dch_rach_usch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_dch_rach_usch_01", HFILL }},
     { &hf_rrc_rlc_SizeList_02,
@@ -159305,7 +159305,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_rlc_SizeList_02_vals), 0,
         "T_rlc_SizeList_02", HFILL }},
     { &hf_rrc_e_dch_01,
-      { "e-dch", "rrc.e_dch",
+      { "e-dch", "rrc.e_dch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_e_dch_01", HFILL }},
     { &hf_rrc_rlc_PDU_Size,
@@ -159313,11 +159313,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_rlc_PDU_Size_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_fixedSize_01,
-      { "fixedSize", "rrc.fixedSize",
+      { "fixedSize", "rrc.fixedSize_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_flexibleSize_02,
-      { "flexibleSize", "rrc.flexibleSize",
+      { "flexibleSize", "rrc.flexibleSize_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLC_PDU_SizeConstraint", HFILL }},
     { &hf_rrc_rlc_LogicalChannelMappingIndicator,
@@ -159329,7 +159329,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_maxLoCHperRLC_OF_UL_LogicalChannelMapping", HFILL }},
     { &hf_rrc_ul_LogicalChannelMapping_item,
-      { "UL-LogicalChannelMapping", "rrc.UL_LogicalChannelMapping",
+      { "UL-LogicalChannelMapping", "rrc.UL_LogicalChannelMapping_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_LogicalChannelMapping_01,
@@ -159337,7 +159337,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_maxLoCHperRLC_OF_UL_LogicalChannelMapping_r6", HFILL }},
     { &hf_rrc_ul_LogicalChannelMapping_item_01,
-      { "UL-LogicalChannelMapping-r6", "rrc.UL_LogicalChannelMapping_r6",
+      { "UL-LogicalChannelMapping-r6", "rrc.UL_LogicalChannelMapping_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_LogicalChannelMapping_02,
@@ -159345,31 +159345,31 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_maxLoCHperRLC_OF_UL_LogicalChannelMapping_r8", HFILL }},
     { &hf_rrc_ul_LogicalChannelMapping_item_02,
-      { "UL-LogicalChannelMapping-r8", "rrc.UL_LogicalChannelMapping_r8",
+      { "UL-LogicalChannelMapping-r8", "rrc.UL_LogicalChannelMapping_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_oneLogicalChannel,
-      { "oneLogicalChannel", "rrc.oneLogicalChannel",
+      { "oneLogicalChannel", "rrc.oneLogicalChannel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_LogicalChannelMapping", HFILL }},
     { &hf_rrc_twoLogicalChannels,
-      { "twoLogicalChannels", "rrc.twoLogicalChannels",
+      { "twoLogicalChannels", "rrc.twoLogicalChannels_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_LogicalChannelMappingList", HFILL }},
     { &hf_rrc_oneLogicalChannel_01,
-      { "oneLogicalChannel", "rrc.oneLogicalChannel",
+      { "oneLogicalChannel", "rrc.oneLogicalChannel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_LogicalChannelMapping_r6", HFILL }},
     { &hf_rrc_twoLogicalChannels_01,
-      { "twoLogicalChannels", "rrc.twoLogicalChannels",
+      { "twoLogicalChannels", "rrc.twoLogicalChannels_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_LogicalChannelMappingList_r6", HFILL }},
     { &hf_rrc_oneLogicalChannel_02,
-      { "oneLogicalChannel", "rrc.oneLogicalChannel",
+      { "oneLogicalChannel", "rrc.oneLogicalChannel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_LogicalChannelMapping_r8", HFILL }},
     { &hf_rrc_twoLogicalChannels_02,
-      { "twoLogicalChannels", "rrc.twoLogicalChannels",
+      { "twoLogicalChannels", "rrc.twoLogicalChannels_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_LogicalChannelMappingList_r8", HFILL }},
     { &hf_rrc_dummy1_01,
@@ -159381,19 +159381,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ROHC_PacketSizeList_r4", HFILL }},
     { &hf_rrc_ul_AM_RLC_Mode,
-      { "ul-AM-RLC-Mode", "rrc.ul_AM_RLC_Mode",
+      { "ul-AM-RLC-Mode", "rrc.ul_AM_RLC_Mode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_UM_RLC_Mode,
-      { "ul-UM-RLC-Mode", "rrc.ul_UM_RLC_Mode",
+      { "ul-UM-RLC-Mode", "rrc.ul_UM_RLC_Mode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_TM_RLC_Mode,
-      { "ul-TM-RLC-Mode", "rrc.ul_TM_RLC_Mode",
+      { "ul-TM-RLC-Mode", "rrc.ul_TM_RLC_Mode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rach,
-      { "rach", "rrc.rach",
+      { "rach", "rrc.rach_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_usch,
@@ -159457,7 +159457,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_127", HFILL }},
     { &hf_rrc_sizeType2,
-      { "sizeType2", "rrc.sizeType2",
+      { "sizeType2", "rrc.sizeType2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_part1,
@@ -159469,7 +159469,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_7", HFILL }},
     { &hf_rrc_sizeType3,
-      { "sizeType3", "rrc.sizeType3",
+      { "sizeType3", "rrc.sizeType3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_part1_01,
@@ -159481,7 +159481,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_15", HFILL }},
     { &hf_rrc_sizeType4,
-      { "sizeType4", "rrc.sizeType4",
+      { "sizeType4", "rrc.sizeType4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_part1_02,
@@ -159493,7 +159493,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_63", HFILL }},
     { &hf_rrc_noCoding,
-      { "noCoding", "rrc.noCoding",
+      { "noCoding", "rrc.noCoding_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_convolutional,
@@ -159501,7 +159501,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_CodingRate_vals), 0,
         "CodingRate", HFILL }},
     { &hf_rrc_turbo,
-      { "turbo", "rrc.turbo",
+      { "turbo", "rrc.turbo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mac_d_FlowIdentity,
@@ -159525,11 +159525,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_E_DCH_MAC_d_FlowRetransTimer_vals_ext, 0,
         "E_DCH_MAC_d_FlowRetransTimer", HFILL }},
     { &hf_rrc_Common_E_DCH_MAC_d_FlowList_item,
-      { "Common-E-DCH-MAC-d-Flow", "rrc.Common_E_DCH_MAC_d_Flow",
+      { "Common-E-DCH-MAC-d-Flow", "rrc.Common_E_DCH_MAC_d_Flow_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_Common_E_DCH_MAC_d_Flow_Info_List_ConcurrentTTI_item,
-      { "Common-E-DCH-MAC-d-Flow-Info-ConcurrentTTI", "rrc.Common_E_DCH_MAC_d_Flow_Info_ConcurrentTTI",
+      { "Common-E-DCH-MAC-d-Flow-Info-ConcurrentTTI", "rrc.Common_E_DCH_MAC_d_Flow_Info_ConcurrentTTI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rlc_Size,
@@ -159537,7 +159537,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_rlc_Size_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_fdd_49,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_48", HFILL }},
     { &hf_rrc_octetModeRLC_SizeInfoType2,
@@ -159545,7 +159545,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_OctetModeRLC_SizeInfoType2_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_14,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_13", HFILL }},
     { &hf_rrc_commonTDD_Choice,
@@ -159581,11 +159581,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_CommonDynamicTF_InfoList_item,
-      { "CommonDynamicTF-Info", "rrc.CommonDynamicTF_Info",
+      { "CommonDynamicTF-Info", "rrc.CommonDynamicTF_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_CommonDynamicTF_InfoList_DynamicTTI_item,
-      { "CommonDynamicTF-Info-DynamicTTI", "rrc.CommonDynamicTF_Info_DynamicTTI",
+      { "CommonDynamicTF-Info-DynamicTTI", "rrc.CommonDynamicTF_Info_DynamicTTI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tti,
@@ -159613,7 +159613,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CommonDynamicTF_InfoList_DynamicTTI", HFILL }},
     { &hf_rrc_semistaticTF_Information,
-      { "semistaticTF-Information", "rrc.semistaticTF_Information",
+      { "semistaticTF-Information", "rrc.semistaticTF_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tti_01,
@@ -159637,7 +159637,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MAC_hs_WindowSize_vals), 0,
         "MAC_hs_WindowSize", HFILL }},
     { &hf_rrc_Common_MAC_ehs_ReorderingQueueList_item,
-      { "Common-MAC-ehs-ReorderingQueue", "rrc.Common_MAC_ehs_ReorderingQueue",
+      { "Common-MAC-ehs-ReorderingQueue", "rrc.Common_MAC_ehs_ReorderingQueue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tti_selection,
@@ -159645,7 +159645,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tti_selection_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_fixed,
-      { "fixed", "rrc.fixed",
+      { "fixed", "rrc.fixed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_fixed_TTI_Selection,
@@ -159653,7 +159653,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_fixed_TTI_Selection_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_threshold_based,
-      { "threshold-based", "rrc.threshold_based",
+      { "threshold-based", "rrc.threshold_based_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_common_E_DCH_TTI_Selection_Thresh,
@@ -159665,7 +159665,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_maxEDCHs_1", HFILL }},
     { &hf_rrc_commonEDCHSystemInfoParamConcurrentTTI,
-      { "commonEDCHSystemInfoParamConcurrentTTI", "rrc.commonEDCHSystemInfoParamConcurrentTTI",
+      { "commonEDCHSystemInfoParamConcurrentTTI", "rrc.commonEDCHSystemInfoParamConcurrentTTI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rlc_Size_01,
@@ -159685,11 +159685,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_rlc_Size_02_vals), 0,
         "T_rlc_Size_02", HFILL }},
     { &hf_rrc_DedicatedDynamicTF_InfoList_item,
-      { "DedicatedDynamicTF-Info", "rrc.DedicatedDynamicTF_Info",
+      { "DedicatedDynamicTF-Info", "rrc.DedicatedDynamicTF_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DedicatedDynamicTF_InfoList_DynamicTTI_item,
-      { "DedicatedDynamicTF-Info-DynamicTTI", "rrc.DedicatedDynamicTF_Info_DynamicTTI",
+      { "DedicatedDynamicTF-Info-DynamicTTI", "rrc.DedicatedDynamicTF_Info_DynamicTTI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tti_02,
@@ -159717,35 +159717,35 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DedicatedDynamicTF_InfoList_DynamicTTI", HFILL }},
     { &hf_rrc_DL_AddReconfTransChInfo2List_item,
-      { "DL-AddReconfTransChInformation2", "rrc.DL_AddReconfTransChInformation2",
+      { "DL-AddReconfTransChInformation2", "rrc.DL_AddReconfTransChInformation2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_AddReconfTransChInfoList_item,
-      { "DL-AddReconfTransChInformation", "rrc.DL_AddReconfTransChInformation",
+      { "DL-AddReconfTransChInformation", "rrc.DL_AddReconfTransChInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_AddReconfTransChInfoList_r4_item,
-      { "DL-AddReconfTransChInformation-r4", "rrc.DL_AddReconfTransChInformation_r4",
+      { "DL-AddReconfTransChInformation-r4", "rrc.DL_AddReconfTransChInformation_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_AddReconfTransChInfoList_r5_item,
-      { "DL-AddReconfTransChInformation-r5", "rrc.DL_AddReconfTransChInformation_r5",
+      { "DL-AddReconfTransChInformation-r5", "rrc.DL_AddReconfTransChInformation_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_AddReconfTransChInfoList_r7_item,
-      { "DL-AddReconfTransChInformation-r7", "rrc.DL_AddReconfTransChInformation_r7",
+      { "DL-AddReconfTransChInformation-r7", "rrc.DL_AddReconfTransChInformation_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_AddReconfTransChInfoList_r9_item,
-      { "DL-AddReconfTransChInformation-r9", "rrc.DL_AddReconfTransChInformation_r9",
+      { "DL-AddReconfTransChInformation-r9", "rrc.DL_AddReconfTransChInformation_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_AddReconfTransChInfoList_TDD128_v9c0ext_item,
-      { "DL-AddReconfTransChInformation-TDD128-v9c0ext", "rrc.DL_AddReconfTransChInformation_TDD128_v9c0ext",
+      { "DL-AddReconfTransChInformation-TDD128-v9c0ext", "rrc.DL_AddReconfTransChInformation_TDD128_v9c0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_AddReconfTransChInfoList_r11_item,
-      { "DL-AddReconfTransChInformation-r11", "rrc.DL_AddReconfTransChInformation_r11",
+      { "DL-AddReconfTransChInformation-r11", "rrc.DL_AddReconfTransChInformation_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_TransportChannelType_03,
@@ -159765,15 +159765,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TransportFormatSet_vals), 0,
         "TransportFormatSet", HFILL }},
     { &hf_rrc_sameAsULTrCH,
-      { "sameAsULTrCH", "rrc.sameAsULTrCH",
+      { "sameAsULTrCH", "rrc.sameAsULTrCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_TransportChannelIdentity", HFILL }},
     { &hf_rrc_dch_QualityTarget,
-      { "dch-QualityTarget", "rrc.dch_QualityTarget",
+      { "dch-QualityTarget", "rrc.dch_QualityTarget_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "QualityTarget", HFILL }},
     { &hf_rrc_dummy_37,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TM_SignallingInfo", HFILL }},
     { &hf_rrc_tfs_SignallingMode_01,
@@ -159789,7 +159789,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tfs_SignallingMode_02_vals), 0,
         "T_tfs_SignallingMode_02", HFILL }},
     { &hf_rrc_hsdsch_02,
-      { "hsdsch", "rrc.hsdsch",
+      { "hsdsch", "rrc.hsdsch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HSDSCH_Info", HFILL }},
     { &hf_rrc_tfs_SignallingMode_03,
@@ -159797,7 +159797,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tfs_SignallingMode_03_vals), 0,
         "T_tfs_SignallingMode_03", HFILL }},
     { &hf_rrc_hsdsch_03,
-      { "hsdsch", "rrc.hsdsch",
+      { "hsdsch", "rrc.hsdsch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HSDSCH_Info_r7", HFILL }},
     { &hf_rrc_tfs_SignallingMode_04,
@@ -159805,11 +159805,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tfs_SignallingMode_04_vals), 0,
         "T_tfs_SignallingMode_04", HFILL }},
     { &hf_rrc_hsdsch_04,
-      { "hsdsch", "rrc.hsdsch",
+      { "hsdsch", "rrc.hsdsch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HSDSCH_Info_r9", HFILL }},
     { &hf_rrc_hsdsch_05,
-      { "hsdsch", "rrc.hsdsch",
+      { "hsdsch", "rrc.hsdsch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HSDSCH_Info_TDD128_v9c0ext", HFILL }},
     { &hf_rrc_tfs_SignallingMode_05,
@@ -159817,7 +159817,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tfs_SignallingMode_05_vals), 0,
         "T_tfs_SignallingMode_05", HFILL }},
     { &hf_rrc_hsdsch_06,
-      { "hsdsch", "rrc.hsdsch",
+      { "hsdsch", "rrc.hsdsch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HSDSCH_Info_r11", HFILL }},
     { &hf_rrc_transportChannelIdentity,
@@ -159829,7 +159829,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tfs_SignallingMode_06_vals), 0,
         "T_tfs_SignallingMode_06", HFILL }},
     { &hf_rrc_qualityTarget,
-      { "qualityTarget", "rrc.qualityTarget",
+      { "qualityTarget", "rrc.qualityTarget_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sccpch_TFCS,
@@ -159841,7 +159841,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_19_vals), 0,
         "T_modeSpecificInfo_19", HFILL }},
     { &hf_rrc_fdd_50,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_49", HFILL }},
     { &hf_rrc_dl_Parameters,
@@ -159853,11 +159853,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TFCS_vals), 0,
         "TFCS", HFILL }},
     { &hf_rrc_sameAsUL,
-      { "sameAsUL", "rrc.sameAsUL",
+      { "sameAsUL", "rrc.sameAsUL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_15,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_14", HFILL }},
     { &hf_rrc_individualDL_CCTrCH_InfoList,
@@ -159869,7 +159869,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_20_vals), 0,
         "T_modeSpecificInfo_20", HFILL }},
     { &hf_rrc_fdd_51,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_50", HFILL }},
     { &hf_rrc_dl_Parameters_01,
@@ -159877,7 +159877,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dl_Parameters_01_vals), 0,
         "T_dl_Parameters_01", HFILL }},
     { &hf_rrc_dl_DCH_TFCS_01,
-      { "dl-DCH-TFCS", "rrc.dl_DCH_TFCS",
+      { "dl-DCH-TFCS", "rrc.dl_DCH_TFCS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tfcs,
@@ -159885,19 +159885,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TFCS_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_16,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_15", HFILL }},
     { &hf_rrc_DL_DeletedTransChInfoList_item,
-      { "DL-TransportChannelIdentity", "rrc.DL_TransportChannelIdentity",
+      { "DL-TransportChannelIdentity", "rrc.DL_TransportChannelIdentity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_DeletedTransChInfoList_r5_item,
-      { "DL-TransportChannelIdentity-r5", "rrc.DL_TransportChannelIdentity_r5",
+      { "DL-TransportChannelIdentity-r5", "rrc.DL_TransportChannelIdentity_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_DeletedTransChInfoList_r7_item,
-      { "DL-TransportChannelIdentity-r7", "rrc.DL_TransportChannelIdentity_r7",
+      { "DL-TransportChannelIdentity-r7", "rrc.DL_TransportChannelIdentity_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_TransportChannelIdentity,
@@ -159913,7 +159913,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_DL_TrCH_TypeId2_r7_vals), 0,
         "DL_TrCH_TypeId2_r7", HFILL }},
     { &hf_rrc_hsdsch_07,
-      { "hsdsch", "rrc.hsdsch",
+      { "hsdsch", "rrc.hsdsch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_hsdsch_08,
@@ -159933,7 +159933,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DRAC_StaticInformationList_item,
-      { "DRAC-StaticInformation", "rrc.DRAC_StaticInformation",
+      { "DRAC-StaticInformation", "rrc.DRAC_StaticInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_transmissionGrantType,
@@ -159941,7 +159941,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_transmissionGrantType_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_non_ScheduledTransGrantInfo,
-      { "non-ScheduledTransGrantInfo", "rrc.non_ScheduledTransGrantInfo",
+      { "non-ScheduledTransGrantInfo", "rrc.non_ScheduledTransGrantInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_maxMAC_e_PDUContents,
@@ -159953,7 +159953,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_scheduledTransmissionGrantInfo,
-      { "scheduledTransmissionGrantInfo", "rrc.scheduledTransmissionGrantInfo",
+      { "scheduledTransmissionGrantInfo", "rrc.scheduledTransmissionGrantInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mac_d_FlowRetransTimer,
@@ -159965,7 +159965,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_transmissionGrantType_01_vals), 0,
         "T_transmissionGrantType_01", HFILL }},
     { &hf_rrc_non_ScheduledTransGrantInfo_01,
-      { "non-ScheduledTransGrantInfo", "rrc.non_ScheduledTransGrantInfo",
+      { "non-ScheduledTransGrantInfo", "rrc.non_ScheduledTransGrantInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_non_ScheduledTransGrantInfo_01", HFILL }},
     { &hf_rrc_modeSpecificInfo_21,
@@ -159973,23 +159973,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_21_vals), 0,
         "T_modeSpecificInfo_21", HFILL }},
     { &hf_rrc_fdd_52,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_51", HFILL }},
     { &hf_rrc_E_DCH_AddReconf_MAC_d_FlowList_item,
-      { "E-DCH-AddReconf-MAC-d-Flow", "rrc.E_DCH_AddReconf_MAC_d_Flow",
+      { "E-DCH-AddReconf-MAC-d-Flow", "rrc.E_DCH_AddReconf_MAC_d_Flow_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_E_DCH_AddReconf_MAC_d_FlowList_r7_item,
-      { "E-DCH-AddReconf-MAC-d-Flow-r7", "rrc.E_DCH_AddReconf_MAC_d_Flow_r7",
+      { "E-DCH-AddReconf-MAC-d-Flow-r7", "rrc.E_DCH_AddReconf_MAC_d_Flow_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_complete_26,
-      { "complete", "rrc.complete",
+      { "complete", "rrc.complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TFCS_ReconfAdd", HFILL }},
     { &hf_rrc_addition,
-      { "addition", "rrc.addition",
+      { "addition", "rrc.addition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TFCS_ReconfAdd", HFILL }},
     { &hf_rrc_removal,
@@ -159997,7 +159997,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TFCS_RemovalList", HFILL }},
     { &hf_rrc_replacement,
-      { "replacement", "rrc.replacement",
+      { "replacement", "rrc.replacement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tfcsRemoval,
@@ -160005,11 +160005,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TFCS_RemovalList", HFILL }},
     { &hf_rrc_tfcsAdd,
-      { "tfcsAdd", "rrc.tfcsAdd",
+      { "tfcsAdd", "rrc.tfcsAdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TFCS_ReconfAdd", HFILL }},
     { &hf_rrc_signalledGainFactors,
-      { "signalledGainFactors", "rrc.signalledGainFactors",
+      { "signalledGainFactors", "rrc.signalledGainFactors_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_computedGainFactors,
@@ -160017,7 +160017,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ReferenceTFC_ID", HFILL }},
     { &hf_rrc_addOrReconfMAC_dFlow,
-      { "addOrReconfMAC-dFlow", "rrc.addOrReconfMAC_dFlow",
+      { "addOrReconfMAC-dFlow", "rrc.addOrReconfMAC_dFlow_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_MAC_HeaderType,
@@ -160025,11 +160025,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dl_MAC_HeaderType_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_mac_hs_02,
-      { "mac-hs", "rrc.mac_hs",
+      { "mac-hs", "rrc.mac_hs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AddOrReconfMAC_dFlow", HFILL }},
     { &hf_rrc_mac_ehs_02,
-      { "mac-ehs", "rrc.mac_ehs",
+      { "mac-ehs", "rrc.mac_ehs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AddOrReconfMAC_ehs_ReordQ", HFILL }},
     { &hf_rrc_dl_MAC_HeaderType_01,
@@ -160037,11 +160037,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dl_MAC_HeaderType_01_vals), 0,
         "T_dl_MAC_HeaderType_01", HFILL }},
     { &hf_rrc_mac_ehs_03,
-      { "mac-ehs", "rrc.mac_ehs",
+      { "mac-ehs", "rrc.mac_ehs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AddOrReconfMAC_ehs_ReordQ_r9", HFILL }},
     { &hf_rrc_mac_ehs_04,
-      { "mac-ehs", "rrc.mac_ehs",
+      { "mac-ehs", "rrc.mac_ehs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AddOrReconfMAC_ehs_ReordQ_TDD128_v9c0ext", HFILL }},
     { &hf_rrc_dl_MAC_HeaderType_02,
@@ -160049,7 +160049,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dl_MAC_HeaderType_02_vals), 0,
         "T_dl_MAC_HeaderType_02", HFILL }},
     { &hf_rrc_mac_ehs_05,
-      { "mac-ehs", "rrc.mac_ehs",
+      { "mac-ehs", "rrc.mac_ehs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AddOrReconfMAC_ehs_ReordQ_r11", HFILL }},
     { &hf_rrc_numberOfProcesses,
@@ -160061,7 +160061,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_memoryPartitioning_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_implicit,
-      { "implicit", "rrc.implicit",
+      { "implicit", "rrc.implicit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_explicit,
@@ -160081,7 +160081,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_memoryPartitioning_01_vals), 0,
         "T_memoryPartitioning_01", HFILL }},
     { &hf_rrc_explicit_01,
-      { "explicit", "rrc.explicit",
+      { "explicit", "rrc.explicit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_memorySize,
@@ -160109,7 +160109,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_memoryPartitioning_02_vals), 0,
         "T_memoryPartitioning_02", HFILL }},
     { &hf_rrc_explicit_02,
-      { "explicit", "rrc.explicit",
+      { "explicit", "rrc.explicit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_explicit_01", HFILL }},
     { &hf_rrc_additionalMemorySizesThirdMIMOStream,
@@ -160129,7 +160129,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_HARQMemorySize_vals_ext, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_TFCS_Identity,
-      { "dl-TFCS-Identity", "rrc.dl_TFCS_Identity",
+      { "dl-TFCS-Identity", "rrc.dl_TFCS_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TFCS_Identity", HFILL }},
     { &hf_rrc_tfcs_SignallingMode,
@@ -160141,15 +160141,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TFCS_vals), 0,
         "TFCS", HFILL }},
     { &hf_rrc_sameAsUL_01,
-      { "sameAsUL", "rrc.sameAsUL",
+      { "sameAsUL", "rrc.sameAsUL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TFCS_Identity", HFILL }},
     { &hf_rrc_IndividualDL_CCTrCH_InfoList_item,
-      { "IndividualDL-CCTrCH-Info", "rrc.IndividualDL_CCTrCH_Info",
+      { "IndividualDL-CCTrCH-Info", "rrc.IndividualDL_CCTrCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_TFCS_Identity,
-      { "ul-TFCS-Identity", "rrc.ul_TFCS_Identity",
+      { "ul-TFCS-Identity", "rrc.ul_TFCS_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TFCS_Identity", HFILL }},
     { &hf_rrc_ul_TFCS,
@@ -160161,7 +160161,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TFC_Subset_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_IndividualUL_CCTrCH_InfoList_item,
-      { "IndividualUL-CCTrCH-Info", "rrc.IndividualUL_CCTrCH_Info",
+      { "IndividualUL-CCTrCH-Info", "rrc.IndividualUL_CCTrCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_logChOfRb,
@@ -160173,7 +160173,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_15_OF_LogicalChannelByRB", HFILL }},
     { &hf_rrc_explicitList_item,
-      { "LogicalChannelByRB", "rrc.LogicalChannelByRB",
+      { "LogicalChannelByRB", "rrc.LogicalChannelByRB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dch_transport_ch_id,
@@ -160185,7 +160185,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MAC_d_FlowIdentity", HFILL }},
     { &hf_rrc_MAC_d_PDU_SizeInfo_List_item,
-      { "MAC-d-PDUsizeInfo", "rrc.MAC_d_PDUsizeInfo",
+      { "MAC-d-PDUsizeInfo", "rrc.MAC_d_PDUsizeInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mac_d_PDU_Size,
@@ -160197,7 +160197,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_7", HFILL }},
     { &hf_rrc_MAC_hs_AddReconfQueue_List_item,
-      { "MAC-hs-AddReconfQueue", "rrc.MAC_hs_AddReconfQueue",
+      { "MAC-hs-AddReconfQueue", "rrc.MAC_hs_AddReconfQueue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mac_hsQueueId,
@@ -160221,23 +160221,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MAC_hs_DelQueue_List_item,
-      { "MAC-hs-DelQueue", "rrc.MAC_hs_DelQueue",
+      { "MAC-hs-DelQueue", "rrc.MAC_hs_DelQueue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MAC_ehs_AddReconfReordQ_List_item,
-      { "MAC-ehs-AddReconfReordQ", "rrc.MAC_ehs_AddReconfReordQ",
+      { "MAC-ehs-AddReconfReordQ", "rrc.MAC_ehs_AddReconfReordQ_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MAC_ehs_AddReconfReordQ_List_r9_item,
-      { "MAC-ehs-AddReconfReordQ-r9", "rrc.MAC_ehs_AddReconfReordQ_r9",
+      { "MAC-ehs-AddReconfReordQ-r9", "rrc.MAC_ehs_AddReconfReordQ_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MAC_ehs_AddReconfReordQ_List_TDD128_v9c0ext_item,
-      { "MAC-ehs-AddReconfReordQ-TDD128-v9c0ext", "rrc.MAC_ehs_AddReconfReordQ_TDD128_v9c0ext",
+      { "MAC-ehs-AddReconfReordQ-TDD128-v9c0ext", "rrc.MAC_ehs_AddReconfReordQ_TDD128_v9c0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MAC_ehs_AddReconfReordQ_List_r11_item,
-      { "MAC-ehs-AddReconfReordQ-r11", "rrc.MAC_ehs_AddReconfReordQ_r11",
+      { "MAC-ehs-AddReconfReordQ-r11", "rrc.MAC_ehs_AddReconfReordQ_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mac_ehsWindowSize_extension,
@@ -160249,7 +160249,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MAC_hs_WindowSize_r11_vals), 0,
         "MAC_hs_WindowSize_r11", HFILL }},
     { &hf_rrc_MAC_ehs_DelReordQ_List_item,
-      { "MAC-ehs-DelReordQ", "rrc.MAC_ehs_DelReordQ",
+      { "MAC-ehs-DelReordQ", "rrc.MAC_ehs_DelReordQ_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_hsdsch_mac_ehs_QueueId,
@@ -160257,7 +160257,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MAC_ehs_QueueId", HFILL }},
     { &hf_rrc_NumberOfTbSizeAndTTIList_item,
-      { "NumberOfTbSizeAndTTIList item", "rrc.NumberOfTbSizeAndTTIList_item",
+      { "NumberOfTbSizeAndTTIList item", "rrc.NumberOfTbSizeAndTTIList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_numberOfTransportBlocks,
@@ -160273,11 +160273,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_zero,
-      { "zero", "rrc.zero",
+      { "zero", "rrc.zero_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_one,
-      { "one", "rrc.one",
+      { "one", "rrc.one_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_small,
@@ -160293,7 +160293,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_31", HFILL }},
     { &hf_rrc_sizeType2_01,
-      { "sizeType2", "rrc.sizeType2",
+      { "sizeType2", "rrc.sizeType2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_sizeType2_01", HFILL }},
     { &hf_rrc_part1_03,
@@ -160305,7 +160305,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_3", HFILL }},
     { &hf_rrc_sizeType3_01,
-      { "sizeType3", "rrc.sizeType3",
+      { "sizeType3", "rrc.sizeType3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_sizeType3_01", HFILL }},
     { &hf_rrc_part1_04,
@@ -160329,7 +160329,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_22_vals), 0,
         "T_modeSpecificInfo_22", HFILL }},
     { &hf_rrc_fdd_53,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_52", HFILL }},
     { &hf_rrc_gainFactorBetaC,
@@ -160373,7 +160373,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RestrictedTrChInfoList_item,
-      { "RestrictedTrChInfo", "rrc.RestrictedTrChInfo",
+      { "RestrictedTrChInfo", "rrc.RestrictedTrChInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_channelCodingType,
@@ -160393,7 +160393,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_23_vals), 0,
         "T_modeSpecificInfo_23", HFILL }},
     { &hf_rrc_fdd_54,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_53", HFILL }},
     { &hf_rrc_referenceTFC_ID,
@@ -160433,11 +160433,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_fullTFCS,
-      { "fullTFCS", "rrc.fullTFCS",
+      { "fullTFCS", "rrc.fullTFCS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_TFC_SubsetList_item,
-      { "TFC-SubsetList item", "rrc.TFC_SubsetList_item",
+      { "TFC-SubsetList item", "rrc.TFC_SubsetList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_24,
@@ -160445,7 +160445,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_24_vals), 0,
         "T_modeSpecificInfo_24", HFILL }},
     { &hf_rrc_tdd_17,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_16", HFILL }},
     { &hf_rrc_tfci_Range,
@@ -160465,7 +160465,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TFCS_InfoForDSCH_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_TFCI_RangeList_item,
-      { "TFCI-Range", "rrc.TFCI_Range",
+      { "TFCI-Range", "rrc.TFCI_Range_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_normalTFCI_Signalling,
@@ -160473,7 +160473,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_ExplicitTFCS_Configuration_vals), 0,
         "ExplicitTFCS_Configuration", HFILL }},
     { &hf_rrc_dummy_38,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SplitTFCI_Signalling", HFILL }},
     { &hf_rrc_tfcs_ID_01,
@@ -160521,7 +160521,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ctfc2Bit_item,
-      { "ctfc2Bit item", "rrc.ctfc2Bit_item",
+      { "ctfc2Bit item", "rrc.ctfc2Bit_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ctfc2Bit_item", HFILL }},
     { &hf_rrc_ctfc2,
@@ -160529,7 +160529,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_3", HFILL }},
     { &hf_rrc_powerOffsetInformation,
-      { "powerOffsetInformation", "rrc.powerOffsetInformation",
+      { "powerOffsetInformation", "rrc.powerOffsetInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ctfc4Bit,
@@ -160537,7 +160537,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ctfc4Bit_item,
-      { "ctfc4Bit item", "rrc.ctfc4Bit_item",
+      { "ctfc4Bit item", "rrc.ctfc4Bit_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ctfc4Bit_item", HFILL }},
     { &hf_rrc_ctfc4,
@@ -160549,7 +160549,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ctfc6Bit_item,
-      { "ctfc6Bit item", "rrc.ctfc6Bit_item",
+      { "ctfc6Bit item", "rrc.ctfc6Bit_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ctfc6Bit_item", HFILL }},
     { &hf_rrc_ctfc6,
@@ -160561,7 +160561,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ctfc8Bit_item,
-      { "ctfc8Bit item", "rrc.ctfc8Bit_item",
+      { "ctfc8Bit item", "rrc.ctfc8Bit_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ctfc8Bit_item", HFILL }},
     { &hf_rrc_ctfc8,
@@ -160573,7 +160573,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ctfc12Bit_item,
-      { "ctfc12Bit item", "rrc.ctfc12Bit_item",
+      { "ctfc12Bit item", "rrc.ctfc12Bit_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ctfc12Bit_item", HFILL }},
     { &hf_rrc_ctfc12,
@@ -160585,7 +160585,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ctfc16Bit_item,
-      { "ctfc16Bit item", "rrc.ctfc16Bit_item",
+      { "ctfc16Bit item", "rrc.ctfc16Bit_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ctfc16Bit_item", HFILL }},
     { &hf_rrc_ctfc16,
@@ -160597,7 +160597,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ctfc24Bit_item,
-      { "ctfc24Bit item", "rrc.ctfc24Bit_item",
+      { "ctfc24Bit item", "rrc.ctfc24Bit_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ctfc24Bit_item", HFILL }},
     { &hf_rrc_ctfc24,
@@ -160609,7 +160609,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_1023", HFILL }},
     { &hf_rrc_TFCS_RemovalList_item,
-      { "TFCS-Removal", "rrc.TFCS_Removal",
+      { "TFCS-Removal", "rrc.TFCS_Removal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_messType,
@@ -160621,11 +160621,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tm_SignallingMode_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_mode1,
-      { "mode1", "rrc.mode1",
+      { "mode1", "rrc.mode1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mode2,
-      { "mode2", "rrc.mode2",
+      { "mode2", "rrc.mode2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_controlledTrChList,
@@ -160637,19 +160637,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TransportChannelIdentity", HFILL }},
     { &hf_rrc_dedicatedTransChTFS,
-      { "dedicatedTransChTFS", "rrc.dedicatedTransChTFS",
+      { "dedicatedTransChTFS", "rrc.dedicatedTransChTFS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_commonTransChTFS,
-      { "commonTransChTFS", "rrc.commonTransChTFS",
+      { "commonTransChTFS", "rrc.commonTransChTFS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_commonTransChTFS_LCR,
-      { "commonTransChTFS-LCR", "rrc.commonTransChTFS_LCR",
+      { "commonTransChTFS-LCR", "rrc.commonTransChTFS_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UL_AddReconfTransChInfoList_item,
-      { "UL-AddReconfTransChInformation", "rrc.UL_AddReconfTransChInformation",
+      { "UL-AddReconfTransChInformation", "rrc.UL_AddReconfTransChInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UL_AddReconfTransChInfoList_r6_item,
@@ -160669,11 +160669,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TransportFormatSet_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_dch_usch,
-      { "dch-usch", "rrc.dch_usch",
+      { "dch-usch", "rrc.dch_usch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_e_dch_02,
-      { "e-dch", "rrc.e_dch",
+      { "e-dch", "rrc.e_dch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_e_dch_02", HFILL }},
     { &hf_rrc_tti_03,
@@ -160689,11 +160689,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_DCH_AddReconf_MAC_d_FlowList", HFILL }},
     { &hf_rrc_dch_usch_01,
-      { "dch-usch", "rrc.dch_usch",
+      { "dch-usch", "rrc.dch_usch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_dch_usch_01", HFILL }},
     { &hf_rrc_e_dch_03,
-      { "e-dch", "rrc.e_dch",
+      { "e-dch", "rrc.e_dch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_e_dch_03", HFILL }},
     { &hf_rrc_modeSpecific,
@@ -160701,7 +160701,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecific_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_fdd_55,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_54", HFILL }},
     { &hf_rrc_harq_Info_01,
@@ -160713,11 +160713,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_DCH_AddReconf_MAC_d_FlowList_r7", HFILL }},
     { &hf_rrc_dch_usch_02,
-      { "dch-usch", "rrc.dch_usch",
+      { "dch-usch", "rrc.dch_usch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_dch_usch_02", HFILL }},
     { &hf_rrc_e_dch_04,
-      { "e-dch", "rrc.e_dch",
+      { "e-dch", "rrc.e_dch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_e_dch_04", HFILL }},
     { &hf_rrc_ul_MAC_HeaderType,
@@ -160729,7 +160729,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecific_01_vals), 0,
         "T_modeSpecific_01", HFILL }},
     { &hf_rrc_fdd_56,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_55", HFILL }},
     { &hf_rrc_harq_Info_02,
@@ -160745,11 +160745,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_25_vals), 0,
         "T_modeSpecificInfo_25", HFILL }},
     { &hf_rrc_fdd_57,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_56", HFILL }},
     { &hf_rrc_tdd_18,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_17", HFILL }},
     { &hf_rrc_individualUL_CCTrCH_InfoList,
@@ -160761,11 +160761,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_26_vals), 0,
         "T_modeSpecificInfo_26", HFILL }},
     { &hf_rrc_fdd_58,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_57", HFILL }},
     { &hf_rrc_tdd_19,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_18", HFILL }},
     { &hf_rrc_tfc_SubsetList,
@@ -160777,7 +160777,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UL_DeletedTransChInfoList_item,
-      { "UL-TransportChannelIdentity", "rrc.UL_TransportChannelIdentity",
+      { "UL-TransportChannelIdentity", "rrc.UL_TransportChannelIdentity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UL_DeletedTransChInfoList_r6_item,
@@ -160789,7 +160789,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TransportChannelIdentity", HFILL }},
     { &hf_rrc_dch_usch_03,
-      { "dch-usch", "rrc.dch_usch",
+      { "dch-usch", "rrc.dch_usch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_dch_usch_03", HFILL }},
     { &hf_rrc_e_dch_05,
@@ -160797,7 +160797,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_DCH_MAC_d_FlowIdentity", HFILL }},
     { &hf_rrc_USCH_TransportChannelsInfo_item,
-      { "USCH-TransportChannelsInfo item", "rrc.USCH_TransportChannelsInfo_item",
+      { "USCH-TransportChannelsInfo item", "rrc.USCH_TransportChannelsInfo_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_usch_TransportChannelIdentity,
@@ -160833,11 +160833,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_subchannelSize_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_size1,
-      { "size1", "rrc.size1",
+      { "size1", "rrc.size1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_size2,
-      { "size2", "rrc.size2",
+      { "size2", "rrc.size2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_subchannels,
@@ -160845,7 +160845,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_subchannels_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_size4,
-      { "size4", "rrc.size4",
+      { "size4", "rrc.size4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_subchannels_01,
@@ -160853,7 +160853,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "T_subchannels_01", HFILL }},
     { &hf_rrc_size8,
-      { "size8", "rrc.size8",
+      { "size8", "rrc.size8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_subchannels_02,
@@ -160869,7 +160869,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_subchannelSize_01_vals), 0,
         "T_subchannelSize_01", HFILL }},
     { &hf_rrc_size2_01,
-      { "size2", "rrc.size2",
+      { "size2", "rrc.size2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_size2_01", HFILL }},
     { &hf_rrc_subchannels_03,
@@ -160877,7 +160877,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_subchannels_03_vals), 0,
         "T_subchannels_03", HFILL }},
     { &hf_rrc_size4_01,
-      { "size4", "rrc.size4",
+      { "size4", "rrc.size4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_size4_01", HFILL }},
     { &hf_rrc_subchannels_04,
@@ -160885,7 +160885,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "T_subchannels_04", HFILL }},
     { &hf_rrc_size8_01,
-      { "size8", "rrc.size8",
+      { "size8", "rrc.size8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_size8_01", HFILL }},
     { &hf_rrc_subchannels_05,
@@ -160893,7 +160893,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "T_subchannels_05", HFILL }},
     { &hf_rrc_size16,
-      { "size16", "rrc.size16",
+      { "size16", "rrc.size16_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_subchannels_06,
@@ -160909,7 +160909,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_subchannelSize_02_vals), 0,
         "T_subchannelSize_02", HFILL }},
     { &hf_rrc_size2_02,
-      { "size2", "rrc.size2",
+      { "size2", "rrc.size2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_size2_02", HFILL }},
     { &hf_rrc_subchannels_07,
@@ -160917,7 +160917,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_subchannels_07_vals), 0,
         "T_subchannels_07", HFILL }},
     { &hf_rrc_size4_02,
-      { "size4", "rrc.size4",
+      { "size4", "rrc.size4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_size4_02", HFILL }},
     { &hf_rrc_subchannels_08,
@@ -160925,7 +160925,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "T_subchannels_08", HFILL }},
     { &hf_rrc_size8_02,
-      { "size8", "rrc.size8",
+      { "size8", "rrc.size8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_size8_02", HFILL }},
     { &hf_rrc_subchannels_09,
@@ -160933,27 +160933,27 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "T_subchannels_09", HFILL }},
     { &hf_rrc_dynamicTFInformationCCCH,
-      { "dynamicTFInformationCCCH", "rrc.dynamicTFInformationCCCH",
+      { "dynamicTFInformationCCCH", "rrc.dynamicTFInformationCCCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_additionalPRACH_TF_and_TFCS_CCCH_IEs,
-      { "additionalPRACH-TF-and-TFCS-CCCH-IEs", "rrc.additionalPRACH_TF_and_TFCS_CCCH_IEs",
+      { "additionalPRACH-TF-and-TFCS-CCCH-IEs", "rrc.additionalPRACH_TF_and_TFCS_CCCH_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_AdditionalPRACH_TF_and_TFCS_CCCH_List_item,
-      { "AdditionalPRACH-TF-and-TFCS-CCCH", "rrc.AdditionalPRACH_TF_and_TFCS_CCCH",
+      { "AdditionalPRACH-TF-and-TFCS-CCCH", "rrc.AdditionalPRACH_TF_and_TFCS_CCCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_AdditionalDLSecCellInfoListFDD_item,
-      { "AdditionalDLSecCellInfoFDD", "rrc.AdditionalDLSecCellInfoFDD",
+      { "AdditionalDLSecCellInfoFDD", "rrc.AdditionalDLSecCellInfoFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_AdditionalDLSecCellInfoListFDD_r11_item,
-      { "AdditionalDLSecCellInfoFDD-r11", "rrc.AdditionalDLSecCellInfoFDD_r11",
+      { "AdditionalDLSecCellInfoFDD-r11", "rrc.AdditionalDLSecCellInfoFDD_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_AdditionalDLSecCellInfoListFDD2_item,
-      { "AdditionalDLSecCellInfoFDD-r11", "rrc.AdditionalDLSecCellInfoFDD_r11",
+      { "AdditionalDLSecCellInfoFDD-r11", "rrc.AdditionalDLSecCellInfoFDD_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_channelisationCode256,
@@ -160977,19 +160977,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_256", HFILL }},
     { &hf_rrc_antenna3And4_S_CPICH,
-      { "antenna3And4-S-CPICH", "rrc.antenna3And4_S_CPICH",
+      { "antenna3And4-S-CPICH", "rrc.antenna3And4_S_CPICH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_antenna3And4_D_CPICH,
-      { "antenna3And4-D-CPICH", "rrc.antenna3And4_D_CPICH",
+      { "antenna3And4-D-CPICH", "rrc.antenna3And4_D_CPICH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_antenna3_S_CPICH,
-      { "antenna3-S-CPICH", "rrc.antenna3_S_CPICH",
+      { "antenna3-S-CPICH", "rrc.antenna3_S_CPICH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_antenna4_S_CPICH,
-      { "antenna4-S-CPICH", "rrc.antenna4_S_CPICH",
+      { "antenna4-S-CPICH", "rrc.antenna4_S_CPICH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_s_cpich_PowerOffset_Mimo,
@@ -160997,11 +160997,11 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "S_CPICH_PowerOffset_4x4MIMO", HFILL }},
     { &hf_rrc_antenna3_D_CPICH,
-      { "antenna3-D-CPICH", "rrc.antenna3_D_CPICH",
+      { "antenna3-D-CPICH", "rrc.antenna3_D_CPICH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_antenna4_D_CPICH,
-      { "antenna4-D-CPICH", "rrc.antenna4_D_CPICH",
+      { "antenna4-D-CPICH", "rrc.antenna4_D_CPICH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_d_cpich_PowerOffset_Mimo,
@@ -161025,23 +161025,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_accessServiceClass_FDD,
-      { "accessServiceClass-FDD", "rrc.accessServiceClass_FDD",
+      { "accessServiceClass-FDD", "rrc.accessServiceClass_FDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_accessServiceClass_TDD,
-      { "accessServiceClass-TDD", "rrc.accessServiceClass_TDD",
+      { "accessServiceClass-TDD", "rrc.accessServiceClass_TDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_accessServiceClass_TDD_01,
-      { "accessServiceClass-TDD", "rrc.accessServiceClass_TDD",
+      { "accessServiceClass-TDD", "rrc.accessServiceClass_TDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AccessServiceClass_TDD_r7", HFILL }},
     { &hf_rrc_accessServiceClass_TDD_LCR,
-      { "accessServiceClass-TDD-LCR", "rrc.accessServiceClass_TDD_LCR",
+      { "accessServiceClass-TDD-LCR", "rrc.accessServiceClass_TDD_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AccessServiceClass_TDD_LCR_r4", HFILL }},
     { &hf_rrc_AvailableAP_Signature_VCAMList_item,
-      { "AP-Signature-VCAM", "rrc.AP_Signature_VCAM",
+      { "AP-Signature-VCAM", "rrc.AP_Signature_VCAM_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_AvailableAP_SignatureList_item,
@@ -161053,7 +161053,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_AvailableMinimumSF_ListVCAM_item,
-      { "AvailableMinimumSF-VCAM", "rrc.AvailableMinimumSF_VCAM",
+      { "AvailableMinimumSF-VCAM", "rrc.AvailableMinimumSF_VCAM_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_minimumSpreadingFactor,
@@ -161073,7 +161073,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tfcs_Identity,
-      { "tfcs-Identity", "rrc.tfcs_Identity",
+      { "tfcs-Identity", "rrc.tfcs_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_DPCH_PowerControlInfo,
@@ -161117,7 +161117,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_notActive,
-      { "notActive", "rrc.notActive",
+      { "notActive", "rrc.notActive_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_isActive,
@@ -161149,23 +161149,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_255", HFILL }},
     { &hf_rrc_e_RGCH_Information_01,
-      { "e-RGCH-Information", "rrc.e_RGCH_Information",
+      { "e-RGCH-Information", "rrc.e_RGCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_RGCH_Information_CommonEdch", HFILL }},
     { &hf_rrc_e_hich_Info,
-      { "e-hich-Info", "rrc.e_hich_Info",
+      { "e-hich-Info", "rrc.e_hich_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_HICH_Information_CommonEdch", HFILL }},
     { &hf_rrc_ul_DPCH_CodeInfoForCommonEDCH,
-      { "ul-DPCH-CodeInfoForCommonEDCH", "rrc.ul_DPCH_CodeInfoForCommonEDCH",
+      { "ul-DPCH-CodeInfoForCommonEDCH", "rrc.ul_DPCH_CodeInfoForCommonEDCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_twoMsHarqConfiguration,
-      { "twoMsHarqConfiguration", "rrc.twoMsHarqConfiguration",
+      { "twoMsHarqConfiguration", "rrc.twoMsHarqConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_Common_E_RNTI_Info_item,
-      { "Common-E-RNTI-Info item", "rrc.Common_E_RNTI_Info_item",
+      { "Common-E-RNTI-Info item", "rrc.Common_E_RNTI_Info_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_starting_E_RNTI,
@@ -161181,7 +161181,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_maxERNTIperGroup", HFILL }},
     { &hf_rrc_scheduledTransmissionConfiguration,
-      { "scheduledTransmissionConfiguration", "rrc.scheduledTransmissionConfiguration",
+      { "scheduledTransmissionConfiguration", "rrc.scheduledTransmissionConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cOffset,
@@ -161201,7 +161201,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_27_vals), 0,
         "T_modeSpecificInfo_27", HFILL }},
     { &hf_rrc_dummy_39,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_dummy_14", HFILL }},
     { &hf_rrc_tdd_20,
@@ -161209,31 +161209,31 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_19_vals), 0,
         "T_tdd_19", HFILL }},
     { &hf_rrc_tdd768_06,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd384_11,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd128_11,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_11", HFILL }},
     { &hf_rrc_e_RUCCH_Info,
-      { "e-RUCCH-Info", "rrc.e_RUCCH_Info",
+      { "e-RUCCH-Info", "rrc.e_RUCCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_RUCCH_Info_TDD128", HFILL }},
     { &hf_rrc_e_PUCH_Info,
-      { "e-PUCH-Info", "rrc.e_PUCH_Info",
+      { "e-PUCH-Info", "rrc.e_PUCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_PUCH_Info_TDD128", HFILL }},
     { &hf_rrc_e_hich_Information,
-      { "e-hich-Information", "rrc.e_hich_Information",
+      { "e-hich-Information", "rrc.e_hich_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_HICH_Information_TDD128", HFILL }},
     { &hf_rrc_e_agch_Information,
-      { "e-agch-Information", "rrc.e_agch_Information",
+      { "e-agch-Information", "rrc.e_agch_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_AGCH_Information_TDD128", HFILL }},
     { &hf_rrc_harq_Info_03,
@@ -161241,7 +161241,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_harq_Info_03_vals), 0,
         "T_harq_Info_03", HFILL }},
     { &hf_rrc_ccch_transmission_Info,
-      { "ccch-transmission-Info", "rrc.ccch_transmission_Info",
+      { "ccch-transmission-Info", "rrc.ccch_transmission_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_common_e_rnti_Info,
@@ -161261,7 +161261,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_6", HFILL }},
     { &hf_rrc_prach_PreambleForEnhancedUplink,
-      { "prach-PreambleForEnhancedUplink", "rrc.prach_PreambleForEnhancedUplink",
+      { "prach-PreambleForEnhancedUplink", "rrc.prach_PreambleForEnhancedUplink_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_initialServingGrantValue,
@@ -161273,7 +161273,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_E_DCH_TTI_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_e_agch_Information_01,
-      { "e-agch-Information", "rrc.e_agch_Information",
+      { "e-agch-Information", "rrc.e_agch_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_harq_Info_04,
@@ -161281,15 +161281,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_harq_Info_04_vals), 0,
         "T_harq_Info_04", HFILL }},
     { &hf_rrc_ul_DPCHpowerControlInfoForCommonEDCH,
-      { "ul-DPCHpowerControlInfoForCommonEDCH", "rrc.ul_DPCHpowerControlInfoForCommonEDCH",
+      { "ul-DPCHpowerControlInfoForCommonEDCH", "rrc.ul_DPCHpowerControlInfoForCommonEDCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_e_dpcch_Info,
-      { "e-dpcch-Info", "rrc.e_dpcch_Info",
+      { "e-dpcch-Info", "rrc.e_dpcch_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_DPCCH_Info_r7", HFILL }},
     { &hf_rrc_e_dpdch_Info,
-      { "e-dpdch-Info", "rrc.e_dpdch_Info",
+      { "e-dpdch-Info", "rrc.e_dpdch_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_DPDCH_Info_r8", HFILL }},
     { &hf_rrc_dl_FDPCH_TPCcommandErrorRate,
@@ -161317,7 +161317,7 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_measurement_Feedback_Info,
-      { "measurement-Feedback-Info", "rrc.measurement_Feedback_Info",
+      { "measurement-Feedback-Info", "rrc.measurement_Feedback_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Measurement_Feedback_Info_r7", HFILL }},
     { &hf_rrc_common_E_DCH_ResourceInfoList,
@@ -161325,7 +161325,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxEDCHs_OF_Common_E_DCH_ResourceInfoList", HFILL }},
     { &hf_rrc_common_E_DCH_ResourceInfoList_item,
-      { "Common-E-DCH-ResourceInfoList", "rrc.Common_E_DCH_ResourceInfoList",
+      { "Common-E-DCH-ResourceInfoList", "rrc.Common_E_DCH_ResourceInfoList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_common_E_DCH_MAC_d_Flow_Info_List_ConcurrentTTI,
@@ -161333,7 +161333,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_DPCHpowerControlInfoConcurrentTTI,
-      { "ul-DPCHpowerControlInfoConcurrentTTI", "rrc.ul_DPCHpowerControlInfoConcurrentTTI",
+      { "ul-DPCHpowerControlInfoConcurrentTTI", "rrc.ul_DPCHpowerControlInfoConcurrentTTI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_e_DPCCH_DPCCH_PowerOffset,
@@ -161349,7 +161349,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_e_dch_TransmitContinuationOffset_01_vals), 0,
         "T_e_dch_TransmitContinuationOffset_01", HFILL }},
     { &hf_rrc_measurement_Feedback_Info_ConcurrentTTI,
-      { "measurement-Feedback-Info-ConcurrentTTI", "rrc.measurement_Feedback_Info_ConcurrentTTI",
+      { "measurement-Feedback-Info-ConcurrentTTI", "rrc.measurement_Feedback_Info_ConcurrentTTI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_channelisationCode_01,
@@ -161365,7 +161365,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_configurationInfo_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_newConfiguration_01,
-      { "newConfiguration", "rrc.newConfiguration",
+      { "newConfiguration", "rrc.newConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_newConfiguration_01", HFILL }},
     { &hf_rrc_eRGCHNeighbourCellList,
@@ -161377,7 +161377,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxCellMeas_OF_CommonERGCHChannelConfig", HFILL }},
     { &hf_rrc_commonERGCHChannelConfigList_item,
-      { "CommonERGCHChannelConfig", "rrc.CommonERGCHChannelConfig",
+      { "CommonERGCHChannelConfig", "rrc.CommonERGCHChannelConfig_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_minimumServingGrantValue,
@@ -161417,7 +161417,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_controlChannelDrxOperation_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_continue_01,
-      { "continue", "rrc.continue",
+      { "continue", "rrc.continue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_enablingDelay,
@@ -161425,15 +161425,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_EnablingDelay_TDD128_vals), 0,
         "EnablingDelay_TDD128", HFILL }},
     { &hf_rrc_newOperation,
-      { "newOperation", "rrc.newOperation",
+      { "newOperation", "rrc.newOperation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_hS_SCCH_Drx_Info,
-      { "hS-SCCH-Drx-Info", "rrc.hS_SCCH_Drx_Info",
+      { "hS-SCCH-Drx-Info", "rrc.hS_SCCH_Drx_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_SCCH_DRX_Info_TDD128", HFILL }},
     { &hf_rrc_e_AGCH_Drx_Info,
-      { "e-AGCH-Drx-Info", "rrc.e_AGCH_Drx_Info",
+      { "e-AGCH-Drx-Info", "rrc.e_AGCH_Drx_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_AGCH_DRX_Info_TDD128", HFILL }},
     { &hf_rrc_cpch_SetID,
@@ -161445,7 +161445,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_CPCH_PersistenceLevelsList_item,
-      { "CPCH-PersistenceLevels", "rrc.CPCH_PersistenceLevels",
+      { "CPCH-PersistenceLevels", "rrc.CPCH_PersistenceLevels_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ap_PreambleScramblingCode,
@@ -161501,19 +161501,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_CPCH_SetInfoList_item,
-      { "CPCH-SetInfo", "rrc.CPCH_SetInfo",
+      { "CPCH-SetInfo", "rrc.CPCH_SetInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_timeInfo,
-      { "timeInfo", "rrc.timeInfo",
+      { "timeInfo", "rrc.timeInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_commonTimeslotInfo,
-      { "commonTimeslotInfo", "rrc.commonTimeslotInfo",
+      { "commonTimeslotInfo", "rrc.commonTimeslotInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_CCTrCH_TimeslotsCodes,
-      { "dl-CCTrCH-TimeslotsCodes", "rrc.dl_CCTrCH_TimeslotsCodes",
+      { "dl-CCTrCH-TimeslotsCodes", "rrc.dl_CCTrCH_TimeslotsCodes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DownlinkTimeslotsCodes", HFILL }},
     { &hf_rrc_ul_CCTrChTPCList,
@@ -161525,15 +161525,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_03_vals), 0,
         "T_tddOption_03", HFILL }},
     { &hf_rrc_tdd384_12,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_11", HFILL }},
     { &hf_rrc_tdd128_12,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_12", HFILL }},
     { &hf_rrc_dl_CCTrCH_TimeslotsCodes_01,
-      { "dl-CCTrCH-TimeslotsCodes", "rrc.dl_CCTrCH_TimeslotsCodes",
+      { "dl-CCTrCH-TimeslotsCodes", "rrc.dl_CCTrCH_TimeslotsCodes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DownlinkTimeslotsCodes_LCR_r4", HFILL }},
     { &hf_rrc_tddOption_04,
@@ -161541,35 +161541,35 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_04_vals), 0,
         "T_tddOption_04", HFILL }},
     { &hf_rrc_tdd384_13,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_12", HFILL }},
     { &hf_rrc_dl_CCTrCH_TimeslotsCodes_02,
-      { "dl-CCTrCH-TimeslotsCodes", "rrc.dl_CCTrCH_TimeslotsCodes",
+      { "dl-CCTrCH-TimeslotsCodes", "rrc.dl_CCTrCH_TimeslotsCodes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DownlinkTimeslotsCodes_r7", HFILL }},
     { &hf_rrc_tdd768_07,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd768_06", HFILL }},
     { &hf_rrc_dl_CCTrCH_TimeslotsCodes_03,
-      { "dl-CCTrCH-TimeslotsCodes", "rrc.dl_CCTrCH_TimeslotsCodes",
+      { "dl-CCTrCH-TimeslotsCodes", "rrc.dl_CCTrCH_TimeslotsCodes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DownlinkTimeslotsCodes_VHCR", HFILL }},
     { &hf_rrc_tdd128_13,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_13", HFILL }},
     { &hf_rrc_DL_CCTrChList_item,
-      { "DL-CCTrCh", "rrc.DL_CCTrCh",
+      { "DL-CCTrCh", "rrc.DL_CCTrCh_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_CCTrChList_r7_item,
-      { "DL-CCTrCh-r7", "rrc.DL_CCTrCh_r7",
+      { "DL-CCTrCh-r7", "rrc.DL_CCTrCh_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_CCTrChList_r4_item,
-      { "DL-CCTrCh-r4", "rrc.DL_CCTrCh_r4",
+      { "DL-CCTrCh-r4", "rrc.DL_CCTrCh_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_CCTrChListToRemove_item,
@@ -161589,11 +161589,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_ScramblingCodeChange_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_DL_ChannelisationCodeList_item,
-      { "DL-ChannelisationCode", "rrc.DL_ChannelisationCode",
+      { "DL-ChannelisationCode", "rrc.DL_ChannelisationCode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_DPCH_InfoCommon,
-      { "dl-DPCH-InfoCommon", "rrc.dl_DPCH_InfoCommon",
+      { "dl-DPCH-InfoCommon", "rrc.dl_DPCH_InfoCommon_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_28,
@@ -161601,7 +161601,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_28_vals), 0,
         "T_modeSpecificInfo_28", HFILL }},
     { &hf_rrc_fdd_59,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_58", HFILL }},
     { &hf_rrc_defaultDPCH_OffsetValue,
@@ -161609,15 +161609,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DefaultDPCH_OffsetValueFDD", HFILL }},
     { &hf_rrc_dpch_CompressedModeInfo,
-      { "dpch-CompressedModeInfo", "rrc.dpch_CompressedModeInfo",
+      { "dpch-CompressedModeInfo", "rrc.dpch_CompressedModeInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dummy_40,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SSDT_Information", HFILL }},
     { &hf_rrc_tdd_21,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_20", HFILL }},
     { &hf_rrc_defaultDPCH_OffsetValue_01,
@@ -161625,7 +161625,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DefaultDPCH_OffsetValueTDD", HFILL }},
     { &hf_rrc_dl_DPCH_InfoCommon_01,
-      { "dl-DPCH-InfoCommon", "rrc.dl_DPCH_InfoCommon",
+      { "dl-DPCH-InfoCommon", "rrc.dl_DPCH_InfoCommon_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_InfoCommon_r4", HFILL }},
     { &hf_rrc_modeSpecificInfo_29,
@@ -161633,15 +161633,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_29_vals), 0,
         "T_modeSpecificInfo_29", HFILL }},
     { &hf_rrc_fdd_60,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_59", HFILL }},
     { &hf_rrc_dummy_41,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SSDT_Information_r4", HFILL }},
     { &hf_rrc_tdd_22,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_21", HFILL }},
     { &hf_rrc_tddOption_05,
@@ -161649,7 +161649,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_05_vals), 0,
         "T_tddOption_05", HFILL }},
     { &hf_rrc_tdd128_14,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_14", HFILL }},
     { &hf_rrc_tstd_Indicator,
@@ -161661,11 +161661,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_30_vals), 0,
         "T_modeSpecificInfo_30", HFILL }},
     { &hf_rrc_fdd_61,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_60", HFILL }},
     { &hf_rrc_tdd_23,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_22", HFILL }},
     { &hf_rrc_tddOption_06,
@@ -161673,7 +161673,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_06_vals), 0,
         "T_tddOption_06", HFILL }},
     { &hf_rrc_tdd128_15,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_15", HFILL }},
     { &hf_rrc_mac_hsResetIndicator_05,
@@ -161685,11 +161685,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dl_dpchInfoCommon_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_dl_DPCH_InfoCommon_02,
-      { "dl-DPCH-InfoCommon", "rrc.dl_DPCH_InfoCommon",
+      { "dl-DPCH-InfoCommon", "rrc.dl_DPCH_InfoCommon_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_InfoCommon_r6", HFILL }},
     { &hf_rrc_dl_FDPCH_InfoCommon,
-      { "dl-FDPCH-InfoCommon", "rrc.dl_FDPCH_InfoCommon",
+      { "dl-FDPCH-InfoCommon", "rrc.dl_FDPCH_InfoCommon_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_FDPCH_InfoCommon_r6", HFILL }},
     { &hf_rrc_modeSpecificInfo_31,
@@ -161697,11 +161697,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_31_vals), 0,
         "T_modeSpecificInfo_31", HFILL }},
     { &hf_rrc_fdd_62,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_61", HFILL }},
     { &hf_rrc_tdd_24,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_23", HFILL }},
     { &hf_rrc_tddOption_07,
@@ -161709,7 +161709,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_07_vals), 0,
         "T_tddOption_07", HFILL }},
     { &hf_rrc_tdd128_16,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_16", HFILL }},
     { &hf_rrc_mac_hsResetIndicator_06,
@@ -161729,11 +161729,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_32_vals), 0,
         "T_modeSpecificInfo_32", HFILL }},
     { &hf_rrc_fdd_63,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_62", HFILL }},
     { &hf_rrc_tdd_25,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_24", HFILL }},
     { &hf_rrc_tddOption_08,
@@ -161741,7 +161741,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_08_vals), 0,
         "T_tddOption_08", HFILL }},
     { &hf_rrc_tdd128_17,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_17", HFILL }},
     { &hf_rrc_mac_hsResetIndicator_07,
@@ -161761,15 +161761,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_33_vals), 0,
         "T_modeSpecificInfo_33", HFILL }},
     { &hf_rrc_fdd_64,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_63", HFILL }},
     { &hf_rrc_dpch_CompressedModeInfo_01,
-      { "dpch-CompressedModeInfo", "rrc.dpch_CompressedModeInfo",
+      { "dpch-CompressedModeInfo", "rrc.dpch_CompressedModeInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DPCH_CompressedModeInfo_r8", HFILL }},
     { &hf_rrc_tdd_26,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_25", HFILL }},
     { &hf_rrc_tddOption_09,
@@ -161777,7 +161777,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_09_vals), 0,
         "T_tddOption_09", HFILL }},
     { &hf_rrc_tdd128_18,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_18", HFILL }},
     { &hf_rrc_mac_hsResetIndicator_08,
@@ -161797,15 +161797,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_34_vals), 0,
         "T_modeSpecificInfo_34", HFILL }},
     { &hf_rrc_fdd_65,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_64", HFILL }},
     { &hf_rrc_dpch_CompressedModeInfo_02,
-      { "dpch-CompressedModeInfo", "rrc.dpch_CompressedModeInfo",
+      { "dpch-CompressedModeInfo", "rrc.dpch_CompressedModeInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DPCH_CompressedModeInfo_r10", HFILL }},
     { &hf_rrc_tdd_27,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_26", HFILL }},
     { &hf_rrc_tddOption_10,
@@ -161813,7 +161813,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_10_vals), 0,
         "T_tddOption_10", HFILL }},
     { &hf_rrc_tdd128_19,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_19", HFILL }},
     { &hf_rrc_mac_hsResetIndicator_09,
@@ -161833,11 +161833,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_35_vals), 0,
         "T_modeSpecificInfo_35", HFILL }},
     { &hf_rrc_fdd_66,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_65", HFILL }},
     { &hf_rrc_tdd_28,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_27", HFILL }},
     { &hf_rrc_tddOption_11,
@@ -161845,7 +161845,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_11_vals), 0,
         "T_tddOption_11", HFILL }},
     { &hf_rrc_tdd128_20,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_20", HFILL }},
     { &hf_rrc_mac_hsResetIndicator_10,
@@ -161861,11 +161861,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_mac_hsResetIndicator_assisting_01_vals), 0,
         "T_mac_hsResetIndicator_assisting_01", HFILL }},
     { &hf_rrc_dl_DPCH_InfoCommon_03,
-      { "dl-DPCH-InfoCommon", "rrc.dl_DPCH_InfoCommon",
+      { "dl-DPCH-InfoCommon", "rrc.dl_DPCH_InfoCommon_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_InfoCommonPost", HFILL }},
     { &hf_rrc_dl_DPCH_InfoCommon_04,
-      { "dl-DPCH-InfoCommon", "rrc.dl_DPCH_InfoCommon",
+      { "dl-DPCH-InfoCommon", "rrc.dl_DPCH_InfoCommon_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_InfoCommonPredef", HFILL }},
     { &hf_rrc_cfnHandling,
@@ -161873,11 +161873,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_cfnHandling_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_maintain,
-      { "maintain", "rrc.maintain",
+      { "maintain", "rrc.maintain_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_initialise,
-      { "initialise", "rrc.initialise",
+      { "initialise", "rrc.initialise_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dummy_42,
@@ -161889,11 +161889,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_36_vals), 0,
         "T_modeSpecificInfo_36", HFILL }},
     { &hf_rrc_fdd_67,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_66", HFILL }},
     { &hf_rrc_dl_DPCH_PowerControlInfo,
-      { "dl-DPCH-PowerControlInfo", "rrc.dl_DPCH_PowerControlInfo",
+      { "dl-DPCH-PowerControlInfo", "rrc.dl_DPCH_PowerControlInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_powerOffsetPilot_pdpdch,
@@ -161901,7 +161901,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_rate_matching_restriction,
-      { "dl-rate-matching-restriction", "rrc.dl_rate_matching_restriction",
+      { "dl-rate-matching-restriction", "rrc.dl_rate_matching_restriction_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_spreadingFactorAndPilot,
@@ -161917,7 +161917,7 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_tdd_29,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_28", HFILL }},
     { &hf_rrc_cfnHandling_01,
@@ -161925,7 +161925,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_cfnHandling_01_vals), 0,
         "T_cfnHandling_01", HFILL }},
     { &hf_rrc_initialise_01,
-      { "initialise", "rrc.initialise",
+      { "initialise", "rrc.initialise_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_initialise_01", HFILL }},
     { &hf_rrc_modeSpecificInfo_37,
@@ -161933,11 +161933,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_37_vals), 0,
         "T_modeSpecificInfo_37", HFILL }},
     { &hf_rrc_fdd_68,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_67", HFILL }},
     { &hf_rrc_tdd_30,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_29", HFILL }},
     { &hf_rrc_mac_d_HFN_initial_value,
@@ -161949,7 +161949,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_cfnHandling_02_vals), 0,
         "T_cfnHandling_02", HFILL }},
     { &hf_rrc_maintain_01,
-      { "maintain", "rrc.maintain",
+      { "maintain", "rrc.maintain_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_timingmaintainedsynchind,
@@ -161957,7 +161957,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TimingMaintainedSynchInd_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_initialise_02,
-      { "initialise", "rrc.initialise",
+      { "initialise", "rrc.initialise_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_38,
@@ -161965,11 +161965,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_38_vals), 0,
         "T_modeSpecificInfo_38", HFILL }},
     { &hf_rrc_fdd_69,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_68", HFILL }},
     { &hf_rrc_tdd_31,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_30", HFILL }},
     { &hf_rrc_modeSpecificInfo_39,
@@ -161977,15 +161977,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_39_vals), 0,
         "T_modeSpecificInfo_39", HFILL }},
     { &hf_rrc_fdd_70,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_69", HFILL }},
     { &hf_rrc_tdd_32,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_31", HFILL }},
     { &hf_rrc_fdd_71,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_70", HFILL }},
     { &hf_rrc_pCPICH_UsageForChannelEst,
@@ -161997,7 +161997,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_secondaryCPICH_Info,
-      { "secondaryCPICH-Info", "rrc.secondaryCPICH_Info",
+      { "secondaryCPICH-Info", "rrc.secondaryCPICH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_ChannelisationCodeList,
@@ -162017,7 +162017,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_ClosedLoopTimingAdjMode_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_33,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_32", HFILL }},
     { &hf_rrc_dl_CCTrChListToEstablish,
@@ -162029,11 +162029,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_fdd_72,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_71", HFILL }},
     { &hf_rrc_tdd_34,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_33", HFILL }},
     { &hf_rrc_dl_CCTrChListToEstablish_01,
@@ -162041,7 +162041,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DL_CCTrChList_r4", HFILL }},
     { &hf_rrc_fdd_73,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_72", HFILL }},
     { &hf_rrc_powerOffsetTPC_pdpdch,
@@ -162049,23 +162049,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_35,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_34", HFILL }},
     { &hf_rrc_fdd_74,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_73", HFILL }},
     { &hf_rrc_tdd_36,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_35", HFILL }},
     { &hf_rrc_fdd_75,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_74", HFILL }},
     { &hf_rrc_tdd_37,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_36", HFILL }},
     { &hf_rrc_dl_CCTrChListToEstablish_02,
@@ -162089,11 +162089,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_STTDIndication_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_dl_ChannelisationCode_01,
-      { "dl-ChannelisationCode", "rrc.dl_ChannelisationCode",
+      { "dl-ChannelisationCode", "rrc.dl_ChannelisationCode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_DPCH_TimeslotsCodes,
-      { "dl-DPCH-TimeslotsCodes", "rrc.dl_DPCH_TimeslotsCodes",
+      { "dl-DPCH-TimeslotsCodes", "rrc.dl_DPCH_TimeslotsCodes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DownlinkTimeslotsCodes", HFILL }},
     { &hf_rrc_modeSpecificInfo_40,
@@ -162101,11 +162101,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_40_vals), 0,
         "T_modeSpecificInfo_40", HFILL }},
     { &hf_rrc_fdd_76,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_75", HFILL }},
     { &hf_rrc_tdd_38,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_37", HFILL }},
     { &hf_rrc_tpc_StepSizeTDD,
@@ -162117,11 +162117,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_cfnHandling_03_vals), 0,
         "T_cfnHandling_03", HFILL }},
     { &hf_rrc_maintain_02,
-      { "maintain", "rrc.maintain",
+      { "maintain", "rrc.maintain_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_maintain_01", HFILL }},
     { &hf_rrc_dl_FDPCH_PowerControlInfo,
-      { "dl-FDPCH-PowerControlInfo", "rrc.dl_FDPCH_PowerControlInfo",
+      { "dl-FDPCH-PowerControlInfo", "rrc.dl_FDPCH_PowerControlInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_PowerControlInfo", HFILL }},
     { &hf_rrc_dl_FDPCH_TPCcommandErrorRate_01,
@@ -162129,11 +162129,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_16", HFILL }},
     { &hf_rrc_hs_scch_Info,
-      { "hs-scch-Info", "rrc.hs_scch_Info",
+      { "hs-scch-Info", "rrc.hs_scch_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_measurement_feedback_Info,
-      { "measurement-feedback-Info", "rrc.measurement_feedback_Info",
+      { "measurement-feedback-Info", "rrc.measurement_feedback_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_41,
@@ -162145,7 +162145,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_38_vals), 0,
         "T_tdd_38", HFILL }},
     { &hf_rrc_tdd384_14,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_13", HFILL }},
     { &hf_rrc_dl_HSPDSCH_TS_Configuration,
@@ -162153,15 +162153,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd128_21,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_21", HFILL }},
     { &hf_rrc_hs_PDSCH_Midamble_Configuration_tdd128,
-      { "hs-PDSCH-Midamble-Configuration-tdd128", "rrc.hs_PDSCH_Midamble_Configuration_tdd128",
+      { "hs-PDSCH-Midamble-Configuration-tdd128", "rrc.hs_PDSCH_Midamble_Configuration_tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_hs_scch_Info_01,
-      { "hs-scch-Info", "rrc.hs_scch_Info",
+      { "hs-scch-Info", "rrc.hs_scch_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_SCCH_Info_r6", HFILL }},
     { &hf_rrc_modeSpecificInfo_42,
@@ -162173,19 +162173,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_39_vals), 0,
         "T_tdd_39", HFILL }},
     { &hf_rrc_tdd384_15,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_14", HFILL }},
     { &hf_rrc_tdd128_22,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_22", HFILL }},
     { &hf_rrc_hs_scch_Info_02,
-      { "hs-scch-Info", "rrc.hs_scch_Info",
+      { "hs-scch-Info", "rrc.hs_scch_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_SCCH_Info_r7", HFILL }},
     { &hf_rrc_measurement_feedback_Info_01,
-      { "measurement-feedback-Info", "rrc.measurement_feedback_Info",
+      { "measurement-feedback-Info", "rrc.measurement_feedback_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Measurement_Feedback_Info_r7", HFILL }},
     { &hf_rrc_modeSpecificInfo_43,
@@ -162197,11 +162197,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_40_vals), 0,
         "T_tdd_40", HFILL }},
     { &hf_rrc_tdd384_16,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_15", HFILL }},
     { &hf_rrc_tdd768_08,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd768_07", HFILL }},
     { &hf_rrc_dl_HSPDSCH_TS_Configuration_01,
@@ -162209,15 +162209,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DL_HSPDSCH_TS_Configuration_VHCR", HFILL }},
     { &hf_rrc_tdd128_23,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_23", HFILL }},
     { &hf_rrc_dl_MultiCarrier_Information,
-      { "dl-MultiCarrier-Information", "rrc.dl_MultiCarrier_Information",
+      { "dl-MultiCarrier-Information", "rrc.dl_MultiCarrier_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_fdd_77,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_76", HFILL }},
     { &hf_rrc_dl_64QAM_Configured,
@@ -162233,19 +162233,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_41_vals), 0,
         "T_tdd_41", HFILL }},
     { &hf_rrc_tdd384_17,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_16", HFILL }},
     { &hf_rrc_tdd768_09,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd768_08", HFILL }},
     { &hf_rrc_tdd128_24,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_24", HFILL }},
     { &hf_rrc_fdd_78,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_77", HFILL }},
     { &hf_rrc_dl_64QAM_Configured_01,
@@ -162261,7 +162261,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_42_vals), 0,
         "T_tdd_42", HFILL }},
     { &hf_rrc_tdd128_25,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_25", HFILL }},
     { &hf_rrc_outofSyncWindow,
@@ -162269,11 +162269,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_OutofSyncWindow_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_hs_scch_Info_03,
-      { "hs-scch-Info", "rrc.hs_scch_Info",
+      { "hs-scch-Info", "rrc.hs_scch_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_SCCH_Info_r8_ext", HFILL }},
     { &hf_rrc_hs_scch_Info_04,
-      { "hs-scch-Info", "rrc.hs_scch_Info",
+      { "hs-scch-Info", "rrc.hs_scch_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_SCCH_Info_r9", HFILL }},
     { &hf_rrc_modeSpecificInfo_46,
@@ -162285,15 +162285,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_43_vals), 0,
         "T_tdd_43", HFILL }},
     { &hf_rrc_tdd384_18,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_17", HFILL }},
     { &hf_rrc_tdd768_10,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd768_09", HFILL }},
     { &hf_rrc_tdd128_26,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_26", HFILL }},
     { &hf_rrc_tS0_Indicator,
@@ -162301,7 +162301,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tS0_Indicator_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_fdd_79,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_78", HFILL }},
     { &hf_rrc_dl_64QAM_Configured_02,
@@ -162309,7 +162309,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dl_64QAM_Configured_02_vals), 0,
         "T_dl_64QAM_Configured_02", HFILL }},
     { &hf_rrc_measurement_feedback_Info_02,
-      { "measurement-feedback-Info", "rrc.measurement_feedback_Info",
+      { "measurement-feedback-Info", "rrc.measurement_feedback_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Measurement_Feedback_Info_r11", HFILL }},
     { &hf_rrc_modeSpecificInfo_47,
@@ -162321,15 +162321,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_44_vals), 0,
         "T_tdd_44", HFILL }},
     { &hf_rrc_tdd384_19,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_18", HFILL }},
     { &hf_rrc_tdd768_11,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd768_10", HFILL }},
     { &hf_rrc_tdd128_27,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_27", HFILL }},
     { &hf_rrc_tS0_Indicator_01,
@@ -162337,7 +162337,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tS0_Indicator_01_vals), 0,
         "T_tS0_Indicator_01", HFILL }},
     { &hf_rrc_fdd_80,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_79", HFILL }},
     { &hf_rrc_dl_64QAM_Configured_03,
@@ -162345,7 +162345,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dl_64QAM_Configured_03_vals), 0,
         "T_dl_64QAM_Configured_03", HFILL }},
     { &hf_rrc_DL_HSPDSCH_MultiCarrier_Information_item,
-      { "DL-HSPDSCH-MultiCarrier-Information item", "rrc.DL_HSPDSCH_MultiCarrier_Information_item",
+      { "DL-HSPDSCH-MultiCarrier-Information item", "rrc.DL_HSPDSCH_MultiCarrier_Information_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_uarfcn_Carrier,
@@ -162353,7 +162353,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "UARFCN", HFILL }},
     { &hf_rrc_hs_PDSCH_Midamble_Configuration,
-      { "hs-PDSCH-Midamble-Configuration", "rrc.hs_PDSCH_Midamble_Configuration",
+      { "hs-PDSCH-Midamble-Configuration", "rrc.hs_PDSCH_Midamble_Configuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_PDSCH_Midamble_Configuration_TDD128", HFILL }},
     { &hf_rrc_hs_SCCH_TDD128_MultiCarrier,
@@ -162361,23 +162361,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxHSSCCHs_OF_HS_SCCH_TDD128_MultiCarrier", HFILL }},
     { &hf_rrc_hs_SCCH_TDD128_MultiCarrier_item,
-      { "HS-SCCH-TDD128-MultiCarrier", "rrc.HS_SCCH_TDD128_MultiCarrier",
+      { "HS-SCCH-TDD128-MultiCarrier", "rrc.HS_SCCH_TDD128_MultiCarrier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_HSPDSCH_TS_Configuration_item,
-      { "DL-HSPDSCH-TS-Configuration item", "rrc.DL_HSPDSCH_TS_Configuration_item",
+      { "DL-HSPDSCH-TS-Configuration item", "rrc.DL_HSPDSCH_TS_Configuration_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_midambleShiftAndBurstType,
-      { "midambleShiftAndBurstType", "rrc.midambleShiftAndBurstType",
+      { "midambleShiftAndBurstType", "rrc.midambleShiftAndBurstType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MidambleShiftAndBurstType_DL", HFILL }},
     { &hf_rrc_DL_HSPDSCH_TS_Configuration_VHCR_item,
-      { "DL-HSPDSCH-TS-Configuration-VHCR item", "rrc.DL_HSPDSCH_TS_Configuration_VHCR_item",
+      { "DL-HSPDSCH-TS-Configuration-VHCR item", "rrc.DL_HSPDSCH_TS_Configuration_VHCR_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_midambleShiftAndBurstType_01,
-      { "midambleShiftAndBurstType", "rrc.midambleShiftAndBurstType",
+      { "midambleShiftAndBurstType", "rrc.midambleShiftAndBurstType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MidambleShiftAndBurstType_DL_VHCR", HFILL }},
     { &hf_rrc_modeSpecificInfo_48,
@@ -162385,15 +162385,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_48_vals), 0,
         "T_modeSpecificInfo_48", HFILL }},
     { &hf_rrc_fdd_81,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_80", HFILL }},
     { &hf_rrc_dummy1_02,
-      { "dummy1", "rrc.dummy1",
+      { "dummy1", "rrc.dummy1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PDSCH_SHO_DCH_Info", HFILL }},
     { &hf_rrc_dummy2_07,
-      { "dummy2", "rrc.dummy2",
+      { "dummy2", "rrc.dummy2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PDSCH_CodeMapping", HFILL }},
     { &hf_rrc_tdd_46,
@@ -162405,7 +162405,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_DL_DPCH_InfoPerRL_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_dummy_44,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SCCPCH_InfoForFACH", HFILL }},
     { &hf_rrc_modeSpecificInfo_49,
@@ -162413,7 +162413,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_49_vals), 0,
         "T_modeSpecificInfo_49", HFILL }},
     { &hf_rrc_fdd_82,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_81", HFILL }},
     { &hf_rrc_tdd_47,
@@ -162425,7 +162425,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_DL_DPCH_InfoPerRL_r4_vals), 0,
         "DL_DPCH_InfoPerRL_r4", HFILL }},
     { &hf_rrc_dummy_45,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SCCPCH_InfoForFACH_r4", HFILL }},
     { &hf_rrc_modeSpecificInfo_50,
@@ -162433,7 +162433,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_50_vals), 0,
         "T_modeSpecificInfo_50", HFILL }},
     { &hf_rrc_fdd_83,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_82", HFILL }},
     { &hf_rrc_servingHSDSCH_RL_indicator,
@@ -162449,7 +162449,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_51_vals), 0,
         "T_modeSpecificInfo_51", HFILL }},
     { &hf_rrc_fdd_84,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_83", HFILL }},
     { &hf_rrc_modeSpecificInfo_52,
@@ -162457,7 +162457,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_52_vals), 0,
         "T_modeSpecificInfo_52", HFILL }},
     { &hf_rrc_fdd_85,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_84", HFILL }},
     { &hf_rrc_servingEDCH_RL_indicator,
@@ -162473,7 +162473,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_DL_DPCH_InfoPerRL_r6_vals), 0,
         "DL_DPCH_InfoPerRL_r6", HFILL }},
     { &hf_rrc_dl_FDPCH_InfoPerRL,
-      { "dl-FDPCH-InfoPerRL", "rrc.dl_FDPCH_InfoPerRL",
+      { "dl-FDPCH-InfoPerRL", "rrc.dl_FDPCH_InfoPerRL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_FDPCH_InfoPerRL_r6", HFILL }},
     { &hf_rrc_e_HICH_Info,
@@ -162489,7 +162489,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_53_vals), 0,
         "T_modeSpecificInfo_53", HFILL }},
     { &hf_rrc_fdd_86,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_85", HFILL }},
     { &hf_rrc_dl_dpchInfo_01,
@@ -162501,11 +162501,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_DL_DPCH_InfoPerRL_r7_vals), 0,
         "DL_DPCH_InfoPerRL_r7", HFILL }},
     { &hf_rrc_dl_FDPCH_InfoPerRL_01,
-      { "dl-FDPCH-InfoPerRL", "rrc.dl_FDPCH_InfoPerRL",
+      { "dl-FDPCH-InfoPerRL", "rrc.dl_FDPCH_InfoPerRL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_FDPCH_InfoPerRL_r7", HFILL }},
     { &hf_rrc_e_AGCH_Information_01,
-      { "e-AGCH-Information", "rrc.e_AGCH_Information",
+      { "e-AGCH-Information", "rrc.e_AGCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_AGCH_Information_r7", HFILL }},
     { &hf_rrc_modeSpecificInfo2,
@@ -162513,7 +162513,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo2_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_fdd_87,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_86", HFILL }},
     { &hf_rrc_e_HICH_Info_01,
@@ -162529,19 +162529,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_45_vals), 0,
         "T_tdd_45", HFILL }},
     { &hf_rrc_tdd384_tdd768,
-      { "tdd384-tdd768", "rrc.tdd384_tdd768",
+      { "tdd384-tdd768", "rrc.tdd384_tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_e_HICH_Info_02,
-      { "e-HICH-Info", "rrc.e_HICH_Info",
+      { "e-HICH-Info", "rrc.e_HICH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_HICH_Information_TDD384_768", HFILL }},
     { &hf_rrc_tdd128_28,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_28", HFILL }},
     { &hf_rrc_e_HICH_Info_03,
-      { "e-HICH-Info", "rrc.e_HICH_Info",
+      { "e-HICH-Info", "rrc.e_HICH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_HICH_Information_TDD128", HFILL }},
     { &hf_rrc_modeSpecificInfo_54,
@@ -162549,7 +162549,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_54_vals), 0,
         "T_modeSpecificInfo_54", HFILL }},
     { &hf_rrc_fdd_88,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_87", HFILL }},
     { &hf_rrc_dl_dpchInfo_02,
@@ -162557,7 +162557,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dl_dpchInfo_02_vals), 0,
         "T_dl_dpchInfo_02", HFILL }},
     { &hf_rrc_e_AGCH_Information_02,
-      { "e-AGCH-Information", "rrc.e_AGCH_Information",
+      { "e-AGCH-Information", "rrc.e_AGCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_AGCH_Information_r8", HFILL }},
     { &hf_rrc_modeSpecificInfo2_01,
@@ -162565,7 +162565,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo2_01_vals), 0,
         "T_modeSpecificInfo2_01", HFILL }},
     { &hf_rrc_fdd_89,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_88", HFILL }},
     { &hf_rrc_e_HICH_Info_04,
@@ -162581,11 +162581,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_46_vals), 0,
         "T_tdd_46", HFILL }},
     { &hf_rrc_tdd384_tdd768_01,
-      { "tdd384-tdd768", "rrc.tdd384_tdd768",
+      { "tdd384-tdd768", "rrc.tdd384_tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_tdd768_01", HFILL }},
     { &hf_rrc_tdd128_29,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_29", HFILL }},
     { &hf_rrc_modeSpecificInfo_55,
@@ -162593,7 +162593,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_55_vals), 0,
         "T_modeSpecificInfo_55", HFILL }},
     { &hf_rrc_fdd_90,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_89", HFILL }},
     { &hf_rrc_dl_dpchInfo_03,
@@ -162601,7 +162601,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dl_dpchInfo_03_vals), 0,
         "T_dl_dpchInfo_03", HFILL }},
     { &hf_rrc_e_ROCH_Information,
-      { "e-ROCH-Information", "rrc.e_ROCH_Information",
+      { "e-ROCH-Information", "rrc.e_ROCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo2_02,
@@ -162609,7 +162609,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo2_02_vals), 0,
         "T_modeSpecificInfo2_02", HFILL }},
     { &hf_rrc_fdd_91,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_90", HFILL }},
     { &hf_rrc_e_HICH_Info_05,
@@ -162617,11 +162617,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_e_HICH_Info_03_vals), 0,
         "T_e_HICH_Info_03", HFILL }},
     { &hf_rrc_e_HICH_Information_01,
-      { "e-HICH-Information", "rrc.e_HICH_Information",
+      { "e-HICH-Information", "rrc.e_HICH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_HICH_Information_r11", HFILL }},
     { &hf_rrc_secondaryReleaseIndicator,
-      { "secondaryReleaseIndicator", "rrc.secondaryReleaseIndicator",
+      { "secondaryReleaseIndicator", "rrc.secondaryReleaseIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_e_RGCH_Info_04,
@@ -162633,7 +162633,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_f_TPICH_Info_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_f_TPICH_Information,
-      { "f-TPICH-Information", "rrc.f_TPICH_Information",
+      { "f-TPICH-Information", "rrc.f_TPICH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_50,
@@ -162641,71 +162641,71 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_47_vals), 0,
         "T_tdd_47", HFILL }},
     { &hf_rrc_tdd384_tdd768_02,
-      { "tdd384-tdd768", "rrc.tdd384_tdd768",
+      { "tdd384-tdd768", "rrc.tdd384_tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_tdd768_02", HFILL }},
     { &hf_rrc_tdd128_30,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_30", HFILL }},
     { &hf_rrc_DL_InformationPerRL_List_item,
-      { "DL-InformationPerRL", "rrc.DL_InformationPerRL",
+      { "DL-InformationPerRL", "rrc.DL_InformationPerRL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_InformationPerRL_List_r4_item,
-      { "DL-InformationPerRL-r4", "rrc.DL_InformationPerRL_r4",
+      { "DL-InformationPerRL-r4", "rrc.DL_InformationPerRL_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_InformationPerRL_List_r5_item,
-      { "DL-InformationPerRL-r5", "rrc.DL_InformationPerRL_r5",
+      { "DL-InformationPerRL-r5", "rrc.DL_InformationPerRL_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_InformationPerRL_List_r6_item,
-      { "DL-InformationPerRL-r6", "rrc.DL_InformationPerRL_r6",
+      { "DL-InformationPerRL-r6", "rrc.DL_InformationPerRL_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_InformationPerRL_List_v6b0ext_item,
-      { "DL-InformationPerRL-v6b0ext", "rrc.DL_InformationPerRL_v6b0ext",
+      { "DL-InformationPerRL-v6b0ext", "rrc.DL_InformationPerRL_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_InformationPerRL_List_r5bis_item,
-      { "DL-InformationPerRL-r5bis", "rrc.DL_InformationPerRL_r5bis",
+      { "DL-InformationPerRL-r5bis", "rrc.DL_InformationPerRL_r5bis_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_InformationPerRL_List_r7_item,
-      { "DL-InformationPerRL-r7", "rrc.DL_InformationPerRL_r7",
+      { "DL-InformationPerRL-r7", "rrc.DL_InformationPerRL_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_InformationPerRL_List_r8_item,
-      { "DL-InformationPerRL-r8", "rrc.DL_InformationPerRL_r8",
+      { "DL-InformationPerRL-r8", "rrc.DL_InformationPerRL_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_InformationPerRL_List_r11_item,
-      { "DL-InformationPerRL-r11", "rrc.DL_InformationPerRL_r11",
+      { "DL-InformationPerRL-r11", "rrc.DL_InformationPerRL_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DL_InformationPerRL_ListPostFDD_item,
-      { "DL-InformationPerRL-PostFDD", "rrc.DL_InformationPerRL_PostFDD",
+      { "DL-InformationPerRL-PostFDD", "rrc.DL_InformationPerRL_PostFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_DPCH_InfoPerRL_05,
-      { "dl-DPCH-InfoPerRL", "rrc.dl_DPCH_InfoPerRL",
+      { "dl-DPCH-InfoPerRL", "rrc.dl_DPCH_InfoPerRL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_InfoPerRL_PostFDD", HFILL }},
     { &hf_rrc_primaryCCPCH_Info,
-      { "primaryCCPCH-Info", "rrc.primaryCCPCH_Info",
+      { "primaryCCPCH-Info", "rrc.primaryCCPCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrimaryCCPCH_InfoPost", HFILL }},
     { &hf_rrc_dl_DPCH_InfoPerRL_06,
-      { "dl-DPCH-InfoPerRL", "rrc.dl_DPCH_InfoPerRL",
+      { "dl-DPCH-InfoPerRL", "rrc.dl_DPCH_InfoPerRL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_InfoPerRL_PostTDD", HFILL }},
     { &hf_rrc_primaryCCPCH_Info_01,
-      { "primaryCCPCH-Info", "rrc.primaryCCPCH_Info",
+      { "primaryCCPCH-Info", "rrc.primaryCCPCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrimaryCCPCH_InfoPostTDD_LCR_r4", HFILL }},
     { &hf_rrc_dl_DPCH_InfoPerRL_07,
-      { "dl-DPCH-InfoPerRL", "rrc.dl_DPCH_InfoPerRL",
+      { "dl-DPCH-InfoPerRL", "rrc.dl_DPCH_InfoPerRL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_DPCH_InfoPerRL_PostTDD_LCR_r4", HFILL }},
     { &hf_rrc_tsn_Length,
@@ -162725,7 +162725,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_newConfiguration_02,
-      { "newConfiguration", "rrc.newConfiguration",
+      { "newConfiguration", "rrc.newConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_newConfiguration_02", HFILL }},
     { &hf_rrc_dl_64QAM_Configured_04,
@@ -162761,7 +162761,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_configurationInfo_01_vals), 0,
         "T_configurationInfo_01", HFILL }},
     { &hf_rrc_newConfiguration_03,
-      { "newConfiguration", "rrc.newConfiguration",
+      { "newConfiguration", "rrc.newConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_newConfiguration_03", HFILL }},
     { &hf_rrc_dl_64QAM_Configured_05,
@@ -162781,7 +162781,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_configurationInfo_02_vals), 0,
         "T_configurationInfo_02", HFILL }},
     { &hf_rrc_newConfiguration_04,
-      { "newConfiguration", "rrc.newConfiguration",
+      { "newConfiguration", "rrc.newConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_newConfiguration_04", HFILL }},
     { &hf_rrc_dl_64QAM_Configured_06,
@@ -162801,7 +162801,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_configurationInfo_03_vals), 0,
         "T_configurationInfo_03", HFILL }},
     { &hf_rrc_newConfiguration_05,
-      { "newConfiguration", "rrc.newConfiguration",
+      { "newConfiguration", "rrc.newConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_newConfiguration_05", HFILL }},
     { &hf_rrc_dl_64QAM_Configured_07,
@@ -162817,15 +162817,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_differentTxModeFromServingHS_DSCHCell_03_vals), 0,
         "T_differentTxModeFromServingHS_DSCHCell_03", HFILL }},
     { &hf_rrc_multiflowConfigurationInfo,
-      { "multiflowConfigurationInfo", "rrc.multiflowConfigurationInfo",
+      { "multiflowConfigurationInfo", "rrc.multiflowConfigurationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_secondaryCell4x4MIMOparameters,
-      { "secondaryCell4x4MIMOparameters", "rrc.secondaryCell4x4MIMOparameters",
+      { "secondaryCell4x4MIMOparameters", "rrc.secondaryCell4x4MIMOparameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecondaryCell4x4MIMOparametersFDD", HFILL }},
     { &hf_rrc_DL_TPC_PowerOffsetPerRL_List_item,
-      { "DL-TPC-PowerOffsetPerRL", "rrc.DL_TPC_PowerOffsetPerRL",
+      { "DL-TPC-PowerOffsetPerRL", "rrc.DL_TPC_PowerOffsetPerRL_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_codesRepresentation,
@@ -162833,7 +162833,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_codesRepresentation_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_consecutive,
-      { "consecutive", "rrc.consecutive",
+      { "consecutive", "rrc.consecutive_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_firstChannelisationCode,
@@ -162853,7 +162853,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_codesRepresentation_01_vals), 0,
         "T_codesRepresentation_01", HFILL }},
     { &hf_rrc_consecutive_01,
-      { "consecutive", "rrc.consecutive",
+      { "consecutive", "rrc.consecutive_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_consecutive_01", HFILL }},
     { &hf_rrc_firstChannelisationCode_01,
@@ -162881,7 +162881,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_parameters_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_sameAsLast,
-      { "sameAsLast", "rrc.sameAsLast",
+      { "sameAsLast", "rrc.sameAsLast_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_timeslotNumber,
@@ -162889,15 +162889,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_newParameters,
-      { "newParameters", "rrc.newParameters",
+      { "newParameters", "rrc.newParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_individualTimeslotInfo,
-      { "individualTimeslotInfo", "rrc.individualTimeslotInfo",
+      { "individualTimeslotInfo", "rrc.individualTimeslotInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_TS_ChannelisationCodesShort,
-      { "dl-TS-ChannelisationCodesShort", "rrc.dl_TS_ChannelisationCodesShort",
+      { "dl-TS-ChannelisationCodesShort", "rrc.dl_TS_ChannelisationCodesShort_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_parameters_01,
@@ -162905,19 +162905,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_parameters_01_vals), 0,
         "T_parameters_01", HFILL }},
     { &hf_rrc_sameAsLast_01,
-      { "sameAsLast", "rrc.sameAsLast",
+      { "sameAsLast", "rrc.sameAsLast_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_sameAsLast_01", HFILL }},
     { &hf_rrc_newParameters_01,
-      { "newParameters", "rrc.newParameters",
+      { "newParameters", "rrc.newParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_newParameters_01", HFILL }},
     { &hf_rrc_individualTimeslotInfo_01,
-      { "individualTimeslotInfo", "rrc.individualTimeslotInfo",
+      { "individualTimeslotInfo", "rrc.individualTimeslotInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IndividualTimeslotInfo_VHCR", HFILL }},
     { &hf_rrc_dl_TS_ChannelisationCodesShort_01,
-      { "dl-TS-ChannelisationCodesShort", "rrc.dl_TS_ChannelisationCodesShort",
+      { "dl-TS-ChannelisationCodesShort", "rrc.dl_TS_ChannelisationCodesShort_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_TS_ChannelisationCodesShort_VHCR", HFILL }},
     { &hf_rrc_parameters_02,
@@ -162925,7 +162925,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_parameters_02_vals), 0,
         "T_parameters_02", HFILL }},
     { &hf_rrc_sameAsLast_02,
-      { "sameAsLast", "rrc.sameAsLast",
+      { "sameAsLast", "rrc.sameAsLast_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_sameAsLast_02", HFILL }},
     { &hf_rrc_timeslotNumber_01,
@@ -162933,11 +162933,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TimeslotNumber_LCR_r4", HFILL }},
     { &hf_rrc_newParameters_02,
-      { "newParameters", "rrc.newParameters",
+      { "newParameters", "rrc.newParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_newParameters_02", HFILL }},
     { &hf_rrc_individualTimeslotInfo_02,
-      { "individualTimeslotInfo", "rrc.individualTimeslotInfo",
+      { "individualTimeslotInfo", "rrc.individualTimeslotInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IndividualTimeslotInfo_LCR_r4", HFILL }},
     { &hf_rrc_parameters_03,
@@ -162945,19 +162945,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_parameters_03_vals), 0,
         "T_parameters_03", HFILL }},
     { &hf_rrc_sameAsLast_03,
-      { "sameAsLast", "rrc.sameAsLast",
+      { "sameAsLast", "rrc.sameAsLast_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_sameAsLast_03", HFILL }},
     { &hf_rrc_newParameters_03,
-      { "newParameters", "rrc.newParameters",
+      { "newParameters", "rrc.newParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_newParameters_03", HFILL }},
     { &hf_rrc_individualTimeslotInfo_03,
-      { "individualTimeslotInfo", "rrc.individualTimeslotInfo",
+      { "individualTimeslotInfo", "rrc.individualTimeslotInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IndividualTimeslotInfo_r7", HFILL }},
     { &hf_rrc_firstIndividualTimeslotInfo,
-      { "firstIndividualTimeslotInfo", "rrc.firstIndividualTimeslotInfo",
+      { "firstIndividualTimeslotInfo", "rrc.firstIndividualTimeslotInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IndividualTimeslotInfo", HFILL }},
     { &hf_rrc_moreTimeslots,
@@ -162965,7 +162965,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_moreTimeslots_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_noMore,
-      { "noMore", "rrc.noMore",
+      { "noMore", "rrc.noMore_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_additionalTimeslots,
@@ -162981,11 +162981,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxTS_1_OF_DownlinkAdditionalTimeslots", HFILL }},
     { &hf_rrc_timeslotList_item,
-      { "DownlinkAdditionalTimeslots", "rrc.DownlinkAdditionalTimeslots",
+      { "DownlinkAdditionalTimeslots", "rrc.DownlinkAdditionalTimeslots_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_firstIndividualTimeslotInfo_01,
-      { "firstIndividualTimeslotInfo", "rrc.firstIndividualTimeslotInfo",
+      { "firstIndividualTimeslotInfo", "rrc.firstIndividualTimeslotInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IndividualTimeslotInfo_VHCR", HFILL }},
     { &hf_rrc_moreTimeslots_01,
@@ -163001,11 +163001,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxTS_1_OF_DownlinkAdditionalTimeslots_VHCR", HFILL }},
     { &hf_rrc_timeslotList_item_01,
-      { "DownlinkAdditionalTimeslots-VHCR", "rrc.DownlinkAdditionalTimeslots_VHCR",
+      { "DownlinkAdditionalTimeslots-VHCR", "rrc.DownlinkAdditionalTimeslots_VHCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_firstIndividualTimeslotInfo_02,
-      { "firstIndividualTimeslotInfo", "rrc.firstIndividualTimeslotInfo",
+      { "firstIndividualTimeslotInfo", "rrc.firstIndividualTimeslotInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IndividualTimeslotInfo_LCR_r4", HFILL }},
     { &hf_rrc_moreTimeslots_02,
@@ -163025,11 +163025,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxTS_LCR_1_OF_DownlinkAdditionalTimeslots_LCR_r4", HFILL }},
     { &hf_rrc_timeslotList_item_02,
-      { "DownlinkAdditionalTimeslots-LCR-r4", "rrc.DownlinkAdditionalTimeslots_LCR_r4",
+      { "DownlinkAdditionalTimeslots-LCR-r4", "rrc.DownlinkAdditionalTimeslots_LCR_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_firstIndividualTimeslotInfo_03,
-      { "firstIndividualTimeslotInfo", "rrc.firstIndividualTimeslotInfo",
+      { "firstIndividualTimeslotInfo", "rrc.firstIndividualTimeslotInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IndividualTimeslotInfo_r7", HFILL }},
     { &hf_rrc_moreTimeslots_03,
@@ -163045,7 +163045,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxTS_1_OF_DownlinkAdditionalTimeslots_r7", HFILL }},
     { &hf_rrc_timeslotList_item_03,
-      { "DownlinkAdditionalTimeslots-r7", "rrc.DownlinkAdditionalTimeslots_r7",
+      { "DownlinkAdditionalTimeslots-r7", "rrc.DownlinkAdditionalTimeslots_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tgp_SequenceList,
@@ -163069,7 +163069,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxTGPS_OF_TGP_SequenceShort", HFILL }},
     { &hf_rrc_tgp_SequenceShortList_item,
-      { "TGP-SequenceShort", "rrc.TGP_SequenceShort",
+      { "TGP-SequenceShort", "rrc.TGP_SequenceShort_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tgp_SequenceShortList_01,
@@ -163077,7 +163077,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxTGPS_OF_TGP_SequenceShort_r10", HFILL }},
     { &hf_rrc_tgp_SequenceShortList_item_01,
-      { "TGP-SequenceShort-r10", "rrc.TGP_SequenceShort_r10",
+      { "TGP-SequenceShort-r10", "rrc.TGP_SequenceShort_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_drx_Cycle,
@@ -163113,11 +163113,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DSCH_MappingList_item,
-      { "DSCH-Mapping", "rrc.DSCH_Mapping",
+      { "DSCH-Mapping", "rrc.DSCH_Mapping_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DSCH_TransportChannelsInfo_item,
-      { "DSCH-TransportChannelsInfo item", "rrc.DSCH_TransportChannelsInfo_item",
+      { "DSCH-TransportChannelsInfo item", "rrc.DSCH_TransportChannelsInfo_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dsch_transport_channel_identity,
@@ -163129,11 +163129,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TransportFormatSet_vals), 0,
         "TransportFormatSet", HFILL }},
     { &hf_rrc_dtx_Info,
-      { "dtx-Info", "rrc.dtx_Info",
+      { "dtx-Info", "rrc.dtx_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_drx_Info,
-      { "drx-Info", "rrc.drx_Info",
+      { "drx-Info", "rrc.drx_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_uplink_DPCCHSlotFormatInformation,
@@ -163169,11 +163169,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_e_dch_TTI_Length_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_dtx_e_dch_TTI_10ms,
-      { "dtx-e-dch-TTI-10ms", "rrc.dtx_e_dch_TTI_10ms",
+      { "dtx-e-dch-TTI-10ms", "rrc.dtx_e_dch_TTI_10ms_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dtx_e_dch_TTI_2ms,
-      { "dtx-e-dch-TTI-2ms", "rrc.dtx_e_dch_TTI_2ms",
+      { "dtx-e-dch-TTI-2ms", "rrc.dtx_e_dch_TTI_2ms_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_dtx_cycle2InactivityThreshold,
@@ -163217,11 +163217,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_e_AGCH_DRX_InfoType_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_sameAsHS_SCCH,
-      { "sameAsHS-SCCH", "rrc.sameAsHS_SCCH",
+      { "sameAsHS-SCCH", "rrc.sameAsHS_SCCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_e_AGCH_DRX_Parameters,
-      { "e-AGCH-DRX-Parameters", "rrc.e_AGCH_DRX_Parameters",
+      { "e-AGCH-DRX-Parameters", "rrc.e_AGCH_DRX_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_e_AGCH_DRX_Cycle,
@@ -163245,7 +163245,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_DL_TS_ChannelisationCode_vals), 0,
         "DL_TS_ChannelisationCode", HFILL }},
     { &hf_rrc_midambleShiftAndBurstType_02,
-      { "midambleShiftAndBurstType", "rrc.midambleShiftAndBurstType",
+      { "midambleShiftAndBurstType", "rrc.midambleShiftAndBurstType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MidambleShiftAndBurstType_EDCH", HFILL }},
     { &hf_rrc_channelisation_code_01,
@@ -163265,11 +163265,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_defaultMidamble,
-      { "defaultMidamble", "rrc.defaultMidamble",
+      { "defaultMidamble", "rrc.defaultMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_commonMidamble,
-      { "commonMidamble", "rrc.commonMidamble",
+      { "commonMidamble", "rrc.commonMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ueSpecificMidamble,
@@ -163289,7 +163289,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecific_02_vals), 0,
         "T_modeSpecific_02", HFILL }},
     { &hf_rrc_fdd_92,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_91", HFILL }},
     { &hf_rrc_tdd_51,
@@ -163297,7 +163297,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_48_vals), 0,
         "T_tdd_48", HFILL }},
     { &hf_rrc_tdd384_20,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_19", HFILL }},
     { &hf_rrc_long_Term_Grant_Indicator,
@@ -163317,7 +163317,7 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "Bler_Target", HFILL }},
     { &hf_rrc_tdd768_12,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd768_11", HFILL }},
     { &hf_rrc_e_AGCH_Set_Config_01,
@@ -163325,7 +163325,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_AGCH_Set_Config_VHCR", HFILL }},
     { &hf_rrc_tdd128_31,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_31", HFILL }},
     { &hf_rrc_rdi_Indicator,
@@ -163345,7 +163345,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecific_03_vals), 0,
         "T_modeSpecific_03", HFILL }},
     { &hf_rrc_fdd_93,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_92", HFILL }},
     { &hf_rrc_tdd_52,
@@ -163353,27 +163353,27 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_49_vals), 0,
         "T_tdd_49", HFILL }},
     { &hf_rrc_tdd384_21,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_20", HFILL }},
     { &hf_rrc_tdd768_13,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd768_12", HFILL }},
     { &hf_rrc_tdd128_32,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_32", HFILL }},
     { &hf_rrc_E_AGCH_Set_Config_item,
-      { "E-AGCH-Individual", "rrc.E_AGCH_Individual",
+      { "E-AGCH-Individual", "rrc.E_AGCH_Individual_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_E_AGCH_Set_Config_VHCR_item,
-      { "E-AGCH-Individual-VHCR", "rrc.E_AGCH_Individual_VHCR",
+      { "E-AGCH-Individual-VHCR", "rrc.E_AGCH_Individual_VHCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_E_AGCH_Set_Config_LCR_item,
-      { "E-AGCH-Individual-LCR", "rrc.E_AGCH_Individual_LCR",
+      { "E-AGCH-Individual-LCR", "rrc.E_AGCH_Individual_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_e_ROCH_ChannelisationCode,
@@ -163385,7 +163385,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "E_RNTI", HFILL }},
     { &hf_rrc_e_DCH_RL_InfoNewServingCell,
-      { "e-DCH-RL-InfoNewServingCell", "rrc.e_DCH_RL_InfoNewServingCell",
+      { "e-DCH-RL-InfoNewServingCell", "rrc.e_DCH_RL_InfoNewServingCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_e_DCH_RL_InfoOtherCellList,
@@ -163393,15 +163393,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxEDCHRL_OF_E_DCH_RL_InfoOtherCell", HFILL }},
     { &hf_rrc_e_DCH_RL_InfoOtherCellList_item,
-      { "E-DCH-RL-InfoOtherCell", "rrc.E_DCH_RL_InfoOtherCell",
+      { "E-DCH-RL-InfoOtherCell", "rrc.E_DCH_RL_InfoOtherCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_e_DCH_RL_InfoNewServingCell_01,
-      { "e-DCH-RL-InfoNewServingCell", "rrc.e_DCH_RL_InfoNewServingCell",
+      { "e-DCH-RL-InfoNewServingCell", "rrc.e_DCH_RL_InfoNewServingCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_DCH_RL_InfoNewServingCell_r7", HFILL }},
     { &hf_rrc_e_DCH_RL_InfoNewServingCell_02,
-      { "e-DCH-RL-InfoNewServingCell", "rrc.e_DCH_RL_InfoNewServingCell",
+      { "e-DCH-RL-InfoNewServingCell", "rrc.e_DCH_RL_InfoNewServingCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_DCH_RL_InfoNewServingCell_r11", HFILL }},
     { &hf_rrc_e_DCH_RL_InfoOtherCellList_01,
@@ -163409,11 +163409,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxEDCHRL_OF_E_DCH_RL_InfoOtherCell_r11", HFILL }},
     { &hf_rrc_e_DCH_RL_InfoOtherCellList_item_01,
-      { "E-DCH-RL-InfoOtherCell-r11", "rrc.E_DCH_RL_InfoOtherCell_r11",
+      { "E-DCH-RL-InfoOtherCell-r11", "rrc.E_DCH_RL_InfoOtherCell_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_e_DCH_RL_InfoNewSecServingCell,
-      { "e-DCH-RL-InfoNewSecServingCell", "rrc.e_DCH_RL_InfoNewSecServingCell",
+      { "e-DCH-RL-InfoNewSecServingCell", "rrc.e_DCH_RL_InfoNewSecServingCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_e_DCH_RL_InfoOtherCellList_SecULFreq,
@@ -163421,11 +163421,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxEDCHRL_OF_E_DCH_RL_InfoOtherCell_SecULFreq", HFILL }},
     { &hf_rrc_e_DCH_RL_InfoOtherCellList_SecULFreq_item,
-      { "E-DCH-RL-InfoOtherCell-SecULFreq", "rrc.E_DCH_RL_InfoOtherCell_SecULFreq",
+      { "E-DCH-RL-InfoOtherCell-SecULFreq", "rrc.E_DCH_RL_InfoOtherCell_SecULFreq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_servingGrant_01,
-      { "servingGrant", "rrc.servingGrant",
+      { "servingGrant", "rrc.servingGrant_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_servingGrant_01", HFILL }},
     { &hf_rrc_value,
@@ -163457,7 +163457,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_e_RGCH_Info_05_vals), 0,
         "T_e_RGCH_Info_05", HFILL }},
     { &hf_rrc_servingGrant_02,
-      { "servingGrant", "rrc.servingGrant",
+      { "servingGrant", "rrc.servingGrant_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_servingGrant_02", HFILL }},
     { &hf_rrc_primary_Secondary_GrantSelector_02,
@@ -163473,7 +163473,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_e_RGCH_Info_06_vals), 0,
         "T_e_RGCH_Info_06", HFILL }},
     { &hf_rrc_servingGrant_03,
-      { "servingGrant", "rrc.servingGrant",
+      { "servingGrant", "rrc.servingGrant_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_servingGrant_03", HFILL }},
     { &hf_rrc_primary_Secondary_GrantSelector_03,
@@ -163513,11 +163513,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_e_dch_SPS_Operation_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_newOperation_01,
-      { "newOperation", "rrc.newOperation",
+      { "newOperation", "rrc.newOperation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_DCH_SPS_NewOperation_TDD128", HFILL }},
     { &hf_rrc_e_hich_Info_01,
-      { "e-hich-Info", "rrc.e_hich_Info",
+      { "e-hich-Info", "rrc.e_hich_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_HICH_Information_For_SPS_TDD128", HFILL }},
     { &hf_rrc_e_dch_TxPattern,
@@ -163525,7 +163525,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_DCH_TxPatternList_TDD128", HFILL }},
     { &hf_rrc_initialSPSInfoForEDCH,
-      { "initialSPSInfoForEDCH", "rrc.initialSPSInfoForEDCH",
+      { "initialSPSInfoForEDCH", "rrc.initialSPSInfoForEDCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_n_E_UCCH,
@@ -163553,7 +163553,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_maxEDCHTxPattern_TDD128_1", HFILL }},
     { &hf_rrc_E_DCH_TxPatternList_TDD128_item,
-      { "E-DCH-TxPatternList-TDD128 item", "rrc.E_DCH_TxPatternList_TDD128_item",
+      { "E-DCH-TxPatternList-TDD128 item", "rrc.E_DCH_TxPatternList_TDD128_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_repetitionPeriodAndLength_01,
@@ -163581,7 +163581,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_DPDCH_PL_NonMax", HFILL }},
     { &hf_rrc_schedulingInfoConfiguration,
-      { "schedulingInfoConfiguration", "rrc.schedulingInfoConfiguration",
+      { "schedulingInfoConfiguration", "rrc.schedulingInfoConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_DPDCH_SchedulingInfoConfiguration", HFILL }},
     { &hf_rrc_reference_E_TFCI,
@@ -163597,11 +163597,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_31", HFILL }},
     { &hf_rrc_E_DPDCH_Reference_E_TFCIList_item,
-      { "E-DPDCH-Reference-E-TFCI", "rrc.E_DPDCH_Reference_E_TFCI",
+      { "E-DPDCH-Reference-E-TFCI", "rrc.E_DPDCH_Reference_E_TFCI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_E_DPDCH_Reference_E_TFCIList_r7_item,
-      { "E-DPDCH-Reference-E-TFCI-r7", "rrc.E_DPDCH_Reference_E_TFCI_r7",
+      { "E-DPDCH-Reference-E-TFCI-r7", "rrc.E_DPDCH_Reference_E_TFCI_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_periodicityOfSchedInfo_NoGrant,
@@ -163613,7 +163613,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_E_DPDCH_PeriodicyOfSchedInfo_vals), 0,
         "E_DPDCH_PeriodicyOfSchedInfo", HFILL }},
     { &hf_rrc_servingGrant_04,
-      { "servingGrant", "rrc.servingGrant",
+      { "servingGrant", "rrc.servingGrant_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_servingGrant_04", HFILL }},
     { &hf_rrc_primary_Secondary_GrantSelector_04,
@@ -163681,7 +163681,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_HICH_Information_LCR_List", HFILL }},
     { &hf_rrc_E_HICH_Information_LCR_List_item,
-      { "E-HICH-Information-LCR", "rrc.E_HICH_Information_LCR",
+      { "E-HICH-Information-LCR", "rrc.E_HICH_Information_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_configurationmode,
@@ -163689,11 +163689,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_configurationmode_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_implicit_01,
-      { "implicit", "rrc.implicit",
+      { "implicit", "rrc.implicit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_explicit_03,
-      { "explicit", "rrc.explicit",
+      { "explicit", "rrc.explicit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_explicit_02", HFILL }},
     { &hf_rrc_midambleAllocationMode_02,
@@ -163705,7 +163705,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_19", HFILL }},
     { &hf_rrc_e_TFCS_Info,
-      { "e-TFCS-Info", "rrc.e_TFCS_Info",
+      { "e-TFCS-Info", "rrc.e_TFCS_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_57,
@@ -163713,7 +163713,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_57_vals), 0,
         "T_modeSpecificInfo_57", HFILL }},
     { &hf_rrc_tdd348_tdd768,
-      { "tdd348-tdd768", "rrc.tdd348_tdd768",
+      { "tdd348-tdd768", "rrc.tdd348_tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_noSlotsForTFCIandTPC,
@@ -163729,7 +163729,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxTS_2_OF_E_PUCH_TS_Slots", HFILL }},
     { &hf_rrc_e_PUCH_TS_ConfigurationList_item,
-      { "E-PUCH-TS-Slots", "rrc.E_PUCH_TS_Slots",
+      { "E-PUCH-TS-Slots", "rrc.E_PUCH_TS_Slots_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_e_PUCH_CodeHopping,
@@ -163749,7 +163749,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_63", HFILL }},
     { &hf_rrc_tdd128_33,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_33", HFILL }},
     { &hf_rrc_snpl_ReportType,
@@ -163773,7 +163773,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxTS_LCR_1_OF_E_PUCH_TS_Slots_LCR", HFILL }},
     { &hf_rrc_e_PUCH_TS_ConfigurationList_item_01,
-      { "E-PUCH-TS-Slots-LCR", "rrc.E_PUCH_TS_Slots_LCR",
+      { "E-PUCH-TS-Slots-LCR", "rrc.E_PUCH_TS_Slots_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_maximumNumOfRetransSchedInfo,
@@ -163817,7 +163817,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_58_vals), 0,
         "T_modeSpecificInfo_58", HFILL }},
     { &hf_rrc_tdd384_tdd768_03,
-      { "tdd384-tdd768", "rrc.tdd384_tdd768",
+      { "tdd384-tdd768", "rrc.tdd384_tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_tdd768_03", HFILL }},
     { &hf_rrc_e_RUCCH_ConstantValue,
@@ -163893,7 +163893,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_SF16Codes2_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_tdd128_34,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_34", HFILL }},
     { &hf_rrc_t_RUCCH_01,
@@ -163925,7 +163925,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PersistenceScalingFactorList", HFILL }},
     { &hf_rrc_sync_UL_InfoForE_RUCCH,
-      { "sync-UL-InfoForE-RUCCH", "rrc.sync_UL_InfoForE_RUCCH",
+      { "sync-UL-InfoForE-RUCCH", "rrc.sync_UL_InfoForE_RUCCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_prach_information,
@@ -163957,7 +163957,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_8_OF_Reference_Beta_QPSK", HFILL }},
     { &hf_rrc_reference_Beta_QPSK_List_item,
-      { "Reference-Beta-QPSK", "rrc.Reference_Beta_QPSK",
+      { "Reference-Beta-QPSK", "rrc.Reference_Beta_QPSK_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_reference_Beta_16QAM_List,
@@ -163965,7 +163965,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_8_OF_Reference_Beta_16QAM", HFILL }},
     { &hf_rrc_reference_Beta_16QAM_List_item,
-      { "Reference-Beta-16QAM", "rrc.Reference_Beta_16QAM",
+      { "Reference-Beta-16QAM", "rrc.Reference_Beta_16QAM_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_earfcnExt,
@@ -163977,7 +163977,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_60_vals), 0,
         "T_modeSpecificInfo_60", HFILL }},
     { &hf_rrc_tdd384_24,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_22", HFILL }},
     { &hf_rrc_ex_ul_TimingAdvance,
@@ -163985,7 +163985,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_255", HFILL }},
     { &hf_rrc_tdd768_16,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd768_14", HFILL }},
     { &hf_rrc_ex_ul_TimingAdvance_01,
@@ -163997,7 +163997,7 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_FACH_PCH_InformationList_item,
-      { "FACH-PCH-Information", "rrc.FACH_PCH_Information",
+      { "FACH-PCH-Information", "rrc.FACH_PCH_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cCCH_Fallback,
@@ -164017,7 +164017,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TDD_FPACH_CCode16_r4_vals), 0,
         "TDD_FPACH_CCode16_r4", HFILL }},
     { &hf_rrc_midambleShiftAndBurstType_03,
-      { "midambleShiftAndBurstType", "rrc.midambleShiftAndBurstType",
+      { "midambleShiftAndBurstType", "rrc.midambleShiftAndBurstType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MidambleShiftAndBurstType_LCR_r4", HFILL }},
     { &hf_rrc_wi,
@@ -164025,7 +164025,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Wi_LCR", HFILL }},
     { &hf_rrc_f_tpich_Information,
-      { "f-tpich-Information", "rrc.f_tpich_Information",
+      { "f-tpich-Information", "rrc.f_tpich_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_f_tpich_Info,
@@ -164045,7 +164045,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_f_tpich_InfoNewServingCell,
-      { "f-tpich-InfoNewServingCell", "rrc.f_tpich_InfoNewServingCell",
+      { "f-tpich-InfoNewServingCell", "rrc.f_tpich_InfoNewServingCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_f_tpich_InfoOtherCellList,
@@ -164053,7 +164053,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxRL_OF_F_TPICH_InfoOtherCell", HFILL }},
     { &hf_rrc_f_tpich_InfoOtherCellList_item,
-      { "F-TPICH-InfoOtherCell", "rrc.F_TPICH_InfoOtherCell",
+      { "F-TPICH-InfoOtherCell", "rrc.F_TPICH_InfoOtherCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_FreqIndexListForEnhancedMeas_item,
@@ -164065,11 +164065,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_61_vals), 0,
         "T_modeSpecificInfo_61", HFILL }},
     { &hf_rrc_fdd_94,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FrequencyInfoFDD", HFILL }},
     { &hf_rrc_tdd_53,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FrequencyInfoTDD", HFILL }},
     { &hf_rrc_uarfcn_UL,
@@ -164089,11 +164089,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_HS_ChannelisationCode_LCR_vals), 0,
         "HS_ChannelisationCode_LCR", HFILL }},
     { &hf_rrc_ccch_MappingInfo,
-      { "ccch-MappingInfo", "rrc.ccch_MappingInfo",
+      { "ccch-MappingInfo", "rrc.ccch_MappingInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CommonRBMappingInfo", HFILL }},
     { &hf_rrc_srb1_MappingInfo,
-      { "srb1-MappingInfo", "rrc.srb1_MappingInfo",
+      { "srb1-MappingInfo", "rrc.srb1_MappingInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CommonRBMappingInfo", HFILL }},
     { &hf_rrc_common_MAC_ehs_ReorderingQueueList,
@@ -164101,11 +164101,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_hs_scch_SystemInfo,
-      { "hs-scch-SystemInfo", "rrc.hs_scch_SystemInfo",
+      { "hs-scch-SystemInfo", "rrc.hs_scch_SystemInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_harq_SystemInfo,
-      { "harq-SystemInfo", "rrc.harq_SystemInfo",
+      { "harq-SystemInfo", "rrc.harq_SystemInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HARQ_Info", HFILL }},
     { &hf_rrc_common_H_RNTI_information,
@@ -164121,11 +164121,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "H_RNTI", HFILL }},
     { &hf_rrc_hs_scch_SystemInfo_tdd128,
-      { "hs-scch-SystemInfo-tdd128", "rrc.hs_scch_SystemInfo_tdd128",
+      { "hs-scch-SystemInfo-tdd128", "rrc.hs_scch_SystemInfo_tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_hs_pdsch_MidambleConfiguration,
-      { "hs-pdsch-MidambleConfiguration", "rrc.hs_pdsch_MidambleConfiguration",
+      { "hs-pdsch-MidambleConfiguration", "rrc.hs_pdsch_MidambleConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_PDSCH_Midamble_Configuration_TDD128", HFILL }},
     { &hf_rrc_t_321,
@@ -164153,7 +164153,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_drx_level_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_one_level_DRX,
-      { "one-level-DRX", "rrc.one_level_DRX",
+      { "one-level-DRX", "rrc.one_level_DRX_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_hs_dsch_Second_Rx_BurstFach,
@@ -164165,7 +164165,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_329_vals), 0,
         "T_329", HFILL }},
     { &hf_rrc_two_level_DRX,
-      { "two-level-DRX", "rrc.two_level_DRX",
+      { "two-level-DRX", "rrc.two_level_DRX_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_t328,
@@ -164189,7 +164189,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxSCCPCH_OF_PICH_ForHSDPASupportedPaging", HFILL }},
     { &hf_rrc_pich_ForHSDPASupportedPagingList_item,
-      { "PICH-ForHSDPASupportedPaging", "rrc.PICH_ForHSDPASupportedPaging",
+      { "PICH-ForHSDPASupportedPaging", "rrc.PICH_ForHSDPASupportedPaging_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_numberOfPcchTransmissions,
@@ -164217,15 +164217,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_16", HFILL }},
     { &hf_rrc_pcch_InformationList,
-      { "pcch-InformationList", "rrc.pcch_InformationList",
+      { "pcch-InformationList", "rrc.pcch_InformationList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_HS_DSCH_RxPatternList_TDD128_item,
-      { "HS-DSCH-RxPatternList-TDD128 item", "rrc.HS_DSCH_RxPatternList_TDD128_item",
+      { "HS-DSCH-RxPatternList-TDD128 item", "rrc.HS_DSCH_RxPatternList_TDD128_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_HS_DSCH_TbsList_TDD128_item,
-      { "HS-DSCH-TbsList-TDD128 item", "rrc.HS_DSCH_TbsList_TDD128_item",
+      { "HS-DSCH-TbsList-TDD128 item", "rrc.HS_DSCH_TbsList_TDD128_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_hs_dsch_TBSizeIndex,
@@ -164237,7 +164237,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_hs_dsch_SPS_Operation_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_newOperation_02,
-      { "newOperation", "rrc.newOperation",
+      { "newOperation", "rrc.newOperation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_DSCH_SPS_NewOperation_TDD128", HFILL }},
     { &hf_rrc_hs_dsch_TbsList,
@@ -164249,7 +164249,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "HS_DSCH_RxPatternList_TDD128", HFILL }},
     { &hf_rrc_hARQInfoForSPS,
-      { "hARQInfoForSPS", "rrc.hARQInfoForSPS",
+      { "hARQInfoForSPS", "rrc.hARQInfoForSPS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_memorySize_01,
@@ -164261,7 +164261,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "HS_SICH_List_TDD128", HFILL }},
     { &hf_rrc_initialSPSInfoForHSDSCH,
-      { "initialSPSInfoForHSDSCH", "rrc.initialSPSInfoForHSDSCH",
+      { "initialSPSInfoForHSDSCH", "rrc.initialSPSInfoForHSDSCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_timeslotInfo,
@@ -164269,7 +164269,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_5", HFILL }},
     { &hf_rrc_codeResourceInfo_01,
-      { "codeResourceInfo", "rrc.codeResourceInfo",
+      { "codeResourceInfo", "rrc.codeResourceInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_ChannelisationCodeSetInfo_LCR", HFILL }},
     { &hf_rrc_sfnNum,
@@ -164301,7 +164301,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_62_vals), 0,
         "T_modeSpecificInfo_62", HFILL }},
     { &hf_rrc_fdd_95,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_93", HFILL }},
     { &hf_rrc_tdd_54,
@@ -164309,7 +164309,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_50_vals), 0,
         "T_tdd_50", HFILL }},
     { &hf_rrc_tdd384_25,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_23", HFILL }},
     { &hf_rrc_nack_ack_power_offset,
@@ -164317,7 +164317,7 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M7_8", HFILL }},
     { &hf_rrc_hs_SICH_PowerControl_Info,
-      { "hs-SICH-PowerControl-Info", "rrc.hs_SICH_PowerControl_Info",
+      { "hs-SICH-PowerControl-Info", "rrc.hs_SICH_PowerControl_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_SICH_Power_Control_Info_TDD384", HFILL }},
     { &hf_rrc_hS_SCCH_SetConfiguration,
@@ -164325,7 +164325,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxHSSCCHs_OF_HS_SCCH_TDD384", HFILL }},
     { &hf_rrc_hS_SCCH_SetConfiguration_item,
-      { "HS-SCCH-TDD384", "rrc.HS_SCCH_TDD384",
+      { "HS-SCCH-TDD384", "rrc.HS_SCCH_TDD384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd128_35,
@@ -164333,7 +164333,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxHSSCCHs_OF_HS_SCCH_TDD128", HFILL }},
     { &hf_rrc_tdd128_item,
-      { "HS-SCCH-TDD128", "rrc.HS_SCCH_TDD128",
+      { "HS-SCCH-TDD128", "rrc.HS_SCCH_TDD128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_63,
@@ -164341,7 +164341,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_63_vals), 0,
         "T_modeSpecificInfo_63", HFILL }},
     { &hf_rrc_fdd_96,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_94", HFILL }},
     { &hf_rrc_tdd_55,
@@ -164349,7 +164349,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_51_vals), 0,
         "T_tdd_51", HFILL }},
     { &hf_rrc_tdd384_26,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_24", HFILL }},
     { &hf_rrc_bler_target,
@@ -164361,11 +164361,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxHSSCCHs_OF_HS_SCCH_TDD384_r6", HFILL }},
     { &hf_rrc_hS_SCCH_SetConfiguration_item_01,
-      { "HS-SCCH-TDD384-r6", "rrc.HS_SCCH_TDD384_r6",
+      { "HS-SCCH-TDD384-r6", "rrc.HS_SCCH_TDD384_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd128_36,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_35", HFILL }},
     { &hf_rrc_power_level_HSSICH,
@@ -164381,7 +164381,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxHSSCCHs_OF_HS_SCCH_TDD128_r6", HFILL }},
     { &hf_rrc_hS_SCCH_SetConfiguration_item_02,
-      { "HS-SCCH-TDD128-r6", "rrc.HS_SCCH_TDD128_r6",
+      { "HS-SCCH-TDD128-r6", "rrc.HS_SCCH_TDD128_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_64,
@@ -164389,7 +164389,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_64_vals), 0,
         "T_modeSpecificInfo_64", HFILL }},
     { &hf_rrc_fdd_97,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_95", HFILL }},
     { &hf_rrc_tdd_56,
@@ -164397,15 +164397,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_52_vals), 0,
         "T_tdd_52", HFILL }},
     { &hf_rrc_tdd384_27,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_25", HFILL }},
     { &hf_rrc_tdd768_17,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd768_15", HFILL }},
     { &hf_rrc_hs_SICH_PowerControl_Info_01,
-      { "hs-SICH-PowerControl-Info", "rrc.hs_SICH_PowerControl_Info",
+      { "hs-SICH-PowerControl-Info", "rrc.hs_SICH_PowerControl_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_SICH_Power_Control_Info_TDD768", HFILL }},
     { &hf_rrc_hS_SCCH_SetConfiguration_03,
@@ -164413,11 +164413,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxHSSCCHs_OF_HS_SCCH_TDD768", HFILL }},
     { &hf_rrc_hS_SCCH_SetConfiguration_item_03,
-      { "HS-SCCH-TDD768", "rrc.HS_SCCH_TDD768",
+      { "HS-SCCH-TDD768", "rrc.HS_SCCH_TDD768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd128_37,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_36", HFILL }},
     { &hf_rrc_tpc_step_size_01,
@@ -164441,7 +164441,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_53_vals), 0,
         "T_tdd_53", HFILL }},
     { &hf_rrc_tdd128_38,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_37", HFILL }},
     { &hf_rrc_hS_SCCH_tpc_step_size,
@@ -164453,7 +164453,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_66_vals), 0,
         "T_modeSpecificInfo_66", HFILL }},
     { &hf_rrc_fdd_98,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_96", HFILL }},
     { &hf_rrc_tdd_58,
@@ -164461,15 +164461,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_54_vals), 0,
         "T_tdd_54", HFILL }},
     { &hf_rrc_tdd384_28,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_26", HFILL }},
     { &hf_rrc_tdd768_18,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd768_16", HFILL }},
     { &hf_rrc_tdd128_39,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_38", HFILL }},
     { &hf_rrc_tpc_step_size_02,
@@ -164505,11 +164505,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_hs_scchLessOperation_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_newOperation_03,
-      { "newOperation", "rrc.newOperation",
+      { "newOperation", "rrc.newOperation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_SCCH_Less_NewOperation", HFILL }},
     { &hf_rrc_HS_SCCH_LessTFSList_item,
-      { "HS-SCCH-LessTFSList item", "rrc.HS_SCCH_LessTFSList_item",
+      { "HS-SCCH-LessTFSList item", "rrc.HS_SCCH_LessTFSList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_hs_scch_LessTFSI,
@@ -164525,7 +164525,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxHSSCCHs_OF_HS_SCCH_TDD128_r6", HFILL }},
     { &hf_rrc_hs_SCCH_SetConfiguration_item,
-      { "HS-SCCH-TDD128-r6", "rrc.HS_SCCH_TDD128_r6",
+      { "HS-SCCH-TDD128-r6", "rrc.HS_SCCH_TDD128_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tpc_step_size_03,
@@ -164545,7 +164545,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_05_vals), 0,
         "T_midambleAllocationMode_05", HFILL }},
     { &hf_rrc_hs_sich_configuration,
-      { "hs-sich-configuration", "rrc.hs_sich_configuration",
+      { "hs-sich-configuration", "rrc.hs_sich_configuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_SICH_Configuration_TDD128", HFILL }},
     { &hf_rrc_midambleAllocationMode_06,
@@ -164553,7 +164553,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_06_vals), 0,
         "T_midambleAllocationMode_06", HFILL }},
     { &hf_rrc_hs_sich_configuration_01,
-      { "hs-sich-configuration", "rrc.hs_sich_configuration",
+      { "hs-sich-configuration", "rrc.hs_sich_configuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_SICH_Configuration_TDD128_r6", HFILL }},
     { &hf_rrc_uarfcn_HS_SCCH_Rx,
@@ -164573,7 +164573,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_08_vals), 0,
         "T_midambleAllocationMode_08", HFILL }},
     { &hf_rrc_ueSpecificMidamble_01,
-      { "ueSpecificMidamble", "rrc.ueSpecificMidamble",
+      { "ueSpecificMidamble", "rrc.ueSpecificMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tpc_step_size_04,
@@ -164585,7 +164585,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_09_vals), 0,
         "T_midambleAllocationMode_09", HFILL }},
     { &hf_rrc_ueSpecificMidamble_02,
-      { "ueSpecificMidamble", "rrc.ueSpecificMidamble",
+      { "ueSpecificMidamble", "rrc.ueSpecificMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueSpecificMidamble_01", HFILL }},
     { &hf_rrc_HS_SICH_List_TDD128_item,
@@ -164593,7 +164593,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_HS_SICH_List_TDD128_item_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_implicit_02,
-      { "implicit", "rrc.implicit",
+      { "implicit", "rrc.implicit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_implicit_01", HFILL }},
     { &hf_rrc_hS_SCCH_Index,
@@ -164601,15 +164601,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_maxHSSCCHs_1", HFILL }},
     { &hf_rrc_explicit_04,
-      { "explicit", "rrc.explicit",
+      { "explicit", "rrc.explicit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_explicit_03", HFILL }},
     { &hf_rrc_hS_SICH_Info,
-      { "hS-SICH-Info", "rrc.hS_SICH_Info",
+      { "hS-SICH-Info", "rrc.hS_SICH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_SICH_Configuration_TDD128_r6", HFILL }},
     { &hf_rrc_HS_SICH_ReferenceSignalInfoList_item,
-      { "HS-SICH-ReferenceSignalInfoList item", "rrc.HS_SICH_ReferenceSignalInfoList_item",
+      { "HS-SICH-ReferenceSignalInfoList item", "rrc.HS_SICH_ReferenceSignalInfoList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_midambleShift_01,
@@ -164629,7 +164629,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_10_vals), 0,
         "T_midambleAllocationMode_10", HFILL }},
     { &hf_rrc_ueSpecificMidamble_03,
-      { "ueSpecificMidamble", "rrc.ueSpecificMidamble",
+      { "ueSpecificMidamble", "rrc.ueSpecificMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueSpecificMidamble_02", HFILL }},
     { &hf_rrc_midambleconfiguration,
@@ -164637,7 +164637,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MidambleConfigurationBurstType1and3_vals), 0,
         "MidambleConfigurationBurstType1and3", HFILL }},
     { &hf_rrc_hs_sich_configuration_02,
-      { "hs-sich-configuration", "rrc.hs_sich_configuration",
+      { "hs-sich-configuration", "rrc.hs_sich_configuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_SICH_Configuration_TDD384", HFILL }},
     { &hf_rrc_midambleAllocationMode_11,
@@ -164645,7 +164645,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_11_vals), 0,
         "T_midambleAllocationMode_11", HFILL }},
     { &hf_rrc_ueSpecificMidamble_04,
-      { "ueSpecificMidamble", "rrc.ueSpecificMidamble",
+      { "ueSpecificMidamble", "rrc.ueSpecificMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueSpecificMidamble_03", HFILL }},
     { &hf_rrc_channelisationCode_06,
@@ -164657,11 +164657,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_12_vals), 0,
         "T_midambleAllocationMode_12", HFILL }},
     { &hf_rrc_ueSpecificMidamble_05,
-      { "ueSpecificMidamble", "rrc.ueSpecificMidamble",
+      { "ueSpecificMidamble", "rrc.ueSpecificMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueSpecificMidamble_04", HFILL }},
     { &hf_rrc_hs_sich_configuration_03,
-      { "hs-sich-configuration", "rrc.hs_sich_configuration",
+      { "hs-sich-configuration", "rrc.hs_sich_configuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_SICH_Configuration_TDD768", HFILL }},
     { &hf_rrc_midambleAllocationMode_13,
@@ -164669,7 +164669,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_13_vals), 0,
         "T_midambleAllocationMode_13", HFILL }},
     { &hf_rrc_ueSpecificMidamble_06,
-      { "ueSpecificMidamble", "rrc.ueSpecificMidamble",
+      { "ueSpecificMidamble", "rrc.ueSpecificMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueSpecificMidamble_05", HFILL }},
     { &hf_rrc_midambleAllocationMode_14,
@@ -164677,7 +164677,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_14_vals), 0,
         "T_midambleAllocationMode_14", HFILL }},
     { &hf_rrc_ueSpecificMidamble_07,
-      { "ueSpecificMidamble", "rrc.ueSpecificMidamble",
+      { "ueSpecificMidamble", "rrc.ueSpecificMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueSpecificMidamble_06", HFILL }},
     { &hf_rrc_ul_target_SIR,
@@ -164689,11 +164689,11 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "ConstantValue", HFILL }},
     { &hf_rrc_midambleShiftAndBurstType_04,
-      { "midambleShiftAndBurstType", "rrc.midambleShiftAndBurstType",
+      { "midambleShiftAndBurstType", "rrc.midambleShiftAndBurstType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_midambleShiftAndBurstType_VHCR,
-      { "midambleShiftAndBurstType-VHCR", "rrc.midambleShiftAndBurstType_VHCR",
+      { "midambleShiftAndBurstType-VHCR", "rrc.midambleShiftAndBurstType_VHCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modulation_01,
@@ -164717,7 +164717,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_ss_TPC_Symbols_01_vals), 0,
         "T_ss_TPC_Symbols_01", HFILL }},
     { &hf_rrc_midambleShiftAndBurstType_05,
-      { "midambleShiftAndBurstType", "rrc.midambleShiftAndBurstType",
+      { "midambleShiftAndBurstType", "rrc.midambleShiftAndBurstType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MidambleShiftAndBurstType_r7", HFILL }},
     { &hf_rrc_ul_TimeslotInterference,
@@ -164725,7 +164725,7 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "TDD_UL_Interference", HFILL }},
     { &hf_rrc_IndividualTS_InterferenceList_item,
-      { "IndividualTS-Interference", "rrc.IndividualTS_Interference",
+      { "IndividualTS-Interference", "rrc.IndividualTS_Interference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_67,
@@ -164733,7 +164733,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_67_vals), 0,
         "T_modeSpecificInfo_67", HFILL }},
     { &hf_rrc_fdd_99,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_97", HFILL }},
     { &hf_rrc_feedback_cycle,
@@ -164753,7 +164753,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_68_vals), 0,
         "T_modeSpecificInfo_68", HFILL }},
     { &hf_rrc_fdd_100,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_98", HFILL }},
     { &hf_rrc_feedback_cycle_01,
@@ -164765,7 +164765,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_69_vals), 0,
         "T_modeSpecificInfo_69", HFILL }},
     { &hf_rrc_fdd_101,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_99", HFILL }},
     { &hf_rrc_cqi_RepetitionFactor_Assisting,
@@ -164781,7 +164781,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_burstType_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_type1_01,
-      { "type1", "rrc.type1",
+      { "type1", "rrc.type1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type1_01", HFILL }},
     { &hf_rrc_midambleConfigurationBurstType1and3,
@@ -164793,11 +164793,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_15_vals), 0,
         "T_midambleAllocationMode_15", HFILL }},
     { &hf_rrc_ueSpecificMidamble_08,
-      { "ueSpecificMidamble", "rrc.ueSpecificMidamble",
+      { "ueSpecificMidamble", "rrc.ueSpecificMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueSpecificMidamble_07", HFILL }},
     { &hf_rrc_type2,
-      { "type2", "rrc.type2",
+      { "type2", "rrc.type2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_midambleConfigurationBurstType2,
@@ -164809,7 +164809,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_16_vals), 0,
         "T_midambleAllocationMode_16", HFILL }},
     { &hf_rrc_ueSpecificMidamble_09,
-      { "ueSpecificMidamble", "rrc.ueSpecificMidamble",
+      { "ueSpecificMidamble", "rrc.ueSpecificMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueSpecificMidamble_08", HFILL }},
     { &hf_rrc_midambleShift_02,
@@ -164817,7 +164817,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MidambleShiftShort", HFILL }},
     { &hf_rrc_type3,
-      { "type3", "rrc.type3",
+      { "type3", "rrc.type3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_midambleAllocationMode_17,
@@ -164825,7 +164825,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_17_vals), 0,
         "T_midambleAllocationMode_17", HFILL }},
     { &hf_rrc_ueSpecificMidamble_10,
-      { "ueSpecificMidamble", "rrc.ueSpecificMidamble",
+      { "ueSpecificMidamble", "rrc.ueSpecificMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueSpecificMidamble_09", HFILL }},
     { &hf_rrc_burstType_02,
@@ -164833,7 +164833,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_burstType_01_vals), 0,
         "T_burstType_01", HFILL }},
     { &hf_rrc_type1_02,
-      { "type1", "rrc.type1",
+      { "type1", "rrc.type1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type1_02", HFILL }},
     { &hf_rrc_midambleAllocationMode_18,
@@ -164841,11 +164841,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_18_vals), 0,
         "T_midambleAllocationMode_18", HFILL }},
     { &hf_rrc_ueSpecificMidamble_11,
-      { "ueSpecificMidamble", "rrc.ueSpecificMidamble",
+      { "ueSpecificMidamble", "rrc.ueSpecificMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueSpecificMidamble_10", HFILL }},
     { &hf_rrc_type2_01,
-      { "type2", "rrc.type2",
+      { "type2", "rrc.type2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_01", HFILL }},
     { &hf_rrc_midambleConfigurationBurstType2_01,
@@ -164857,7 +164857,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_19_vals), 0,
         "T_midambleAllocationMode_19", HFILL }},
     { &hf_rrc_ueSpecificMidamble_12,
-      { "ueSpecificMidamble", "rrc.ueSpecificMidamble",
+      { "ueSpecificMidamble", "rrc.ueSpecificMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueSpecificMidamble_11", HFILL }},
     { &hf_rrc_midambleShift_03,
@@ -164865,7 +164865,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MidambleShiftShort_VHCR", HFILL }},
     { &hf_rrc_type3_01,
-      { "type3", "rrc.type3",
+      { "type3", "rrc.type3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type3_01", HFILL }},
     { &hf_rrc_midambleAllocationMode_20,
@@ -164873,11 +164873,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_20_vals), 0,
         "T_midambleAllocationMode_20", HFILL }},
     { &hf_rrc_ueSpecificMidamble_13,
-      { "ueSpecificMidamble", "rrc.ueSpecificMidamble",
+      { "ueSpecificMidamble", "rrc.ueSpecificMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueSpecificMidamble_12", HFILL }},
     { &hf_rrc_mbsfnBurstType4,
-      { "mbsfnBurstType4", "rrc.mbsfnBurstType4",
+      { "mbsfnBurstType4", "rrc.mbsfnBurstType4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_burstType_03,
@@ -164885,7 +164885,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_burstType_02_vals), 0,
         "T_burstType_02", HFILL }},
     { &hf_rrc_type1_03,
-      { "type1", "rrc.type1",
+      { "type1", "rrc.type1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type1_03", HFILL }},
     { &hf_rrc_midambleAllocationMode_21,
@@ -164893,11 +164893,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_21_vals), 0,
         "T_midambleAllocationMode_21", HFILL }},
     { &hf_rrc_ueSpecificMidamble_14,
-      { "ueSpecificMidamble", "rrc.ueSpecificMidamble",
+      { "ueSpecificMidamble", "rrc.ueSpecificMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueSpecificMidamble_13", HFILL }},
     { &hf_rrc_type2_02,
-      { "type2", "rrc.type2",
+      { "type2", "rrc.type2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_02", HFILL }},
     { &hf_rrc_midambleAllocationMode_22,
@@ -164905,11 +164905,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_22_vals), 0,
         "T_midambleAllocationMode_22", HFILL }},
     { &hf_rrc_ueSpecificMidamble_15,
-      { "ueSpecificMidamble", "rrc.ueSpecificMidamble",
+      { "ueSpecificMidamble", "rrc.ueSpecificMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueSpecificMidamble_14", HFILL }},
     { &hf_rrc_type3_02,
-      { "type3", "rrc.type3",
+      { "type3", "rrc.type3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type3_02", HFILL }},
     { &hf_rrc_midambleAllocationMode_23,
@@ -164917,7 +164917,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_23_vals), 0,
         "T_midambleAllocationMode_23", HFILL }},
     { &hf_rrc_ueSpecificMidamble_16,
-      { "ueSpecificMidamble", "rrc.ueSpecificMidamble",
+      { "ueSpecificMidamble", "rrc.ueSpecificMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueSpecificMidamble_15", HFILL }},
     { &hf_rrc_burstType_04,
@@ -164925,7 +164925,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_burstType_03_vals), 0,
         "T_burstType_03", HFILL }},
     { &hf_rrc_type1_04,
-      { "type1", "rrc.type1",
+      { "type1", "rrc.type1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type1_04", HFILL }},
     { &hf_rrc_midambleAllocationMode_24,
@@ -164933,11 +164933,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_24_vals), 0,
         "T_midambleAllocationMode_24", HFILL }},
     { &hf_rrc_ueSpecificMidamble_17,
-      { "ueSpecificMidamble", "rrc.ueSpecificMidamble",
+      { "ueSpecificMidamble", "rrc.ueSpecificMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueSpecificMidamble_16", HFILL }},
     { &hf_rrc_type2_03,
-      { "type2", "rrc.type2",
+      { "type2", "rrc.type2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_03", HFILL }},
     { &hf_rrc_midambleAllocationMode_25,
@@ -164945,7 +164945,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_25_vals), 0,
         "T_midambleAllocationMode_25", HFILL }},
     { &hf_rrc_ueSpecificMidamble_18,
-      { "ueSpecificMidamble", "rrc.ueSpecificMidamble",
+      { "ueSpecificMidamble", "rrc.ueSpecificMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueSpecificMidamble_17", HFILL }},
     { &hf_rrc_burstType_05,
@@ -164953,7 +164953,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_burstType_04_vals), 0,
         "T_burstType_04", HFILL }},
     { &hf_rrc_type1_05,
-      { "type1", "rrc.type1",
+      { "type1", "rrc.type1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type1_05", HFILL }},
     { &hf_rrc_midambleAllocationMode_26,
@@ -164961,11 +164961,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_26_vals), 0,
         "T_midambleAllocationMode_26", HFILL }},
     { &hf_rrc_ueSpecificMidamble_19,
-      { "ueSpecificMidamble", "rrc.ueSpecificMidamble",
+      { "ueSpecificMidamble", "rrc.ueSpecificMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueSpecificMidamble_18", HFILL }},
     { &hf_rrc_type2_04,
-      { "type2", "rrc.type2",
+      { "type2", "rrc.type2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_04", HFILL }},
     { &hf_rrc_midambleAllocationMode_27,
@@ -164973,7 +164973,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_27_vals), 0,
         "T_midambleAllocationMode_27", HFILL }},
     { &hf_rrc_ueSpecificMidamble_20,
-      { "ueSpecificMidamble", "rrc.ueSpecificMidamble",
+      { "ueSpecificMidamble", "rrc.ueSpecificMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueSpecificMidamble_19", HFILL }},
     { &hf_rrc_midambleAllocationMode_28,
@@ -164981,7 +164981,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_28_vals), 0,
         "T_midambleAllocationMode_28", HFILL }},
     { &hf_rrc_ueSpecificMidamble_21,
-      { "ueSpecificMidamble", "rrc.ueSpecificMidamble",
+      { "ueSpecificMidamble", "rrc.ueSpecificMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueSpecificMidamble_20", HFILL }},
     { &hf_rrc_burstType_06,
@@ -164989,7 +164989,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_burstType_05_vals), 0,
         "T_burstType_05", HFILL }},
     { &hf_rrc_type1_06,
-      { "type1", "rrc.type1",
+      { "type1", "rrc.type1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type1_06", HFILL }},
     { &hf_rrc_midambleConfigurationBurstType1,
@@ -165001,11 +165001,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_29_vals), 0,
         "T_midambleAllocationMode_29", HFILL }},
     { &hf_rrc_ueSpecificMidamble_22,
-      { "ueSpecificMidamble", "rrc.ueSpecificMidamble",
+      { "ueSpecificMidamble", "rrc.ueSpecificMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueSpecificMidamble_21", HFILL }},
     { &hf_rrc_type2_05,
-      { "type2", "rrc.type2",
+      { "type2", "rrc.type2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_05", HFILL }},
     { &hf_rrc_midambleAllocationMode_30,
@@ -165013,7 +165013,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_30_vals), 0,
         "T_midambleAllocationMode_30", HFILL }},
     { &hf_rrc_ueSpecificMidamble_23,
-      { "ueSpecificMidamble", "rrc.ueSpecificMidamble",
+      { "ueSpecificMidamble", "rrc.ueSpecificMidamble_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueSpecificMidamble_22", HFILL }},
     { &hf_rrc_mimoOperation,
@@ -165025,7 +165025,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MIMO_N_M_Ratio_vals), 0,
         "MIMO_N_M_Ratio", HFILL }},
     { &hf_rrc_mimoPilotConfiguration,
-      { "mimoPilotConfiguration", "rrc.mimoPilotConfiguration",
+      { "mimoPilotConfiguration", "rrc.mimoPilotConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MIMO_PilotConfiguration", HFILL }},
     { &hf_rrc_configurationInfo_04,
@@ -165033,7 +165033,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_configurationInfo_04_vals), 0,
         "T_configurationInfo_04", HFILL }},
     { &hf_rrc_newConfiguration_06,
-      { "newConfiguration", "rrc.newConfiguration",
+      { "newConfiguration", "rrc.newConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_newConfiguration_06", HFILL }},
     { &hf_rrc_mimo4x4N_M_Ratio,
@@ -165041,7 +165041,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MIMO_N_M_Ratio_vals), 0,
         "MIMO_N_M_Ratio", HFILL }},
     { &hf_rrc_mimo4x4PilotConfiguration,
-      { "mimo4x4PilotConfiguration", "rrc.mimo4x4PilotConfiguration",
+      { "mimo4x4PilotConfiguration", "rrc.mimo4x4PilotConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MIMO4x4_PilotConfiguration", HFILL }},
     { &hf_rrc_precodingWeightSetRestriction,
@@ -165057,7 +165057,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_70_vals), 0,
         "T_modeSpecificInfo_70", HFILL }},
     { &hf_rrc_fdd_102,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_100", HFILL }},
     { &hf_rrc_tdd_59,
@@ -165065,7 +165065,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_55_vals), 0,
         "T_tdd_55", HFILL }},
     { &hf_rrc_tdd128_40,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_39", HFILL }},
     { &hf_rrc_mimoSFModeForHSPDSCHDualStream,
@@ -165077,7 +165077,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd384_tdd768_04,
-      { "tdd384-tdd768", "rrc.tdd384_tdd768",
+      { "tdd384-tdd768", "rrc.tdd384_tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_71,
@@ -165085,11 +165085,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_71_vals), 0,
         "T_modeSpecificInfo_71", HFILL }},
     { &hf_rrc_fdd_103,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_101", HFILL }},
     { &hf_rrc_mimoPilotConfiguration_01,
-      { "mimoPilotConfiguration", "rrc.mimoPilotConfiguration",
+      { "mimoPilotConfiguration", "rrc.mimoPilotConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MIMO_PilotConfiguration_r9", HFILL }},
     { &hf_rrc_precodingWeightSetRestriction_02,
@@ -165101,7 +165101,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tdd_56_vals), 0,
         "T_tdd_56", HFILL }},
     { &hf_rrc_tdd128_41,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_40", HFILL }},
     { &hf_rrc_mimoSFModeForHSPDSCHDualStream_01,
@@ -165113,11 +165113,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_secondCPICH_Pattern_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_normalPattern,
-      { "normalPattern", "rrc.normalPattern",
+      { "normalPattern", "rrc.normalPattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_diversityPattern,
-      { "diversityPattern", "rrc.diversityPattern",
+      { "diversityPattern", "rrc.diversityPattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_s_cpich_PowerOffset_Mimo_01,
@@ -165129,23 +165129,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_secondCPICH_Pattern_01_vals), 0,
         "T_secondCPICH_Pattern_01", HFILL }},
     { &hf_rrc_diversityPattern_01,
-      { "diversityPattern", "rrc.diversityPattern",
+      { "diversityPattern", "rrc.diversityPattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_diversityPattern_01", HFILL }},
     { &hf_rrc_antenna2,
-      { "antenna2", "rrc.antenna2",
+      { "antenna2", "rrc.antenna2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MIMO_PilotConfiguration_r9", HFILL }},
     { &hf_rrc_antenna3And4,
-      { "antenna3And4", "rrc.antenna3And4",
+      { "antenna3And4", "rrc.antenna3And4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_secondFrequencyInfo,
-      { "secondFrequencyInfo", "rrc.secondFrequencyInfo",
+      { "secondFrequencyInfo", "rrc.secondFrequencyInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FrequencyInfoTDD", HFILL }},
     { &hf_rrc_fPachFrequencyInfo,
-      { "fPachFrequencyInfo", "rrc.fPachFrequencyInfo",
+      { "fPachFrequencyInfo", "rrc.fPachFrequencyInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FrequencyInfoTDD", HFILL }},
     { &hf_rrc_upPCHpositionInfo,
@@ -165161,7 +165161,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_timeReferenceCell_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_newConfiguration_07,
-      { "newConfiguration", "rrc.newConfiguration",
+      { "newConfiguration", "rrc.newConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_newConfiguration_07", HFILL }},
     { &hf_rrc_mu_MIMO_Operation,
@@ -165169,7 +165169,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MU_MIMO_Operation_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_standaloneMidambleInfo,
-      { "standaloneMidambleInfo", "rrc.standaloneMidambleInfo",
+      { "standaloneMidambleInfo", "rrc.standaloneMidambleInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "StandaloneMidambleInfo_TDD128", HFILL }},
     { &hf_rrc_enablingDelay_01,
@@ -165185,7 +165185,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_hs_dpcch_TransmitContinuationOffset_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_tdd384_768,
-      { "tdd384-768", "rrc.tdd384_768",
+      { "tdd384-768", "rrc.tdd384_768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_timeslotResourceRelatedInfo_01,
@@ -165193,11 +165193,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_13", HFILL }},
     { &hf_rrc_tdd128_42,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_41", HFILL }},
     { &hf_rrc_e_HICH_Info_08,
-      { "e-HICH-Info", "rrc.e_HICH_Info",
+      { "e-HICH-Info", "rrc.e_HICH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_e_HICH_Info_06", HFILL }},
     { &hf_rrc_midambleAllocationMode_31,
@@ -165205,11 +165205,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_midambleAllocationMode_31_vals), 0,
         "T_midambleAllocationMode_31", HFILL }},
     { &hf_rrc_tdd384_768_01,
-      { "tdd384-768", "rrc.tdd384_768",
+      { "tdd384-768", "rrc.tdd384_768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd128_43,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_42", HFILL }},
     { &hf_rrc_t_SI_nst,
@@ -165217,15 +165217,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_t_SI_nst_vals), 0,
         "T_t_SI_nst", HFILL }},
     { &hf_rrc_tdd384_768_02,
-      { "tdd384-768", "rrc.tdd384_768",
+      { "tdd384-768", "rrc.tdd384_768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_768_01", HFILL }},
     { &hf_rrc_tdd128_44,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_43", HFILL }},
     { &hf_rrc_e_HICH_Info_09,
-      { "e-HICH-Info", "rrc.e_HICH_Info",
+      { "e-HICH-Info", "rrc.e_HICH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_e_HICH_Info_07", HFILL }},
     { &hf_rrc_midambleAllocationMode_32,
@@ -165253,7 +165253,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_paging_associatedHspdschInfo_item,
-      { "paging-associatedHspdschInfo item", "rrc.paging_associatedHspdschInfo_item",
+      { "paging-associatedHspdschInfo item", "rrc.paging_associatedHspdschInfo_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_timeslotResourceRelatedInfo_02,
@@ -165261,7 +165261,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_6", HFILL }},
     { &hf_rrc_codeResourceInformation,
-      { "codeResourceInformation", "rrc.codeResourceInformation",
+      { "codeResourceInformation", "rrc.codeResourceInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CodeResourceInformation_TDD128", HFILL }},
     { &hf_rrc_paging_sub_Channel_size,
@@ -165285,19 +165285,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_PCP_Length_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_ucsm_Info,
-      { "ucsm-Info", "rrc.ucsm_Info",
+      { "ucsm-Info", "rrc.ucsm_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_PCPCH_ChannelInfoList_item,
-      { "PCPCH-ChannelInfo", "rrc.PCPCH_ChannelInfo",
+      { "PCPCH-ChannelInfo", "rrc.PCPCH_ChannelInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_pdsch_PowerControlInfo,
-      { "pdsch-PowerControlInfo", "rrc.pdsch_PowerControlInfo",
+      { "pdsch-PowerControlInfo", "rrc.pdsch_PowerControlInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_pdsch_AllocationPeriodInfo,
-      { "pdsch-AllocationPeriodInfo", "rrc.pdsch_AllocationPeriodInfo",
+      { "pdsch-AllocationPeriodInfo", "rrc.pdsch_AllocationPeriodInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AllocationPeriodInfo", HFILL }},
     { &hf_rrc_configuration,
@@ -165305,7 +165305,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_configuration_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_old_Configuration,
-      { "old-Configuration", "rrc.old_Configuration",
+      { "old-Configuration", "rrc.old_Configuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_pdsch_Identity,
@@ -165313,11 +165313,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_new_Configuration,
-      { "new-Configuration", "rrc.new_Configuration",
+      { "new-Configuration", "rrc.new_Configuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_pdsch_Info,
-      { "pdsch-Info", "rrc.pdsch_Info",
+      { "pdsch-Info", "rrc.pdsch_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_configuration_01,
@@ -165325,15 +165325,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_configuration_01_vals), 0,
         "T_configuration_01", HFILL }},
     { &hf_rrc_old_Configuration_01,
-      { "old-Configuration", "rrc.old_Configuration",
+      { "old-Configuration", "rrc.old_Configuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_old_Configuration_01", HFILL }},
     { &hf_rrc_new_Configuration_01,
-      { "new-Configuration", "rrc.new_Configuration",
+      { "new-Configuration", "rrc.new_Configuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_new_Configuration_01", HFILL }},
     { &hf_rrc_pdsch_Info_01,
-      { "pdsch-Info", "rrc.pdsch_Info",
+      { "pdsch-Info", "rrc.pdsch_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PDSCH_Info_r4", HFILL }},
     { &hf_rrc_configuration_02,
@@ -165341,19 +165341,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_configuration_02_vals), 0,
         "T_configuration_02", HFILL }},
     { &hf_rrc_old_Configuration_02,
-      { "old-Configuration", "rrc.old_Configuration",
+      { "old-Configuration", "rrc.old_Configuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_old_Configuration_02", HFILL }},
     { &hf_rrc_new_Configuration_02,
-      { "new-Configuration", "rrc.new_Configuration",
+      { "new-Configuration", "rrc.new_Configuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_new_Configuration_02", HFILL }},
     { &hf_rrc_pdsch_Info_02,
-      { "pdsch-Info", "rrc.pdsch_Info",
+      { "pdsch-Info", "rrc.pdsch_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PDSCH_Info_r7", HFILL }},
     { &hf_rrc_PDSCH_CodeInfoList_item,
-      { "PDSCH-CodeInfo", "rrc.PDSCH_CodeInfo",
+      { "PDSCH-CodeInfo", "rrc.PDSCH_CodeInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_codeNumberStart,
@@ -165365,7 +165365,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CodeNumberDSCH", HFILL }},
     { &hf_rrc_PDSCH_CodeMapList_item,
-      { "PDSCH-CodeMap", "rrc.PDSCH_CodeMap",
+      { "PDSCH-CodeMap", "rrc.PDSCH_CodeMap_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_signallingMethod,
@@ -165373,7 +165373,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_signallingMethod_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_codeRange,
-      { "codeRange", "rrc.codeRange",
+      { "codeRange", "rrc.codeRange_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tfci_Range_01,
@@ -165389,7 +165389,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ReplacedPDSCH_CodeInfoList", HFILL }},
     { &hf_rrc_pdsch_TimeslotsCodes,
-      { "pdsch-TimeslotsCodes", "rrc.pdsch_TimeslotsCodes",
+      { "pdsch-TimeslotsCodes", "rrc.pdsch_TimeslotsCodes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DownlinkTimeslotsCodes", HFILL }},
     { &hf_rrc_tddOption_12,
@@ -165397,15 +165397,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_12_vals), 0,
         "T_tddOption_12", HFILL }},
     { &hf_rrc_tdd384_29,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_27", HFILL }},
     { &hf_rrc_tdd128_45,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_44", HFILL }},
     { &hf_rrc_pdsch_TimeslotsCodes_01,
-      { "pdsch-TimeslotsCodes", "rrc.pdsch_TimeslotsCodes",
+      { "pdsch-TimeslotsCodes", "rrc.pdsch_TimeslotsCodes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DownlinkTimeslotsCodes_LCR_r4", HFILL }},
     { &hf_rrc_tddOption_13,
@@ -165413,19 +165413,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_13_vals), 0,
         "T_tddOption_13", HFILL }},
     { &hf_rrc_tdd384_30,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_28", HFILL }},
     { &hf_rrc_tdd768_19,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd768_17", HFILL }},
     { &hf_rrc_pdsch_TimeslotsCodes_02,
-      { "pdsch-TimeslotsCodes", "rrc.pdsch_TimeslotsCodes",
+      { "pdsch-TimeslotsCodes", "rrc.pdsch_TimeslotsCodes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DownlinkTimeslotsCodes_VHCR", HFILL }},
     { &hf_rrc_tdd128_46,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_45", HFILL }},
     { &hf_rrc_dsch_RadioLinkIdentifier,
@@ -165445,51 +165445,51 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_pdsch_Info_03,
-      { "pdsch-Info", "rrc.pdsch_Info",
+      { "pdsch-Info", "rrc.pdsch_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PDSCH_Info_LCR_r4", HFILL }},
     { &hf_rrc_PDSCH_SysInfoList_item,
-      { "PDSCH-SysInfo", "rrc.PDSCH_SysInfo",
+      { "PDSCH-SysInfo", "rrc.PDSCH_SysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_PDSCH_SysInfoList_VHCR_r7_item,
-      { "PDSCH-SysInfo-VHCR-r7", "rrc.PDSCH_SysInfo_VHCR_r7",
+      { "PDSCH-SysInfo-VHCR-r7", "rrc.PDSCH_SysInfo_VHCR_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_PDSCH_SysInfoList_HCR_r5_item,
-      { "PDSCH-SysInfo-HCR-r5", "rrc.PDSCH_SysInfo_HCR_r5",
+      { "PDSCH-SysInfo-HCR-r5", "rrc.PDSCH_SysInfo_HCR_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_PDSCH_SysInfoList_LCR_r4_item,
-      { "PDSCH-SysInfo-LCR-r4", "rrc.PDSCH_SysInfo_LCR_r4",
+      { "PDSCH-SysInfo-LCR-r4", "rrc.PDSCH_SysInfo_LCR_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_PDSCH_SysInfoList_SFN_item,
-      { "PDSCH-SysInfoList-SFN item", "rrc.PDSCH_SysInfoList_SFN_item",
+      { "PDSCH-SysInfoList-SFN item", "rrc.PDSCH_SysInfoList_SFN_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_pdsch_SysInfo,
-      { "pdsch-SysInfo", "rrc.pdsch_SysInfo",
+      { "pdsch-SysInfo", "rrc.pdsch_SysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sfn_TimeInfo,
-      { "sfn-TimeInfo", "rrc.sfn_TimeInfo",
+      { "sfn-TimeInfo", "rrc.sfn_TimeInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_PDSCH_SysInfoList_SFN_HCR_r5_item,
-      { "PDSCH-SysInfoList-SFN-HCR-r5 item", "rrc.PDSCH_SysInfoList_SFN_HCR_r5_item",
+      { "PDSCH-SysInfoList-SFN-HCR-r5 item", "rrc.PDSCH_SysInfoList_SFN_HCR_r5_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_pdsch_SysInfo_01,
-      { "pdsch-SysInfo", "rrc.pdsch_SysInfo",
+      { "pdsch-SysInfo", "rrc.pdsch_SysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PDSCH_SysInfo_HCR_r5", HFILL }},
     { &hf_rrc_PDSCH_SysInfoList_SFN_LCR_r4_item,
-      { "PDSCH-SysInfoList-SFN-LCR-r4 item", "rrc.PDSCH_SysInfoList_SFN_LCR_r4_item",
+      { "PDSCH-SysInfoList-SFN-LCR-r4 item", "rrc.PDSCH_SysInfoList_SFN_LCR_r4_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_pdsch_SysInfo_02,
-      { "pdsch-SysInfo", "rrc.pdsch_SysInfo",
+      { "pdsch-SysInfo", "rrc.pdsch_SysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PDSCH_SysInfo_LCR_r4", HFILL }},
     { &hf_rrc_PersistenceScalingFactorList_item,
@@ -165509,7 +165509,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_15", HFILL }},
     { &hf_rrc_implicit_03,
-      { "implicit", "rrc.implicit",
+      { "implicit", "rrc.implicit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_implicit_02", HFILL }},
     { &hf_rrc_occurrenceSequenceNumberOfPICH,
@@ -165517,11 +165517,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_explicit_05,
-      { "explicit", "rrc.explicit",
+      { "explicit", "rrc.explicit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PICH_Info_LCR_r4", HFILL }},
     { &hf_rrc_fdd_104,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_102", HFILL }},
     { &hf_rrc_pi_CountPerFrame,
@@ -165529,7 +165529,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_PI_CountPerFrame_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_61,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_57", HFILL }},
     { &hf_rrc_channelisationCode_07,
@@ -165581,7 +165581,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TPC_StepSizeFDD", HFILL }},
     { &hf_rrc_algorithm2,
-      { "algorithm2", "rrc.algorithm2",
+      { "algorithm2", "rrc.algorithm2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_PRACH_ChanCodes_LCR_r4_item,
@@ -165601,7 +165601,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PRACH_ChanCodes_LCR_r4", HFILL }},
     { &hf_rrc_fpach_Info,
-      { "fpach-Info", "rrc.fpach_Info",
+      { "fpach-Info", "rrc.fpach_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FPACH_Info_r4", HFILL }},
     { &hf_rrc_prach_ChanCodes_list_LCR,
@@ -165609,7 +165609,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_PRACH_Information_LCR_List_item,
-      { "PRACH-Information-LCR", "rrc.PRACH_Information_LCR",
+      { "PRACH-Information-LCR", "rrc.PRACH_Information_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_fdd_105,
@@ -165617,7 +165617,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxASC_OF_ASCSetting_FDD", HFILL }},
     { &hf_rrc_fdd_item,
-      { "ASCSetting-FDD", "rrc.ASCSetting_FDD",
+      { "ASCSetting-FDD", "rrc.ASCSetting_FDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_62,
@@ -165625,7 +165625,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxASC_OF_ASCSetting_TDD", HFILL }},
     { &hf_rrc_tdd_item,
-      { "ASCSetting-TDD", "rrc.ASCSetting_TDD",
+      { "ASCSetting-TDD", "rrc.ASCSetting_TDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_63,
@@ -165633,11 +165633,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxASC_OF_ASCSetting_TDD_r7", HFILL }},
     { &hf_rrc_tdd_item_01,
-      { "ASCSetting-TDD-r7", "rrc.ASCSetting_TDD_r7",
+      { "ASCSetting-TDD-r7", "rrc.ASCSetting_TDD_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_PRACH_Partitioning_LCR_r4_item,
-      { "ASCSetting-TDD-LCR-r4", "rrc.ASCSetting_TDD_LCR_r4",
+      { "ASCSetting-TDD-LCR-r4", "rrc.ASCSetting_TDD_LCR_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_powerRampStep,
@@ -165685,15 +165685,15 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_prach_PowerOffset,
-      { "prach-PowerOffset", "rrc.prach_PowerOffset",
+      { "prach-PowerOffset", "rrc.prach_PowerOffset_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rach_TransmissionParameters,
-      { "rach-TransmissionParameters", "rrc.rach_TransmissionParameters",
+      { "rach-TransmissionParameters", "rrc.rach_TransmissionParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_aich_Info,
-      { "aich-Info", "rrc.aich_Info",
+      { "aich-Info", "rrc.aich_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_powerOffsetPp_e,
@@ -165701,15 +165701,15 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M5_10", HFILL }},
     { &hf_rrc_aich_Info_01,
-      { "aich-Info", "rrc.aich_Info",
+      { "aich-Info", "rrc.aich_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AICH_Info_Compressed", HFILL }},
     { &hf_rrc_PRACH_PreambleForEnhancedUplinkExtList_item,
-      { "PRACH-PreambleForEnhancedUplinkExtWithWeight", "rrc.PRACH_PreambleForEnhancedUplinkExtWithWeight",
+      { "PRACH-PreambleForEnhancedUplinkExtWithWeight", "rrc.PRACH_PreambleForEnhancedUplinkExtWithWeight_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_prach_PreambleForEnhancedUplinkExt,
-      { "prach-PreambleForEnhancedUplinkExt", "rrc.prach_PreambleForEnhancedUplinkExt",
+      { "prach-PreambleForEnhancedUplinkExt", "rrc.prach_PreambleForEnhancedUplinkExt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_weight,
@@ -165721,7 +165721,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_72_vals), 0,
         "T_modeSpecificInfo_72", HFILL }},
     { &hf_rrc_fdd_106,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_103", HFILL }},
     { &hf_rrc_availableSF,
@@ -165729,7 +165729,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_SF_PRACH_vals), 0,
         "SF_PRACH", HFILL }},
     { &hf_rrc_tdd_64,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_58", HFILL }},
     { &hf_rrc_channelisationCodeList,
@@ -165749,7 +165749,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Sync_UL_Codes_Bitmap", HFILL }},
     { &hf_rrc_sync_UL_Info,
-      { "sync-UL-Info", "rrc.sync_UL_Info",
+      { "sync-UL-Info", "rrc.sync_UL_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SYNC_UL_Info_r4", HFILL }},
     { &hf_rrc_prach_DefinitionList,
@@ -165757,11 +165757,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxPRACH_FPACH_OF_PRACH_Definition_LCR_r4", HFILL }},
     { &hf_rrc_prach_DefinitionList_item,
-      { "PRACH-Definition-LCR-r4", "rrc.PRACH_Definition_LCR_r4",
+      { "PRACH-Definition-LCR-r4", "rrc.PRACH_Definition_LCR_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_prach_RACH_Info,
-      { "prach-RACH-Info", "rrc.prach_RACH_Info",
+      { "prach-RACH-Info", "rrc.prach_RACH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rach_TransportFormatSet,
@@ -165781,15 +165781,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_73_vals), 0,
         "T_modeSpecificInfo_73", HFILL }},
     { &hf_rrc_fdd_107,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_104", HFILL }},
     { &hf_rrc_prach_RACH_Info_01,
-      { "prach-RACH-Info", "rrc.prach_RACH_Info",
+      { "prach-RACH-Info", "rrc.prach_RACH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PRACH_RACH_Info_VHCR_r7", HFILL }},
     { &hf_rrc_prach_RACH_Info_LCR,
-      { "prach-RACH-Info-LCR", "rrc.prach_RACH_Info_LCR",
+      { "prach-RACH-Info-LCR", "rrc.prach_RACH_Info_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PRACH_RACH_Info_LCR_r4", HFILL }},
     { &hf_rrc_rach_TransportFormatSet_LCR,
@@ -165801,39 +165801,39 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PRACH_Partitioning_LCR_r4", HFILL }},
     { &hf_rrc_prach_RACH_Info_LCR_01,
-      { "prach-RACH-Info-LCR", "rrc.prach_RACH_Info_LCR",
+      { "prach-RACH-Info-LCR", "rrc.prach_RACH_Info_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PRACH_RACH_Info_LCR_v770ext", HFILL }},
     { &hf_rrc_PRACH_SystemInformationList_item,
-      { "PRACH-SystemInformation", "rrc.PRACH_SystemInformation",
+      { "PRACH-SystemInformation", "rrc.PRACH_SystemInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_PRACH_SystemInformationList_VHCR_r7_item,
-      { "PRACH-SystemInformation-VHCR-r7", "rrc.PRACH_SystemInformation_VHCR_r7",
+      { "PRACH-SystemInformation-VHCR-r7", "rrc.PRACH_SystemInformation_VHCR_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_PRACH_SystemInformationList_LCR_r4_item,
-      { "PRACH-SystemInformation-LCR-r4", "rrc.PRACH_SystemInformation_LCR_r4",
+      { "PRACH-SystemInformation-LCR-r4", "rrc.PRACH_SystemInformation_LCR_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_PRACH_SystemInformationList_LCR_v770ext_item,
-      { "PRACH-SystemInformation-LCR-v770ext", "rrc.PRACH_SystemInformation_LCR_v770ext",
+      { "PRACH-SystemInformation-LCR-v770ext", "rrc.PRACH_SystemInformation_LCR_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_DPCH_InfoPredef,
-      { "ul-DPCH-InfoPredef", "rrc.ul_DPCH_InfoPredef",
+      { "ul-DPCH-InfoPredef", "rrc.ul_DPCH_InfoPredef_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_CommonInformationPredef,
-      { "dl-CommonInformationPredef", "rrc.dl_CommonInformationPredef",
+      { "dl-CommonInformationPredef", "rrc.dl_CommonInformationPredef_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_DPCH_InfoPredef_01,
-      { "ul-DPCH-InfoPredef", "rrc.ul_DPCH_InfoPredef",
+      { "ul-DPCH-InfoPredef", "rrc.ul_DPCH_InfoPredef_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_InfoPredef_v770ext", HFILL }},
     { &hf_rrc_fdd_108,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_105", HFILL }},
     { &hf_rrc_tx_DiversityIndicator,
@@ -165841,7 +165841,7 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_tdd_65,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_59", HFILL }},
     { &hf_rrc_syncCase,
@@ -165849,11 +165849,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_syncCase_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_syncCase1,
-      { "syncCase1", "rrc.syncCase1",
+      { "syncCase1", "rrc.syncCase1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_syncCase2,
-      { "syncCase2", "rrc.syncCase2",
+      { "syncCase2", "rrc.syncCase2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_timeslotSync2,
@@ -165865,11 +165865,11 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_fdd_109,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_106", HFILL }},
     { &hf_rrc_tdd_66,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_60", HFILL }},
     { &hf_rrc_tddOption_14,
@@ -165877,7 +165877,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_14_vals), 0,
         "T_tddOption_14", HFILL }},
     { &hf_rrc_tdd384_tdd768_05,
-      { "tdd384-tdd768", "rrc.tdd384_tdd768",
+      { "tdd384-tdd768", "rrc.tdd384_tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_tdd768_04", HFILL }},
     { &hf_rrc_syncCase_01,
@@ -165885,15 +165885,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_syncCase_01_vals), 0,
         "T_syncCase_01", HFILL }},
     { &hf_rrc_syncCase1_01,
-      { "syncCase1", "rrc.syncCase1",
+      { "syncCase1", "rrc.syncCase1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_syncCase1_01", HFILL }},
     { &hf_rrc_syncCase2_01,
-      { "syncCase2", "rrc.syncCase2",
+      { "syncCase2", "rrc.syncCase2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_syncCase2_01", HFILL }},
     { &hf_rrc_tdd128_47,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_46", HFILL }},
     { &hf_rrc_syncCase_02,
@@ -165901,11 +165901,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_syncCase_02_vals), 0,
         "T_syncCase_02", HFILL }},
     { &hf_rrc_syncCase1_02,
-      { "syncCase1", "rrc.syncCase1",
+      { "syncCase1", "rrc.syncCase1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_syncCase1_02", HFILL }},
     { &hf_rrc_syncCase2_02,
-      { "syncCase2", "rrc.syncCase2",
+      { "syncCase2", "rrc.syncCase2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_syncCase2_02", HFILL }},
     { &hf_rrc_primaryScramblingCode,
@@ -165917,15 +165917,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_pusch_Allocation_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_pusch_AllocationPending,
-      { "pusch-AllocationPending", "rrc.pusch_AllocationPending",
+      { "pusch-AllocationPending", "rrc.pusch_AllocationPending_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_pusch_AllocationAssignment,
-      { "pusch-AllocationAssignment", "rrc.pusch_AllocationAssignment",
+      { "pusch-AllocationAssignment", "rrc.pusch_AllocationAssignment_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_pusch_AllocationPeriodInfo,
-      { "pusch-AllocationPeriodInfo", "rrc.pusch_AllocationPeriodInfo",
+      { "pusch-AllocationPeriodInfo", "rrc.pusch_AllocationPeriodInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AllocationPeriodInfo", HFILL }},
     { &hf_rrc_pusch_PowerControlInfo,
@@ -165937,7 +165937,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_configuration_03_vals), 0,
         "T_configuration_03", HFILL }},
     { &hf_rrc_old_Configuration_03,
-      { "old-Configuration", "rrc.old_Configuration",
+      { "old-Configuration", "rrc.old_Configuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_old_Configuration_03", HFILL }},
     { &hf_rrc_pusch_Identity,
@@ -165945,11 +165945,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_new_Configuration_03,
-      { "new-Configuration", "rrc.new_Configuration",
+      { "new-Configuration", "rrc.new_Configuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_new_Configuration_03", HFILL }},
     { &hf_rrc_pusch_Info,
-      { "pusch-Info", "rrc.pusch_Info",
+      { "pusch-Info", "rrc.pusch_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_pusch_Allocation_01,
@@ -165957,11 +165957,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_pusch_Allocation_01_vals), 0,
         "T_pusch_Allocation_01", HFILL }},
     { &hf_rrc_pusch_AllocationAssignment_01,
-      { "pusch-AllocationAssignment", "rrc.pusch_AllocationAssignment",
+      { "pusch-AllocationAssignment", "rrc.pusch_AllocationAssignment_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_pusch_AllocationAssignment_01", HFILL }},
     { &hf_rrc_pusch_PowerControlInfo_01,
-      { "pusch-PowerControlInfo", "rrc.pusch_PowerControlInfo",
+      { "pusch-PowerControlInfo", "rrc.pusch_PowerControlInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PUSCH_PowerControlInfo_r4", HFILL }},
     { &hf_rrc_configuration_04,
@@ -165969,15 +165969,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_configuration_04_vals), 0,
         "T_configuration_04", HFILL }},
     { &hf_rrc_old_Configuration_04,
-      { "old-Configuration", "rrc.old_Configuration",
+      { "old-Configuration", "rrc.old_Configuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_old_Configuration_04", HFILL }},
     { &hf_rrc_new_Configuration_04,
-      { "new-Configuration", "rrc.new_Configuration",
+      { "new-Configuration", "rrc.new_Configuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_new_Configuration_04", HFILL }},
     { &hf_rrc_pusch_Info_01,
-      { "pusch-Info", "rrc.pusch_Info",
+      { "pusch-Info", "rrc.pusch_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PUSCH_Info_r4", HFILL }},
     { &hf_rrc_pusch_Allocation_02,
@@ -165985,11 +165985,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_pusch_Allocation_02_vals), 0,
         "T_pusch_Allocation_02", HFILL }},
     { &hf_rrc_pusch_AllocationAssignment_02,
-      { "pusch-AllocationAssignment", "rrc.pusch_AllocationAssignment",
+      { "pusch-AllocationAssignment", "rrc.pusch_AllocationAssignment_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_pusch_AllocationAssignment_02", HFILL }},
     { &hf_rrc_pusch_PowerControlInfo_02,
-      { "pusch-PowerControlInfo", "rrc.pusch_PowerControlInfo",
+      { "pusch-PowerControlInfo", "rrc.pusch_PowerControlInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PUSCH_PowerControlInfo_r7", HFILL }},
     { &hf_rrc_configuration_05,
@@ -165997,19 +165997,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_configuration_05_vals), 0,
         "T_configuration_05", HFILL }},
     { &hf_rrc_old_Configuration_05,
-      { "old-Configuration", "rrc.old_Configuration",
+      { "old-Configuration", "rrc.old_Configuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_old_Configuration_05", HFILL }},
     { &hf_rrc_new_Configuration_05,
-      { "new-Configuration", "rrc.new_Configuration",
+      { "new-Configuration", "rrc.new_Configuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_new_Configuration_05", HFILL }},
     { &hf_rrc_pusch_Info_02,
-      { "pusch-Info", "rrc.pusch_Info",
+      { "pusch-Info", "rrc.pusch_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PUSCH_Info_VHCR", HFILL }},
     { &hf_rrc_pusch_TimeslotsCodes,
-      { "pusch-TimeslotsCodes", "rrc.pusch_TimeslotsCodes",
+      { "pusch-TimeslotsCodes", "rrc.pusch_TimeslotsCodes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UplinkTimeslotsCodes", HFILL }},
     { &hf_rrc_tddOption_15,
@@ -166017,19 +166017,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_15_vals), 0,
         "T_tddOption_15", HFILL }},
     { &hf_rrc_tdd384_32,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_29", HFILL }},
     { &hf_rrc_tdd128_48,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_47", HFILL }},
     { &hf_rrc_pusch_TimeslotsCodes_01,
-      { "pusch-TimeslotsCodes", "rrc.pusch_TimeslotsCodes",
+      { "pusch-TimeslotsCodes", "rrc.pusch_TimeslotsCodes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UplinkTimeslotsCodes_LCR_r4", HFILL }},
     { &hf_rrc_pusch_TimeslotsCodes_VHCR,
-      { "pusch-TimeslotsCodes-VHCR", "rrc.pusch_TimeslotsCodes_VHCR",
+      { "pusch-TimeslotsCodes-VHCR", "rrc.pusch_TimeslotsCodes_VHCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UplinkTimeslotsCodes_VHCR", HFILL }},
     { &hf_rrc_ul_TargetSIR,
@@ -166041,7 +166041,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_16_vals), 0,
         "T_tddOption_16", HFILL }},
     { &hf_rrc_tdd128_49,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_48", HFILL }},
     { &hf_rrc_tddOption_17,
@@ -166049,7 +166049,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_17_vals), 0,
         "T_tddOption_17", HFILL }},
     { &hf_rrc_tdd128_50,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_49", HFILL }},
     { &hf_rrc_usch_TFCS,
@@ -166057,7 +166057,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TFCS_vals), 0,
         "TFCS", HFILL }},
     { &hf_rrc_pusch_Info_VHCR,
-      { "pusch-Info-VHCR", "rrc.pusch_Info_VHCR",
+      { "pusch-Info-VHCR", "rrc.pusch_Info_VHCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_usch_TransportChannelsInfo,
@@ -166065,51 +166065,51 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_pusch_Info_03,
-      { "pusch-Info", "rrc.pusch_Info",
+      { "pusch-Info", "rrc.pusch_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PUSCH_Info_LCR_r4", HFILL }},
     { &hf_rrc_PUSCH_SysInfoList_item,
-      { "PUSCH-SysInfo", "rrc.PUSCH_SysInfo",
+      { "PUSCH-SysInfo", "rrc.PUSCH_SysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_PUSCH_SysInfoList_HCR_r5_item,
-      { "PUSCH-SysInfo-HCR-r5", "rrc.PUSCH_SysInfo_HCR_r5",
+      { "PUSCH-SysInfo-HCR-r5", "rrc.PUSCH_SysInfo_HCR_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_PUSCH_SysInfoList_LCR_r4_item,
-      { "PUSCH-SysInfo-LCR-r4", "rrc.PUSCH_SysInfo_LCR_r4",
+      { "PUSCH-SysInfo-LCR-r4", "rrc.PUSCH_SysInfo_LCR_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_PUSCH_SysInfoList_SFN_item,
-      { "PUSCH-SysInfoList-SFN item", "rrc.PUSCH_SysInfoList_SFN_item",
+      { "PUSCH-SysInfoList-SFN item", "rrc.PUSCH_SysInfoList_SFN_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_pusch_SysInfo,
-      { "pusch-SysInfo", "rrc.pusch_SysInfo",
+      { "pusch-SysInfo", "rrc.pusch_SysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_PUSCH_SysInfoList_SFN_HCR_r5_item,
-      { "PUSCH-SysInfoList-SFN-HCR-r5 item", "rrc.PUSCH_SysInfoList_SFN_HCR_r5_item",
+      { "PUSCH-SysInfoList-SFN-HCR-r5 item", "rrc.PUSCH_SysInfoList_SFN_HCR_r5_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_pusch_SysInfo_01,
-      { "pusch-SysInfo", "rrc.pusch_SysInfo",
+      { "pusch-SysInfo", "rrc.pusch_SysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PUSCH_SysInfo_HCR_r5", HFILL }},
     { &hf_rrc_PUSCH_SysInfoList_SFN_LCR_r4_item,
-      { "PUSCH-SysInfoList-SFN-LCR-r4 item", "rrc.PUSCH_SysInfoList_SFN_LCR_r4_item",
+      { "PUSCH-SysInfoList-SFN-LCR-r4 item", "rrc.PUSCH_SysInfoList_SFN_LCR_r4_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_pusch_SysInfo_02,
-      { "pusch-SysInfo", "rrc.pusch_SysInfo",
+      { "pusch-SysInfo", "rrc.pusch_SysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PUSCH_SysInfo_LCR_r4", HFILL }},
     { &hf_rrc_PUSCH_SysInfoList_SFN_VHCR_item,
-      { "PUSCH-SysInfoList-SFN-VHCR item", "rrc.PUSCH_SysInfoList_SFN_VHCR_item",
+      { "PUSCH-SysInfoList-SFN-VHCR item", "rrc.PUSCH_SysInfoList_SFN_VHCR_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_pusch_SysInfo_VHCR,
-      { "pusch-SysInfo-VHCR", "rrc.pusch_SysInfo_VHCR",
+      { "pusch-SysInfo-VHCR", "rrc.pusch_SysInfo_VHCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mmax,
@@ -166133,7 +166133,7 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M15_16", HFILL }},
     { &hf_rrc_repetitionPeriod1,
-      { "repetitionPeriod1", "rrc.repetitionPeriod1",
+      { "repetitionPeriod1", "rrc.repetitionPeriod1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_repetitionPeriod2,
@@ -166161,11 +166161,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_63", HFILL }},
     { &hf_rrc_repetitionPeriod2_01,
-      { "repetitionPeriod2", "rrc.repetitionPeriod2",
+      { "repetitionPeriod2", "rrc.repetitionPeriod2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_length,
-      { "length", "rrc.length",
+      { "length", "rrc.length_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_offset,
@@ -166173,7 +166173,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_1", HFILL }},
     { &hf_rrc_repetitionPeriod4_01,
-      { "repetitionPeriod4", "rrc.repetitionPeriod4",
+      { "repetitionPeriod4", "rrc.repetitionPeriod4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_length_01,
@@ -166185,7 +166185,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_3", HFILL }},
     { &hf_rrc_repetitionPeriod8_01,
-      { "repetitionPeriod8", "rrc.repetitionPeriod8",
+      { "repetitionPeriod8", "rrc.repetitionPeriod8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_length_02,
@@ -166197,7 +166197,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_7", HFILL }},
     { &hf_rrc_repetitionPeriod16_01,
-      { "repetitionPeriod16", "rrc.repetitionPeriod16",
+      { "repetitionPeriod16", "rrc.repetitionPeriod16_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_length_03,
@@ -166209,7 +166209,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_15", HFILL }},
     { &hf_rrc_repetitionPeriod32_01,
-      { "repetitionPeriod32", "rrc.repetitionPeriod32",
+      { "repetitionPeriod32", "rrc.repetitionPeriod32_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_length_04,
@@ -166221,7 +166221,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_31", HFILL }},
     { &hf_rrc_repetitionPeriod64_01,
-      { "repetitionPeriod64", "rrc.repetitionPeriod64",
+      { "repetitionPeriod64", "rrc.repetitionPeriod64_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_length_05,
@@ -166237,7 +166237,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MaxTFCI_Field2Value", HFILL }},
     { &hf_rrc_ReplacedPDSCH_CodeInfoList_item,
-      { "ReplacedPDSCH-CodeInfo", "rrc.ReplacedPDSCH_CodeInfo",
+      { "ReplacedPDSCH-CodeInfo", "rrc.ReplacedPDSCH_CodeInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rpp4_2,
@@ -166289,11 +166289,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "AllowedTFI_List", HFILL }},
     { &hf_rrc_RestrictedTrCH_InfoList_item,
-      { "RestrictedTrCH", "rrc.RestrictedTrCH",
+      { "RestrictedTrCH", "rrc.RestrictedTrCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dummy2_08,
-      { "dummy2", "rrc.dummy2",
+      { "dummy2", "rrc.dummy2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SCCPCH_InfoForFACH", HFILL }},
     { &hf_rrc_cell_Id,
@@ -166313,7 +166313,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dl_dpchInfo_06_vals), 0,
         "T_dl_dpchInfo_06", HFILL }},
     { &hf_rrc_targetCellPreconfigInfo,
-      { "targetCellPreconfigInfo", "rrc.targetCellPreconfigInfo",
+      { "targetCellPreconfigInfo", "rrc.targetCellPreconfigInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_dpchInfo_07,
@@ -166321,7 +166321,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dl_dpchInfo_07_vals), 0,
         "T_dl_dpchInfo_07", HFILL }},
     { &hf_rrc_targetCellPreconfigInfo_01,
-      { "targetCellPreconfigInfo", "rrc.targetCellPreconfigInfo",
+      { "targetCellPreconfigInfo", "rrc.targetCellPreconfigInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TargetCellPreconfigInfo_r9", HFILL }},
     { &hf_rrc_dl_dpchInfo_08,
@@ -166329,11 +166329,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dl_dpchInfo_08_vals), 0,
         "T_dl_dpchInfo_08", HFILL }},
     { &hf_rrc_targetCellPreconfigInfo_02,
-      { "targetCellPreconfigInfo", "rrc.targetCellPreconfigInfo",
+      { "targetCellPreconfigInfo", "rrc.targetCellPreconfigInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TargetCellPreconfigInfo_r10", HFILL }},
     { &hf_rrc_targetCellPreconfigInfo_03,
-      { "targetCellPreconfigInfo", "rrc.targetCellPreconfigInfo",
+      { "targetCellPreconfigInfo", "rrc.targetCellPreconfigInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TargetCellPreconfigInfo_vb50ext", HFILL }},
     { &hf_rrc_dl_dpchInfo_09,
@@ -166341,75 +166341,75 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dl_dpchInfo_09_vals), 0,
         "T_dl_dpchInfo_09", HFILL }},
     { &hf_rrc_targetCellPreconfigInfo_04,
-      { "targetCellPreconfigInfo", "rrc.targetCellPreconfigInfo",
+      { "targetCellPreconfigInfo", "rrc.targetCellPreconfigInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TargetCellPreconfigInfo_r11", HFILL }},
     { &hf_rrc_targetCellPreconfigInfo_05,
-      { "targetCellPreconfigInfo", "rrc.targetCellPreconfigInfo",
+      { "targetCellPreconfigInfo", "rrc.targetCellPreconfigInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TargetCellPreconfigInfo_v890ext", HFILL }},
     { &hf_rrc_targetCellPreconfigInfo_06,
-      { "targetCellPreconfigInfo", "rrc.targetCellPreconfigInfo",
+      { "targetCellPreconfigInfo", "rrc.targetCellPreconfigInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TargetCellPreconfigInfo_v950ext", HFILL }},
     { &hf_rrc_RL_AdditionInformationList_item,
-      { "RL-AdditionInformation", "rrc.RL_AdditionInformation",
+      { "RL-AdditionInformation", "rrc.RL_AdditionInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RL_AdditionInformationList_r6_item,
-      { "RL-AdditionInformation-r6", "rrc.RL_AdditionInformation_r6",
+      { "RL-AdditionInformation-r6", "rrc.RL_AdditionInformation_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RL_AdditionInformationList_r7_item,
-      { "RL-AdditionInformation-r7", "rrc.RL_AdditionInformation_r7",
+      { "RL-AdditionInformation-r7", "rrc.RL_AdditionInformation_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RL_AdditionInformation_list_v6b0ext_item,
-      { "RL-AdditionInformation-v6b0ext", "rrc.RL_AdditionInformation_v6b0ext",
+      { "RL-AdditionInformation-v6b0ext", "rrc.RL_AdditionInformation_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RL_AdditionInformationList_r8_item,
-      { "RL-AdditionInformation-r8", "rrc.RL_AdditionInformation_r8",
+      { "RL-AdditionInformation-r8", "rrc.RL_AdditionInformation_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RL_AdditionInformationList_v890ext_item,
-      { "RL-AdditionInformation-v890ext", "rrc.RL_AdditionInformation_v890ext",
+      { "RL-AdditionInformation-v890ext", "rrc.RL_AdditionInformation_v890ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RL_AdditionInformationList_r9_item,
-      { "RL-AdditionInformation-r9", "rrc.RL_AdditionInformation_r9",
+      { "RL-AdditionInformation-r9", "rrc.RL_AdditionInformation_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RL_AdditionInformationList_v950ext_item,
-      { "RL-AdditionInformation-v950ext", "rrc.RL_AdditionInformation_v950ext",
+      { "RL-AdditionInformation-v950ext", "rrc.RL_AdditionInformation_v950ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RL_AdditionInformationList_r10_item,
-      { "RL-AdditionInformation-r10", "rrc.RL_AdditionInformation_r10",
+      { "RL-AdditionInformation-r10", "rrc.RL_AdditionInformation_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RL_AdditionInformationList_vb50ext_item,
-      { "RL-AdditionInformation-vb50ext", "rrc.RL_AdditionInformation_vb50ext",
+      { "RL-AdditionInformation-vb50ext", "rrc.RL_AdditionInformation_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RL_AdditionInformationList_r11_item,
-      { "RL-AdditionInformation-r11", "rrc.RL_AdditionInformation_r11",
+      { "RL-AdditionInformation-r11", "rrc.RL_AdditionInformation_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RL_AdditionInformationList_SecULFreq_item,
-      { "RL-AdditionInformation-SecULFreq", "rrc.RL_AdditionInformation_SecULFreq",
+      { "RL-AdditionInformation-SecULFreq", "rrc.RL_AdditionInformation_SecULFreq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RL_IdentifierList_item,
-      { "PrimaryCPICH-Info", "rrc.PrimaryCPICH_Info",
+      { "PrimaryCPICH-Info", "rrc.PrimaryCPICH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RL_RemovalInformationList_item,
-      { "PrimaryCPICH-Info", "rrc.PrimaryCPICH_Info",
+      { "PrimaryCPICH-Info", "rrc.PrimaryCPICH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RL_RemovalInformationList_SecULFreq_item,
-      { "PrimaryCPICH-Info", "rrc.PrimaryCPICH_Info",
+      { "PrimaryCPICH-Info", "rrc.PrimaryCPICH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SCCPCH_ChannelisationCodeList_item,
@@ -166421,7 +166421,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_SCCPCH_ChannelisationCode_VHCR_vals_ext, 0,
         NULL, HFILL }},
     { &hf_rrc_secondaryCCPCH_Info,
-      { "secondaryCCPCH-Info", "rrc.secondaryCCPCH_Info",
+      { "secondaryCCPCH-Info", "rrc.secondaryCCPCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_74,
@@ -166429,7 +166429,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_74_vals), 0,
         "T_modeSpecificInfo_74", HFILL }},
     { &hf_rrc_fdd_110,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_107", HFILL }},
     { &hf_rrc_fach_PCH_InformationList,
@@ -166441,11 +166441,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_67,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_61", HFILL }},
     { &hf_rrc_secondaryCCPCH_Info_01,
-      { "secondaryCCPCH-Info", "rrc.secondaryCCPCH_Info",
+      { "secondaryCCPCH-Info", "rrc.secondaryCCPCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecondaryCCPCH_Info_r4", HFILL }},
     { &hf_rrc_modeSpecificInfo_75,
@@ -166453,7 +166453,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_75_vals), 0,
         "T_modeSpecificInfo_75", HFILL }},
     { &hf_rrc_fdd_111,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_108", HFILL }},
     { &hf_rrc_pich_Info,
@@ -166461,35 +166461,35 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_PICH_Info_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_secondaryCCPCH_LCR_Extensions,
-      { "secondaryCCPCH-LCR-Extensions", "rrc.secondaryCCPCH_LCR_Extensions",
+      { "secondaryCCPCH-LCR-Extensions", "rrc.secondaryCCPCH_LCR_Extensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecondaryCCPCH_Info_LCR_r4_ext", HFILL }},
     { &hf_rrc_pich_Info_01,
-      { "pich-Info", "rrc.pich_Info",
+      { "pich-Info", "rrc.pich_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PICH_Info_LCR_r4", HFILL }},
     { &hf_rrc_secondaryCCPCH_Info_02,
-      { "secondaryCCPCH-Info", "rrc.secondaryCCPCH_Info",
+      { "secondaryCCPCH-Info", "rrc.secondaryCCPCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecondaryCCPCH_Info_HCR_VHCR_r7", HFILL }},
     { &hf_rrc_pich_Info_02,
-      { "pich-Info", "rrc.pich_Info",
+      { "pich-Info", "rrc.pich_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PICH_Info_HCR_VHCR_r7", HFILL }},
     { &hf_rrc_SCCPCH_SystemInformationList_item,
-      { "SCCPCH-SystemInformation", "rrc.SCCPCH_SystemInformation",
+      { "SCCPCH-SystemInformation", "rrc.SCCPCH_SystemInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SCCPCH_SystemInformationList_HCR_VHCR_r7_item,
-      { "SCCPCH-SystemInformation-HCR-VHCR-r7", "rrc.SCCPCH_SystemInformation_HCR_VHCR_r7",
+      { "SCCPCH-SystemInformation-HCR-VHCR-r7", "rrc.SCCPCH_SystemInformation_HCR_VHCR_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SCCPCH_SystemInformationList_LCR_r4_ext_item,
-      { "SCCPCH-SystemInformation-LCR-r4-ext", "rrc.SCCPCH_SystemInformation_LCR_r4_ext",
+      { "SCCPCH-SystemInformation-LCR-r4-ext", "rrc.SCCPCH_SystemInformation_LCR_r4_ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_secondaryCCPCHInfo_MBMS,
-      { "secondaryCCPCHInfo-MBMS", "rrc.secondaryCCPCHInfo_MBMS",
+      { "secondaryCCPCHInfo-MBMS", "rrc.secondaryCCPCHInfo_MBMS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecondaryCCPCHInfo_MBMS_r6", HFILL }},
     { &hf_rrc_transportFormatCombinationSet,
@@ -166497,7 +166497,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TFCS_vals), 0,
         "TFCS", HFILL }},
     { &hf_rrc_fachCarryingMCCH,
-      { "fachCarryingMCCH", "rrc.fachCarryingMCCH",
+      { "fachCarryingMCCH", "rrc.fachCarryingMCCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mcch_transportFormatSet,
@@ -166505,7 +166505,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TransportFormatSet_vals), 0,
         "TransportFormatSet", HFILL }},
     { &hf_rrc_mcch_ConfigurationInfo,
-      { "mcch-ConfigurationInfo", "rrc.mcch_ConfigurationInfo",
+      { "mcch-ConfigurationInfo", "rrc.mcch_ConfigurationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMS_MCCH_ConfigurationInfo_r6", HFILL }},
     { &hf_rrc_fachCarryingMTCH_List,
@@ -166513,7 +166513,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MBMS_FACHCarryingMTCH_List", HFILL }},
     { &hf_rrc_fachCarryingMSCH,
-      { "fachCarryingMSCH", "rrc.fachCarryingMSCH",
+      { "fachCarryingMSCH", "rrc.fachCarryingMSCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_msch_transportFormatSet,
@@ -166521,19 +166521,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TransportFormatSet_vals), 0,
         "TransportFormatSet", HFILL }},
     { &hf_rrc_dummy_47,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMS_MSCH_ConfigurationInfo_r6", HFILL }},
     { &hf_rrc_secondaryCCPCHInfo_MBMS_01,
-      { "secondaryCCPCHInfo-MBMS", "rrc.secondaryCCPCHInfo_MBMS",
+      { "secondaryCCPCHInfo-MBMS", "rrc.secondaryCCPCHInfo_MBMS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecondaryCCPCHInfo_MBMS_r7", HFILL }},
     { &hf_rrc_fachCarryingMCCH_01,
-      { "fachCarryingMCCH", "rrc.fachCarryingMCCH",
+      { "fachCarryingMCCH", "rrc.fachCarryingMCCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fachCarryingMCCH_01", HFILL }},
     { &hf_rrc_fachCarryingMSCH_01,
-      { "fachCarryingMSCH", "rrc.fachCarryingMSCH",
+      { "fachCarryingMSCH", "rrc.fachCarryingMSCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fachCarryingMSCH_01", HFILL }},
     { &hf_rrc_common_E_DCH_ResourceInfoListExt,
@@ -166541,7 +166541,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxEDCHs_OF_Common_E_DCH_ResourceInfoListExt", HFILL }},
     { &hf_rrc_common_E_DCH_ResourceInfoListExt_item,
-      { "Common-E-DCH-ResourceInfoListExt", "rrc.Common_E_DCH_ResourceInfoListExt",
+      { "Common-E-DCH-ResourceInfoListExt", "rrc.Common_E_DCH_ResourceInfoListExt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_76,
@@ -166549,7 +166549,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_76_vals), 0,
         "T_modeSpecificInfo_76", HFILL }},
     { &hf_rrc_fdd_112,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_109", HFILL }},
     { &hf_rrc_dummy1_03,
@@ -166557,7 +166557,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_PCPICH_UsageForChannelEst_vals), 0,
         "PCPICH_UsageForChannelEst", HFILL }},
     { &hf_rrc_dummy2_09,
-      { "dummy2", "rrc.dummy2",
+      { "dummy2", "rrc.dummy2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecondaryCPICH_Info", HFILL }},
     { &hf_rrc_sf_AndCodeNumber_01,
@@ -166573,11 +166573,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_68,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_62", HFILL }},
     { &hf_rrc_commonTimeslotInfo_01,
-      { "commonTimeslotInfo", "rrc.commonTimeslotInfo",
+      { "commonTimeslotInfo", "rrc.commonTimeslotInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CommonTimeslotInfoSCCPCH", HFILL }},
     { &hf_rrc_channelisationCode_09,
@@ -166589,11 +166589,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_77_vals), 0,
         "T_modeSpecificInfo_77", HFILL }},
     { &hf_rrc_fdd_113,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_110", HFILL }},
     { &hf_rrc_tdd_69,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_63", HFILL }},
     { &hf_rrc_tddOption_18,
@@ -166601,11 +166601,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_18_vals), 0,
         "T_tddOption_18", HFILL }},
     { &hf_rrc_tdd384_33,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_30", HFILL }},
     { &hf_rrc_tdd128_51,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_50", HFILL }},
     { &hf_rrc_modeSpecificInfo_78,
@@ -166613,11 +166613,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_78_vals), 0,
         "T_modeSpecificInfo_78", HFILL }},
     { &hf_rrc_tdd384_34,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_31", HFILL }},
     { &hf_rrc_tdd768_21,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd768_18", HFILL }},
     { &hf_rrc_channelisationCode_10,
@@ -166625,7 +166625,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SCCPCH_ChannelisationCodeList_VHCR", HFILL }},
     { &hf_rrc_individualTimeslotLCR_Ext,
-      { "individualTimeslotLCR-Ext", "rrc.individualTimeslotLCR_Ext",
+      { "individualTimeslotLCR-Ext", "rrc.individualTimeslotLCR_Ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IndividualTimeslotInfo_LCR_r4_ext", HFILL }},
     { &hf_rrc_subFrameNumber,
@@ -166633,7 +166633,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_4", HFILL }},
     { &hf_rrc_dl_ChannelisationCodes,
-      { "dl-ChannelisationCodes", "rrc.dl_ChannelisationCodes",
+      { "dl-ChannelisationCodes", "rrc.dl_ChannelisationCodes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_ChannelCodes_MBSFN_IMB384", HFILL }},
     { &hf_rrc_modulation_03,
@@ -166641,11 +166641,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modulation_03_vals), 0,
         "T_modulation_03", HFILL }},
     { &hf_rrc_modQPSK,
-      { "modQPSK", "rrc.modQPSK",
+      { "modQPSK", "rrc.modQPSK_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mod16QAM,
-      { "mod16QAM", "rrc.mod16QAM",
+      { "mod16QAM", "rrc.mod16QAM_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cpich_SecCCPCH_PowerOffset,
@@ -166657,27 +166657,27 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_79_vals), 0,
         "T_modeSpecificInfo_79", HFILL }},
     { &hf_rrc_fdd_114,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_111", HFILL }},
     { &hf_rrc_tdd384_35,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_32", HFILL }},
     { &hf_rrc_commonTimeslotInfoMBMS,
-      { "commonTimeslotInfoMBMS", "rrc.commonTimeslotInfoMBMS",
+      { "commonTimeslotInfoMBMS", "rrc.commonTimeslotInfoMBMS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_downlinkTimeslotsCodes,
-      { "downlinkTimeslotsCodes", "rrc.downlinkTimeslotsCodes",
+      { "downlinkTimeslotsCodes", "rrc.downlinkTimeslotsCodes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd128_52,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_51", HFILL }},
     { &hf_rrc_downlinkTimeslotsCodes_01,
-      { "downlinkTimeslotsCodes", "rrc.downlinkTimeslotsCodes",
+      { "downlinkTimeslotsCodes", "rrc.downlinkTimeslotsCodes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DownlinkTimeslotsCodes_LCR_r4", HFILL }},
     { &hf_rrc_modeSpecificInfo_80,
@@ -166685,7 +166685,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_80_vals), 0,
         "T_modeSpecificInfo_80", HFILL }},
     { &hf_rrc_fdd_115,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_112", HFILL }},
     { &hf_rrc_modulation_04,
@@ -166697,11 +166697,11 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M11_4", HFILL }},
     { &hf_rrc_tdd384_36,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_33", HFILL }},
     { &hf_rrc_downlinkTimeslotsCodes_02,
-      { "downlinkTimeslotsCodes", "rrc.downlinkTimeslotsCodes",
+      { "downlinkTimeslotsCodes", "rrc.downlinkTimeslotsCodes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DownlinkTimeslotsCodes_r7", HFILL }},
     { &hf_rrc_modulation_05,
@@ -166709,11 +166709,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modulation_05_vals), 0,
         "T_modulation_05", HFILL }},
     { &hf_rrc_tdd768_22,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd768_19", HFILL }},
     { &hf_rrc_downlinkTimeslotsCodes_03,
-      { "downlinkTimeslotsCodes", "rrc.downlinkTimeslotsCodes",
+      { "downlinkTimeslotsCodes", "rrc.downlinkTimeslotsCodes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DownlinkTimeslotsCodes_VHCR", HFILL }},
     { &hf_rrc_modulation_06,
@@ -166721,7 +166721,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modulation_06_vals), 0,
         "T_modulation_06", HFILL }},
     { &hf_rrc_tdd128_53,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_52", HFILL }},
     { &hf_rrc_mbsfnSpecialTimeSlot,
@@ -166737,7 +166737,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SecondaryScramblingCode", HFILL }},
     { &hf_rrc_newConfiguration_08,
-      { "newConfiguration", "rrc.newConfiguration",
+      { "newConfiguration", "rrc.newConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_newConfiguration_08", HFILL }},
     { &hf_rrc_precodingWeightSetRestriction_03,
@@ -166745,7 +166745,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_precodingWeightSetRestriction_02_vals), 0,
         "T_precodingWeightSetRestriction_02", HFILL }},
     { &hf_rrc_newConfiguration_09,
-      { "newConfiguration", "rrc.newConfiguration",
+      { "newConfiguration", "rrc.newConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_newConfiguration_09", HFILL }},
     { &hf_rrc_precodingWeightSetRestriction_04,
@@ -166757,11 +166757,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_configurationInfo_05_vals), 0,
         "T_configurationInfo_05", HFILL }},
     { &hf_rrc_newConfiguration_10,
-      { "newConfiguration", "rrc.newConfiguration",
+      { "newConfiguration", "rrc.newConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_newConfiguration_10", HFILL }},
     { &hf_rrc_mimoPilotConfiguration_02,
-      { "mimoPilotConfiguration", "rrc.mimoPilotConfiguration",
+      { "mimoPilotConfiguration", "rrc.mimoPilotConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MIMO4x4_PilotConfiguration", HFILL }},
     { &hf_rrc_servingCellChangeMACreset,
@@ -166809,23 +166809,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_511", HFILL }},
     { &hf_rrc_sfd4,
-      { "sfd4", "rrc.sfd4",
+      { "sfd4", "rrc.sfd4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sfd8,
-      { "sfd8", "rrc.sfd8",
+      { "sfd8", "rrc.sfd8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sfd16,
-      { "sfd16", "rrc.sfd16",
+      { "sfd16", "rrc.sfd16_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sfd32,
-      { "sfd32", "rrc.sfd32",
+      { "sfd32", "rrc.sfd32_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sfd64,
-      { "sfd64", "rrc.sfd64",
+      { "sfd64", "rrc.sfd64_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sfd128,
@@ -166837,7 +166837,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_PilotBits256_vals), 0,
         "PilotBits256", HFILL }},
     { &hf_rrc_sfd512,
-      { "sfd512", "rrc.sfd512",
+      { "sfd512", "rrc.sfd512_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_activationTimeSFN,
@@ -166849,11 +166849,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DurationTimeInfo", HFILL }},
     { &hf_rrc_e_dch_SPS_Info,
-      { "e-dch-SPS-Info", "rrc.e_dch_SPS_Info",
+      { "e-dch-SPS-Info", "rrc.e_dch_SPS_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_DCH_SPS_Information_TDD128", HFILL }},
     { &hf_rrc_hs_dsch_SPS_Info,
-      { "hs-dsch-SPS-Info", "rrc.hs_dsch_SPS_Info",
+      { "hs-dsch-SPS-Info", "rrc.hs_dsch_SPS_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_DSCH_SPS_Information_TDD128", HFILL }},
     { &hf_rrc_s_Field,
@@ -166889,7 +166889,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_62", HFILL }},
     { &hf_rrc_sync_UL_Procedure,
-      { "sync-UL-Procedure", "rrc.sync_UL_Procedure",
+      { "sync-UL-Procedure", "rrc.sync_UL_Procedure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SYNC_UL_Procedure_r4", HFILL }},
     { &hf_rrc_max_SYNC_UL_Transmissions,
@@ -166917,15 +166917,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_uL_OLTD_InfoFDD,
-      { "uL-OLTD-InfoFDD", "rrc.uL_OLTD_InfoFDD",
+      { "uL-OLTD-InfoFDD", "rrc.uL_OLTD_InfoFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_MIMO_Info,
-      { "ul-MIMO-Info", "rrc.ul_MIMO_Info",
+      { "ul-MIMO-Info", "rrc.ul_MIMO_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_MIMO_InfoFDD", HFILL }},
     { &hf_rrc_TDD_MBSFNInformation_item,
-      { "TDD-MBSFNTSlotInfo", "rrc.TDD_MBSFNTSlotInfo",
+      { "TDD-MBSFNTSlotInfo", "rrc.TDD_MBSFNTSlotInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_timeSlotNumber,
@@ -166973,7 +166973,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tgps_Status_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_activate,
-      { "activate", "rrc.activate",
+      { "activate", "rrc.activate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tgcfn,
@@ -166981,11 +166981,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_deactivate,
-      { "deactivate", "rrc.deactivate",
+      { "deactivate", "rrc.deactivate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tgps_ConfigurationParams,
-      { "tgps-ConfigurationParams", "rrc.tgps_ConfigurationParams",
+      { "tgps-ConfigurationParams", "rrc.tgps_ConfigurationParams_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tgps_Status_01,
@@ -166993,11 +166993,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tgps_Status_01_vals), 0,
         "T_tgps_Status_01", HFILL }},
     { &hf_rrc_activate_01,
-      { "activate", "rrc.activate",
+      { "activate", "rrc.activate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_activate_01", HFILL }},
     { &hf_rrc_tgps_ConfigurationParams_01,
-      { "tgps-ConfigurationParams", "rrc.tgps_ConfigurationParams",
+      { "tgps-ConfigurationParams", "rrc.tgps_ConfigurationParams_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TGPS_ConfigurationParams_r8", HFILL }},
     { &hf_rrc_tgps_Status_02,
@@ -167005,23 +167005,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tgps_Status_02_vals), 0,
         "T_tgps_Status_02", HFILL }},
     { &hf_rrc_activate_02,
-      { "activate", "rrc.activate",
+      { "activate", "rrc.activate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_activate_02", HFILL }},
     { &hf_rrc_tgps_ConfigurationParams_02,
-      { "tgps-ConfigurationParams", "rrc.tgps_ConfigurationParams",
+      { "tgps-ConfigurationParams", "rrc.tgps_ConfigurationParams_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TGPS_ConfigurationParams_r10", HFILL }},
     { &hf_rrc_TGP_SequenceList_item,
-      { "TGP-Sequence", "rrc.TGP_Sequence",
+      { "TGP-Sequence", "rrc.TGP_Sequence_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_TGP_SequenceList_r8_item,
-      { "TGP-Sequence-r8", "rrc.TGP_Sequence_r8",
+      { "TGP-Sequence-r8", "rrc.TGP_Sequence_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_TGP_SequenceList_r10_item,
-      { "TGP-Sequence-r10", "rrc.TGP_Sequence_r10",
+      { "TGP-Sequence-r10", "rrc.TGP_Sequence_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tgps_Status_03,
@@ -167029,7 +167029,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tgps_Status_03_vals), 0,
         "T_tgps_Status_03", HFILL }},
     { &hf_rrc_activate_03,
-      { "activate", "rrc.activate",
+      { "activate", "rrc.activate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_activate_03", HFILL }},
     { &hf_rrc_tgps_Status_04,
@@ -167037,7 +167037,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tgps_Status_04_vals), 0,
         "T_tgps_Status_04", HFILL }},
     { &hf_rrc_activate_04,
-      { "activate", "rrc.activate",
+      { "activate", "rrc.activate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_activate_04", HFILL }},
     { &hf_rrc_freqSpecificCompressedMode_01,
@@ -167153,7 +167153,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_timing_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_newTiming,
-      { "newTiming", "rrc.newTiming",
+      { "newTiming", "rrc.newTiming_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_harqProcessAllocation,
@@ -167161,11 +167161,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_channelReqParamsForUCSM,
-      { "channelReqParamsForUCSM", "rrc.channelReqParamsForUCSM",
+      { "channelReqParamsForUCSM", "rrc.channelReqParamsForUCSM_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_16QAM_Settings,
-      { "ul-16QAM-Settings", "rrc.ul_16QAM_Settings",
+      { "ul-16QAM-Settings", "rrc.ul_16QAM_Settings_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mac_es_e_resetIndicator,
@@ -167177,7 +167177,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_1", HFILL }},
     { &hf_rrc_ul_64QAM_Settings,
-      { "ul-64QAM-Settings", "rrc.ul_64QAM_Settings",
+      { "ul-64QAM-Settings", "rrc.ul_64QAM_Settings_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mac_is_i_resetIndicator,
@@ -167185,7 +167185,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_mac_is_i_resetIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_ul_CCTrCH_TimeslotsCodes,
-      { "ul-CCTrCH-TimeslotsCodes", "rrc.ul_CCTrCH_TimeslotsCodes",
+      { "ul-CCTrCH-TimeslotsCodes", "rrc.ul_CCTrCH_TimeslotsCodes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UplinkTimeslotsCodes", HFILL }},
     { &hf_rrc_tddOption_19,
@@ -167193,15 +167193,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_19_vals), 0,
         "T_tddOption_19", HFILL }},
     { &hf_rrc_tdd384_38,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_34", HFILL }},
     { &hf_rrc_tdd128_55,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_53", HFILL }},
     { &hf_rrc_ul_CCTrCH_TimeslotsCodes_01,
-      { "ul-CCTrCH-TimeslotsCodes", "rrc.ul_CCTrCH_TimeslotsCodes",
+      { "ul-CCTrCH-TimeslotsCodes", "rrc.ul_CCTrCH_TimeslotsCodes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UplinkTimeslotsCodes_LCR_r4", HFILL }},
     { &hf_rrc_tddOption_20,
@@ -167209,35 +167209,35 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_20_vals), 0,
         "T_tddOption_20", HFILL }},
     { &hf_rrc_tdd384_39,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_35", HFILL }},
     { &hf_rrc_tdd768_23,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd768_20", HFILL }},
     { &hf_rrc_ul_CCTrCH_TimeslotsCodes_02,
-      { "ul-CCTrCH-TimeslotsCodes", "rrc.ul_CCTrCH_TimeslotsCodes",
+      { "ul-CCTrCH-TimeslotsCodes", "rrc.ul_CCTrCH_TimeslotsCodes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UplinkTimeslotsCodes_VHCR", HFILL }},
     { &hf_rrc_tdd128_56,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_54", HFILL }},
     { &hf_rrc_ul_CCTrCH_TimeslotsCodes_03,
-      { "ul-CCTrCH-TimeslotsCodes", "rrc.ul_CCTrCH_TimeslotsCodes",
+      { "ul-CCTrCH-TimeslotsCodes", "rrc.ul_CCTrCH_TimeslotsCodes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UplinkTimeslotsCodes_LCR_r7", HFILL }},
     { &hf_rrc_UL_CCTrCHList_item,
-      { "UL-CCTrCH", "rrc.UL_CCTrCH",
+      { "UL-CCTrCH", "rrc.UL_CCTrCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UL_CCTrCHList_r4_item,
-      { "UL-CCTrCH-r4", "rrc.UL_CCTrCH_r4",
+      { "UL-CCTrCH-r4", "rrc.UL_CCTrCH_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UL_CCTrCHList_r7_item,
-      { "UL-CCTrCH-r7", "rrc.UL_CCTrCH_r7",
+      { "UL-CCTrCH-r7", "rrc.UL_CCTrCH_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UL_CCTrCHListToRemove_item,
@@ -167245,15 +167245,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UL_CCTrChTPCList_item,
-      { "TFCS-Identity", "rrc.TFCS_Identity",
+      { "TFCS-Identity", "rrc.TFCS_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dummy_49,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CPCH_SetInfo", HFILL }},
     { &hf_rrc_dummy1_04,
-      { "dummy1", "rrc.dummy1",
+      { "dummy1", "rrc.dummy1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CPCH_SetInfo", HFILL }},
     { &hf_rrc_dummy2_10,
@@ -167265,11 +167265,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_configurationInfo_06_vals), 0,
         "T_configurationInfo_06", HFILL }},
     { &hf_rrc_newConfiguration_11,
-      { "newConfiguration", "rrc.newConfiguration",
+      { "newConfiguration", "rrc.newConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_newConfiguration_11", HFILL }},
     { &hf_rrc_s_dpcch_Info,
-      { "s-dpcch-Info", "rrc.s_dpcch_Info",
+      { "s-dpcch-Info", "rrc.s_dpcch_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "S_DPCCH_Information", HFILL }},
     { &hf_rrc_initial_CLTD_ActivationState,
@@ -167285,7 +167285,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_DL_CompressedModeMethod_vals), 0,
         "DL_CompressedModeMethod", HFILL }},
     { &hf_rrc_ul_and_dl,
-      { "ul-and-dl", "rrc.ul_and_dl",
+      { "ul-and-dl", "rrc.ul_and_dl_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_DPCCHscramblingCodeType,
@@ -167301,7 +167301,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_81_vals), 0,
         "T_modeSpecificInfo_81", HFILL }},
     { &hf_rrc_fdd_116,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_113", HFILL }},
     { &hf_rrc_scramblingCode,
@@ -167321,7 +167321,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_70,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_64", HFILL }},
     { &hf_rrc_ul_CCTrCHList,
@@ -167337,11 +167337,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_82_vals), 0,
         "T_modeSpecificInfo_82", HFILL }},
     { &hf_rrc_fdd_117,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_114", HFILL }},
     { &hf_rrc_tdd_71,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_65", HFILL }},
     { &hf_rrc_ul_CCTrCHList_01,
@@ -167353,11 +167353,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_83_vals), 0,
         "T_modeSpecificInfo_83", HFILL }},
     { &hf_rrc_fdd_118,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_115", HFILL }},
     { &hf_rrc_tdd_72,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_66", HFILL }},
     { &hf_rrc_ul_DPCH_PowerControlInfo_04,
@@ -167369,7 +167369,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_84_vals), 0,
         "T_modeSpecificInfo_84", HFILL }},
     { &hf_rrc_fdd_119,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_116", HFILL }},
     { &hf_rrc_dpdchPresence,
@@ -167377,15 +167377,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dpdchPresence_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_present_04,
-      { "present", "rrc.present",
+      { "present", "rrc.present_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_present_02", HFILL }},
     { &hf_rrc_notPresent,
-      { "notPresent", "rrc.notPresent",
+      { "notPresent", "rrc.notPresent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_73,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_67", HFILL }},
     { &hf_rrc_modeSpecificInfo_85,
@@ -167393,7 +167393,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_85_vals), 0,
         "T_modeSpecificInfo_85", HFILL }},
     { &hf_rrc_fdd_120,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_117", HFILL }},
     { &hf_rrc_dpdchPresence_01,
@@ -167401,7 +167401,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dpdchPresence_01_vals), 0,
         "T_dpdchPresence_01", HFILL }},
     { &hf_rrc_present_05,
-      { "present", "rrc.present",
+      { "present", "rrc.present_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_present_03", HFILL }},
     { &hf_rrc_numberOfTPC_Bits,
@@ -167409,11 +167409,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_NumberOfTPC_Bits_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_notPresent_01,
-      { "notPresent", "rrc.notPresent",
+      { "notPresent", "rrc.notPresent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_notPresent_01", HFILL }},
     { &hf_rrc_tdd_74,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_68", HFILL }},
     { &hf_rrc_ul_CCTrCHList_02,
@@ -167429,7 +167429,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_86_vals), 0,
         "T_modeSpecificInfo_86", HFILL }},
     { &hf_rrc_fdd_121,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_118", HFILL }},
     { &hf_rrc_dpdchPresence_02,
@@ -167437,19 +167437,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dpdchPresence_02_vals), 0,
         "T_dpdchPresence_02", HFILL }},
     { &hf_rrc_present_06,
-      { "present", "rrc.present",
+      { "present", "rrc.present_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_present_04", HFILL }},
     { &hf_rrc_notPresent_02,
-      { "notPresent", "rrc.notPresent",
+      { "notPresent", "rrc.notPresent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_notPresent_02", HFILL }},
     { &hf_rrc_tdd_75,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_69", HFILL }},
     { &hf_rrc_ul_DPCH_PowerControlInfo_06,
-      { "ul-DPCH-PowerControlInfo", "rrc.ul_DPCH_PowerControlInfo",
+      { "ul-DPCH-PowerControlInfo", "rrc.ul_DPCH_PowerControlInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_PowerControlInfoPostFDD", HFILL }},
     { &hf_rrc_reducedScramblingCodeNumber,
@@ -167457,11 +167457,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_DPCH_PowerControlInfo_07,
-      { "ul-DPCH-PowerControlInfo", "rrc.ul_DPCH_PowerControlInfo",
+      { "ul-DPCH-PowerControlInfo", "rrc.ul_DPCH_PowerControlInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_PowerControlInfoPostTDD", HFILL }},
     { &hf_rrc_ul_DPCH_PowerControlInfo_08,
-      { "ul-DPCH-PowerControlInfo", "rrc.ul_DPCH_PowerControlInfo",
+      { "ul-DPCH-PowerControlInfo", "rrc.ul_DPCH_PowerControlInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_DPCH_PowerControlInfoPostTDD_LCR_r4", HFILL }},
     { &hf_rrc_ul_TimingAdvance_04,
@@ -167477,11 +167477,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_87_vals), 0,
         "T_modeSpecificInfo_87", HFILL }},
     { &hf_rrc_fdd_122,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_119", HFILL }},
     { &hf_rrc_tdd_76,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_70", HFILL }},
     { &hf_rrc_modeSpecificInfo_88,
@@ -167489,11 +167489,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_88_vals), 0,
         "T_modeSpecificInfo_88", HFILL }},
     { &hf_rrc_fdd_123,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_120", HFILL }},
     { &hf_rrc_fdd_124,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_121", HFILL }},
     { &hf_rrc_dpcch_PowerOffset,
@@ -167505,7 +167505,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_77,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_71", HFILL }},
     { &hf_rrc_ul_OL_PC_Signalling,
@@ -167513,11 +167513,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_ul_OL_PC_Signalling_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_broadcast_UL_OL_PC_info,
-      { "broadcast-UL-OL-PC-info", "rrc.broadcast_UL_OL_PC_info",
+      { "broadcast-UL-OL-PC-info", "rrc.broadcast_UL_OL_PC_info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_individuallySignalled,
-      { "individuallySignalled", "rrc.individuallySignalled",
+      { "individuallySignalled", "rrc.individuallySignalled_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_individualTS_InterferenceList,
@@ -167525,11 +167525,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_fdd_125,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_122", HFILL }},
     { &hf_rrc_tdd_78,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_72", HFILL }},
     { &hf_rrc_ul_OL_PC_Signalling_01,
@@ -167537,7 +167537,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_ul_OL_PC_Signalling_01_vals), 0,
         "T_ul_OL_PC_Signalling_01", HFILL }},
     { &hf_rrc_individuallySignalled_01,
-      { "individuallySignalled", "rrc.individuallySignalled",
+      { "individuallySignalled", "rrc.individuallySignalled_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_individuallySignalled_01", HFILL }},
     { &hf_rrc_tddOption_21,
@@ -167545,7 +167545,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_21_vals), 0,
         "T_tddOption_21", HFILL }},
     { &hf_rrc_tdd384_40,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_36", HFILL }},
     { &hf_rrc_dpch_ConstantValue_01,
@@ -167553,11 +167553,11 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "ConstantValue", HFILL }},
     { &hf_rrc_tdd128_57,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_55", HFILL }},
     { &hf_rrc_fdd_126,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_123", HFILL }},
     { &hf_rrc_ack_NACK_repetition_factor,
@@ -167565,7 +167565,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ACK_NACK_repetitionFactor", HFILL }},
     { &hf_rrc_tdd_79,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_73", HFILL }},
     { &hf_rrc_ul_OL_PC_Signalling_02,
@@ -167573,7 +167573,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_ul_OL_PC_Signalling_02_vals), 0,
         "T_ul_OL_PC_Signalling_02", HFILL }},
     { &hf_rrc_individuallySignalled_02,
-      { "individuallySignalled", "rrc.individuallySignalled",
+      { "individuallySignalled", "rrc.individuallySignalled_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_individuallySignalled_02", HFILL }},
     { &hf_rrc_tddOption_22,
@@ -167581,19 +167581,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_22_vals), 0,
         "T_tddOption_22", HFILL }},
     { &hf_rrc_tdd384_41,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_37", HFILL }},
     { &hf_rrc_tdd128_58,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_56", HFILL }},
     { &hf_rrc_fdd_127,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_124", HFILL }},
     { &hf_rrc_tdd_80,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_74", HFILL }},
     { &hf_rrc_ul_OL_PC_Signalling_03,
@@ -167601,7 +167601,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_ul_OL_PC_Signalling_03_vals), 0,
         "T_ul_OL_PC_Signalling_03", HFILL }},
     { &hf_rrc_individuallySignalled_03,
-      { "individuallySignalled", "rrc.individuallySignalled",
+      { "individuallySignalled", "rrc.individuallySignalled_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_individuallySignalled_03", HFILL }},
     { &hf_rrc_tddOption_23,
@@ -167609,19 +167609,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_23_vals), 0,
         "T_tddOption_23", HFILL }},
     { &hf_rrc_tdd384_42,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_38", HFILL }},
     { &hf_rrc_tdd128_59,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_57", HFILL }},
     { &hf_rrc_fdd_128,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_125", HFILL }},
     { &hf_rrc_tdd_81,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_75", HFILL }},
     { &hf_rrc_ul_OL_PC_Signalling_04,
@@ -167629,7 +167629,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_ul_OL_PC_Signalling_04_vals), 0,
         "T_ul_OL_PC_Signalling_04", HFILL }},
     { &hf_rrc_individuallySignalled_04,
-      { "individuallySignalled", "rrc.individuallySignalled",
+      { "individuallySignalled", "rrc.individuallySignalled_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_individuallySignalled_04", HFILL }},
     { &hf_rrc_tddOption_24,
@@ -167637,19 +167637,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_24_vals), 0,
         "T_tddOption_24", HFILL }},
     { &hf_rrc_tdd384_43,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_39", HFILL }},
     { &hf_rrc_tdd768_24,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd768_21", HFILL }},
     { &hf_rrc_tdd128_60,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_58", HFILL }},
     { &hf_rrc_fdd_129,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_126", HFILL }},
     { &hf_rrc_ack_NACK_repetition_factor_assisting,
@@ -167657,7 +167657,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ACK_NACK_repetitionFactor", HFILL }},
     { &hf_rrc_tdd_82,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_76", HFILL }},
     { &hf_rrc_ul_OL_PC_Signalling_05,
@@ -167665,7 +167665,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_ul_OL_PC_Signalling_05_vals), 0,
         "T_ul_OL_PC_Signalling_05", HFILL }},
     { &hf_rrc_individuallySignalled_05,
-      { "individuallySignalled", "rrc.individuallySignalled",
+      { "individuallySignalled", "rrc.individuallySignalled_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_individuallySignalled_05", HFILL }},
     { &hf_rrc_tddOption_25,
@@ -167673,15 +167673,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_25_vals), 0,
         "T_tddOption_25", HFILL }},
     { &hf_rrc_tdd384_44,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_40", HFILL }},
     { &hf_rrc_tdd768_25,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd768_22", HFILL }},
     { &hf_rrc_tdd128_61,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_59", HFILL }},
     { &hf_rrc_dpcch_PowerOffset_01,
@@ -167689,15 +167689,15 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "DPCCH_PowerOffset2", HFILL }},
     { &hf_rrc_fdd_130,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_127", HFILL }},
     { &hf_rrc_tdd_83,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_77", HFILL }},
     { &hf_rrc_tdd_84,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_78", HFILL }},
     { &hf_rrc_non_ScheduledTransGrantInfo_02,
@@ -167709,15 +167709,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_mac_es_e_resetIndicator_01_vals), 0,
         "T_mac_es_e_resetIndicator_01", HFILL }},
     { &hf_rrc_e_DPCCH_Info,
-      { "e-DPCCH-Info", "rrc.e_DPCCH_Info",
+      { "e-DPCCH-Info", "rrc.e_DPCCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_e_DPDCH_Info,
-      { "e-DPDCH-Info", "rrc.e_DPDCH_Info",
+      { "e-DPDCH-Info", "rrc.e_DPDCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_schedulingTransmConfiguration,
-      { "schedulingTransmConfiguration", "rrc.schedulingTransmConfiguration",
+      { "schedulingTransmConfiguration", "rrc.schedulingTransmConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_DPDCH_SchedulingTransmConfiguration", HFILL }},
     { &hf_rrc_mac_es_e_resetIndicator_02,
@@ -167729,27 +167729,27 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_89_vals), 0,
         "T_modeSpecificInfo_89", HFILL }},
     { &hf_rrc_fdd_131,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_128", HFILL }},
     { &hf_rrc_e_DPCCH_Info_01,
-      { "e-DPCCH-Info", "rrc.e_DPCCH_Info",
+      { "e-DPCCH-Info", "rrc.e_DPCCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_DPCCH_Info_r7", HFILL }},
     { &hf_rrc_e_DPDCH_Info_01,
-      { "e-DPDCH-Info", "rrc.e_DPDCH_Info",
+      { "e-DPDCH-Info", "rrc.e_DPDCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_DPDCH_Info_r7", HFILL }},
     { &hf_rrc_tdd_85,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_79", HFILL }},
     { &hf_rrc_e_RUCCH_Info_01,
-      { "e-RUCCH-Info", "rrc.e_RUCCH_Info",
+      { "e-RUCCH-Info", "rrc.e_RUCCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_e_PUCH_Info_01,
-      { "e-PUCH-Info", "rrc.e_PUCH_Info",
+      { "e-PUCH-Info", "rrc.e_PUCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_non_ScheduledTransGrantInfo_03,
@@ -167765,15 +167765,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_90_vals), 0,
         "T_modeSpecificInfo_90", HFILL }},
     { &hf_rrc_fdd_132,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_129", HFILL }},
     { &hf_rrc_e_DPDCH_Info_02,
-      { "e-DPDCH-Info", "rrc.e_DPDCH_Info",
+      { "e-DPDCH-Info", "rrc.e_DPDCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_DPDCH_Info_r8", HFILL }},
     { &hf_rrc_tdd_86,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_80", HFILL }},
     { &hf_rrc_mac_es_e_resetIndicator_04,
@@ -167785,11 +167785,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_91_vals), 0,
         "T_modeSpecificInfo_91", HFILL }},
     { &hf_rrc_fdd_133,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_130", HFILL }},
     { &hf_rrc_tdd_87,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_81", HFILL }},
     { &hf_rrc_non_ScheduledTransGrantInfo_04,
@@ -167805,11 +167805,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_92_vals), 0,
         "T_modeSpecificInfo_92", HFILL }},
     { &hf_rrc_fdd_134,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_131", HFILL }},
     { &hf_rrc_tdd_88,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_82", HFILL }},
     { &hf_rrc_configurationInfo_07,
@@ -167817,7 +167817,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_configurationInfo_07_vals), 0,
         "T_configurationInfo_07", HFILL }},
     { &hf_rrc_newConfiguration_12,
-      { "newConfiguration", "rrc.newConfiguration",
+      { "newConfiguration", "rrc.newConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_newConfiguration_12", HFILL }},
     { &hf_rrc_s_e_dpcch_power_offset,
@@ -167833,19 +167833,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_15", HFILL }},
     { &hf_rrc_e_PUCH_info,
-      { "e-PUCH-info", "rrc.e_PUCH_info",
+      { "e-PUCH-info", "rrc.e_PUCH_info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_PUCH_Info_MulticarrierEDCH_TDD128", HFILL }},
     { &hf_rrc_e_AGCH_info,
-      { "e-AGCH-info", "rrc.e_AGCH_info",
+      { "e-AGCH-info", "rrc.e_AGCH_info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_AGCH_Information_TDD128", HFILL }},
     { &hf_rrc_e_HICH_info,
-      { "e-HICH-info", "rrc.e_HICH_info",
+      { "e-HICH-info", "rrc.e_HICH_info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "E_HICH_Information_TDD128", HFILL }},
     { &hf_rrc_UL_MulticarrierEDCH_Infolist_TDD128_item,
-      { "UL-MulticarrierEDCH-InfolistItem-TDD128", "rrc.UL_MulticarrierEDCH_InfolistItem_TDD128",
+      { "UL-MulticarrierEDCH-InfolistItem-TDD128", "rrc.UL_MulticarrierEDCH_InfolistItem_TDD128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UL_MulticarrierEDCH_Deletelist_TDD128_item,
@@ -167857,7 +167857,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_configuration_info_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_newConfiguration_13,
-      { "newConfiguration", "rrc.newConfiguration",
+      { "newConfiguration", "rrc.newConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UL_MulticarrierEDCH_NewConfigurationInfo_TDD128", HFILL }},
     { &hf_rrc_tsn_Length_01,
@@ -167881,15 +167881,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_8", HFILL }},
     { &hf_rrc_disabled,
-      { "disabled", "rrc.disabled",
+      { "disabled", "rrc.disabled_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_enabled,
-      { "enabled", "rrc.enabled",
+      { "enabled", "rrc.enabled_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_enabled_01,
-      { "enabled", "rrc.enabled",
+      { "enabled", "rrc.enabled_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_enabled_01", HFILL }},
     { &hf_rrc_tddOption_26,
@@ -167897,19 +167897,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_26_vals), 0,
         "T_tddOption_26", HFILL }},
     { &hf_rrc_tdd384_45,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_41", HFILL }},
     { &hf_rrc_tdd128_62,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_60", HFILL }},
     { &hf_rrc_synchronisationParameters,
-      { "synchronisationParameters", "rrc.synchronisationParameters",
+      { "synchronisationParameters", "rrc.synchronisationParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SynchronisationParameters_r4", HFILL }},
     { &hf_rrc_enabled_02,
-      { "enabled", "rrc.enabled",
+      { "enabled", "rrc.enabled_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_enabled_02", HFILL }},
     { &hf_rrc_tddOption_27,
@@ -167917,19 +167917,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_27_vals), 0,
         "T_tddOption_27", HFILL }},
     { &hf_rrc_tdd384_46,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_42", HFILL }},
     { &hf_rrc_tdd768_26,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd768_23", HFILL }},
     { &hf_rrc_tdd128_63,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_61", HFILL }},
     { &hf_rrc_enabled_03,
-      { "enabled", "rrc.enabled",
+      { "enabled", "rrc.enabled_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_enabled_03", HFILL }},
     { &hf_rrc_UL_TS_ChannelisationCodeList_item,
@@ -167937,7 +167937,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_UL_TS_ChannelisationCode_vals_ext, 0,
         NULL, HFILL }},
     { &hf_rrc_UL_TS_ChannelisationCodeList_r7_item,
-      { "UL-TS-ChannelisationCodeList-r7 item", "rrc.UL_TS_ChannelisationCodeList_r7_item",
+      { "UL-TS-ChannelisationCodeList-r7 item", "rrc.UL_TS_ChannelisationCodeList_r7_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_TS_Channelisation_Code,
@@ -167945,7 +167945,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_UL_TS_ChannelisationCode_vals_ext, 0,
         "UL_TS_ChannelisationCode", HFILL }},
     { &hf_rrc_plcch_info,
-      { "plcch-info", "rrc.plcch_info",
+      { "plcch-info", "rrc.plcch_info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UL_TS_ChannelisationCodeList_VHCR_item,
@@ -167957,11 +167957,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_parameters_04_vals), 0,
         "T_parameters_04", HFILL }},
     { &hf_rrc_sameAsLast_04,
-      { "sameAsLast", "rrc.sameAsLast",
+      { "sameAsLast", "rrc.sameAsLast_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_sameAsLast_04", HFILL }},
     { &hf_rrc_newParameters_04,
-      { "newParameters", "rrc.newParameters",
+      { "newParameters", "rrc.newParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_newParameters_04", HFILL }},
     { &hf_rrc_ul_TS_ChannelisationCodeList,
@@ -167973,11 +167973,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_parameters_05_vals), 0,
         "T_parameters_05", HFILL }},
     { &hf_rrc_sameAsLast_05,
-      { "sameAsLast", "rrc.sameAsLast",
+      { "sameAsLast", "rrc.sameAsLast_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_sameAsLast_05", HFILL }},
     { &hf_rrc_newParameters_05,
-      { "newParameters", "rrc.newParameters",
+      { "newParameters", "rrc.newParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_newParameters_05", HFILL }},
     { &hf_rrc_parameters_06,
@@ -167985,11 +167985,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_parameters_06_vals), 0,
         "T_parameters_06", HFILL }},
     { &hf_rrc_sameAsLast_06,
-      { "sameAsLast", "rrc.sameAsLast",
+      { "sameAsLast", "rrc.sameAsLast_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_sameAsLast_06", HFILL }},
     { &hf_rrc_newParameters_06,
-      { "newParameters", "rrc.newParameters",
+      { "newParameters", "rrc.newParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_newParameters_06", HFILL }},
     { &hf_rrc_ul_TS_ChannelisationCodeList_01,
@@ -168001,11 +168001,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_parameters_07_vals), 0,
         "T_parameters_07", HFILL }},
     { &hf_rrc_sameAsLast_07,
-      { "sameAsLast", "rrc.sameAsLast",
+      { "sameAsLast", "rrc.sameAsLast_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_sameAsLast_07", HFILL }},
     { &hf_rrc_newParameters_07,
-      { "newParameters", "rrc.newParameters",
+      { "newParameters", "rrc.newParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_newParameters_07", HFILL }},
     { &hf_rrc_dynamicSFusage,
@@ -168021,7 +168021,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_additionalTimeslots_04_vals), 0,
         "T_additionalTimeslots_04", HFILL }},
     { &hf_rrc_consecutive_04,
-      { "consecutive", "rrc.consecutive",
+      { "consecutive", "rrc.consecutive_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_consecutive_02", HFILL }},
     { &hf_rrc_numAdditionalTimeslots,
@@ -168033,7 +168033,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxTS_1_OF_UplinkAdditionalTimeslots", HFILL }},
     { &hf_rrc_timeslotList_item_04,
-      { "UplinkAdditionalTimeslots", "rrc.UplinkAdditionalTimeslots",
+      { "UplinkAdditionalTimeslots", "rrc.UplinkAdditionalTimeslots_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_TS_ChannelisationCodeList_02,
@@ -168049,7 +168049,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_additionalTimeslots_05_vals), 0,
         "T_additionalTimeslots_05", HFILL }},
     { &hf_rrc_consecutive_05,
-      { "consecutive", "rrc.consecutive",
+      { "consecutive", "rrc.consecutive_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_consecutive_03", HFILL }},
     { &hf_rrc_timeslotList_05,
@@ -168057,7 +168057,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxTS_1_OF_UplinkAdditionalTimeslots_VHCR", HFILL }},
     { &hf_rrc_timeslotList_item_05,
-      { "UplinkAdditionalTimeslots-VHCR", "rrc.UplinkAdditionalTimeslots_VHCR",
+      { "UplinkAdditionalTimeslots-VHCR", "rrc.UplinkAdditionalTimeslots_VHCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_moreTimeslots_06,
@@ -168069,7 +168069,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_additionalTimeslots_06_vals), 0,
         "T_additionalTimeslots_06", HFILL }},
     { &hf_rrc_consecutive_06,
-      { "consecutive", "rrc.consecutive",
+      { "consecutive", "rrc.consecutive_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_consecutive_04", HFILL }},
     { &hf_rrc_numAdditionalTimeslots_01,
@@ -168081,7 +168081,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxTS_LCR_1_OF_UplinkAdditionalTimeslots_LCR_r4", HFILL }},
     { &hf_rrc_timeslotList_item_06,
-      { "UplinkAdditionalTimeslots-LCR-r4", "rrc.UplinkAdditionalTimeslots_LCR_r4",
+      { "UplinkAdditionalTimeslots-LCR-r4", "rrc.UplinkAdditionalTimeslots_LCR_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_moreTimeslots_07,
@@ -168093,7 +168093,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_additionalTimeslots_07_vals), 0,
         "T_additionalTimeslots_07", HFILL }},
     { &hf_rrc_consecutive_07,
-      { "consecutive", "rrc.consecutive",
+      { "consecutive", "rrc.consecutive_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_consecutive_05", HFILL }},
     { &hf_rrc_timeslotList_07,
@@ -168101,7 +168101,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxTS_LCR_1_OF_UplinkAdditionalTimeslots_LCR_r7", HFILL }},
     { &hf_rrc_timeslotList_item_07,
-      { "UplinkAdditionalTimeslots-LCR-r7", "rrc.UplinkAdditionalTimeslots_LCR_r7",
+      { "UplinkAdditionalTimeslots-LCR-r7", "rrc.UplinkAdditionalTimeslots_LCR_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_satID,
@@ -168113,7 +168113,7 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M2048_2047", HFILL }},
     { &hf_rrc_extraDopplerInfo,
-      { "extraDopplerInfo", "rrc.extraDopplerInfo",
+      { "extraDopplerInfo", "rrc.extraDopplerInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_codePhase,
@@ -168133,27 +168133,27 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_CodePhaseSearchWindow_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_azimuthAndElevation,
-      { "azimuthAndElevation", "rrc.azimuthAndElevation",
+      { "azimuthAndElevation", "rrc.azimuthAndElevation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_azimuthAndElevation_01,
-      { "azimuthAndElevation", "rrc.azimuthAndElevation",
+      { "azimuthAndElevation", "rrc.azimuthAndElevation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AzimuthAndElevation_va40ext", HFILL }},
     { &hf_rrc_azimuthAndElevation_02,
-      { "azimuthAndElevation", "rrc.azimuthAndElevation",
+      { "azimuthAndElevation", "rrc.azimuthAndElevation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AzimuthAndElevation_r10", HFILL }},
     { &hf_rrc_AcquisitionSatInfoList_item,
-      { "AcquisitionSatInfo", "rrc.AcquisitionSatInfo",
+      { "AcquisitionSatInfo", "rrc.AcquisitionSatInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_AcquisitionSatInfoList_va40ext_item,
-      { "AcquisitionSatInfo-va40ext", "rrc.AcquisitionSatInfo_va40ext",
+      { "AcquisitionSatInfo-va40ext", "rrc.AcquisitionSatInfo_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_AcquisitionSatInfoList_r10_item,
-      { "AcquisitionSatInfo-r10", "rrc.AcquisitionSatInfo_r10",
+      { "AcquisitionSatInfo-r10", "rrc.AcquisitionSatInfo_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_AdditionalMeasurementID_List_item,
@@ -168213,7 +168213,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_11", HFILL }},
     { &hf_rrc_AlmanacSatInfoList_item,
-      { "AlmanacSatInfo", "rrc.AlmanacSatInfo",
+      { "AlmanacSatInfo", "rrc.AlmanacSatInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sat_info_SBASecefList,
@@ -168249,7 +168249,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GANSS_SAT_Info_Almanac_REDkpList", HFILL }},
     { &hf_rrc_AuxInfoGANSS_ID1_item,
-      { "AuxInfoGANSS-ID1-element", "rrc.AuxInfoGANSS_ID1_element",
+      { "AuxInfoGANSS-ID1-element", "rrc.AuxInfoGANSS_ID1_element_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_svID,
@@ -168261,7 +168261,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_AuxInfoGANSS_ID3_item,
-      { "AuxInfoGANSS-ID3-element", "rrc.AuxInfoGANSS_ID3_element",
+      { "AuxInfoGANSS-ID3-element", "rrc.AuxInfoGANSS_ID3_element_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_channelNumber,
@@ -168293,7 +168293,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_BLER_MeasurementResultsList_item,
-      { "BLER-MeasurementResults", "rrc.BLER_MeasurementResults",
+      { "BLER-MeasurementResults", "rrc.BLER_MeasurementResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_BLER_TransChIdList_item,
@@ -168321,15 +168321,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_16", HFILL }},
     { &hf_rrc_intraFreqReportingCriteria,
-      { "intraFreqReportingCriteria", "rrc.intraFreqReportingCriteria",
+      { "intraFreqReportingCriteria", "rrc.intraFreqReportingCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_periodicalReportingCriteria,
-      { "periodicalReportingCriteria", "rrc.periodicalReportingCriteria",
+      { "periodicalReportingCriteria", "rrc.periodicalReportingCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_intraFreqReportingCriteria_01,
-      { "intraFreqReportingCriteria", "rrc.intraFreqReportingCriteria",
+      { "intraFreqReportingCriteria", "rrc.intraFreqReportingCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqReportingCriteria_LCR_r4", HFILL }},
     { &hf_rrc_patternIdentifier,
@@ -168345,7 +168345,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_5", HFILL }},
     { &hf_rrc_measurementOccasionPatternParameter,
-      { "measurementOccasionPatternParameter", "rrc.measurementOccasionPatternParameter",
+      { "measurementOccasionPatternParameter", "rrc.measurementOccasionPatternParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cellDCHMeasOccasionSequenceList,
@@ -168353,7 +168353,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxMeasOccasionPattern_OF_CellDCHMeasOccasionPattern_LCR", HFILL }},
     { &hf_rrc_cellDCHMeasOccasionSequenceList_item,
-      { "CellDCHMeasOccasionPattern-LCR", "rrc.CellDCHMeasOccasionPattern_LCR",
+      { "CellDCHMeasOccasionPattern-LCR", "rrc.CellDCHMeasOccasionPattern_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cellIndividualOffset,
@@ -168369,7 +168369,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_93_vals), 0,
         "T_modeSpecificInfo_93", HFILL }},
     { &hf_rrc_fdd_135,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_132", HFILL }},
     { &hf_rrc_readSFN_Indicator,
@@ -168377,7 +168377,7 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_tdd_89,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_83", HFILL }},
     { &hf_rrc_primaryCCPCH_Info_02,
@@ -168393,11 +168393,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_94_vals), 0,
         "T_modeSpecificInfo_94", HFILL }},
     { &hf_rrc_fdd_136,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_133", HFILL }},
     { &hf_rrc_tdd_90,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_84", HFILL }},
     { &hf_rrc_primaryCCPCH_Info_03,
@@ -168409,7 +168409,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TimeslotInfoList_r4_vals), 0,
         "TimeslotInfoList_r4", HFILL }},
     { &hf_rrc_cellSelectionReselectionInfo,
-      { "cellSelectionReselectionInfo", "rrc.cellSelectionReselectionInfo",
+      { "cellSelectionReselectionInfo", "rrc.cellSelectionReselectionInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellSelectReselectInfoMC_RSCP", HFILL }},
     { &hf_rrc_modeSpecificInfo_95,
@@ -168417,15 +168417,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_95_vals), 0,
         "T_modeSpecificInfo_95", HFILL }},
     { &hf_rrc_fdd_137,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_134", HFILL }},
     { &hf_rrc_tdd_91,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_85", HFILL }},
     { &hf_rrc_CellInfoListToBeExcluded_item,
-      { "PrimaryCPICH-Info", "rrc.PrimaryCPICH_Info",
+      { "PrimaryCPICH-Info", "rrc.PrimaryCPICH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_96,
@@ -168433,19 +168433,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_96_vals), 0,
         "T_modeSpecificInfo_96", HFILL }},
     { &hf_rrc_fdd_138,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_135", HFILL }},
     { &hf_rrc_tdd_92,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_86", HFILL }},
     { &hf_rrc_cellSelectionReselectionInfo_01,
-      { "cellSelectionReselectionInfo", "rrc.cellSelectionReselectionInfo",
+      { "cellSelectionReselectionInfo", "rrc.cellSelectionReselectionInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellSelectReselectInfoSIB_11_12_RSCP", HFILL }},
     { &hf_rrc_primaryCCPCH_Info_04,
-      { "primaryCCPCH-Info", "rrc.primaryCCPCH_Info",
+      { "primaryCCPCH-Info", "rrc.primaryCCPCH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrimaryCCPCH_Info_LCR_r4", HFILL }},
     { &hf_rrc_timeslotInfoList_02,
@@ -168457,15 +168457,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_97_vals), 0,
         "T_modeSpecificInfo_97", HFILL }},
     { &hf_rrc_fdd_139,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_136", HFILL }},
     { &hf_rrc_tdd_93,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_87", HFILL }},
     { &hf_rrc_cellSelectionReselectionInfo_02,
-      { "cellSelectionReselectionInfo", "rrc.cellSelectionReselectionInfo",
+      { "cellSelectionReselectionInfo", "rrc.cellSelectionReselectionInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellSelectReselectInfoSIB_11_12_ECN0", HFILL }},
     { &hf_rrc_modeSpecificInfo_98,
@@ -168473,15 +168473,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_98_vals), 0,
         "T_modeSpecificInfo_98", HFILL }},
     { &hf_rrc_fdd_140,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_137", HFILL }},
     { &hf_rrc_tdd_94,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_88", HFILL }},
     { &hf_rrc_cellSelectionReselectionInfo_03,
-      { "cellSelectionReselectionInfo", "rrc.cellSelectionReselectionInfo",
+      { "cellSelectionReselectionInfo", "rrc.cellSelectionReselectionInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellSelectReselectInfoSIB_11_12_HCS_RSCP", HFILL }},
     { &hf_rrc_modeSpecificInfo_99,
@@ -168489,15 +168489,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_99_vals), 0,
         "T_modeSpecificInfo_99", HFILL }},
     { &hf_rrc_fdd_141,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_138", HFILL }},
     { &hf_rrc_tdd_95,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_89", HFILL }},
     { &hf_rrc_cellSelectionReselectionInfo_04,
-      { "cellSelectionReselectionInfo", "rrc.cellSelectionReselectionInfo",
+      { "cellSelectionReselectionInfo", "rrc.cellSelectionReselectionInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellSelectReselectInfoSIB_11_12_HCS_ECN0", HFILL }},
     { &hf_rrc_cellIdentity,
@@ -168509,7 +168509,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_SFN_SFN_ObsTimeDifference_vals), 0,
         "SFN_SFN_ObsTimeDifference", HFILL }},
     { &hf_rrc_cellSynchronisationInfo,
-      { "cellSynchronisationInfo", "rrc.cellSynchronisationInfo",
+      { "cellSynchronisationInfo", "rrc.cellSynchronisationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_100,
@@ -168517,7 +168517,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_100_vals), 0,
         "T_modeSpecificInfo_100", HFILL }},
     { &hf_rrc_fdd_142,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_139", HFILL }},
     { &hf_rrc_cpich_Ec_N0_01,
@@ -168533,7 +168533,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_96,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_90", HFILL }},
     { &hf_rrc_proposedTGSN,
@@ -168549,15 +168549,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_101_vals), 0,
         "T_modeSpecificInfo_101", HFILL }},
     { &hf_rrc_fdd_143,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_140", HFILL }},
     { &hf_rrc_deltaRSCPPerCell,
-      { "deltaRSCPPerCell", "rrc.deltaRSCPPerCell",
+      { "deltaRSCPPerCell", "rrc.deltaRSCPPerCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_97,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_91", HFILL }},
     { &hf_rrc_csgIdentity,
@@ -168573,7 +168573,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxCellMeas_OF_PrimaryCPICH_Info", HFILL }},
     { &hf_rrc_fdd_item_01,
-      { "PrimaryCPICH-Info", "rrc.PrimaryCPICH_Info",
+      { "PrimaryCPICH-Info", "rrc.PrimaryCPICH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_98,
@@ -168589,7 +168589,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxCellMeasOnSecULFreq_OF_PrimaryCPICH_Info", HFILL }},
     { &hf_rrc_CellMeasurementEventResults_LCR_r4_item,
-      { "PrimaryCCPCH-Info-LCR-r4", "rrc.PrimaryCCPCH_Info_LCR_r4",
+      { "PrimaryCCPCH-Info-LCR-r4", "rrc.PrimaryCCPCH_Info_LCR_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dummy_51,
@@ -168609,7 +168609,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_102_vals), 0,
         "T_modeSpecificInfo_102", HFILL }},
     { &hf_rrc_fdd_146,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_141", HFILL }},
     { &hf_rrc_cpich_Ec_N0_reportingIndicator,
@@ -168625,7 +168625,7 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_tdd_99,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_92", HFILL }},
     { &hf_rrc_timeslotISCP_reportingIndicator,
@@ -168645,7 +168645,7 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_hcs_NeighbouringCellInformation_RSCP,
-      { "hcs-NeighbouringCellInformation-RSCP", "rrc.hcs_NeighbouringCellInformation_RSCP",
+      { "hcs-NeighbouringCellInformation-RSCP", "rrc.hcs_NeighbouringCellInformation_RSCP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_103,
@@ -168653,15 +168653,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_103_vals), 0,
         "T_modeSpecificInfo_103", HFILL }},
     { &hf_rrc_fdd_147,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_142", HFILL }},
     { &hf_rrc_tdd_100,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_93", HFILL }},
     { &hf_rrc_gsm_03,
-      { "gsm", "rrc.gsm",
+      { "gsm", "rrc.gsm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_gsm_03", HFILL }},
     { &hf_rrc_q_Offset1S_N,
@@ -168677,15 +168677,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_104_vals), 0,
         "T_modeSpecificInfo_104", HFILL }},
     { &hf_rrc_fdd_148,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_143", HFILL }},
     { &hf_rrc_tdd_101,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_94", HFILL }},
     { &hf_rrc_gsm_04,
-      { "gsm", "rrc.gsm",
+      { "gsm", "rrc.gsm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_gsm_04", HFILL }},
     { &hf_rrc_modeSpecificInfo_105,
@@ -168693,15 +168693,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_105_vals), 0,
         "T_modeSpecificInfo_105", HFILL }},
     { &hf_rrc_fdd_149,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_144", HFILL }},
     { &hf_rrc_tdd_102,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_95", HFILL }},
     { &hf_rrc_gsm_05,
-      { "gsm", "rrc.gsm",
+      { "gsm", "rrc.gsm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_gsm_05", HFILL }},
     { &hf_rrc_modeSpecificInfo_106,
@@ -168709,15 +168709,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_106_vals), 0,
         "T_modeSpecificInfo_106", HFILL }},
     { &hf_rrc_fdd_150,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_145", HFILL }},
     { &hf_rrc_tdd_103,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_96", HFILL }},
     { &hf_rrc_gsm_06,
-      { "gsm", "rrc.gsm",
+      { "gsm", "rrc.gsm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_gsm_06", HFILL }},
     { &hf_rrc_modeSpecificInfo_107,
@@ -168725,19 +168725,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_107_vals), 0,
         "T_modeSpecificInfo_107", HFILL }},
     { &hf_rrc_fdd_151,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_146", HFILL }},
     { &hf_rrc_tdd_104,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_97", HFILL }},
     { &hf_rrc_gsm_07,
-      { "gsm", "rrc.gsm",
+      { "gsm", "rrc.gsm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_gsm_07", HFILL }},
     { &hf_rrc_hcs_NeighbouringCellInformation_ECN0,
-      { "hcs-NeighbouringCellInformation-ECN0", "rrc.hcs_NeighbouringCellInformation_ECN0",
+      { "hcs-NeighbouringCellInformation-ECN0", "rrc.hcs_NeighbouringCellInformation_ECN0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_108,
@@ -168745,15 +168745,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_108_vals), 0,
         "T_modeSpecificInfo_108", HFILL }},
     { &hf_rrc_fdd_152,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_147", HFILL }},
     { &hf_rrc_tdd_105,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_98", HFILL }},
     { &hf_rrc_gsm_08,
-      { "gsm", "rrc.gsm",
+      { "gsm", "rrc.gsm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_gsm_08", HFILL }},
     { &hf_rrc_deltaQrxlevmin,
@@ -168825,11 +168825,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_109_vals), 0,
         "T_modeSpecificInfo_109", HFILL }},
     { &hf_rrc_fdd_153,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_148", HFILL }},
     { &hf_rrc_countC_SFN_Frame_difference,
-      { "countC-SFN-Frame-difference", "rrc.countC_SFN_Frame_difference",
+      { "countC-SFN-Frame-difference", "rrc.countC_SFN_Frame_difference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tm,
@@ -168837,7 +168837,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_38399", HFILL }},
     { &hf_rrc_tdd_106,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_99", HFILL }},
     { &hf_rrc_bsicReported,
@@ -168845,7 +168845,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_BSICReported_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_CellToReportList_item,
-      { "CellToReport", "rrc.CellToReport",
+      { "CellToReport", "rrc.CellToReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cnavToc,
@@ -168921,11 +168921,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_110_vals), 0,
         "T_modeSpecificInfo_110", HFILL }},
     { &hf_rrc_fdd_154,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_149", HFILL }},
     { &hf_rrc_startPSC_01,
-      { "startPSC", "rrc.startPSC",
+      { "startPSC", "rrc.startPSC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrimaryCPICH_Info", HFILL }},
     { &hf_rrc_numberOfPSCs_01,
@@ -168933,7 +168933,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_512", HFILL }},
     { &hf_rrc_CSGCellInfoList_item,
-      { "CSGCellInfo", "rrc.CSGCellInfo",
+      { "CSGCellInfo", "rrc.CSGCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cSGInterFreqCellInfoListperFreq,
@@ -168941,7 +168941,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CSGCellInfoList", HFILL }},
     { &hf_rrc_CSGInterFreqCellInfoList_item,
-      { "CSGInterFreqCellInfo", "rrc.CSGInterFreqCellInfo",
+      { "CSGInterFreqCellInfo", "rrc.CSGInterFreqCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_uTRACSGProximityDetec,
@@ -168961,15 +168961,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_radioAccessTechnology_02_vals), 0,
         "T_radioAccessTechnology_02", HFILL }},
     { &hf_rrc_uTRA,
-      { "uTRA", "rrc.uTRA",
+      { "uTRA", "rrc.uTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cSGFrequencyInfoUTRA,
-      { "cSGFrequencyInfoUTRA", "rrc.cSGFrequencyInfoUTRA",
+      { "cSGFrequencyInfoUTRA", "rrc.cSGFrequencyInfoUTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FrequencyInfo", HFILL }},
     { &hf_rrc_e_UTRA,
-      { "e-UTRA", "rrc.e_UTRA",
+      { "e-UTRA", "rrc.e_UTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cSGFrequencyInfoEUTRA,
@@ -168989,7 +168989,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_1_1024", HFILL }},
     { &hf_rrc_DataBitAssistanceList_item,
-      { "DataBitAssistanceSat", "rrc.DataBitAssistanceSat",
+      { "DataBitAssistanceSat", "rrc.DataBitAssistanceSat_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_satID_01,
@@ -169001,7 +169001,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DataBitAssistanceSgnList_item,
-      { "DataBitAssistance", "rrc.DataBitAssistance",
+      { "DataBitAssistance", "rrc.DataBitAssistance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_deltaRSCP,
@@ -169037,15 +169037,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DGANSSSignalInformationList_v920ext", HFILL }},
     { &hf_rrc_DGANSSInfoList_item,
-      { "DGANSSInfo", "rrc.DGANSSInfo",
+      { "DGANSSInfo", "rrc.DGANSSInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DGANSSInfoList_r9_item,
-      { "DGANSSInfo-r9", "rrc.DGANSSInfo_r9",
+      { "DGANSSInfo-r9", "rrc.DGANSSInfo_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DGANSSInfoList_v920ext_item,
-      { "DGANSSInfo-v920ext", "rrc.DGANSSInfo_v920ext",
+      { "DGANSSInfo-v920ext", "rrc.DGANSSInfo_v920ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_satId,
@@ -169077,15 +169077,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UDREValidityTime_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_DGANSSSignalInformationList_item,
-      { "DGANSSSignalInformation", "rrc.DGANSSSignalInformation",
+      { "DGANSSSignalInformation", "rrc.DGANSSSignalInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DGANSSSignalInformationList_r9_item,
-      { "DGANSSSignalInformation-r9", "rrc.DGANSSSignalInformation_r9",
+      { "DGANSSSignalInformation-r9", "rrc.DGANSSSignalInformation_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DGANSSSignalInformationList_v920ext_item,
-      { "DGANSSSignalInformation-v920ext", "rrc.DGANSSSignalInformation_v920ext",
+      { "DGANSSSignalInformation-v920ext", "rrc.DGANSSSignalInformation_v920ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_iode,
@@ -169117,15 +169117,15 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "DeltaRRC", HFILL }},
     { &hf_rrc_DGPS_CorrectionSatInfoList_item,
-      { "DGPS-CorrectionSatInfo", "rrc.DGPS_CorrectionSatInfo",
+      { "DGPS-CorrectionSatInfo", "rrc.DGPS_CorrectionSatInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DGPS_CorrectionSatInfoList_r9_item,
-      { "DGPS-CorrectionSatInfo-r9", "rrc.DGPS_CorrectionSatInfo_r9",
+      { "DGPS-CorrectionSatInfo-r9", "rrc.DGPS_CorrectionSatInfo_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_DGPS_CorrectionSatInfoList_v920ext_item,
-      { "DGPS-CorrectionSatInfo-v920ext", "rrc.DGPS_CorrectionSatInfo_v920ext",
+      { "DGPS-CorrectionSatInfo-v920ext", "rrc.DGPS_CorrectionSatInfo_v920ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_latitudeSign,
@@ -169205,11 +169205,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "EARFCNExtension", HFILL }},
     { &hf_rrc_Eutra_EventResultList_item,
-      { "Eutra-EventResult", "rrc.Eutra_EventResult",
+      { "Eutra-EventResult", "rrc.Eutra_EventResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_EUTRA_EventResultList_vb50ext_item,
-      { "EUTRA-EventResult-vb50ext", "rrc.EUTRA_EventResult_vb50ext",
+      { "EUTRA-EventResult-vb50ext", "rrc.EUTRA_EventResult_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_eventID,
@@ -169265,19 +169265,19 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M34_M3", HFILL }},
     { &hf_rrc_EUTRA_FrequencyAndPriorityInfoExtensionList_item,
-      { "EUTRA-FrequencyAndPriorityInfoExtension-vb50ext", "rrc.EUTRA_FrequencyAndPriorityInfoExtension_vb50ext",
+      { "EUTRA-FrequencyAndPriorityInfoExtension-vb50ext", "rrc.EUTRA_FrequencyAndPriorityInfoExtension_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_EUTRA_FrequencyAndPriorityInfoList_item,
-      { "EUTRA-FrequencyAndPriorityInfo", "rrc.EUTRA_FrequencyAndPriorityInfo",
+      { "EUTRA-FrequencyAndPriorityInfo", "rrc.EUTRA_FrequencyAndPriorityInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_EUTRA_FrequencyAndPriorityInfoList_v920ext_item,
-      { "EUTRA-FrequencyAndPriorityInfo-v920ext", "rrc.EUTRA_FrequencyAndPriorityInfo_v920ext",
+      { "EUTRA-FrequencyAndPriorityInfo-v920ext", "rrc.EUTRA_FrequencyAndPriorityInfo_v920ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_EUTRA_FrequencyAndPriorityInfoList_vb50ext_item,
-      { "EUTRA-FrequencyAndPriorityInfo-vb50ext", "rrc.EUTRA_FrequencyAndPriorityInfo_vb50ext",
+      { "EUTRA-FrequencyAndPriorityInfo-vb50ext", "rrc.EUTRA_FrequencyAndPriorityInfo_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_eutraFrequencyRemoval,
@@ -169289,7 +169289,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "EUTRA_FrequencyInfoList", HFILL }},
     { &hf_rrc_eutraSIAcquisition,
-      { "eutraSIAcquisition", "rrc.eutraSIAcquisition",
+      { "eutraSIAcquisition", "rrc.eutraSIAcquisition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EUTRA_SIAcquisition", HFILL }},
     { &hf_rrc_eutraFrequencyRemoval_01,
@@ -169301,7 +169301,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "EUTRA_FrequencyInfoList_r11", HFILL }},
     { &hf_rrc_eutraSIAcquisition_01,
-      { "eutraSIAcquisition", "rrc.eutraSIAcquisition",
+      { "eutraSIAcquisition", "rrc.eutraSIAcquisition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EUTRA_SIAcquisition_r11", HFILL }},
     { &hf_rrc_physicalCellIdentity,
@@ -169321,15 +169321,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxReportedEUTRACellPerFreq_OF_EUTRA_MeasuredCells", HFILL }},
     { &hf_rrc_measuredEUTRACells_item,
-      { "EUTRA-MeasuredCells", "rrc.EUTRA_MeasuredCells",
+      { "EUTRA-MeasuredCells", "rrc.EUTRA_MeasuredCells_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_Eutra_MeasuredResultList_item,
-      { "Eutra-MeasuredResult", "rrc.Eutra_MeasuredResult",
+      { "Eutra-MeasuredResult", "rrc.Eutra_MeasuredResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_EUTRA_MeasuredResultList_vb50ext_item,
-      { "EUTRA-MeasuredResult-vb50ext", "rrc.EUTRA_MeasuredResult_vb50ext",
+      { "EUTRA-MeasuredResult-vb50ext", "rrc.EUTRA_MeasuredResult_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_eutraMeasuredResultList,
@@ -169341,7 +169341,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "EUTRA_MeasuredResultList_vb50ext", HFILL }},
     { &hf_rrc_eutraSIacquisitionResults,
-      { "eutraSIacquisitionResults", "rrc.eutraSIacquisitionResults",
+      { "eutraSIacquisitionResults", "rrc.eutraSIacquisitionResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EUTRA_SIacquisitionResults", HFILL }},
     { &hf_rrc_measuredEUTRACells_v920ext,
@@ -169349,11 +169349,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxReportedEUTRACellPerFreq_OF_EUTRA_MeasuredCells_v920ext", HFILL }},
     { &hf_rrc_measuredEUTRACells_v920ext_item,
-      { "EUTRA-MeasuredCells-v920ext", "rrc.EUTRA_MeasuredCells_v920ext",
+      { "EUTRA-MeasuredCells-v920ext", "rrc.EUTRA_MeasuredCells_v920ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_Eutra_MeasuredResultList_v920ext_item,
-      { "Eutra-MeasuredResult-v920ext", "rrc.Eutra_MeasuredResult_v920ext",
+      { "Eutra-MeasuredResult-v920ext", "rrc.Eutra_MeasuredResult_v920ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_eutraMeasuredResultList_v920ext,
@@ -169361,7 +169361,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Eutra_MeasuredResultList_v920ext", HFILL }},
     { &hf_rrc_cgiInfo,
-      { "cgiInfo", "rrc.cgiInfo",
+      { "cgiInfo", "rrc.cgiInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cellIdentity_01,
@@ -169377,7 +169377,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_csgMemberIndication_01_vals), 0,
         "T_csgMemberIndication_01", HFILL }},
     { &hf_rrc_removeAllFrequencies,
-      { "removeAllFrequencies", "rrc.removeAllFrequencies",
+      { "removeAllFrequencies", "rrc.removeAllFrequencies_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_removeSomeFrequencies,
@@ -169389,7 +169389,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_removeNoFrequencies,
-      { "removeNoFrequencies", "rrc.removeNoFrequencies",
+      { "removeNoFrequencies", "rrc.removeNoFrequencies_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_removeSomeFrequencies_01,
@@ -169397,11 +169397,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "FrequenciesToRemove", HFILL }},
     { &hf_rrc_EUTRA_FrequencyInfoList_item,
-      { "EUTRA-FrequencyInfo", "rrc.EUTRA_FrequencyInfo",
+      { "EUTRA-FrequencyInfo", "rrc.EUTRA_FrequencyInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_EUTRA_FrequencyInfoList_r11_item,
-      { "EUTRA-FrequencyInfo-r11", "rrc.EUTRA_FrequencyInfo_r11",
+      { "EUTRA-FrequencyInfo-r11", "rrc.EUTRA_FrequencyInfo_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_widebandRSRQMeasurements,
@@ -169429,7 +169429,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxNumEUTRAFreqs_FACH_OF_EARFCNRange", HFILL }},
     { &hf_rrc_eutraFrequenciesForMeasurement_item,
-      { "EARFCNRange", "rrc.EARFCNRange",
+      { "EARFCNRange", "rrc.EARFCNRange_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_reportCriteria,
@@ -169445,7 +169445,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_97", HFILL }},
     { &hf_rrc_FrequenciesToRemove_item,
-      { "EARFCNRange", "rrc.EARFCNRange",
+      { "EARFCNRange", "rrc.EARFCNRange_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_triggeringCondition,
@@ -169489,7 +169489,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TriggeringCondition1_vals), 0,
         "TriggeringCondition1", HFILL }},
     { &hf_rrc_periodicReportingInfo_1b,
-      { "periodicReportingInfo-1b", "rrc.periodicReportingInfo_1b",
+      { "periodicReportingInfo-1b", "rrc.periodicReportingInfo_1b_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_replacementActivationThreshold,
@@ -169581,19 +169581,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_intraFreqEventResults,
-      { "intraFreqEventResults", "rrc.intraFreqEventResults",
+      { "intraFreqEventResults", "rrc.intraFreqEventResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interFreqEventResults,
-      { "interFreqEventResults", "rrc.interFreqEventResults",
+      { "interFreqEventResults", "rrc.interFreqEventResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interRATEventResults,
-      { "interRATEventResults", "rrc.interRATEventResults",
+      { "interRATEventResults", "rrc.interRATEventResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_trafficVolumeEventResults,
-      { "trafficVolumeEventResults", "rrc.trafficVolumeEventResults",
+      { "trafficVolumeEventResults", "rrc.trafficVolumeEventResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_qualityEventResults,
@@ -169617,11 +169617,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UE_Positioning_MeasurementEventResults_v860ext_vals), 0,
         "UE_Positioning_MeasurementEventResults_v860ext", HFILL }},
     { &hf_rrc_interFreqEventResults_01,
-      { "interFreqEventResults", "rrc.interFreqEventResults",
+      { "interFreqEventResults", "rrc.interFreqEventResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqEventResults_va40ext", HFILL }},
     { &hf_rrc_intraFreqEventResults_01,
-      { "intraFreqEventResults", "rrc.intraFreqEventResults",
+      { "intraFreqEventResults", "rrc.intraFreqEventResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqEventResultsOnSecUlFreq", HFILL }},
     { &hf_rrc_dopplerFirstOrder,
@@ -169665,11 +169665,11 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_fdd_155,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrimaryCPICH_Info", HFILL }},
     { &hf_rrc_tdd_107,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrimaryCCPCH_Info_LCR_r4", HFILL }},
     { &hf_rrc_ForbiddenAffectCellList_item,
@@ -169681,15 +169681,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_ForbiddenAffectCell_r4_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_ForbiddenAffectCellList_LCR_r4_item,
-      { "ForbiddenAffectCell-LCR-r4", "rrc.ForbiddenAffectCell_LCR_r4",
+      { "ForbiddenAffectCell-LCR-r4", "rrc.ForbiddenAffectCell_LCR_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ForbiddenAffectCellListOnSecULFreq_item,
-      { "ForbiddenAffectCellOnSecULFreq", "rrc.ForbiddenAffectCellOnSecULFreq",
+      { "ForbiddenAffectCellOnSecULFreq", "rrc.ForbiddenAffectCellOnSecULFreq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_primaryCPICH,
-      { "primaryCPICH", "rrc.primaryCPICH",
+      { "primaryCPICH", "rrc.primaryCPICH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrimaryCPICH_Info", HFILL }},
     { &hf_rrc_ganssTod,
@@ -169697,7 +169697,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_86399", HFILL }},
     { &hf_rrc_dataBitAssistance,
-      { "dataBitAssistance", "rrc.dataBitAssistance",
+      { "dataBitAssistance", "rrc.dataBitAssistance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReqDataBitAssistance", HFILL }},
     { &hf_rrc_ganssId,
@@ -169709,11 +169709,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_uePositioningDGANSSCorrections,
-      { "uePositioningDGANSSCorrections", "rrc.uePositioningDGANSSCorrections",
+      { "uePositioningDGANSSCorrections", "rrc.uePositioningDGANSSCorrections_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_DGANSSCorrections", HFILL }},
     { &hf_rrc_uePositioningGANSSNavigationModel,
-      { "uePositioningGANSSNavigationModel", "rrc.uePositioningGANSSNavigationModel",
+      { "uePositioningGANSSNavigationModel", "rrc.uePositioningGANSSNavigationModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_NavigationModel", HFILL }},
     { &hf_rrc_uePositioningGANSSRealTimeIntegrity,
@@ -169721,19 +169721,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "UE_Positioning_GANSS_RealTimeIntegrity", HFILL }},
     { &hf_rrc_uePositioningGANSSDataBitAssistance,
-      { "uePositioningGANSSDataBitAssistance", "rrc.uePositioningGANSSDataBitAssistance",
+      { "uePositioningGANSSDataBitAssistance", "rrc.uePositioningGANSSDataBitAssistance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_Data_Bit_Assistance", HFILL }},
     { &hf_rrc_uePositioningGANSSReferenceMeasurementInfo,
-      { "uePositioningGANSSReferenceMeasurementInfo", "rrc.uePositioningGANSSReferenceMeasurementInfo",
+      { "uePositioningGANSSReferenceMeasurementInfo", "rrc.uePositioningGANSSReferenceMeasurementInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_ReferenceMeasurementInfo", HFILL }},
     { &hf_rrc_uePositioningGANSSAlmanac,
-      { "uePositioningGANSSAlmanac", "rrc.uePositioningGANSSAlmanac",
+      { "uePositioningGANSSAlmanac", "rrc.uePositioningGANSSAlmanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_Almanac", HFILL }},
     { &hf_rrc_uePositioningGANSSUTCModel,
-      { "uePositioningGANSSUTCModel", "rrc.uePositioningGANSSUTCModel",
+      { "uePositioningGANSSUTCModel", "rrc.uePositioningGANSSUTCModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_UTCModel", HFILL }},
     { &hf_rrc_uePositiningGANSSsbasID,
@@ -169741,15 +169741,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UE_Positioning_GANSS_SBAS_ID_vals), 0,
         "UE_Positioning_GANSS_SBAS_ID", HFILL }},
     { &hf_rrc_uePositioningGANSSAddNavigationModels,
-      { "uePositioningGANSSAddNavigationModels", "rrc.uePositioningGANSSAddNavigationModels",
+      { "uePositioningGANSSAddNavigationModels", "rrc.uePositioningGANSSAddNavigationModels_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_AddNavigationModels", HFILL }},
     { &hf_rrc_uePositioningGANSSAlmanac_01,
-      { "uePositioningGANSSAlmanac", "rrc.uePositioningGANSSAlmanac",
+      { "uePositioningGANSSAlmanac", "rrc.uePositioningGANSSAlmanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_Almanac_v860ext", HFILL }},
     { &hf_rrc_uePositioningGANSSAddUTCModels,
-      { "uePositioningGANSSAddUTCModels", "rrc.uePositioningGANSSAddUTCModels",
+      { "uePositioningGANSSAddUTCModels", "rrc.uePositioningGANSSAddUTCModels_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_AddUTCModels", HFILL }},
     { &hf_rrc_uePositioningGANSSAuxiliaryInfo,
@@ -169757,15 +169757,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UE_Positioning_GANSS_AuxiliaryInfo_vals), 0,
         "UE_Positioning_GANSS_AuxiliaryInfo", HFILL }},
     { &hf_rrc_uePositioningGANSSAlmanac_02,
-      { "uePositioningGANSSAlmanac", "rrc.uePositioningGANSSAlmanac",
+      { "uePositioningGANSSAlmanac", "rrc.uePositioningGANSSAlmanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_Almanac_r8", HFILL }},
     { &hf_rrc_uePositioningDGANSSCorrections_01,
-      { "uePositioningDGANSSCorrections", "rrc.uePositioningDGANSSCorrections",
+      { "uePositioningDGANSSCorrections", "rrc.uePositioningDGANSSCorrections_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_DGANSSCorrections_r9", HFILL }},
     { &hf_rrc_uePositioningDGANSSCorrections_02,
-      { "uePositioningDGANSSCorrections", "rrc.uePositioningDGANSSCorrections",
+      { "uePositioningDGANSSCorrections", "rrc.uePositioningDGANSSCorrections_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_DGANSSCorrections_v920ext", HFILL }},
     { &hf_rrc_ganssTimeModelsList_01,
@@ -169773,11 +169773,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GANSSTimeModelsList_va40ext", HFILL }},
     { &hf_rrc_uePositioningGANSSReferenceMeasurementInfo_01,
-      { "uePositioningGANSSReferenceMeasurementInfo", "rrc.uePositioningGANSSReferenceMeasurementInfo",
+      { "uePositioningGANSSReferenceMeasurementInfo", "rrc.uePositioningGANSSReferenceMeasurementInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_ReferenceMeasurementInfo_va40ext", HFILL }},
     { &hf_rrc_uePositioningGANSSAlmanac_03,
-      { "uePositioningGANSSAlmanac", "rrc.uePositioningGANSSAlmanac",
+      { "uePositioningGANSSAlmanac", "rrc.uePositioningGANSSAlmanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_Almanac_va40ext", HFILL }},
     { &hf_rrc_ganssTimeModelsList_02,
@@ -169785,43 +169785,43 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GANSSTimeModelsList_r10", HFILL }},
     { &hf_rrc_uePositioningGANSSReferenceMeasurementInfo_02,
-      { "uePositioningGANSSReferenceMeasurementInfo", "rrc.uePositioningGANSSReferenceMeasurementInfo",
+      { "uePositioningGANSSReferenceMeasurementInfo", "rrc.uePositioningGANSSReferenceMeasurementInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_ReferenceMeasurementInfo_r10", HFILL }},
     { &hf_rrc_uePositioningGANSSAlmanac_04,
-      { "uePositioningGANSSAlmanac", "rrc.uePositioningGANSSAlmanac",
+      { "uePositioningGANSSAlmanac", "rrc.uePositioningGANSSAlmanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_Almanac_r10", HFILL }},
     { &hf_rrc_GANSSGenericDataList_item,
-      { "GANSSGenericData", "rrc.GANSSGenericData",
+      { "GANSSGenericData", "rrc.GANSSGenericData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_GANSSGenericDataList_v860ext_item,
-      { "GANSSGenericData-v860ext", "rrc.GANSSGenericData_v860ext",
+      { "GANSSGenericData-v860ext", "rrc.GANSSGenericData_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_GANSSGenericDataList_r8_item,
-      { "GANSSGenericData-r8", "rrc.GANSSGenericData_r8",
+      { "GANSSGenericData-r8", "rrc.GANSSGenericData_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_GANSSGenericDataList_r9_item,
-      { "GANSSGenericData-r9", "rrc.GANSSGenericData_r9",
+      { "GANSSGenericData-r9", "rrc.GANSSGenericData_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_GANSSGenericDataList_v920ext_item,
-      { "GANSSGenericData-v920ext", "rrc.GANSSGenericData_v920ext",
+      { "GANSSGenericData-v920ext", "rrc.GANSSGenericData_v920ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_GANSSGenericDataList_va40ext_item,
-      { "GANSSGenericData-va40ext", "rrc.GANSSGenericData_va40ext",
+      { "GANSSGenericData-va40ext", "rrc.GANSSGenericData_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_GANSSGenericDataList_r10_item,
-      { "GANSSGenericData-r10", "rrc.GANSSGenericData_r10",
+      { "GANSSGenericData-r10", "rrc.GANSSGenericData_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_GANSSGenericMeasurementInfo_item,
-      { "GANSSGenericMeasurementInfo item", "rrc.GANSSGenericMeasurementInfo_item",
+      { "GANSSGenericMeasurementInfo item", "rrc.GANSSGenericMeasurementInfo_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ganssMeasurementSignalList,
@@ -169829,7 +169829,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_GANSSGenericMeasurementInfo_v860ext_item,
-      { "GANSSGenericMeasurementInfo-v860ext item", "rrc.GANSSGenericMeasurementInfo_v860ext_item",
+      { "GANSSGenericMeasurementInfo-v860ext item", "rrc.GANSSGenericMeasurementInfo_v860ext_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ganssMeasurementSignalList_01,
@@ -169837,7 +169837,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GANSSMeasurementSignalList_v860ext", HFILL }},
     { &hf_rrc_GANSSMeasurementParameters_item,
-      { "GANSSMeasurementParameters item", "rrc.GANSSMeasurementParameters_item",
+      { "GANSSMeasurementParameters item", "rrc.GANSSMeasurementParameters_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cSurNzero,
@@ -169873,7 +169873,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_33554431", HFILL }},
     { &hf_rrc_GANSSMeasurementParameters_v860ext_item,
-      { "GANSSMeasurementParameters-v860ext item", "rrc.GANSSMeasurementParameters_v860ext_item",
+      { "GANSSMeasurementParameters-v860ext item", "rrc.GANSSMeasurementParameters_v860ext_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ganssIntegerCodePhaseExt,
@@ -169881,7 +169881,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_64_127", HFILL }},
     { &hf_rrc_GANSSMeasurementSignalList_item,
-      { "GANSSMeasurementSignalList item", "rrc.GANSSMeasurementSignalList_item",
+      { "GANSSMeasurementSignalList item", "rrc.GANSSMeasurementSignalList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ganssCodePhaseAmbiguity,
@@ -169893,7 +169893,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_GANSSMeasurementSignalList_v860ext_item,
-      { "GANSSMeasurementSignalList-v860ext item", "rrc.GANSSMeasurementSignalList_v860ext_item",
+      { "GANSSMeasurementSignalList-v860ext item", "rrc.GANSSMeasurementSignalList_v860ext_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ganssCodePhaseAmbiguityExt,
@@ -169957,7 +169957,7 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_ganssDataBits,
-      { "ganssDataBits", "rrc.ganssDataBits",
+      { "ganssDataBits", "rrc.ganssDataBits_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ganssUTCModel,
@@ -169965,7 +169965,7 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_ganssNavigationModelAdditionalData,
-      { "ganssNavigationModelAdditionalData", "rrc.ganssNavigationModelAdditionalData",
+      { "ganssNavigationModelAdditionalData", "rrc.ganssNavigationModelAdditionalData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sbasId,
@@ -169985,7 +169985,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_ganssAuxInfo_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_ganssAddADchoices,
-      { "ganssAddADchoices", "rrc.ganssAddADchoices",
+      { "ganssAddADchoices", "rrc.ganssAddADchoices_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_orbitModelID,
@@ -170005,11 +170005,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_7", HFILL }},
     { &hf_rrc_GanssRequestedGenericAssistanceDataList_item,
-      { "GanssReqGenericData", "rrc.GanssReqGenericData",
+      { "GanssReqGenericData", "rrc.GanssReqGenericData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_GanssRequestedGenericAssistanceDataList_v860ext_item,
-      { "GanssReqGenericData-v860ext", "rrc.GanssReqGenericData_v860ext",
+      { "GanssReqGenericData-v860ext", "rrc.GanssReqGenericData_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ganssSatId,
@@ -170021,7 +170021,7 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M2048_2047", HFILL }},
     { &hf_rrc_extraDoppler,
-      { "extraDoppler", "rrc.extraDoppler",
+      { "extraDoppler", "rrc.extraDoppler_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_codePhase_01,
@@ -170037,35 +170037,35 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_5", HFILL }},
     { &hf_rrc_azimuthandElevation,
-      { "azimuthandElevation", "rrc.azimuthandElevation",
+      { "azimuthandElevation", "rrc.azimuthandElevation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_azimuthandElevation_01,
-      { "azimuthandElevation", "rrc.azimuthandElevation",
+      { "azimuthandElevation", "rrc.azimuthandElevation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AzimuthAndElevation_r10", HFILL }},
     { &hf_rrc_GANSSSatelliteInformationList_item,
-      { "GANSSSatelliteInformation", "rrc.GANSSSatelliteInformation",
+      { "GANSSSatelliteInformation", "rrc.GANSSSatelliteInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_GANSSSatelliteInformationList_va40ext_item,
-      { "GANSSSatelliteInformation-va40ext", "rrc.GANSSSatelliteInformation_va40ext",
+      { "GANSSSatelliteInformation-va40ext", "rrc.GANSSSatelliteInformation_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_GANSSSatelliteInformationList_r10_item,
-      { "GANSSSatelliteInformation-r10", "rrc.GANSSSatelliteInformation_r10",
+      { "GANSSSatelliteInformation-r10", "rrc.GANSSSatelliteInformation_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_GANSSTimeModelsList_item,
-      { "UE-Positioning-GANSS-TimeModel", "rrc.UE_Positioning_GANSS_TimeModel",
+      { "UE-Positioning-GANSS-TimeModel", "rrc.UE_Positioning_GANSS_TimeModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_GANSSTimeModelsList_va40ext_item,
-      { "UE-Positioning-GANSS-TimeModel-va40ext", "rrc.UE_Positioning_GANSS_TimeModel_va40ext",
+      { "UE-Positioning-GANSS-TimeModel-va40ext", "rrc.UE_Positioning_GANSS_TimeModel_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_GANSSTimeModelsList_r10_item,
-      { "UE-Positioning-GANSS-TimeModel-r10", "rrc.UE_Positioning_GANSS_TimeModel_r10",
+      { "UE-Positioning-GANSS-TimeModel-r10", "rrc.UE_Positioning_GANSS_TimeModel_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_gloAlmNA,
@@ -170313,27 +170313,27 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_11", HFILL }},
     { &hf_rrc_GANSS_SAT_Info_Almanac_GLOkpList_item,
-      { "GANSS-SAT-Info-Almanac-GLOkp", "rrc.GANSS_SAT_Info_Almanac_GLOkp",
+      { "GANSS-SAT-Info-Almanac-GLOkp", "rrc.GANSS_SAT_Info_Almanac_GLOkp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_GANSS_SAT_Info_Almanac_KpList_item,
-      { "GANSS-SAT-Info-Almanac-Kp", "rrc.GANSS_SAT_Info_Almanac_Kp",
+      { "GANSS-SAT-Info-Almanac-Kp", "rrc.GANSS_SAT_Info_Almanac_Kp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_GANSS_SAT_Info_Almanac_MIDIkpList_item,
-      { "GANSS-SAT-Info-Almanac-MIDIkp", "rrc.GANSS_SAT_Info_Almanac_MIDIkp",
+      { "GANSS-SAT-Info-Almanac-MIDIkp", "rrc.GANSS_SAT_Info_Almanac_MIDIkp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_GANSS_SAT_Info_Almanac_NAVkpList_item,
-      { "GANSS-SAT-Info-Almanac-NAVkp", "rrc.GANSS_SAT_Info_Almanac_NAVkp",
+      { "GANSS-SAT-Info-Almanac-NAVkp", "rrc.GANSS_SAT_Info_Almanac_NAVkp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_GANSS_SAT_Info_Almanac_REDkpList_item,
-      { "GANSS-SAT-Info-Almanac-REDkp", "rrc.GANSS_SAT_Info_Almanac_REDkp",
+      { "GANSS-SAT-Info-Almanac-REDkp", "rrc.GANSS_SAT_Info_Almanac_REDkp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_GANSS_SAT_Info_Almanac_SBASecefList_item,
-      { "GANSS-SAT-Info-Almanac-SBASecef", "rrc.GANSS_SAT_Info_Almanac_SBASecef",
+      { "GANSS-SAT-Info-Almanac-SBASecef", "rrc.GANSS_SAT_Info_Almanac_SBASecef_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_svHealth,
@@ -170345,11 +170345,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_11", HFILL }},
     { &hf_rrc_ganssClockModel,
-      { "ganssClockModel", "rrc.ganssClockModel",
+      { "ganssClockModel", "rrc.ganssClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_AddClockModels", HFILL }},
     { &hf_rrc_ganssOrbitModel,
-      { "ganssOrbitModel", "rrc.ganssOrbitModel",
+      { "ganssOrbitModel", "rrc.ganssOrbitModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_AddOrbitModels", HFILL }},
     { &hf_rrc_svHealth_01,
@@ -170361,19 +170361,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_10", HFILL }},
     { &hf_rrc_ganssClockModel_01,
-      { "ganssClockModel", "rrc.ganssClockModel",
+      { "ganssClockModel", "rrc.ganssClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_ClockModel", HFILL }},
     { &hf_rrc_ganssOrbitModel_01,
-      { "ganssOrbitModel", "rrc.ganssOrbitModel",
+      { "ganssOrbitModel", "rrc.ganssOrbitModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_OrbitModel", HFILL }},
     { &hf_rrc_Ganss_Sat_Info_AddNavList_item,
-      { "Ganss-Sat-Info-AddNav", "rrc.Ganss_Sat_Info_AddNav",
+      { "Ganss-Sat-Info-AddNav", "rrc.Ganss_Sat_Info_AddNav_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_Ganss_Sat_Info_NavList_item,
-      { "Ganss-Sat-Info-Nav", "rrc.Ganss_Sat_Info_Nav",
+      { "Ganss-Sat-Info-Nav", "rrc.Ganss_Sat_Info_Nav_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_storm_flag_one,
@@ -170437,7 +170437,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_63", HFILL }},
     { &hf_rrc_GPS_MeasurementParamList_item,
-      { "GPS-MeasurementParam", "rrc.GPS_MeasurementParam",
+      { "GPS-MeasurementParam", "rrc.GPS_MeasurementParam_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_startingARFCN,
@@ -170461,7 +170461,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_equallySpacedARFCNs,
-      { "equallySpacedARFCNs", "rrc.equallySpacedARFCNs",
+      { "equallySpacedARFCNs", "rrc.equallySpacedARFCNs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_arfcn_Spacing,
@@ -170477,7 +170477,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_1_16", HFILL }},
     { &hf_rrc_continuousRangeOfARFCNs,
-      { "continuousRangeOfARFCNs", "rrc.continuousRangeOfARFCNs",
+      { "continuousRangeOfARFCNs", "rrc.continuousRangeOfARFCNs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_endingARFCN,
@@ -170497,7 +170497,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ObservedTimeDifferenceToGSM", HFILL }},
     { &hf_rrc_GSM_MeasuredResultsList_item,
-      { "GSM-MeasuredResults", "rrc.GSM_MeasuredResults",
+      { "GSM-MeasuredResults", "rrc.GSM_MeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tlm_Message,
@@ -170517,11 +170517,11 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_GPS_TOW_AssistList_item,
-      { "GPS-TOW-Assist", "rrc.GPS_TOW_Assist",
+      { "GPS-TOW-Assist", "rrc.GPS_TOW_Assist_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_gsmCellGroup,
-      { "gsmCellGroup", "rrc.gsmCellGroup",
+      { "gsmCellGroup", "rrc.gsmCellGroup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GSM_CellGroup", HFILL }},
     { &hf_rrc_qRxLevMinGSM,
@@ -170529,7 +170529,7 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M58_M13", HFILL }},
     { &hf_rrc_GSM_PriorityInfoList_item,
-      { "GSM-PriorityInfo", "rrc.GSM_PriorityInfo",
+      { "GSM-PriorityInfo", "rrc.GSM_PriorityInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_penaltyTime,
@@ -170549,11 +170549,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_hcs_CellReselectInformation,
-      { "hcs-CellReselectInformation", "rrc.hcs_CellReselectInformation",
+      { "hcs-CellReselectInformation", "rrc.hcs_CellReselectInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HCS_CellReselectInformation_RSCP", HFILL }},
     { &hf_rrc_hcs_CellReselectInformation_01,
-      { "hcs-CellReselectInformation", "rrc.hcs_CellReselectInformation",
+      { "hcs-CellReselectInformation", "rrc.hcs_CellReselectInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HCS_CellReselectInformation_ECN0", HFILL }},
     { &hf_rrc_t_CR_Max,
@@ -170633,7 +170633,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interFreqSIAcquisition,
-      { "interFreqSIAcquisition", "rrc.interFreqSIAcquisition",
+      { "interFreqSIAcquisition", "rrc.interFreqSIAcquisition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_newInterFreqCellList_06,
@@ -170645,11 +170645,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_111_vals), 0,
         "T_modeSpecificInfo_111", HFILL }},
     { &hf_rrc_fdd_156,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_150", HFILL }},
     { &hf_rrc_primaryScramblingCode_01,
-      { "primaryScramblingCode", "rrc.primaryScramblingCode",
+      { "primaryScramblingCode", "rrc.primaryScramblingCode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrimaryCPICH_Info", HFILL }},
     { &hf_rrc_newInterFreqCellList_07,
@@ -170685,107 +170685,107 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "NewInterFreqCellSI_List_HCS_ECN0_LCR_r4", HFILL }},
     { &hf_rrc_InterFreqCellList_item,
-      { "InterFreqCell", "rrc.InterFreqCell",
+      { "InterFreqCell", "rrc.InterFreqCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_InterFreqCellList_LCR_r4_ext_item,
-      { "InterFreqCell-LCR-r4", "rrc.InterFreqCell_LCR_r4",
+      { "InterFreqCell-LCR-r4", "rrc.InterFreqCell_LCR_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_InterFreqCellMeasuredResultsList_item,
-      { "CellMeasuredResults", "rrc.CellMeasuredResults",
+      { "CellMeasuredResults", "rrc.CellMeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_InterFreqCellMeasuredResultsList_v920ext_item,
-      { "CellMeasuredResults-v920ext", "rrc.CellMeasuredResults_v920ext",
+      { "CellMeasuredResults-v920ext", "rrc.CellMeasuredResults_v920ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_event2a,
-      { "event2a", "rrc.event2a",
+      { "event2a", "rrc.event2a_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_event2b,
-      { "event2b", "rrc.event2b",
+      { "event2b", "rrc.event2b_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_event2c,
-      { "event2c", "rrc.event2c",
+      { "event2c", "rrc.event2c_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_event2d,
-      { "event2d", "rrc.event2d",
+      { "event2d", "rrc.event2d_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_event2e,
-      { "event2e", "rrc.event2e",
+      { "event2e", "rrc.event2e_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_event2f,
-      { "event2f", "rrc.event2f",
+      { "event2f", "rrc.event2f_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_event2a_01,
-      { "event2a", "rrc.event2a",
+      { "event2a", "rrc.event2a_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event2a_r6", HFILL }},
     { &hf_rrc_event2b_01,
-      { "event2b", "rrc.event2b",
+      { "event2b", "rrc.event2b_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event2b_r6", HFILL }},
     { &hf_rrc_event2c_01,
-      { "event2c", "rrc.event2c",
+      { "event2c", "rrc.event2c_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event2c_r6", HFILL }},
     { &hf_rrc_event2d_01,
-      { "event2d", "rrc.event2d",
+      { "event2d", "rrc.event2d_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event2d_r6", HFILL }},
     { &hf_rrc_event2e_01,
-      { "event2e", "rrc.event2e",
+      { "event2e", "rrc.event2e_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event2e_r6", HFILL }},
     { &hf_rrc_event2f_01,
-      { "event2f", "rrc.event2f",
+      { "event2f", "rrc.event2f_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event2f_r6", HFILL }},
     { &hf_rrc_event2a_02,
-      { "event2a", "rrc.event2a",
+      { "event2a", "rrc.event2a_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event2a_r10", HFILL }},
     { &hf_rrc_event2b_02,
-      { "event2b", "rrc.event2b",
+      { "event2b", "rrc.event2b_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event2b_r10", HFILL }},
     { &hf_rrc_event2c_02,
-      { "event2c", "rrc.event2c",
+      { "event2c", "rrc.event2c_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event2c_r10", HFILL }},
     { &hf_rrc_event2d_02,
-      { "event2d", "rrc.event2d",
+      { "event2d", "rrc.event2d_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event2d_r10", HFILL }},
     { &hf_rrc_event2e_02,
-      { "event2e", "rrc.event2e",
+      { "event2e", "rrc.event2e_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event2e_r10", HFILL }},
     { &hf_rrc_event2f_02,
-      { "event2f", "rrc.event2f",
+      { "event2f", "rrc.event2f_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event2f_r10", HFILL }},
     { &hf_rrc_event2a_03,
-      { "event2a", "rrc.event2a",
+      { "event2a", "rrc.event2a_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event2a_r11", HFILL }},
     { &hf_rrc_event2b_03,
-      { "event2b", "rrc.event2b",
+      { "event2b", "rrc.event2b_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event2b_r11", HFILL }},
     { &hf_rrc_event2c_03,
-      { "event2c", "rrc.event2c",
+      { "event2c", "rrc.event2c_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event2c_r11", HFILL }},
     { &hf_rrc_event2e_03,
-      { "event2e", "rrc.event2e",
+      { "event2e", "rrc.event2e_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event2e_r11", HFILL }},
     { &hf_rrc_InterFreqEventList_item,
@@ -170805,7 +170805,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_InterFreqEvent_r11_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_InterFrequencyMeasuredResultsList_v590ext_item,
-      { "DeltaRSCPPerCell", "rrc.DeltaRSCPPerCell",
+      { "DeltaRSCPPerCell", "rrc.DeltaRSCPPerCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_threholdUsedFrequency_delta,
@@ -170817,7 +170817,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_Inter_FreqEventCriteriaList_v590ext_item,
-      { "Inter-FreqEventCriteria-v590ext", "rrc.Inter_FreqEventCriteria_v590ext",
+      { "Inter-FreqEventCriteria-v590ext", "rrc.Inter_FreqEventCriteria_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_Intra_FreqEventCriteriaList_v590ext_item,
@@ -170825,7 +170825,7 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_IntraFrequencyMeasuredResultsList_v590ext_item,
-      { "DeltaRSCPPerCell", "rrc.DeltaRSCPPerCell",
+      { "DeltaRSCPPerCell", "rrc.DeltaRSCPPerCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_eventID_01,
@@ -170849,15 +170849,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_reportingCriteria_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_intraFreqReportingCriteria_02,
-      { "intraFreqReportingCriteria", "rrc.intraFreqReportingCriteria",
+      { "intraFreqReportingCriteria", "rrc.intraFreqReportingCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_intraFreqMeasQuantity,
-      { "intraFreqMeasQuantity", "rrc.intraFreqMeasQuantity",
+      { "intraFreqMeasQuantity", "rrc.intraFreqMeasQuantity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interFreqReportingCriteria,
-      { "interFreqReportingCriteria", "rrc.interFreqReportingCriteria",
+      { "interFreqReportingCriteria", "rrc.interFreqReportingCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_112,
@@ -170865,7 +170865,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_112_vals), 0,
         "T_modeSpecificInfo_112", HFILL }},
     { &hf_rrc_fdd_157,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_151", HFILL }},
     { &hf_rrc_freqQualityEstimateQuantity_FDD,
@@ -170873,7 +170873,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_FreqQualityEstimateQuantity_FDD_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_108,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_100", HFILL }},
     { &hf_rrc_freqQualityEstimateQuantity_TDD,
@@ -170893,43 +170893,43 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "InterFreqCellMeasuredResultsList_v920ext", HFILL }},
     { &hf_rrc_InterFreqMeasuredResultsList_item,
-      { "InterFreqMeasuredResults", "rrc.InterFreqMeasuredResults",
+      { "InterFreqMeasuredResults", "rrc.InterFreqMeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_InterFreqMeasuredResultsList_v920ext_item,
-      { "InterFreqMeasuredResults-v920ext", "rrc.InterFreqMeasuredResults_v920ext",
+      { "InterFreqMeasuredResults-v920ext", "rrc.InterFreqMeasuredResults_v920ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interFreqCellInfoSI_List,
-      { "interFreqCellInfoSI-List", "rrc.interFreqCellInfoSI_List",
+      { "interFreqCellInfoSI-List", "rrc.interFreqCellInfoSI_List_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqCellInfoSI_List_RSCP", HFILL }},
     { &hf_rrc_interFreqCellInfoSI_List_01,
-      { "interFreqCellInfoSI-List", "rrc.interFreqCellInfoSI_List",
+      { "interFreqCellInfoSI-List", "rrc.interFreqCellInfoSI_List_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqCellInfoSI_List_ECN0", HFILL }},
     { &hf_rrc_interFreqCellInfoSI_List_02,
-      { "interFreqCellInfoSI-List", "rrc.interFreqCellInfoSI_List",
+      { "interFreqCellInfoSI-List", "rrc.interFreqCellInfoSI_List_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqCellInfoSI_List_HCS_RSCP", HFILL }},
     { &hf_rrc_interFreqCellInfoSI_List_03,
-      { "interFreqCellInfoSI-List", "rrc.interFreqCellInfoSI_List",
+      { "interFreqCellInfoSI-List", "rrc.interFreqCellInfoSI_List_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqCellInfoSI_List_HCS_ECN0", HFILL }},
     { &hf_rrc_interFreqCellInfoSI_List_04,
-      { "interFreqCellInfoSI-List", "rrc.interFreqCellInfoSI_List",
+      { "interFreqCellInfoSI-List", "rrc.interFreqCellInfoSI_List_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqCellInfoSI_List_RSCP_LCR", HFILL }},
     { &hf_rrc_interFreqCellInfoSI_List_05,
-      { "interFreqCellInfoSI-List", "rrc.interFreqCellInfoSI_List",
+      { "interFreqCellInfoSI-List", "rrc.interFreqCellInfoSI_List_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqCellInfoSI_List_ECN0_LCR", HFILL }},
     { &hf_rrc_interFreqCellInfoSI_List_06,
-      { "interFreqCellInfoSI-List", "rrc.interFreqCellInfoSI_List",
+      { "interFreqCellInfoSI-List", "rrc.interFreqCellInfoSI_List_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqCellInfoSI_List_HCS_RSCP_LCR", HFILL }},
     { &hf_rrc_interFreqCellInfoSI_List_07,
-      { "interFreqCellInfoSI-List", "rrc.interFreqCellInfoSI_List",
+      { "interFreqCellInfoSI-List", "rrc.interFreqCellInfoSI_List_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqCellInfoSI_List_HCS_ECN0_LCR", HFILL }},
     { &hf_rrc_InterFreqRACHRepCellsList_item,
@@ -170941,7 +170941,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_113_vals), 0,
         "T_modeSpecificInfo_113", HFILL }},
     { &hf_rrc_fdd_158,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_152", HFILL }},
     { &hf_rrc_interFreqRepQuantityRACH_FDD,
@@ -170949,7 +170949,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_InterFreqRepQuantityRACH_FDD_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_109,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_101", HFILL }},
     { &hf_rrc_interFreqRepQuantityRACH_TDDList,
@@ -170969,63 +170969,63 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_114_vals), 0,
         "T_modeSpecificInfo_114", HFILL }},
     { &hf_rrc_fdd_159,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_153", HFILL }},
     { &hf_rrc_tdd_110,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_102", HFILL }},
     { &hf_rrc_interFreqReportingCriteria_01,
-      { "interFreqReportingCriteria", "rrc.interFreqReportingCriteria",
+      { "interFreqReportingCriteria", "rrc.interFreqReportingCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_periodicalReportingCriteria_01,
-      { "periodicalReportingCriteria", "rrc.periodicalReportingCriteria",
+      { "periodicalReportingCriteria", "rrc.periodicalReportingCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PeriodicalWithReportingCellStatus", HFILL }},
     { &hf_rrc_noReporting,
-      { "noReporting", "rrc.noReporting",
+      { "noReporting", "rrc.noReporting_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReportingCellStatusOpt", HFILL }},
     { &hf_rrc_intraFreqReportingCriteria_03,
-      { "intraFreqReportingCriteria", "rrc.intraFreqReportingCriteria",
+      { "intraFreqReportingCriteria", "rrc.intraFreqReportingCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqReportingCriteria_r4", HFILL }},
     { &hf_rrc_intraFreqReportingCriteria_04,
-      { "intraFreqReportingCriteria", "rrc.intraFreqReportingCriteria",
+      { "intraFreqReportingCriteria", "rrc.intraFreqReportingCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqReportingCriteria_r6", HFILL }},
     { &hf_rrc_interFreqReportingCriteria_02,
-      { "interFreqReportingCriteria", "rrc.interFreqReportingCriteria",
+      { "interFreqReportingCriteria", "rrc.interFreqReportingCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqReportingCriteria_r6", HFILL }},
     { &hf_rrc_intraFreqReportingCriteria_05,
-      { "intraFreqReportingCriteria", "rrc.intraFreqReportingCriteria",
+      { "intraFreqReportingCriteria", "rrc.intraFreqReportingCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqReportingCriteria_r7", HFILL }},
     { &hf_rrc_intraFreqReportingCriteria_06,
-      { "intraFreqReportingCriteria", "rrc.intraFreqReportingCriteria",
+      { "intraFreqReportingCriteria", "rrc.intraFreqReportingCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqReportingCriteria_r9", HFILL }},
     { &hf_rrc_interFreqReportingCriteria_03,
-      { "interFreqReportingCriteria", "rrc.interFreqReportingCriteria",
+      { "interFreqReportingCriteria", "rrc.interFreqReportingCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqReportingCriteria_r10", HFILL }},
     { &hf_rrc_periodicalReportingCriteria_02,
-      { "periodicalReportingCriteria", "rrc.periodicalReportingCriteria",
+      { "periodicalReportingCriteria", "rrc.periodicalReportingCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PeriodicalWithReportingCellStatus_r10", HFILL }},
     { &hf_rrc_noReporting_01,
-      { "noReporting", "rrc.noReporting",
+      { "noReporting", "rrc.noReporting_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReportingCellStatusOpt_r10", HFILL }},
     { &hf_rrc_intraFreqReportingCriteria_07,
-      { "intraFreqReportingCriteria", "rrc.intraFreqReportingCriteria",
+      { "intraFreqReportingCriteria", "rrc.intraFreqReportingCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqReportingCriteria_r11", HFILL }},
     { &hf_rrc_interFreqReportingCriteria_04,
-      { "interFreqReportingCriteria", "rrc.interFreqReportingCriteria",
+      { "interFreqReportingCriteria", "rrc.interFreqReportingCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqReportingCriteria_r11", HFILL }},
     { &hf_rrc_interFreqEventList,
@@ -171053,7 +171053,7 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_nonFreqRelatedQuantities,
-      { "nonFreqRelatedQuantities", "rrc.nonFreqRelatedQuantities",
+      { "nonFreqRelatedQuantities", "rrc.nonFreqRelatedQuantities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellReportingQuantities", HFILL }},
     { &hf_rrc_InterFreqRepQuantityRACH_TDDList_item,
@@ -171061,19 +171061,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_InterFreqRepQuantityRACH_TDD_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_interFreqCellInfoList,
-      { "interFreqCellInfoList", "rrc.interFreqCellInfoList",
+      { "interFreqCellInfoList", "rrc.interFreqCellInfoList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interFreqMeasQuantity,
-      { "interFreqMeasQuantity", "rrc.interFreqMeasQuantity",
+      { "interFreqMeasQuantity", "rrc.interFreqMeasQuantity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interFreqReportingQuantity,
-      { "interFreqReportingQuantity", "rrc.interFreqReportingQuantity",
+      { "interFreqReportingQuantity", "rrc.interFreqReportingQuantity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_measurementValidity,
-      { "measurementValidity", "rrc.measurementValidity",
+      { "measurementValidity", "rrc.measurementValidity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interFreqSetUpdate,
@@ -171085,7 +171085,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_InterFreqReportCriteria_vals), 0,
         "InterFreqReportCriteria", HFILL }},
     { &hf_rrc_interFreqCellInfoList_01,
-      { "interFreqCellInfoList", "rrc.interFreqCellInfoList",
+      { "interFreqCellInfoList", "rrc.interFreqCellInfoList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqCellInfoList_r4", HFILL }},
     { &hf_rrc_reportCriteria_02,
@@ -171101,7 +171101,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_InterFreqReportCriteria_r7_vals), 0,
         "InterFreqReportCriteria_r7", HFILL }},
     { &hf_rrc_interFreqCellInfoList_02,
-      { "interFreqCellInfoList", "rrc.interFreqCellInfoList",
+      { "interFreqCellInfoList", "rrc.interFreqCellInfoList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqCellInfoList_r8", HFILL }},
     { &hf_rrc_adjacentFrequencyIndex,
@@ -171109,7 +171109,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_31", HFILL }},
     { &hf_rrc_interFreqCellInfoList_03,
-      { "interFreqCellInfoList", "rrc.interFreqCellInfoList",
+      { "interFreqCellInfoList", "rrc.interFreqCellInfoList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqCellInfoList_r9", HFILL }},
     { &hf_rrc_interBandFrequencyIndex,
@@ -171121,7 +171121,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_InterFreqReportCriteria_r9_vals), 0,
         "InterFreqReportCriteria_r9", HFILL }},
     { &hf_rrc_interFreqCellInfoList_04,
-      { "interFreqCellInfoList", "rrc.interFreqCellInfoList",
+      { "interFreqCellInfoList", "rrc.interFreqCellInfoList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqCellInfoList_r10", HFILL }},
     { &hf_rrc_freqIndexListForEnhancedMeas,
@@ -171141,11 +171141,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_technologySpecificInfo_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_gsm_09,
-      { "gsm", "rrc.gsm",
+      { "gsm", "rrc.gsm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_gsm_09", HFILL }},
     { &hf_rrc_bsic,
-      { "bsic", "rrc.bsic",
+      { "bsic", "rrc.bsic_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_bcch_ARFCN,
@@ -171157,7 +171157,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "NC_Mode", HFILL }},
     { &hf_rrc_is_2000,
-      { "is-2000", "rrc.is_2000",
+      { "is-2000", "rrc.is_2000_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_removedInterRATCellList,
@@ -171181,19 +171181,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "InterRATCellInfoIndication", HFILL }},
     { &hf_rrc_event3a,
-      { "event3a", "rrc.event3a",
+      { "event3a", "rrc.event3a_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_event3b,
-      { "event3b", "rrc.event3b",
+      { "event3b", "rrc.event3b_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_event3c,
-      { "event3c", "rrc.event3c",
+      { "event3c", "rrc.event3c_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_event3d,
-      { "event3d", "rrc.event3d",
+      { "event3d", "rrc.event3d_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_InterRATEventList_item,
@@ -171213,11 +171213,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_gsm_10,
-      { "gsm", "rrc.gsm",
+      { "gsm", "rrc.gsm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_eutra_02,
-      { "eutra", "rrc.eutra",
+      { "eutra", "rrc.eutra_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_eutra_01", HFILL }},
     { &hf_rrc_eutra_TargetFreqInfoList_01,
@@ -171225,7 +171225,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_measQuantityUTRAN_QualityEstimate,
-      { "measQuantityUTRAN-QualityEstimate", "rrc.measQuantityUTRAN_QualityEstimate",
+      { "measQuantityUTRAN-QualityEstimate", "rrc.measQuantityUTRAN_QualityEstimate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqMeasQuantity", HFILL }},
     { &hf_rrc_ratSpecificInfo,
@@ -171233,7 +171233,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_ratSpecificInfo_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_gsm_11,
-      { "gsm", "rrc.gsm",
+      { "gsm", "rrc.gsm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_gsm_10", HFILL }},
     { &hf_rrc_measurementQuantity_01,
@@ -171245,7 +171245,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_BSIC_VerificationRequired_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_is_2000_01,
-      { "is-2000", "rrc.is_2000",
+      { "is-2000", "rrc.is_2000_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tadd_EcIo,
@@ -171269,15 +171269,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_ratSpecificInfo_01_vals), 0,
         "T_ratSpecificInfo_01", HFILL }},
     { &hf_rrc_gsm_12,
-      { "gsm", "rrc.gsm",
+      { "gsm", "rrc.gsm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_gsm_11", HFILL }},
     { &hf_rrc_is_2000_02,
-      { "is-2000", "rrc.is_2000",
+      { "is-2000", "rrc.is_2000_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_is_2000_01", HFILL }},
     { &hf_rrc_e_UTRA_01,
-      { "e-UTRA", "rrc.e_UTRA",
+      { "e-UTRA", "rrc.e_UTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_e_UTRA_01", HFILL }},
     { &hf_rrc_measurementQuantity_02,
@@ -171293,15 +171293,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_InterRATMeasuredResults_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_interRATCellInfoList,
-      { "interRATCellInfoList", "rrc.interRATCellInfoList",
+      { "interRATCellInfoList", "rrc.interRATCellInfoList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interRATMeasQuantity,
-      { "interRATMeasQuantity", "rrc.interRATMeasQuantity",
+      { "interRATMeasQuantity", "rrc.interRATMeasQuantity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interRATReportingQuantity,
-      { "interRATReportingQuantity", "rrc.interRATReportingQuantity",
+      { "interRATReportingQuantity", "rrc.interRATReportingQuantity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_reportCriteria_08,
@@ -171309,11 +171309,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_InterRATReportCriteria_vals), 0,
         "InterRATReportCriteria", HFILL }},
     { &hf_rrc_interRATCellInfoList_01,
-      { "interRATCellInfoList", "rrc.interRATCellInfoList",
+      { "interRATCellInfoList", "rrc.interRATCellInfoList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATCellInfoList_r4", HFILL }},
     { &hf_rrc_interRATCellInfoList_02,
-      { "interRATCellInfoList", "rrc.interRATCellInfoList",
+      { "interRATCellInfoList", "rrc.interRATCellInfoList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATCellInfoList_r6", HFILL }},
     { &hf_rrc_interRATMeasurementObjects,
@@ -171321,19 +171321,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_interRATMeasurementObjects_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_eutra_FrequencyList,
-      { "eutra-FrequencyList", "rrc.eutra_FrequencyList",
+      { "eutra-FrequencyList", "rrc.eutra_FrequencyList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interRATMeasQuantity_01,
-      { "interRATMeasQuantity", "rrc.interRATMeasQuantity",
+      { "interRATMeasQuantity", "rrc.interRATMeasQuantity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATMeasQuantity_r8", HFILL }},
     { &hf_rrc_interRATReportingQuantity_01,
-      { "interRATReportingQuantity", "rrc.interRATReportingQuantity",
+      { "interRATReportingQuantity", "rrc.interRATReportingQuantity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATReportingQuantity_r8", HFILL }},
     { &hf_rrc_idleIntervalInfo,
-      { "idleIntervalInfo", "rrc.idleIntervalInfo",
+      { "idleIntervalInfo", "rrc.idleIntervalInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interRATMeasurementObjects_01,
@@ -171341,7 +171341,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_interRATMeasurementObjects_01_vals), 0,
         "T_interRATMeasurementObjects_01", HFILL }},
     { &hf_rrc_eutra_FrequencyList_01,
-      { "eutra-FrequencyList", "rrc.eutra_FrequencyList",
+      { "eutra-FrequencyList", "rrc.eutra_FrequencyList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EUTRA_FrequencyList_r9", HFILL }},
     { &hf_rrc_interRATMeasurementObjects_02,
@@ -171349,15 +171349,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_interRATMeasurementObjects_02_vals), 0,
         "T_interRATMeasurementObjects_02", HFILL }},
     { &hf_rrc_eutra_FrequencyList_02,
-      { "eutra-FrequencyList", "rrc.eutra_FrequencyList",
+      { "eutra-FrequencyList", "rrc.eutra_FrequencyList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EUTRA_FrequencyList_r11", HFILL }},
     { &hf_rrc_interRATCellInfoList_03,
-      { "interRATCellInfoList", "rrc.interRATCellInfoList",
+      { "interRATCellInfoList", "rrc.interRATCellInfoList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATCellInfoList_B", HFILL }},
     { &hf_rrc_interRATReportingCriteria,
-      { "interRATReportingCriteria", "rrc.interRATReportingCriteria",
+      { "interRATReportingCriteria", "rrc.interRATReportingCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interRATEventList,
@@ -171373,7 +171373,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_ratSpecificInfo_02_vals), 0,
         "T_ratSpecificInfo_02", HFILL }},
     { &hf_rrc_gsm_14,
-      { "gsm", "rrc.gsm",
+      { "gsm", "rrc.gsm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_gsm_12", HFILL }},
     { &hf_rrc_gsm_Carrier_RSSI,
@@ -171385,11 +171385,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_ratSpecificInfo_03_vals), 0,
         "T_ratSpecificInfo_03", HFILL }},
     { &hf_rrc_gsm_15,
-      { "gsm", "rrc.gsm",
+      { "gsm", "rrc.gsm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_gsm_13", HFILL }},
     { &hf_rrc_eutra_03,
-      { "eutra", "rrc.eutra",
+      { "eutra", "rrc.eutra_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_eutra_02", HFILL }},
     { &hf_rrc_reportingQuantity,
@@ -171425,7 +171425,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CellsForIntraFreqMeasListOnSecULFreq", HFILL }},
     { &hf_rrc_intraFreqCellInfoListOnSecULFreq,
-      { "intraFreqCellInfoListOnSecULFreq", "rrc.intraFreqCellInfoListOnSecULFreq",
+      { "intraFreqCellInfoListOnSecULFreq", "rrc.intraFreqCellInfoListOnSecULFreq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqCellInfoListInfoOnSecULFreq", HFILL }},
     { &hf_rrc_newIntraFreqCellList_04,
@@ -171437,7 +171437,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_intraFreqSIAcquisition,
-      { "intraFreqSIAcquisition", "rrc.intraFreqSIAcquisition",
+      { "intraFreqSIAcquisition", "rrc.intraFreqSIAcquisition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_newIntraFreqCellList_05,
@@ -171445,7 +171445,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "NewIntraFreqCellList_r10", HFILL }},
     { &hf_rrc_IntraFreqSIAcquisitionInfo_item,
-      { "PrimaryCPICH-Info", "rrc.PrimaryCPICH_Info",
+      { "PrimaryCPICH-Info", "rrc.PrimaryCPICH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_115,
@@ -171453,7 +171453,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_115_vals), 0,
         "T_modeSpecificInfo_115", HFILL }},
     { &hf_rrc_fdd_160,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_154", HFILL }},
     { &hf_rrc_intraFreqSIAcquisitionInfo,
@@ -171493,31 +171493,31 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "NewIntraFreqCellSI_List_HCS_ECN0_LCR_r4", HFILL }},
     { &hf_rrc_e1a,
-      { "e1a", "rrc.e1a",
+      { "e1a", "rrc.e1a_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event1a", HFILL }},
     { &hf_rrc_e1b,
-      { "e1b", "rrc.e1b",
+      { "e1b", "rrc.e1b_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event1b", HFILL }},
     { &hf_rrc_e1c,
-      { "e1c", "rrc.e1c",
+      { "e1c", "rrc.e1c_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event1c", HFILL }},
     { &hf_rrc_e1d,
-      { "e1d", "rrc.e1d",
+      { "e1d", "rrc.e1d_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_e1e,
-      { "e1e", "rrc.e1e",
+      { "e1e", "rrc.e1e_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event1e", HFILL }},
     { &hf_rrc_e1f,
-      { "e1f", "rrc.e1f",
+      { "e1f", "rrc.e1f_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event1f", HFILL }},
     { &hf_rrc_e1g,
-      { "e1g", "rrc.e1g",
+      { "e1g", "rrc.e1g_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_e1h,
@@ -171529,31 +171529,31 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "ThresholdUsedFrequency", HFILL }},
     { &hf_rrc_e1a_01,
-      { "e1a", "rrc.e1a",
+      { "e1a", "rrc.e1a_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event1a_r4", HFILL }},
     { &hf_rrc_e1b_01,
-      { "e1b", "rrc.e1b",
+      { "e1b", "rrc.e1b_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event1b_r4", HFILL }},
     { &hf_rrc_e1a_02,
-      { "e1a", "rrc.e1a",
+      { "e1a", "rrc.e1a_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event1a_LCR_r4", HFILL }},
     { &hf_rrc_e1b_02,
-      { "e1b", "rrc.e1b",
+      { "e1b", "rrc.e1b_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event1b_LCR_r4", HFILL }},
     { &hf_rrc_e1d_01,
-      { "e1d", "rrc.e1d",
+      { "e1d", "rrc.e1d_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event1d", HFILL }},
     { &hf_rrc_e1e_01,
-      { "e1e", "rrc.e1e",
+      { "e1e", "rrc.e1e_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event1e_r6", HFILL }},
     { &hf_rrc_e1f_01,
-      { "e1f", "rrc.e1f",
+      { "e1f", "rrc.e1f_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event1f_r6", HFILL }},
     { &hf_rrc_e1h_01,
@@ -171565,19 +171565,19 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "ThresholdUsedFrequency_r6", HFILL }},
     { &hf_rrc_e1j,
-      { "e1j", "rrc.e1j",
+      { "e1j", "rrc.e1j_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event1j_r6", HFILL }},
     { &hf_rrc_e1b_03,
-      { "e1b", "rrc.e1b",
+      { "e1b", "rrc.e1b_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event1b_r7", HFILL }},
     { &hf_rrc_e1a_03,
-      { "e1a", "rrc.e1a",
+      { "e1a", "rrc.e1a_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event1a_OnSecUlFreq_r9", HFILL }},
     { &hf_rrc_e1b_04,
-      { "e1b", "rrc.e1b",
+      { "e1b", "rrc.e1b_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event1b_OnSecUlFreq_r9", HFILL }},
     { &hf_rrc_event,
@@ -171605,23 +171605,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_IntraFreqEventOnSecULFreq_vals), 0,
         "IntraFreqEventOnSecULFreq", HFILL }},
     { &hf_rrc_IntraFreqEventCriteriaList_item,
-      { "IntraFreqEventCriteria", "rrc.IntraFreqEventCriteria",
+      { "IntraFreqEventCriteria", "rrc.IntraFreqEventCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_IntraFreqEventCriteriaList_r4_item,
-      { "IntraFreqEventCriteria-r4", "rrc.IntraFreqEventCriteria_r4",
+      { "IntraFreqEventCriteria-r4", "rrc.IntraFreqEventCriteria_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_IntraFreqEventCriteriaList_LCR_r4_item,
-      { "IntraFreqEventCriteria-LCR-r4", "rrc.IntraFreqEventCriteria_LCR_r4",
+      { "IntraFreqEventCriteria-LCR-r4", "rrc.IntraFreqEventCriteria_LCR_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_IntraFreqEventCriteriaList_r6_item,
-      { "IntraFreqEventCriteria-r6", "rrc.IntraFreqEventCriteria_r6",
+      { "IntraFreqEventCriteria-r6", "rrc.IntraFreqEventCriteria_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_IntraFreqEventCriteriaList_r7_item,
-      { "IntraFreqEventCriteria-r7", "rrc.IntraFreqEventCriteria_r7",
+      { "IntraFreqEventCriteria-r7", "rrc.IntraFreqEventCriteria_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_intraFreqEventCriteria,
@@ -171629,7 +171629,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxMeasEventOnSecULFreq_OF_IntraFreqEventCriteriaOnSecULFreq", HFILL }},
     { &hf_rrc_intraFreqEventCriteria_item,
-      { "IntraFreqEventCriteriaOnSecULFreq", "rrc.IntraFreqEventCriteriaOnSecULFreq",
+      { "IntraFreqEventCriteriaOnSecULFreq", "rrc.IntraFreqEventCriteriaOnSecULFreq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_eventID_02,
@@ -171649,7 +171649,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_116_vals), 0,
         "T_modeSpecificInfo_116", HFILL }},
     { &hf_rrc_fdd_161,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_155", HFILL }},
     { &hf_rrc_intraFreqMeasQuantity_FDD,
@@ -171657,7 +171657,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_IntraFreqMeasQuantity_FDD_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_111,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_103", HFILL }},
     { &hf_rrc_intraFreqMeasQuantity_TDDList,
@@ -171673,11 +171673,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_IntraFreqMeasQuantity_TDD_sib3List_item_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_IntraFreqMeasuredResultsList_item,
-      { "CellMeasuredResults", "rrc.CellMeasuredResults",
+      { "CellMeasuredResults", "rrc.CellMeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_IntraFreqMeasuredResultsList_v920ext_item,
-      { "CellMeasuredResults-v920ext", "rrc.CellMeasuredResults_v920ext",
+      { "CellMeasuredResults-v920ext", "rrc.CellMeasuredResults_v920ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_intraFreqMeasurementID,
@@ -171685,11 +171685,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MeasurementIdentity", HFILL }},
     { &hf_rrc_intraFreqCellInfoSI_List,
-      { "intraFreqCellInfoSI-List", "rrc.intraFreqCellInfoSI_List",
+      { "intraFreqCellInfoSI-List", "rrc.intraFreqCellInfoSI_List_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqCellInfoSI_List_RSCP", HFILL }},
     { &hf_rrc_intraFreqReportingQuantityForRACH,
-      { "intraFreqReportingQuantityForRACH", "rrc.intraFreqReportingQuantityForRACH",
+      { "intraFreqReportingQuantityForRACH", "rrc.intraFreqReportingQuantityForRACH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_maxReportedCellsOnRACH,
@@ -171697,39 +171697,39 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MaxReportedCellsOnRACH_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_reportingInfoForCellDCH,
-      { "reportingInfoForCellDCH", "rrc.reportingInfoForCellDCH",
+      { "reportingInfoForCellDCH", "rrc.reportingInfoForCellDCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_intraFreqCellInfoSI_List_01,
-      { "intraFreqCellInfoSI-List", "rrc.intraFreqCellInfoSI_List",
+      { "intraFreqCellInfoSI-List", "rrc.intraFreqCellInfoSI_List_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqCellInfoSI_List_ECN0", HFILL }},
     { &hf_rrc_intraFreqCellInfoSI_List_02,
-      { "intraFreqCellInfoSI-List", "rrc.intraFreqCellInfoSI_List",
+      { "intraFreqCellInfoSI-List", "rrc.intraFreqCellInfoSI_List_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqCellInfoSI_List_HCS_RSCP", HFILL }},
     { &hf_rrc_intraFreqCellInfoSI_List_03,
-      { "intraFreqCellInfoSI-List", "rrc.intraFreqCellInfoSI_List",
+      { "intraFreqCellInfoSI-List", "rrc.intraFreqCellInfoSI_List_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqCellInfoSI_List_HCS_ECN0", HFILL }},
     { &hf_rrc_intraFreqCellInfoSI_List_04,
-      { "intraFreqCellInfoSI-List", "rrc.intraFreqCellInfoSI_List",
+      { "intraFreqCellInfoSI-List", "rrc.intraFreqCellInfoSI_List_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqCellInfoSI_List_RSCP_LCR_r4", HFILL }},
     { &hf_rrc_reportingInfoForCellDCH_01,
-      { "reportingInfoForCellDCH", "rrc.reportingInfoForCellDCH",
+      { "reportingInfoForCellDCH", "rrc.reportingInfoForCellDCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReportingInfoForCellDCH_LCR_r4", HFILL }},
     { &hf_rrc_intraFreqCellInfoSI_List_05,
-      { "intraFreqCellInfoSI-List", "rrc.intraFreqCellInfoSI_List",
+      { "intraFreqCellInfoSI-List", "rrc.intraFreqCellInfoSI_List_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqCellInfoSI_List_ECN0_LCR_r4", HFILL }},
     { &hf_rrc_intraFreqCellInfoSI_List_06,
-      { "intraFreqCellInfoSI-List", "rrc.intraFreqCellInfoSI_List",
+      { "intraFreqCellInfoSI-List", "rrc.intraFreqCellInfoSI_List_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqCellInfoSI_List_HCS_RSCP_LCR_r4", HFILL }},
     { &hf_rrc_intraFreqCellInfoSI_List_07,
-      { "intraFreqCellInfoSI-List", "rrc.intraFreqCellInfoSI_List",
+      { "intraFreqCellInfoSI-List", "rrc.intraFreqCellInfoSI_List_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqCellInfoSI_List_HCS_ECN0_LCR_r4", HFILL }},
     { &hf_rrc_eventCriteriaList,
@@ -171753,7 +171753,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "IntraFreqEventCriteriaList_r7", HFILL }},
     { &hf_rrc_eventCriteriaListOnSecULFreq,
-      { "eventCriteriaListOnSecULFreq", "rrc.eventCriteriaListOnSecULFreq",
+      { "eventCriteriaListOnSecULFreq", "rrc.eventCriteriaListOnSecULFreq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqEventCriteriaListOnSecULFreq", HFILL }},
     { &hf_rrc_excludedCellInfoList,
@@ -171761,15 +171761,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CellInfoListToBeExcluded", HFILL }},
     { &hf_rrc_activeSetReportingQuantities,
-      { "activeSetReportingQuantities", "rrc.activeSetReportingQuantities",
+      { "activeSetReportingQuantities", "rrc.activeSetReportingQuantities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellReportingQuantities", HFILL }},
     { &hf_rrc_monitoredSetReportingQuantities,
-      { "monitoredSetReportingQuantities", "rrc.monitoredSetReportingQuantities",
+      { "monitoredSetReportingQuantities", "rrc.monitoredSetReportingQuantities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellReportingQuantities", HFILL }},
     { &hf_rrc_detectedSetReportingQuantities,
-      { "detectedSetReportingQuantities", "rrc.detectedSetReportingQuantities",
+      { "detectedSetReportingQuantities", "rrc.detectedSetReportingQuantities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellReportingQuantities", HFILL }},
     { &hf_rrc_sfn_SFN_OTD_Type,
@@ -171781,7 +171781,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_117_vals), 0,
         "T_modeSpecificInfo_117", HFILL }},
     { &hf_rrc_fdd_162,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_156", HFILL }},
     { &hf_rrc_intraFreqRepQuantityRACH_FDD,
@@ -171789,7 +171789,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_IntraFreqRepQuantityRACH_FDD_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_112,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_104", HFILL }},
     { &hf_rrc_intraFreqRepQuantityRACH_TDDList,
@@ -171801,11 +171801,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_IntraFreqRepQuantityRACH_TDD_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_intraFreqCellInfoList,
-      { "intraFreqCellInfoList", "rrc.intraFreqCellInfoList",
+      { "intraFreqCellInfoList", "rrc.intraFreqCellInfoList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_intraFreqReportingQuantity,
-      { "intraFreqReportingQuantity", "rrc.intraFreqReportingQuantity",
+      { "intraFreqReportingQuantity", "rrc.intraFreqReportingQuantity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_reportCriteria_09,
@@ -171813,7 +171813,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_IntraFreqReportCriteria_vals), 0,
         "IntraFreqReportCriteria", HFILL }},
     { &hf_rrc_intraFreqCellInfoList_01,
-      { "intraFreqCellInfoList", "rrc.intraFreqCellInfoList",
+      { "intraFreqCellInfoList", "rrc.intraFreqCellInfoList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqCellInfoList_r4", HFILL }},
     { &hf_rrc_reportCriteria_10,
@@ -171829,11 +171829,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_IntraFreqReportCriteria_r7_vals), 0,
         "IntraFreqReportCriteria_r7", HFILL }},
     { &hf_rrc_intraFreqCellInfoList_02,
-      { "intraFreqCellInfoList", "rrc.intraFreqCellInfoList",
+      { "intraFreqCellInfoList", "rrc.intraFreqCellInfoList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqCellInfoList_r9", HFILL }},
     { &hf_rrc_intraFreqCellInfoListOnSecULFreq_01,
-      { "intraFreqCellInfoListOnSecULFreq", "rrc.intraFreqCellInfoListOnSecULFreq",
+      { "intraFreqCellInfoListOnSecULFreq", "rrc.intraFreqCellInfoListOnSecULFreq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_reportCriteria_13,
@@ -171841,7 +171841,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_IntraFreqReportCriteria_r9_vals), 0,
         "IntraFreqReportCriteria_r9", HFILL }},
     { &hf_rrc_intraFreqCellInfoList_03,
-      { "intraFreqCellInfoList", "rrc.intraFreqCellInfoList",
+      { "intraFreqCellInfoList", "rrc.intraFreqCellInfoList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqCellInfoList_r10", HFILL }},
     { &hf_rrc_reportCriteria_14,
@@ -171849,7 +171849,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_IntraFreqReportCriteria_r11_vals), 0,
         "IntraFreqReportCriteria_r11", HFILL }},
     { &hf_rrc_IntraFrequencyMeasuredResultsListOnSecULFreq_item,
-      { "CellMeasuredResults-r9", "rrc.CellMeasuredResults_r9",
+      { "CellMeasuredResults-r9", "rrc.CellMeasuredResults_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_loggingAbsoluteThreshold,
@@ -171865,7 +171865,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_loggingDuration_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_intraUTRAANR,
-      { "intraUTRAANR", "rrc.intraUTRAANR",
+      { "intraUTRAANR", "rrc.intraUTRAANR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interRATANRforEUTRAIndicator,
@@ -171877,11 +171877,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_interRATANRforGSMIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_LoggedANRReportInfoList_item,
-      { "LoggedANRReportInfo", "rrc.LoggedANRReportInfo",
+      { "LoggedANRReportInfo", "rrc.LoggedANRReportInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_LoggedANRReportInfoList_vb50ext_item,
-      { "LoggedANRReportInfo-vb50ext", "rrc.LoggedANRReportInfo_vb50ext",
+      { "LoggedANRReportInfo-vb50ext", "rrc.LoggedANRReportInfo_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_servingCell,
@@ -171897,27 +171897,27 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_LoggedCellInfo_vb50ext_vals), 0,
         "LoggedCellInfo_vb50ext", HFILL }},
     { &hf_rrc_loggedUTRACellInfo,
-      { "loggedUTRACellInfo", "rrc.loggedUTRACellInfo",
+      { "loggedUTRACellInfo", "rrc.loggedUTRACellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_loggedEUTRACellInfo,
-      { "loggedEUTRACellInfo", "rrc.loggedEUTRACellInfo",
+      { "loggedEUTRACellInfo", "rrc.loggedEUTRACellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_loggedGSMCellInfo,
-      { "loggedGSMCellInfo", "rrc.loggedGSMCellInfo",
+      { "loggedGSMCellInfo", "rrc.loggedGSMCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_loggedEUTRACellInfo_01,
-      { "loggedEUTRACellInfo", "rrc.loggedEUTRACellInfo",
+      { "loggedEUTRACellInfo", "rrc.loggedEUTRACellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LoggedEUTRACellInfo_vb50ext", HFILL }},
     { &hf_rrc_loggedConnectionEstablishmentFailureAccessInfo_FDD,
-      { "loggedConnectionEstablishmentFailureAccessInfo-FDD", "rrc.loggedConnectionEstablishmentFailureAccessInfo_FDD",
+      { "loggedConnectionEstablishmentFailureAccessInfo-FDD", "rrc.loggedConnectionEstablishmentFailureAccessInfo_FDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_loggedMeasFailedCellMeas,
-      { "loggedMeasFailedCellMeas", "rrc.loggedMeasFailedCellMeas",
+      { "loggedMeasFailedCellMeas", "rrc.loggedMeasFailedCellMeas_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LoggedMeasServingCellMeas_FDD", HFILL }},
     { &hf_rrc_loggedMeasIntrafreqNeighbourList,
@@ -171929,19 +171929,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "LoggedMeasInterfreqList_FDD", HFILL }},
     { &hf_rrc_loggedMeasInterRATNeighbourMeas,
-      { "loggedMeasInterRATNeighbourMeas", "rrc.loggedMeasInterRATNeighbourMeas",
+      { "loggedMeasInterRATNeighbourMeas", "rrc.loggedMeasInterRATNeighbourMeas_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LoggedMeasInterRATNeighbourMeas_vb50ext", HFILL }},
     { &hf_rrc_loggedConnectionEstablishmentFailureLocationInfo,
-      { "loggedConnectionEstablishmentFailureLocationInfo", "rrc.loggedConnectionEstablishmentFailureLocationInfo",
+      { "loggedConnectionEstablishmentFailureLocationInfo", "rrc.loggedConnectionEstablishmentFailureLocationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_loggedConnectionEstablishmentFailureAccessInfo_TDD,
-      { "loggedConnectionEstablishmentFailureAccessInfo-TDD", "rrc.loggedConnectionEstablishmentFailureAccessInfo_TDD",
+      { "loggedConnectionEstablishmentFailureAccessInfo-TDD", "rrc.loggedConnectionEstablishmentFailureAccessInfo_TDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_loggedMeasFailedCellMeas_01,
-      { "loggedMeasFailedCellMeas", "rrc.loggedMeasFailedCellMeas",
+      { "loggedMeasFailedCellMeas", "rrc.loggedMeasFailedCellMeas_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LoggedMeasServingCellMeas_TDD128", HFILL }},
     { &hf_rrc_loggedMeasIntrafreqNeighbourList_01,
@@ -171969,27 +171969,27 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_location_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_ellipsoidPoint,
-      { "ellipsoidPoint", "rrc.ellipsoidPoint",
+      { "ellipsoidPoint", "rrc.ellipsoidPoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ellipsoidPointUncertCircle,
-      { "ellipsoidPointUncertCircle", "rrc.ellipsoidPointUncertCircle",
+      { "ellipsoidPointUncertCircle", "rrc.ellipsoidPointUncertCircle_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ellipsoidPointUncertEllipse,
-      { "ellipsoidPointUncertEllipse", "rrc.ellipsoidPointUncertEllipse",
+      { "ellipsoidPointUncertEllipse", "rrc.ellipsoidPointUncertEllipse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ellipsoidPointAltitude,
-      { "ellipsoidPointAltitude", "rrc.ellipsoidPointAltitude",
+      { "ellipsoidPointAltitude", "rrc.ellipsoidPointAltitude_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ellipsoidPointAltitudeEllipse,
-      { "ellipsoidPointAltitudeEllipse", "rrc.ellipsoidPointAltitudeEllipse",
+      { "ellipsoidPointAltitudeEllipse", "rrc.ellipsoidPointAltitudeEllipse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EllipsoidPointAltitudeEllipsoide", HFILL }},
     { &hf_rrc_horizontalVelocity,
-      { "horizontalVelocity", "rrc.horizontalVelocity",
+      { "horizontalVelocity", "rrc.horizontalVelocity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_timeSinceFailure,
@@ -172001,19 +172001,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_118_vals), 0,
         "T_modeSpecificInfo_118", HFILL }},
     { &hf_rrc_fdd_163,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_157", HFILL }},
     { &hf_rrc_loggedConnectionEstablishmentFailureInfo,
-      { "loggedConnectionEstablishmentFailureInfo", "rrc.loggedConnectionEstablishmentFailureInfo",
+      { "loggedConnectionEstablishmentFailureInfo", "rrc.loggedConnectionEstablishmentFailureInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LoggedConnectionEstablishmentFailureInfo_FDD", HFILL }},
     { &hf_rrc_tdd_113,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_105", HFILL }},
     { &hf_rrc_loggedConnectionEstablishmentFailureInfo_01,
-      { "loggedConnectionEstablishmentFailureInfo", "rrc.loggedConnectionEstablishmentFailureInfo",
+      { "loggedConnectionEstablishmentFailureInfo", "rrc.loggedConnectionEstablishmentFailureInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LoggedConnectionEstablishmentFailureInfo_TDD128", HFILL }},
     { &hf_rrc_eutraCellIdentity,
@@ -172041,15 +172041,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_loggingInterval_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_traceReference,
-      { "traceReference", "rrc.traceReference",
+      { "traceReference", "rrc.traceReference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_traceRecordingSession,
-      { "traceRecordingSession", "rrc.traceRecordingSession",
+      { "traceRecordingSession", "rrc.traceRecordingSession_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tce_Id,
-      { "tce-Id", "rrc.tce_Id",
+      { "tce-Id", "rrc.tce_Id_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_areaConfiguration,
@@ -172069,7 +172069,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_8_OF_LAI", HFILL }},
     { &hf_rrc_locationAreaList_item,
-      { "LAI", "rrc.LAI",
+      { "LAI", "rrc.LAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_routingAreaList,
@@ -172077,7 +172077,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_8_OF_RAI", HFILL }},
     { &hf_rrc_routingAreaList_item,
-      { "RAI", "rrc.RAI",
+      { "RAI", "rrc.RAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_loggingDuration_02,
@@ -172101,11 +172101,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_32_OF_CellIDListItem", HFILL }},
     { &hf_rrc_cellIDList_item_01,
-      { "CellIDListItem", "rrc.CellIDListItem",
+      { "CellIDListItem", "rrc.CellIDListItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_LoggedMeasInterfreqList_FDD_item,
-      { "LoggedMeasInterfreqInfo-FDD", "rrc.LoggedMeasInterfreqInfo_FDD",
+      { "LoggedMeasInterfreqInfo-FDD", "rrc.LoggedMeasInterfreqInfo_FDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_loggedMeasInterfreqNeighbourList,
@@ -172113,7 +172113,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxnumLoggedMeas_OF_LoggedMeasNeighbourInfo_FDD", HFILL }},
     { &hf_rrc_loggedMeasInterfreqNeighbourList_item,
-      { "LoggedMeasNeighbourInfo-FDD", "rrc.LoggedMeasNeighbourInfo_FDD",
+      { "LoggedMeasNeighbourInfo-FDD", "rrc.LoggedMeasNeighbourInfo_FDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_loggedMeasInterfreqNeighbourList_01,
@@ -172133,23 +172133,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "LoggedMeasEUTRAFreqList_vb50ext", HFILL }},
     { &hf_rrc_LoggedMeasIntrafreqNeighbourList_FDD_item,
-      { "LoggedMeasNeighbourInfo-FDD", "rrc.LoggedMeasNeighbourInfo_FDD",
+      { "LoggedMeasNeighbourInfo-FDD", "rrc.LoggedMeasNeighbourInfo_FDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_LoggedMeasIntrafreqNeighbourMeasList_TDD128_item,
-      { "LoggedMeasNeighbourMeas-TDD128", "rrc.LoggedMeasNeighbourMeas_TDD128",
+      { "LoggedMeasNeighbourMeas-TDD128", "rrc.LoggedMeasNeighbourMeas_TDD128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_LoggedMeasGSMNeighbourCellsList_item,
-      { "LoggedMeasGSMNeighbourCellsinfo", "rrc.LoggedMeasGSMNeighbourCellsinfo",
+      { "LoggedMeasGSMNeighbourCellsinfo", "rrc.LoggedMeasGSMNeighbourCellsinfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_LoggedMeasEUTRAFreqList_item,
-      { "LoggedMeasEUTRAFreqInfo", "rrc.LoggedMeasEUTRAFreqInfo",
+      { "LoggedMeasEUTRAFreqInfo", "rrc.LoggedMeasEUTRAFreqInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_LoggedMeasEUTRAFreqList_vb50ext_item,
-      { "LoggedMeasEUTRAFreqInfo-vb50ext", "rrc.LoggedMeasEUTRAFreqInfo_vb50ext",
+      { "LoggedMeasEUTRAFreqInfo-vb50ext", "rrc.LoggedMeasEUTRAFreqInfo_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_loggedMeasEUTRAFreqNeighbourInfoList,
@@ -172157,7 +172157,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxnumLoggedMeas_OF_LoggedMeasEUTRAFreqNeighbourInfo", HFILL }},
     { &hf_rrc_loggedMeasEUTRAFreqNeighbourInfoList_item,
-      { "LoggedMeasEUTRAFreqNeighbourInfo", "rrc.LoggedMeasEUTRAFreqNeighbourInfo",
+      { "LoggedMeasEUTRAFreqNeighbourInfo", "rrc.LoggedMeasEUTRAFreqNeighbourInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_relativeTimeStamp,
@@ -172165,11 +172165,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_7200", HFILL }},
     { &hf_rrc_loggedMeasServingCellMeas,
-      { "loggedMeasServingCellMeas", "rrc.loggedMeasServingCellMeas",
+      { "loggedMeasServingCellMeas", "rrc.loggedMeasServingCellMeas_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LoggedMeasServingCellMeas_FDD", HFILL }},
     { &hf_rrc_loggedMeasInterRATNeighbourMeas_01,
-      { "loggedMeasInterRATNeighbourMeas", "rrc.loggedMeasInterRATNeighbourMeas",
+      { "loggedMeasInterRATNeighbourMeas", "rrc.loggedMeasInterRATNeighbourMeas_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_loggedMeasLocationInfo,
@@ -172177,7 +172177,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_LoggedMeasLocationInfo_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_loggedMeasServingCellMeas_01,
-      { "loggedMeasServingCellMeas", "rrc.loggedMeasServingCellMeas",
+      { "loggedMeasServingCellMeas", "rrc.loggedMeasServingCellMeas_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LoggedMeasServingCellMeas_FDD_vb50ext", HFILL }},
     { &hf_rrc_loggedMeasLocationInfo_01,
@@ -172185,27 +172185,27 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_LoggedMeasLocationInfo_vb50ext_vals), 0,
         "LoggedMeasLocationInfo_vb50ext", HFILL }},
     { &hf_rrc_loggedMeasServingCellMeas_02,
-      { "loggedMeasServingCellMeas", "rrc.loggedMeasServingCellMeas",
+      { "loggedMeasServingCellMeas", "rrc.loggedMeasServingCellMeas_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LoggedMeasServingCellMeas_TDD128", HFILL }},
     { &hf_rrc_loggedMeasServingCellMeas_03,
-      { "loggedMeasServingCellMeas", "rrc.loggedMeasServingCellMeas",
+      { "loggedMeasServingCellMeas", "rrc.loggedMeasServingCellMeas_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LoggedMeasServingCellMeas_TDD128_vb50ext", HFILL }},
     { &hf_rrc_LoggedMeasInfoList_FDD_item,
-      { "LoggedMeasInfo-FDD", "rrc.LoggedMeasInfo_FDD",
+      { "LoggedMeasInfo-FDD", "rrc.LoggedMeasInfo_FDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_LoggedMeasInfoList_FDD_vb50ext_item,
-      { "LoggedMeasInfo-FDD-vb50ext", "rrc.LoggedMeasInfo_FDD_vb50ext",
+      { "LoggedMeasInfo-FDD-vb50ext", "rrc.LoggedMeasInfo_FDD_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_LoggedMeasInfoList_TDD128_item,
-      { "LoggedMeasInfo-TDD128", "rrc.LoggedMeasInfo_TDD128",
+      { "LoggedMeasInfo-TDD128", "rrc.LoggedMeasInfo_TDD128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_LoggedMeasInfoList_TDD128_vb50ext_item,
-      { "LoggedMeasInfo-TDD128-vb50ext", "rrc.LoggedMeasInfo_TDD128_vb50ext",
+      { "LoggedMeasInfo-TDD128-vb50ext", "rrc.LoggedMeasInfo_TDD128_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_119,
@@ -172213,7 +172213,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_119_vals), 0,
         "T_modeSpecificInfo_119", HFILL }},
     { &hf_rrc_fdd_164,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_158", HFILL }},
     { &hf_rrc_loggedMeasInfoList,
@@ -172221,7 +172221,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "LoggedMeasInfoList_FDD", HFILL }},
     { &hf_rrc_tdd_114,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_106", HFILL }},
     { &hf_rrc_loggedMeasInfoList_01,
@@ -172233,7 +172233,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_120_vals), 0,
         "T_modeSpecificInfo_120", HFILL }},
     { &hf_rrc_fdd_165,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_159", HFILL }},
     { &hf_rrc_loggedMeasInfoList_02,
@@ -172241,7 +172241,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "LoggedMeasInfoList_FDD_vb50ext", HFILL }},
     { &hf_rrc_tdd_115,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_107", HFILL }},
     { &hf_rrc_loggedMeasInfoList_03,
@@ -172249,15 +172249,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "LoggedMeasInfoList_TDD128_vb50ext", HFILL }},
     { &hf_rrc_LoggedMeasInterfreqList_TDD128_item,
-      { "LoggedMeasInterfreqInfo-TDD128", "rrc.LoggedMeasInterfreqInfo_TDD128",
+      { "LoggedMeasInterfreqInfo-TDD128", "rrc.LoggedMeasInterfreqInfo_TDD128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_LoggedMeasInterfreqNeighbourList_TDD128_item,
-      { "LoggedMeasNeighbourMeas-TDD128", "rrc.LoggedMeasNeighbourMeas_TDD128",
+      { "LoggedMeasNeighbourMeas-TDD128", "rrc.LoggedMeasNeighbourMeas_TDD128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_loggedMeasInfoList_04,
-      { "loggedMeasInfoList", "rrc.loggedMeasInfoList",
+      { "loggedMeasInfoList", "rrc.loggedMeasInfoList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_loggedMeasAvailable_07,
@@ -172265,19 +172265,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_loggedMeasAvailable_07_vals), 0,
         "T_loggedMeasAvailable_07", HFILL }},
     { &hf_rrc_loggedMeasInfoList_05,
-      { "loggedMeasInfoList", "rrc.loggedMeasInfoList",
+      { "loggedMeasInfoList", "rrc.loggedMeasInfoList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LoggedMeasInfoList_vb50ext", HFILL }},
     { &hf_rrc_plmnIdentity,
-      { "plmnIdentity", "rrc.plmnIdentity",
+      { "plmnIdentity", "rrc.plmnIdentity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PLMN_Identity", HFILL }},
     { &hf_rrc_rscpforANR,
-      { "rscpforANR", "rrc.rscpforANR",
+      { "rscpforANR", "rrc.rscpforANR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ec_N0forANR,
-      { "ec-N0forANR", "rrc.ec_N0forANR",
+      { "ec-N0forANR", "rrc.ec_N0forANR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_toe_nav,
@@ -172361,15 +172361,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_qualityMeasuredResults,
-      { "qualityMeasuredResults", "rrc.qualityMeasuredResults",
+      { "qualityMeasuredResults", "rrc.qualityMeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_InternalMeasuredResults,
-      { "ue-InternalMeasuredResults", "rrc.ue_InternalMeasuredResults",
+      { "ue-InternalMeasuredResults", "rrc.ue_InternalMeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_MeasuredResults,
-      { "ue-positioning-MeasuredResults", "rrc.ue_positioning_MeasuredResults",
+      { "ue-positioning-MeasuredResults", "rrc.ue_positioning_MeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_intraFreqMeasuredResultsList_01,
@@ -172377,7 +172377,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "IntraFrequencyMeasuredResultsListOnSecULFreq", HFILL }},
     { &hf_rrc_ue_positioning_MeasuredResults_v390ext,
-      { "ue-positioning-MeasuredResults-v390ext", "rrc.ue_positioning_MeasuredResults_v390ext",
+      { "ue-positioning-MeasuredResults-v390ext", "rrc.ue_positioning_MeasuredResults_v390ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_intraFrequencyMeasuredResultsList,
@@ -172389,15 +172389,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "InterFrequencyMeasuredResultsList_v590ext", HFILL }},
     { &hf_rrc_ueInternalMeasuredResults,
-      { "ueInternalMeasuredResults", "rrc.ueInternalMeasuredResults",
+      { "ueInternalMeasuredResults", "rrc.ueInternalMeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_InternalMeasuredResults_v770ext", HFILL }},
     { &hf_rrc_ue_positioning_MeasuredResults_01,
-      { "ue-positioning-MeasuredResults", "rrc.ue_positioning_MeasuredResults",
+      { "ue-positioning-MeasuredResults", "rrc.ue_positioning_MeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_MeasuredResults_v770ext", HFILL }},
     { &hf_rrc_ue_positioning_MeasuredResults_02,
-      { "ue-positioning-MeasuredResults", "rrc.ue_positioning_MeasuredResults",
+      { "ue-positioning-MeasuredResults", "rrc.ue_positioning_MeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_MeasuredResults_v860ext", HFILL }},
     { &hf_rrc_MeasuredResultsList_v920ext_item,
@@ -172405,7 +172405,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MeasuredResults_v920ext_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_MeasuredResultsListOnSecUlFreq_item,
-      { "MeasuredResultsOnSecUlFreq", "rrc.MeasuredResultsOnSecUlFreq",
+      { "MeasuredResultsOnSecUlFreq", "rrc.MeasuredResultsOnSecUlFreq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_intraFreqMeasuredResultsList_02,
@@ -172417,11 +172417,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "InterFreqMeasuredResultsList_v920ext", HFILL }},
     { &hf_rrc_ue_InternalMeasuredResults_01,
-      { "ue-InternalMeasuredResults", "rrc.ue_InternalMeasuredResults",
+      { "ue-InternalMeasuredResults", "rrc.ue_InternalMeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_InternalMeasuredResults_LCR_r4", HFILL }},
     { &hf_rrc_ue_positioniing_MeasuredResults,
-      { "ue-positioniing-MeasuredResults", "rrc.ue_positioniing_MeasuredResults",
+      { "ue-positioniing-MeasuredResults", "rrc.ue_positioniing_MeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_MeasuredResults", HFILL }},
     { &hf_rrc_MeasuredResultsList_item,
@@ -172433,15 +172433,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MeasuredResults_LCR_r4_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_MeasuredResultsList_v770xet_item,
-      { "MeasuredResultsList-v770xet item", "rrc.MeasuredResultsList_v770xet_item",
+      { "MeasuredResultsList-v770xet item", "rrc.MeasuredResultsList_v770xet_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MeasuredResultsList_v860ext_item,
-      { "MeasuredResultsList-v860ext item", "rrc.MeasuredResultsList_v860ext_item",
+      { "MeasuredResultsList-v860ext item", "rrc.MeasuredResultsList_v860ext_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_currentCell,
-      { "currentCell", "rrc.currentCell",
+      { "currentCell", "rrc.currentCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_121,
@@ -172449,7 +172449,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_121_vals), 0,
         "T_modeSpecificInfo_121", HFILL }},
     { &hf_rrc_fdd_166,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_160", HFILL }},
     { &hf_rrc_measurementQuantity_03,
@@ -172457,7 +172457,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_measurementQuantity_01_vals), 0,
         "T_measurementQuantity_01", HFILL }},
     { &hf_rrc_tdd_116,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_108", HFILL }},
     { &hf_rrc_timeslotISCP,
@@ -172469,7 +172469,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MonitoredCellRACH_List", HFILL }},
     { &hf_rrc_currentCell_DeltaRSCP,
-      { "currentCell-DeltaRSCP", "rrc.currentCell_DeltaRSCP",
+      { "currentCell-DeltaRSCP", "rrc.currentCell_DeltaRSCP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DeltaRSCPPerCell", HFILL }},
     { &hf_rrc_monitoredCellRACH_List_v7g0ext,
@@ -172477,11 +172477,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MonitoredCellRACH_List_v7g0ext_item,
-      { "DeltaRSCPPerCell", "rrc.DeltaRSCPPerCell",
+      { "DeltaRSCPPerCell", "rrc.DeltaRSCPPerCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_currentCell_01,
-      { "currentCell", "rrc.currentCell",
+      { "currentCell", "rrc.currentCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_currentCell_01", HFILL }},
     { &hf_rrc_measurementQuantity_04,
@@ -172493,11 +172493,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MonitoredCellRACH_ListFDD_r11", HFILL }},
     { &hf_rrc_measuredResultsNonUsedFreq,
-      { "measuredResultsNonUsedFreq", "rrc.measuredResultsNonUsedFreq",
+      { "measuredResultsNonUsedFreq", "rrc.measuredResultsNonUsedFreq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasuredResultsOnRACHinterFreq", HFILL }},
     { &hf_rrc_measuredResultsEUTRAFreq,
-      { "measuredResultsEUTRAFreq", "rrc.measuredResultsEUTRAFreq",
+      { "measuredResultsEUTRAFreq", "rrc.measuredResultsEUTRAFreq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasuredResultsOnRACH_EUTRAFreq", HFILL }},
     { &hf_rrc_interFreqCellIndication_SIB11,
@@ -172521,7 +172521,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MeasurementType_vals), 0,
         "MeasurementType", HFILL }},
     { &hf_rrc_modify_01,
-      { "modify", "rrc.modify",
+      { "modify", "rrc.modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_modify_01", HFILL }},
     { &hf_rrc_measurementType,
@@ -172533,7 +172533,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MeasurementType_r4_vals), 0,
         "MeasurementType_r4", HFILL }},
     { &hf_rrc_modify_02,
-      { "modify", "rrc.modify",
+      { "modify", "rrc.modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_modify_02", HFILL }},
     { &hf_rrc_measurementType_01,
@@ -172545,7 +172545,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MeasurementType_r6_vals), 0,
         "MeasurementType_r6", HFILL }},
     { &hf_rrc_modify_03,
-      { "modify", "rrc.modify",
+      { "modify", "rrc.modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_modify_03", HFILL }},
     { &hf_rrc_measurementType_02,
@@ -172557,7 +172557,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MeasurementType_r7_vals), 0,
         "MeasurementType_r7", HFILL }},
     { &hf_rrc_modify_04,
-      { "modify", "rrc.modify",
+      { "modify", "rrc.modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_modify_04", HFILL }},
     { &hf_rrc_measurementType_03,
@@ -172569,7 +172569,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MeasurementType_r8_vals), 0,
         "MeasurementType_r8", HFILL }},
     { &hf_rrc_modify_05,
-      { "modify", "rrc.modify",
+      { "modify", "rrc.modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_modify_05", HFILL }},
     { &hf_rrc_measurementType_04,
@@ -172581,7 +172581,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MeasurementType_r9_vals), 0,
         "MeasurementType_r9", HFILL }},
     { &hf_rrc_modify_06,
-      { "modify", "rrc.modify",
+      { "modify", "rrc.modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_modify_06", HFILL }},
     { &hf_rrc_measurementType_05,
@@ -172593,7 +172593,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MeasurementType_r10_vals), 0,
         "MeasurementType_r10", HFILL }},
     { &hf_rrc_modify_07,
-      { "modify", "rrc.modify",
+      { "modify", "rrc.modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_modify_07", HFILL }},
     { &hf_rrc_measurementType_06,
@@ -172605,7 +172605,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MeasurementType_r11_vals), 0,
         "MeasurementType_r11", HFILL }},
     { &hf_rrc_modify_08,
-      { "modify", "rrc.modify",
+      { "modify", "rrc.modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_modify_08", HFILL }},
     { &hf_rrc_measurementType_07,
@@ -172617,7 +172617,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_use_of_HCS_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_hcs_not_used,
-      { "hcs-not-used", "rrc.hcs_not_used",
+      { "hcs-not-used", "rrc.hcs_not_used_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_hcs_not_used", HFILL }},
     { &hf_rrc_cellSelectQualityMeasure_01,
@@ -172625,35 +172625,35 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_cellSelectQualityMeasure_01_vals), 0,
         "T_cellSelectQualityMeasure_01", HFILL }},
     { &hf_rrc_cpich_RSCP_02,
-      { "cpich-RSCP", "rrc.cpich_RSCP",
+      { "cpich-RSCP", "rrc.cpich_RSCP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_intraFreqMeasurementSysInfo,
-      { "intraFreqMeasurementSysInfo", "rrc.intraFreqMeasurementSysInfo",
+      { "intraFreqMeasurementSysInfo", "rrc.intraFreqMeasurementSysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqMeasurementSysInfo_RSCP", HFILL }},
     { &hf_rrc_interFreqMeasurementSysInfo,
-      { "interFreqMeasurementSysInfo", "rrc.interFreqMeasurementSysInfo",
+      { "interFreqMeasurementSysInfo", "rrc.interFreqMeasurementSysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqMeasurementSysInfo_RSCP", HFILL }},
     { &hf_rrc_cpich_Ec_N0_02,
-      { "cpich-Ec-N0", "rrc.cpich_Ec_N0",
+      { "cpich-Ec-N0", "rrc.cpich_Ec_N0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_cpich_Ec_N0_01", HFILL }},
     { &hf_rrc_intraFreqMeasurementSysInfo_01,
-      { "intraFreqMeasurementSysInfo", "rrc.intraFreqMeasurementSysInfo",
+      { "intraFreqMeasurementSysInfo", "rrc.intraFreqMeasurementSysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqMeasurementSysInfo_ECN0", HFILL }},
     { &hf_rrc_interFreqMeasurementSysInfo_01,
-      { "interFreqMeasurementSysInfo", "rrc.interFreqMeasurementSysInfo",
+      { "interFreqMeasurementSysInfo", "rrc.interFreqMeasurementSysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqMeasurementSysInfo_ECN0", HFILL }},
     { &hf_rrc_interRATMeasurementSysInfo,
-      { "interRATMeasurementSysInfo", "rrc.interRATMeasurementSysInfo",
+      { "interRATMeasurementSysInfo", "rrc.interRATMeasurementSysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATMeasurementSysInfo_B", HFILL }},
     { &hf_rrc_hcs_used,
-      { "hcs-used", "rrc.hcs_used",
+      { "hcs-used", "rrc.hcs_used_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cellSelectQualityMeasure_02,
@@ -172661,39 +172661,39 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_cellSelectQualityMeasure_02_vals), 0,
         "T_cellSelectQualityMeasure_02", HFILL }},
     { &hf_rrc_cpich_RSCP_03,
-      { "cpich-RSCP", "rrc.cpich_RSCP",
+      { "cpich-RSCP", "rrc.cpich_RSCP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_cpich_RSCP_01", HFILL }},
     { &hf_rrc_intraFreqMeasurementSysInfo_02,
-      { "intraFreqMeasurementSysInfo", "rrc.intraFreqMeasurementSysInfo",
+      { "intraFreqMeasurementSysInfo", "rrc.intraFreqMeasurementSysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqMeasurementSysInfo_HCS_RSCP", HFILL }},
     { &hf_rrc_interFreqMeasurementSysInfo_02,
-      { "interFreqMeasurementSysInfo", "rrc.interFreqMeasurementSysInfo",
+      { "interFreqMeasurementSysInfo", "rrc.interFreqMeasurementSysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqMeasurementSysInfo_HCS_RSCP", HFILL }},
     { &hf_rrc_cpich_Ec_N0_03,
-      { "cpich-Ec-N0", "rrc.cpich_Ec_N0",
+      { "cpich-Ec-N0", "rrc.cpich_Ec_N0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_cpich_Ec_N0_02", HFILL }},
     { &hf_rrc_intraFreqMeasurementSysInfo_03,
-      { "intraFreqMeasurementSysInfo", "rrc.intraFreqMeasurementSysInfo",
+      { "intraFreqMeasurementSysInfo", "rrc.intraFreqMeasurementSysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqMeasurementSysInfo_HCS_ECN0", HFILL }},
     { &hf_rrc_interFreqMeasurementSysInfo_03,
-      { "interFreqMeasurementSysInfo", "rrc.interFreqMeasurementSysInfo",
+      { "interFreqMeasurementSysInfo", "rrc.interFreqMeasurementSysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqMeasurementSysInfo_HCS_ECN0", HFILL }},
     { &hf_rrc_interRATMeasurementSysInfo_01,
-      { "interRATMeasurementSysInfo", "rrc.interRATMeasurementSysInfo",
+      { "interRATMeasurementSysInfo", "rrc.interRATMeasurementSysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_trafficVolumeMeasSysInfo,
-      { "trafficVolumeMeasSysInfo", "rrc.trafficVolumeMeasSysInfo",
+      { "trafficVolumeMeasSysInfo", "rrc.trafficVolumeMeasSysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dummy_54,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_InternalMeasurementSysInfo", HFILL }},
     { &hf_rrc_use_of_HCS_01,
@@ -172701,7 +172701,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_use_of_HCS_01_vals), 0,
         "T_use_of_HCS_01", HFILL }},
     { &hf_rrc_hcs_not_used_01,
-      { "hcs-not-used", "rrc.hcs_not_used",
+      { "hcs-not-used", "rrc.hcs_not_used_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_hcs_not_used_01", HFILL }},
     { &hf_rrc_cellSelectQualityMeasure_03,
@@ -172709,15 +172709,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_cellSelectQualityMeasure_03_vals), 0,
         "T_cellSelectQualityMeasure_03", HFILL }},
     { &hf_rrc_cpich_RSCP_04,
-      { "cpich-RSCP", "rrc.cpich_RSCP",
+      { "cpich-RSCP", "rrc.cpich_RSCP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_cpich_RSCP_02", HFILL }},
     { &hf_rrc_cpich_Ec_N0_04,
-      { "cpich-Ec-N0", "rrc.cpich_Ec_N0",
+      { "cpich-Ec-N0", "rrc.cpich_Ec_N0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_cpich_Ec_N0_03", HFILL }},
     { &hf_rrc_hcs_used_01,
-      { "hcs-used", "rrc.hcs_used",
+      { "hcs-used", "rrc.hcs_used_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_hcs_used_01", HFILL }},
     { &hf_rrc_cellSelectQualityMeasure_04,
@@ -172725,11 +172725,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_cellSelectQualityMeasure_04_vals), 0,
         "T_cellSelectQualityMeasure_04", HFILL }},
     { &hf_rrc_cpich_RSCP_05,
-      { "cpich-RSCP", "rrc.cpich_RSCP",
+      { "cpich-RSCP", "rrc.cpich_RSCP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_cpich_RSCP_03", HFILL }},
     { &hf_rrc_cpich_Ec_N0_05,
-      { "cpich-Ec-N0", "rrc.cpich_Ec_N0",
+      { "cpich-Ec-N0", "rrc.cpich_Ec_N0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_cpich_Ec_N0_04", HFILL }},
     { &hf_rrc_newIntraFrequencyCellInfoListAddon_r5,
@@ -172737,7 +172737,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxCellMeas_OF_CellSelectReselectInfo_v590ext", HFILL }},
     { &hf_rrc_newIntraFrequencyCellInfoListAddon_r5_item,
-      { "CellSelectReselectInfo-v590ext", "rrc.CellSelectReselectInfo_v590ext",
+      { "CellSelectReselectInfo-v590ext", "rrc.CellSelectReselectInfo_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_newInterFrequencyCellInfoListAddon_r5,
@@ -172745,7 +172745,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxCellMeas_OF_CellSelectReselectInfo_v590ext", HFILL }},
     { &hf_rrc_newInterFrequencyCellInfoListAddon_r5_item,
-      { "CellSelectReselectInfo-v590ext", "rrc.CellSelectReselectInfo_v590ext",
+      { "CellSelectReselectInfo-v590ext", "rrc.CellSelectReselectInfo_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_newInterRATCellInfoListAddon_r5,
@@ -172753,7 +172753,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxCellMeas_OF_CellSelectReselectInfo_v590ext", HFILL }},
     { &hf_rrc_newInterRATCellInfoListAddon_r5_item,
-      { "CellSelectReselectInfo-v590ext", "rrc.CellSelectReselectInfo_v590ext",
+      { "CellSelectReselectInfo-v590ext", "rrc.CellSelectReselectInfo_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_use_of_HCS_02,
@@ -172761,7 +172761,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_use_of_HCS_02_vals), 0,
         "T_use_of_HCS_02", HFILL }},
     { &hf_rrc_hcs_not_used_02,
-      { "hcs-not-used", "rrc.hcs_not_used",
+      { "hcs-not-used", "rrc.hcs_not_used_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_hcs_not_used_02", HFILL }},
     { &hf_rrc_cellSelectQualityMeasure_05,
@@ -172769,15 +172769,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_cellSelectQualityMeasure_05_vals), 0,
         "T_cellSelectQualityMeasure_05", HFILL }},
     { &hf_rrc_cpich_RSCP_06,
-      { "cpich-RSCP", "rrc.cpich_RSCP",
+      { "cpich-RSCP", "rrc.cpich_RSCP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_cpich_RSCP_04", HFILL }},
     { &hf_rrc_cpich_Ec_N0_06,
-      { "cpich-Ec-N0", "rrc.cpich_Ec_N0",
+      { "cpich-Ec-N0", "rrc.cpich_Ec_N0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_cpich_Ec_N0_05", HFILL }},
     { &hf_rrc_hcs_used_02,
-      { "hcs-used", "rrc.hcs_used",
+      { "hcs-used", "rrc.hcs_used_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_hcs_used_02", HFILL }},
     { &hf_rrc_cellSelectQualityMeasure_06,
@@ -172785,11 +172785,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_cellSelectQualityMeasure_06_vals), 0,
         "T_cellSelectQualityMeasure_06", HFILL }},
     { &hf_rrc_cpich_RSCP_07,
-      { "cpich-RSCP", "rrc.cpich_RSCP",
+      { "cpich-RSCP", "rrc.cpich_RSCP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_cpich_RSCP_05", HFILL }},
     { &hf_rrc_cpich_Ec_N0_07,
-      { "cpich-Ec-N0", "rrc.cpich_Ec_N0",
+      { "cpich-Ec-N0", "rrc.cpich_Ec_N0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_cpich_Ec_N0_06", HFILL }},
     { &hf_rrc_use_of_HCS_03,
@@ -172797,7 +172797,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_use_of_HCS_03_vals), 0,
         "T_use_of_HCS_03", HFILL }},
     { &hf_rrc_hcs_not_used_03,
-      { "hcs-not-used", "rrc.hcs_not_used",
+      { "hcs-not-used", "rrc.hcs_not_used_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_hcs_not_used_03", HFILL }},
     { &hf_rrc_cellSelectQualityMeasure_07,
@@ -172805,31 +172805,31 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_cellSelectQualityMeasure_07_vals), 0,
         "T_cellSelectQualityMeasure_07", HFILL }},
     { &hf_rrc_cpich_RSCP_08,
-      { "cpich-RSCP", "rrc.cpich_RSCP",
+      { "cpich-RSCP", "rrc.cpich_RSCP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_cpich_RSCP_06", HFILL }},
     { &hf_rrc_intraFreqMeasurementSysInfo_04,
-      { "intraFreqMeasurementSysInfo", "rrc.intraFreqMeasurementSysInfo",
+      { "intraFreqMeasurementSysInfo", "rrc.intraFreqMeasurementSysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqMeasurementSysInfo_RSCP_LCR_r4", HFILL }},
     { &hf_rrc_interFreqMeasurementSysInfo_04,
-      { "interFreqMeasurementSysInfo", "rrc.interFreqMeasurementSysInfo",
+      { "interFreqMeasurementSysInfo", "rrc.interFreqMeasurementSysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqMeasurementSysInfo_RSCP_LCR_r4", HFILL }},
     { &hf_rrc_cpich_Ec_N0_08,
-      { "cpich-Ec-N0", "rrc.cpich_Ec_N0",
+      { "cpich-Ec-N0", "rrc.cpich_Ec_N0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_cpich_Ec_N0_07", HFILL }},
     { &hf_rrc_intraFreqMeasurementSysInfo_05,
-      { "intraFreqMeasurementSysInfo", "rrc.intraFreqMeasurementSysInfo",
+      { "intraFreqMeasurementSysInfo", "rrc.intraFreqMeasurementSysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqMeasurementSysInfo_ECN0_LCR_r4", HFILL }},
     { &hf_rrc_interFreqMeasurementSysInfo_05,
-      { "interFreqMeasurementSysInfo", "rrc.interFreqMeasurementSysInfo",
+      { "interFreqMeasurementSysInfo", "rrc.interFreqMeasurementSysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqMeasurementSysInfo_ECN0_LCR_r4", HFILL }},
     { &hf_rrc_hcs_used_03,
-      { "hcs-used", "rrc.hcs_used",
+      { "hcs-used", "rrc.hcs_used_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_hcs_used_03", HFILL }},
     { &hf_rrc_cellSelectQualityMeasure_08,
@@ -172837,27 +172837,27 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_cellSelectQualityMeasure_08_vals), 0,
         "T_cellSelectQualityMeasure_08", HFILL }},
     { &hf_rrc_cpich_RSCP_09,
-      { "cpich-RSCP", "rrc.cpich_RSCP",
+      { "cpich-RSCP", "rrc.cpich_RSCP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_cpich_RSCP_07", HFILL }},
     { &hf_rrc_intraFreqMeasurementSysInfo_06,
-      { "intraFreqMeasurementSysInfo", "rrc.intraFreqMeasurementSysInfo",
+      { "intraFreqMeasurementSysInfo", "rrc.intraFreqMeasurementSysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqMeasurementSysInfo_HCS_RSCP_LCR_r4", HFILL }},
     { &hf_rrc_interFreqMeasurementSysInfo_06,
-      { "interFreqMeasurementSysInfo", "rrc.interFreqMeasurementSysInfo",
+      { "interFreqMeasurementSysInfo", "rrc.interFreqMeasurementSysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqMeasurementSysInfo_HCS_RSCP_LCR_r4", HFILL }},
     { &hf_rrc_cpich_Ec_N0_09,
-      { "cpich-Ec-N0", "rrc.cpich_Ec_N0",
+      { "cpich-Ec-N0", "rrc.cpich_Ec_N0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_cpich_Ec_N0_08", HFILL }},
     { &hf_rrc_intraFreqMeasurementSysInfo_07,
-      { "intraFreqMeasurementSysInfo", "rrc.intraFreqMeasurementSysInfo",
+      { "intraFreqMeasurementSysInfo", "rrc.intraFreqMeasurementSysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqMeasurementSysInfo_HCS_ECN0_LCR_r4", HFILL }},
     { &hf_rrc_interFreqMeasurementSysInfo_07,
-      { "interFreqMeasurementSysInfo", "rrc.interFreqMeasurementSysInfo",
+      { "interFreqMeasurementSysInfo", "rrc.interFreqMeasurementSysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFreqMeasurementSysInfo_HCS_ECN0_LCR_r4", HFILL }},
     { &hf_rrc_measurement_Occasion_Coeff,
@@ -172885,131 +172885,131 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_PeriodicalOrEventTrigger_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_intraFrequencyMeasurement,
-      { "intraFrequencyMeasurement", "rrc.intraFrequencyMeasurement",
+      { "intraFrequencyMeasurement", "rrc.intraFrequencyMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interFrequencyMeasurement,
-      { "interFrequencyMeasurement", "rrc.interFrequencyMeasurement",
+      { "interFrequencyMeasurement", "rrc.interFrequencyMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interRATMeasurement_01,
-      { "interRATMeasurement", "rrc.interRATMeasurement",
+      { "interRATMeasurement", "rrc.interRATMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_Measurement,
-      { "ue-positioning-Measurement", "rrc.ue_positioning_Measurement",
+      { "ue-positioning-Measurement", "rrc.ue_positioning_Measurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_trafficVolumeMeasurement,
-      { "trafficVolumeMeasurement", "rrc.trafficVolumeMeasurement",
+      { "trafficVolumeMeasurement", "rrc.trafficVolumeMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_qualityMeasurement,
-      { "qualityMeasurement", "rrc.qualityMeasurement",
+      { "qualityMeasurement", "rrc.qualityMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_InternalMeasurement,
-      { "ue-InternalMeasurement", "rrc.ue_InternalMeasurement",
+      { "ue-InternalMeasurement", "rrc.ue_InternalMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_intraFrequencyMeasurement_01,
-      { "intraFrequencyMeasurement", "rrc.intraFrequencyMeasurement",
+      { "intraFrequencyMeasurement", "rrc.intraFrequencyMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFrequencyMeasurement_r4", HFILL }},
     { &hf_rrc_interFrequencyMeasurement_01,
-      { "interFrequencyMeasurement", "rrc.interFrequencyMeasurement",
+      { "interFrequencyMeasurement", "rrc.interFrequencyMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFrequencyMeasurement_r4", HFILL }},
     { &hf_rrc_interRATMeasurement_02,
-      { "interRATMeasurement", "rrc.interRATMeasurement",
+      { "interRATMeasurement", "rrc.interRATMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATMeasurement_r4", HFILL }},
     { &hf_rrc_up_Measurement,
-      { "up-Measurement", "rrc.up_Measurement",
+      { "up-Measurement", "rrc.up_Measurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_Measurement_r4", HFILL }},
     { &hf_rrc_ue_InternalMeasurement_01,
-      { "ue-InternalMeasurement", "rrc.ue_InternalMeasurement",
+      { "ue-InternalMeasurement", "rrc.ue_InternalMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_InternalMeasurement_r4", HFILL }},
     { &hf_rrc_intraFrequencyMeasurement_02,
-      { "intraFrequencyMeasurement", "rrc.intraFrequencyMeasurement",
+      { "intraFrequencyMeasurement", "rrc.intraFrequencyMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFrequencyMeasurement_r6", HFILL }},
     { &hf_rrc_interFrequencyMeasurement_02,
-      { "interFrequencyMeasurement", "rrc.interFrequencyMeasurement",
+      { "interFrequencyMeasurement", "rrc.interFrequencyMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFrequencyMeasurement_r6", HFILL }},
     { &hf_rrc_interRATMeasurement_03,
-      { "interRATMeasurement", "rrc.interRATMeasurement",
+      { "interRATMeasurement", "rrc.interRATMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATMeasurement_r6", HFILL }},
     { &hf_rrc_intraFrequencyMeasurement_03,
-      { "intraFrequencyMeasurement", "rrc.intraFrequencyMeasurement",
+      { "intraFrequencyMeasurement", "rrc.intraFrequencyMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFrequencyMeasurement_r7", HFILL }},
     { &hf_rrc_interFrequencyMeasurement_03,
-      { "interFrequencyMeasurement", "rrc.interFrequencyMeasurement",
+      { "interFrequencyMeasurement", "rrc.interFrequencyMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFrequencyMeasurement_r7", HFILL }},
     { &hf_rrc_up_Measurement_01,
-      { "up-Measurement", "rrc.up_Measurement",
+      { "up-Measurement", "rrc.up_Measurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_Measurement_r7", HFILL }},
     { &hf_rrc_interFrequencyMeasurement_04,
-      { "interFrequencyMeasurement", "rrc.interFrequencyMeasurement",
+      { "interFrequencyMeasurement", "rrc.interFrequencyMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFrequencyMeasurement_r8", HFILL }},
     { &hf_rrc_interRATMeasurement_04,
-      { "interRATMeasurement", "rrc.interRATMeasurement",
+      { "interRATMeasurement", "rrc.interRATMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATMeasurement_r8", HFILL }},
     { &hf_rrc_up_Measurement_02,
-      { "up-Measurement", "rrc.up_Measurement",
+      { "up-Measurement", "rrc.up_Measurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_Measurement_r8", HFILL }},
     { &hf_rrc_intraFrequencyMeasurement_04,
-      { "intraFrequencyMeasurement", "rrc.intraFrequencyMeasurement",
+      { "intraFrequencyMeasurement", "rrc.intraFrequencyMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFrequencyMeasurement_r9", HFILL }},
     { &hf_rrc_interFrequencyMeasurement_05,
-      { "interFrequencyMeasurement", "rrc.interFrequencyMeasurement",
+      { "interFrequencyMeasurement", "rrc.interFrequencyMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFrequencyMeasurement_r9", HFILL }},
     { &hf_rrc_interRATMeasurement_05,
-      { "interRATMeasurement", "rrc.interRATMeasurement",
+      { "interRATMeasurement", "rrc.interRATMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATMeasurement_r9", HFILL }},
     { &hf_rrc_up_Measurement_03,
-      { "up-Measurement", "rrc.up_Measurement",
+      { "up-Measurement", "rrc.up_Measurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_Measurement_r9", HFILL }},
     { &hf_rrc_csgProximityDetection,
-      { "csgProximityDetection", "rrc.csgProximityDetection",
+      { "csgProximityDetection", "rrc.csgProximityDetection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_intraFrequencyMeasurement_05,
-      { "intraFrequencyMeasurement", "rrc.intraFrequencyMeasurement",
+      { "intraFrequencyMeasurement", "rrc.intraFrequencyMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFrequencyMeasurement_r10", HFILL }},
     { &hf_rrc_interFrequencyMeasurement_06,
-      { "interFrequencyMeasurement", "rrc.interFrequencyMeasurement",
+      { "interFrequencyMeasurement", "rrc.interFrequencyMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFrequencyMeasurement_r10", HFILL }},
     { &hf_rrc_up_Measurement_04,
-      { "up-Measurement", "rrc.up_Measurement",
+      { "up-Measurement", "rrc.up_Measurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_Measurement_r10", HFILL }},
     { &hf_rrc_intraFrequencyMeasurement_06,
-      { "intraFrequencyMeasurement", "rrc.intraFrequencyMeasurement",
+      { "intraFrequencyMeasurement", "rrc.intraFrequencyMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFrequencyMeasurement_r11", HFILL }},
     { &hf_rrc_interFrequencyMeasurement_07,
-      { "interFrequencyMeasurement", "rrc.interFrequencyMeasurement",
+      { "interFrequencyMeasurement", "rrc.interFrequencyMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterFrequencyMeasurement_r11", HFILL }},
     { &hf_rrc_eutraMeasurementForCELLFACH,
-      { "eutraMeasurementForCELLFACH", "rrc.eutraMeasurementForCELLFACH",
+      { "eutraMeasurementForCELLFACH", "rrc.eutraMeasurementForCELLFACH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EUTRA_MeasurementForCELLFACH", HFILL }},
     { &hf_rrc_ue_State,
@@ -173017,7 +173017,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_ue_State_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_MonitoredCellRACH_List_item,
-      { "MonitoredCellRACH-Result", "rrc.MonitoredCellRACH_Result",
+      { "MonitoredCellRACH-Result", "rrc.MonitoredCellRACH_Result_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sfn_SFN_ObsTimeDifference,
@@ -173029,7 +173029,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_122_vals), 0,
         "T_modeSpecificInfo_122", HFILL }},
     { &hf_rrc_fdd_167,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_161", HFILL }},
     { &hf_rrc_measurementQuantity_05,
@@ -173037,11 +173037,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_measurementQuantity_03_vals), 0,
         "T_measurementQuantity_03", HFILL }},
     { &hf_rrc_tdd_117,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_109", HFILL }},
     { &hf_rrc_MonitoredCellRACH_ListFDD_r11_item,
-      { "MonitoredCellRACH-ResultFDD-r11", "rrc.MonitoredCellRACH_ResultFDD_r11",
+      { "MonitoredCellRACH-ResultFDD-r11", "rrc.MonitoredCellRACH_ResultFDD_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_measurementQuantity_06,
@@ -173065,11 +173065,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MultipleEUTRAFrequencyBandIndicatorExtensionList", HFILL }},
     { &hf_rrc_MultipleEUTRAFrequencyInfoList_item,
-      { "MultipleEUTRAFrequencyBandInfo", "rrc.MultipleEUTRAFrequencyBandInfo",
+      { "MultipleEUTRAFrequencyBandInfo", "rrc.MultipleEUTRAFrequencyBandInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MultipleEUTRAFrequencyInfoExtensionList_item,
-      { "MultipleEUTRAFrequencyBandExtensionInfo", "rrc.MultipleEUTRAFrequencyBandExtensionInfo",
+      { "MultipleEUTRAFrequencyBandExtensionInfo", "rrc.MultipleEUTRAFrequencyBandExtensionInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MultipleFrequencyBandIndicatorListFDD_item,
@@ -173081,7 +173081,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MultipleFrequencyInfoListFDD_item,
-      { "MultipleFrequencyBandInfo", "rrc.MultipleFrequencyBandInfo",
+      { "MultipleFrequencyBandInfo", "rrc.MultipleFrequencyBandInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_n_CR,
@@ -173117,11 +173117,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_SatelliteStatus_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_ephemerisParameter,
-      { "ephemerisParameter", "rrc.ephemerisParameter",
+      { "ephemerisParameter", "rrc.ephemerisParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NavigationModelSatInfoList_item,
-      { "NavigationModelSatInfo", "rrc.NavigationModelSatInfo",
+      { "NavigationModelSatInfo", "rrc.NavigationModelSatInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cnavURAindex,
@@ -173385,7 +173385,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_1", HFILL }},
     { &hf_rrc_sf1Revd,
-      { "sf1Revd", "rrc.sf1Revd",
+      { "sf1Revd", "rrc.sf1Revd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SubFrame1Reserved", HFILL }},
     { &hf_rrc_t_GD,
@@ -173485,27 +173485,27 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_123_vals), 0,
         "T_modeSpecificInfo_123", HFILL }},
     { &hf_rrc_fdd_168,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_162", HFILL }},
     { &hf_rrc_neighbourIdentity,
-      { "neighbourIdentity", "rrc.neighbourIdentity",
+      { "neighbourIdentity", "rrc.neighbourIdentity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrimaryCPICH_Info", HFILL }},
     { &hf_rrc_uE_RX_TX_TimeDifferenceType2Info,
-      { "uE-RX-TX-TimeDifferenceType2Info", "rrc.uE_RX_TX_TimeDifferenceType2Info",
+      { "uE-RX-TX-TimeDifferenceType2Info", "rrc.uE_RX_TX_TimeDifferenceType2Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_118,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_110", HFILL }},
     { &hf_rrc_neighbourAndChannelIdentity,
-      { "neighbourAndChannelIdentity", "rrc.neighbourAndChannelIdentity",
+      { "neighbourAndChannelIdentity", "rrc.neighbourAndChannelIdentity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellAndChannelIdentity", HFILL }},
     { &hf_rrc_neighbourQuality,
-      { "neighbourQuality", "rrc.neighbourQuality",
+      { "neighbourQuality", "rrc.neighbourQuality_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sfn_SFN_ObsTimeDifference2,
@@ -173517,23 +173517,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_124_vals), 0,
         "T_modeSpecificInfo_124", HFILL }},
     { &hf_rrc_fdd_169,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_163", HFILL }},
     { &hf_rrc_NeighbourList_item,
-      { "Neighbour", "rrc.Neighbour",
+      { "Neighbour", "rrc.Neighbour_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NeighbourList_TDD_r7_item,
-      { "Neighbour-TDD-r7", "rrc.Neighbour_TDD_r7",
+      { "Neighbour-TDD-r7", "rrc.Neighbour_TDD_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NeighbourList_v390ext_item,
-      { "Neighbour-v390ext", "rrc.Neighbour_v390ext",
+      { "Neighbour-v390ext", "rrc.Neighbour_v390ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_Positioning_OTDOA_Quality,
-      { "ue-Positioning-OTDOA-Quality", "rrc.ue_Positioning_OTDOA_Quality",
+      { "ue-Positioning-OTDOA-Quality", "rrc.ue_Positioning_OTDOA_Quality_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interFreqCellID,
@@ -173541,11 +173541,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cellInfo,
-      { "cellInfo", "rrc.cellInfo",
+      { "cellInfo", "rrc.cellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cellInfo_01,
-      { "cellInfo", "rrc.cellInfo",
+      { "cellInfo", "rrc.cellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellInfo_r4", HFILL }},
     { &hf_rrc_intraSecondaryFreqIndicator,
@@ -173553,7 +173553,7 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_cellInfo_LCR_r8,
-      { "cellInfo-LCR-r8", "rrc.cellInfo_LCR_r8",
+      { "cellInfo-LCR-r8", "rrc.cellInfo_LCR_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellInfo_LCR_r8_ext", HFILL }},
     { &hf_rrc_modeSpecificInfo_125,
@@ -173561,15 +173561,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_125_vals), 0,
         "T_modeSpecificInfo_125", HFILL }},
     { &hf_rrc_noInfo,
-      { "noInfo", "rrc.noInfo",
+      { "noInfo", "rrc.noInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd128_64,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_62", HFILL }},
     { &hf_rrc_cellInfo_02,
-      { "cellInfo", "rrc.cellInfo",
+      { "cellInfo", "rrc.cellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellInfo_r9", HFILL }},
     { &hf_rrc_modeSpecificInfo_126,
@@ -173577,7 +173577,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_126_vals), 0,
         "T_modeSpecificInfo_126", HFILL }},
     { &hf_rrc_tdd128_65,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_63", HFILL }},
     { &hf_rrc_modeSpecificInfo_127,
@@ -173585,7 +173585,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_127_vals), 0,
         "T_modeSpecificInfo_127", HFILL }},
     { &hf_rrc_tdd128_66,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_64", HFILL }},
     { &hf_rrc_sNPLMonitorSetIndicator_TDD128,
@@ -173593,95 +173593,95 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_5", HFILL }},
     { &hf_rrc_NewInterFreqCellList_item,
-      { "NewInterFreqCell", "rrc.NewInterFreqCell",
+      { "NewInterFreqCell", "rrc.NewInterFreqCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewInterFreqCellList_r4_item,
-      { "NewInterFreqCell-r4", "rrc.NewInterFreqCell_r4",
+      { "NewInterFreqCell-r4", "rrc.NewInterFreqCell_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewInterFreqCellList_v7b0ext_item,
-      { "NewInterFreqCell-v7b0ext", "rrc.NewInterFreqCell_v7b0ext",
+      { "NewInterFreqCell-v7b0ext", "rrc.NewInterFreqCell_v7b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewInterFreqCellList_LCR_v8a0ext_item,
-      { "NewInterFreqCell-LCR-v8a0ext", "rrc.NewInterFreqCell_LCR_v8a0ext",
+      { "NewInterFreqCell-LCR-v8a0ext", "rrc.NewInterFreqCell_LCR_v8a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewInterFreqCellList_r8_item,
-      { "NewInterFreqCell-r8", "rrc.NewInterFreqCell_r8",
+      { "NewInterFreqCell-r8", "rrc.NewInterFreqCell_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewInterFreqCellList_r9_item,
-      { "NewInterFreqCell-r9", "rrc.NewInterFreqCell_r9",
+      { "NewInterFreqCell-r9", "rrc.NewInterFreqCell_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewInterFreqCellList_r10_item,
-      { "NewInterFreqCell-r10", "rrc.NewInterFreqCell_r10",
+      { "NewInterFreqCell-r10", "rrc.NewInterFreqCell_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cellInfo_03,
-      { "cellInfo", "rrc.cellInfo",
+      { "cellInfo", "rrc.cellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellInfoSI_RSCP", HFILL }},
     { &hf_rrc_cellInfo_04,
-      { "cellInfo", "rrc.cellInfo",
+      { "cellInfo", "rrc.cellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellInfoSI_ECN0", HFILL }},
     { &hf_rrc_cellInfo_05,
-      { "cellInfo", "rrc.cellInfo",
+      { "cellInfo", "rrc.cellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellInfoSI_HCS_RSCP", HFILL }},
     { &hf_rrc_cellInfo_06,
-      { "cellInfo", "rrc.cellInfo",
+      { "cellInfo", "rrc.cellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellInfoSI_HCS_ECN0", HFILL }},
     { &hf_rrc_cellInfo_07,
-      { "cellInfo", "rrc.cellInfo",
+      { "cellInfo", "rrc.cellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellInfoSI_RSCP_LCR_r4", HFILL }},
     { &hf_rrc_cellInfo_08,
-      { "cellInfo", "rrc.cellInfo",
+      { "cellInfo", "rrc.cellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellInfoSI_ECN0_LCR_r4", HFILL }},
     { &hf_rrc_cellInfo_09,
-      { "cellInfo", "rrc.cellInfo",
+      { "cellInfo", "rrc.cellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellInfoSI_HCS_RSCP_LCR_r4", HFILL }},
     { &hf_rrc_cellInfo_10,
-      { "cellInfo", "rrc.cellInfo",
+      { "cellInfo", "rrc.cellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellInfoSI_HCS_ECN0_LCR_r4", HFILL }},
     { &hf_rrc_NewInterFreqCellSI_List_ECN0_item,
-      { "NewInterFreqCellSI-ECN0", "rrc.NewInterFreqCellSI_ECN0",
+      { "NewInterFreqCellSI-ECN0", "rrc.NewInterFreqCellSI_ECN0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewInterFreqCellSI_List_HCS_RSCP_item,
-      { "NewInterFreqCellSI-HCS-RSCP", "rrc.NewInterFreqCellSI_HCS_RSCP",
+      { "NewInterFreqCellSI-HCS-RSCP", "rrc.NewInterFreqCellSI_HCS_RSCP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewInterFreqCellSI_List_HCS_ECN0_item,
-      { "NewInterFreqCellSI-HCS-ECN0", "rrc.NewInterFreqCellSI_HCS_ECN0",
+      { "NewInterFreqCellSI-HCS-ECN0", "rrc.NewInterFreqCellSI_HCS_ECN0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewInterFreqCellSI_List_RSCP_item,
-      { "NewInterFreqCellSI-RSCP", "rrc.NewInterFreqCellSI_RSCP",
+      { "NewInterFreqCellSI-RSCP", "rrc.NewInterFreqCellSI_RSCP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewInterFreqCellSI_List_ECN0_LCR_r4_item,
-      { "NewInterFreqCellSI-ECN0-LCR-r4", "rrc.NewInterFreqCellSI_ECN0_LCR_r4",
+      { "NewInterFreqCellSI-ECN0-LCR-r4", "rrc.NewInterFreqCellSI_ECN0_LCR_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewInterFreqCellSI_List_HCS_RSCP_LCR_r4_item,
-      { "NewInterFreqCellSI-HCS-RSCP-LCR-r4", "rrc.NewInterFreqCellSI_HCS_RSCP_LCR_r4",
+      { "NewInterFreqCellSI-HCS-RSCP-LCR-r4", "rrc.NewInterFreqCellSI_HCS_RSCP_LCR_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewInterFreqCellSI_List_HCS_ECN0_LCR_r4_item,
-      { "NewInterFreqCellSI-HCS-ECN0-LCR-r4", "rrc.NewInterFreqCellSI_HCS_ECN0_LCR_r4",
+      { "NewInterFreqCellSI-HCS-ECN0-LCR-r4", "rrc.NewInterFreqCellSI_HCS_ECN0_LCR_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewInterFreqCellSI_List_RSCP_LCR_r4_item,
-      { "NewInterFreqCellSI-RSCP-LCR-r4", "rrc.NewInterFreqCellSI_RSCP_LCR_r4",
+      { "NewInterFreqCellSI-RSCP-LCR-r4", "rrc.NewInterFreqCellSI_RSCP_LCR_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interRATCellID,
@@ -173693,11 +173693,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_technologySpecificInfo_01_vals), 0,
         "T_technologySpecificInfo_01", HFILL }},
     { &hf_rrc_gsm_16,
-      { "gsm", "rrc.gsm",
+      { "gsm", "rrc.gsm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_gsm_14", HFILL }},
     { &hf_rrc_cellSelectionReselectionInfo_05,
-      { "cellSelectionReselectionInfo", "rrc.cellSelectionReselectionInfo",
+      { "cellSelectionReselectionInfo", "rrc.cellSelectionReselectionInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellSelectReselectInfoSIB_11_12", HFILL }},
     { &hf_rrc_interRATCellIndividualOffset,
@@ -173705,7 +173705,7 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_is_2000_03,
-      { "is-2000", "rrc.is_2000",
+      { "is-2000", "rrc.is_2000_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_is_2000_02", HFILL }},
     { &hf_rrc_is_2000SpecificMeasInfo,
@@ -173717,19 +173717,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_technologySpecificInfo_02_vals), 0,
         "T_technologySpecificInfo_02", HFILL }},
     { &hf_rrc_gsm_17,
-      { "gsm", "rrc.gsm",
+      { "gsm", "rrc.gsm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_gsm_15", HFILL }},
     { &hf_rrc_is_2000_04,
-      { "is-2000", "rrc.is_2000",
+      { "is-2000", "rrc.is_2000_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_is_2000_03", HFILL }},
     { &hf_rrc_NewInterRATCellList_item,
-      { "NewInterRATCell", "rrc.NewInterRATCell",
+      { "NewInterRATCell", "rrc.NewInterRATCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewInterRATCellList_B_item,
-      { "NewInterRATCell-B", "rrc.NewInterRATCell_B",
+      { "NewInterRATCell-B", "rrc.NewInterRATCell_B_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_intraFreqCellID,
@@ -173741,7 +173741,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_128_vals), 0,
         "T_modeSpecificInfo_128", HFILL }},
     { &hf_rrc_tdd128_67,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_65", HFILL }},
     { &hf_rrc_intraFreqCellIDOnSecULFreq,
@@ -173749,59 +173749,59 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewIntraFreqCellList_item,
-      { "NewIntraFreqCell", "rrc.NewIntraFreqCell",
+      { "NewIntraFreqCell", "rrc.NewIntraFreqCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewIntraFreqCellList_r4_item,
-      { "NewIntraFreqCell-r4", "rrc.NewIntraFreqCell_r4",
+      { "NewIntraFreqCell-r4", "rrc.NewIntraFreqCell_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewIntraFreqCellList_r9_item,
-      { "NewIntraFreqCell-r9", "rrc.NewIntraFreqCell_r9",
+      { "NewIntraFreqCell-r9", "rrc.NewIntraFreqCell_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewIntraFreqCellList_r10_item,
-      { "NewIntraFreqCell-r10", "rrc.NewIntraFreqCell_r10",
+      { "NewIntraFreqCell-r10", "rrc.NewIntraFreqCell_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewIntraFreqCellList_LCR_v8a0ext_item,
-      { "NewIntraFreqCell-LCR-v8a0ext", "rrc.NewIntraFreqCell_LCR_v8a0ext",
+      { "NewIntraFreqCell-LCR-v8a0ext", "rrc.NewIntraFreqCell_LCR_v8a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewIntraFreqCellListOnSecULFreq_item,
-      { "NewIntraFreqCellOnSecULFreq", "rrc.NewIntraFreqCellOnSecULFreq",
+      { "NewIntraFreqCellOnSecULFreq", "rrc.NewIntraFreqCellOnSecULFreq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewIntraFreqCellSI_List_RSCP_item,
-      { "NewIntraFreqCellSI-RSCP", "rrc.NewIntraFreqCellSI_RSCP",
+      { "NewIntraFreqCellSI-RSCP", "rrc.NewIntraFreqCellSI_RSCP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewIntraFreqCellSI_List_ECN0_item,
-      { "NewIntraFreqCellSI-ECN0", "rrc.NewIntraFreqCellSI_ECN0",
+      { "NewIntraFreqCellSI-ECN0", "rrc.NewIntraFreqCellSI_ECN0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewIntraFreqCellSI_List_HCS_RSCP_item,
-      { "NewIntraFreqCellSI-HCS-RSCP", "rrc.NewIntraFreqCellSI_HCS_RSCP",
+      { "NewIntraFreqCellSI-HCS-RSCP", "rrc.NewIntraFreqCellSI_HCS_RSCP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewIntraFreqCellSI_List_HCS_ECN0_item,
-      { "NewIntraFreqCellSI-HCS-ECN0", "rrc.NewIntraFreqCellSI_HCS_ECN0",
+      { "NewIntraFreqCellSI-HCS-ECN0", "rrc.NewIntraFreqCellSI_HCS_ECN0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewIntraFreqCellSI_List_RSCP_LCR_r4_item,
-      { "NewIntraFreqCellSI-RSCP-LCR-r4", "rrc.NewIntraFreqCellSI_RSCP_LCR_r4",
+      { "NewIntraFreqCellSI-RSCP-LCR-r4", "rrc.NewIntraFreqCellSI_RSCP_LCR_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewIntraFreqCellSI_List_ECN0_LCR_r4_item,
-      { "NewIntraFreqCellSI-ECN0-LCR-r4", "rrc.NewIntraFreqCellSI_ECN0_LCR_r4",
+      { "NewIntraFreqCellSI-ECN0-LCR-r4", "rrc.NewIntraFreqCellSI_ECN0_LCR_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewIntraFreqCellSI_List_HCS_RSCP_LCR_r4_item,
-      { "NewIntraFreqCellSI-HCS-RSCP-LCR-r4", "rrc.NewIntraFreqCellSI_HCS_RSCP_LCR_r4",
+      { "NewIntraFreqCellSI-HCS-RSCP-LCR-r4", "rrc.NewIntraFreqCellSI_HCS_RSCP_LCR_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NewIntraFreqCellSI_List_HCS_ECN0_LCR_r4_item,
-      { "NewIntraFreqCellSI-HCS-ECN0-LCR-r4", "rrc.NewIntraFreqCellSI_HCS_ECN0_LCR_r4",
+      { "NewIntraFreqCellSI-HCS-ECN0-LCR-r4", "rrc.NewIntraFreqCellSI_HCS_ECN0_LCR_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_nonUsedFreqThreshold,
@@ -173833,27 +173833,27 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_nonUsedFreqTriggeringConditionDetectedCells_03_vals), 0,
         "T_nonUsedFreqTriggeringConditionDetectedCells_03", HFILL }},
     { &hf_rrc_NonUsedFreqParameterList_item,
-      { "NonUsedFreqParameter", "rrc.NonUsedFreqParameter",
+      { "NonUsedFreqParameter", "rrc.NonUsedFreqParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NonUsedFreqParameterList_r6_item,
-      { "NonUsedFreqParameter-r6", "rrc.NonUsedFreqParameter_r6",
+      { "NonUsedFreqParameter-r6", "rrc.NonUsedFreqParameter_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NonUsedFreqParameterList_r10_item,
-      { "NonUsedFreqParameter-r10", "rrc.NonUsedFreqParameter_r10",
+      { "NonUsedFreqParameter-r10", "rrc.NonUsedFreqParameter_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NonUsedFreqParameterList_r11_item,
-      { "NonUsedFreqParameter-r11", "rrc.NonUsedFreqParameter_r11",
+      { "NonUsedFreqParameter-r11", "rrc.NonUsedFreqParameter_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NonUsedFreq2aParameterList_r10_item,
-      { "NonUsedFreq2aParameter-r10", "rrc.NonUsedFreq2aParameter_r10",
+      { "NonUsedFreq2aParameter-r10", "rrc.NonUsedFreq2aParameter_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NonUsedFreq2aParameterList_r11_item,
-      { "NonUsedFreq2aParameter-r11", "rrc.NonUsedFreq2aParameter_r11",
+      { "NonUsedFreq2aParameter-r11", "rrc.NonUsedFreq2aParameter_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_NonUsedFreqWList_r6_item,
@@ -173861,7 +173861,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_notUsed,
-      { "notUsed", "rrc.notUsed",
+      { "notUsed", "rrc.notUsed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_pt10,
@@ -173889,27 +173889,27 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TemporaryOffset1_vals), 0,
         "TemporaryOffset1", HFILL }},
     { &hf_rrc_pt10_01,
-      { "pt10", "rrc.pt10",
+      { "pt10", "rrc.pt10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TemporaryOffsetList", HFILL }},
     { &hf_rrc_pt20_01,
-      { "pt20", "rrc.pt20",
+      { "pt20", "rrc.pt20_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TemporaryOffsetList", HFILL }},
     { &hf_rrc_pt30_01,
-      { "pt30", "rrc.pt30",
+      { "pt30", "rrc.pt30_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TemporaryOffsetList", HFILL }},
     { &hf_rrc_pt40_01,
-      { "pt40", "rrc.pt40",
+      { "pt40", "rrc.pt40_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TemporaryOffsetList", HFILL }},
     { &hf_rrc_pt50_01,
-      { "pt50", "rrc.pt50",
+      { "pt50", "rrc.pt50_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TemporaryOffsetList", HFILL }},
     { &hf_rrc_pt60_01,
-      { "pt60", "rrc.pt60",
+      { "pt60", "rrc.pt60_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TemporaryOffsetList", HFILL }},
     { &hf_rrc_reportingInterval_01,
@@ -173917,7 +173917,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_ReportingIntervalLong_vals), 0,
         "ReportingIntervalLong", HFILL }},
     { &hf_rrc_periodicalWithReportingCellStatus,
-      { "periodicalWithReportingCellStatus", "rrc.periodicalWithReportingCellStatus",
+      { "periodicalWithReportingCellStatus", "rrc.periodicalWithReportingCellStatus_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PeriodicalWithReportingCellStatus_r10", HFILL }},
     { &hf_rrc_plmnsOfIntraFreqCellsList,
@@ -173941,15 +173941,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_PlmnList_item,
-      { "PLMN-Identity", "rrc.PLMN_Identity",
+      { "PLMN-Identity", "rrc.PLMN_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_PLMNsOfInterFreqCellsList_item,
-      { "PLMNsOfInterFreqCellsList item", "rrc.PLMNsOfInterFreqCellsList_item",
+      { "PLMNsOfInterFreqCellsList item", "rrc.PLMNsOfInterFreqCellsList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MultiplePLMNsOfInterFreqCellsList_item,
-      { "MultiplePLMNsOfInterFreqCellsList item", "rrc.MultiplePLMNsOfInterFreqCellsList_item",
+      { "MultiplePLMNsOfInterFreqCellsList item", "rrc.MultiplePLMNsOfInterFreqCellsList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_multiplePLMN_list,
@@ -173957,19 +173957,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_6_OF_PLMN_IdentityWithOptionalMCC_r6", HFILL }},
     { &hf_rrc_multiplePLMN_list_item,
-      { "PLMN-IdentityWithOptionalMCC-r6", "rrc.PLMN_IdentityWithOptionalMCC_r6",
+      { "PLMN-IdentityWithOptionalMCC-r6", "rrc.PLMN_IdentityWithOptionalMCC_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_PLMNsOfIntraFreqCellsList_item,
-      { "PLMNsOfIntraFreqCellsList item", "rrc.PLMNsOfIntraFreqCellsList_item",
+      { "PLMNsOfIntraFreqCellsList item", "rrc.PLMNsOfIntraFreqCellsList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MultiplePLMNsOfIntraFreqCellsList_item,
-      { "MultiplePLMNsOfIntraFreqCellsList item", "rrc.MultiplePLMNsOfIntraFreqCellsList_item",
+      { "MultiplePLMNsOfIntraFreqCellsList item", "rrc.MultiplePLMNsOfIntraFreqCellsList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_PLMNsOfInterRATCellsList_item,
-      { "PLMNsOfInterRATCellsList item", "rrc.PLMNsOfInterRATCellsList_item",
+      { "PLMNsOfInterRATCellsList item", "rrc.PLMNsOfInterRATCellsList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_QualityEventResults_item,
@@ -173985,7 +173985,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_129_vals), 0,
         "T_modeSpecificInfo_129", HFILL }},
     { &hf_rrc_tdd_119,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_111", HFILL }},
     { &hf_rrc_sir_MeasurementResults,
@@ -173993,7 +173993,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SIR_MeasurementList", HFILL }},
     { &hf_rrc_qualityReportingQuantity,
-      { "qualityReportingQuantity", "rrc.qualityReportingQuantity",
+      { "qualityReportingQuantity", "rrc.qualityReportingQuantity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_reportCriteria_15,
@@ -174005,11 +174005,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_noReporting_02,
-      { "noReporting", "rrc.noReporting",
+      { "noReporting", "rrc.noReporting_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_QualityReportingCriteria_item,
-      { "QualityReportingCriteriaSingle", "rrc.QualityReportingCriteriaSingle",
+      { "QualityReportingCriteriaSingle", "rrc.QualityReportingCriteriaSingle_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_totalCRC,
@@ -174037,7 +174037,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_130_vals), 0,
         "T_modeSpecificInfo_130", HFILL }},
     { &hf_rrc_tdd_120,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_112", HFILL }},
     { &hf_rrc_sir_TFCS_List,
@@ -174045,11 +174045,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ellipsoidPointWithAltitude,
-      { "ellipsoidPointWithAltitude", "rrc.ellipsoidPointWithAltitude",
+      { "ellipsoidPointWithAltitude", "rrc.ellipsoidPointWithAltitude_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EllipsoidPointAltitude", HFILL }},
     { &hf_rrc_ellipsoidPointAltitudeEllipsoide,
-      { "ellipsoidPointAltitudeEllipsoide", "rrc.ellipsoidPointAltitudeEllipsoide",
+      { "ellipsoidPointAltitudeEllipsoide", "rrc.ellipsoidPointAltitudeEllipsoide_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_accuracy40,
@@ -174065,7 +174065,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_15", HFILL }},
     { &hf_rrc_removeAllInterFreqCells,
-      { "removeAllInterFreqCells", "rrc.removeAllInterFreqCells",
+      { "removeAllInterFreqCells", "rrc.removeAllInterFreqCells_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_removeSomeInterFreqCells,
@@ -174077,11 +174077,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_removeNoInterFreqCells,
-      { "removeNoInterFreqCells", "rrc.removeNoInterFreqCells",
+      { "removeNoInterFreqCells", "rrc.removeNoInterFreqCells_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_removeAllInterRATCells,
-      { "removeAllInterRATCells", "rrc.removeAllInterRATCells",
+      { "removeAllInterRATCells", "rrc.removeAllInterRATCells_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_removeSomeInterRATCells,
@@ -174093,11 +174093,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_removeNoInterRATCells,
-      { "removeNoInterRATCells", "rrc.removeNoInterRATCells",
+      { "removeNoInterRATCells", "rrc.removeNoInterRATCells_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_removeAllIntraFreqCells,
-      { "removeAllIntraFreqCells", "rrc.removeAllIntraFreqCells",
+      { "removeAllIntraFreqCells", "rrc.removeAllIntraFreqCells_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_removeSomeIntraFreqCells,
@@ -174109,7 +174109,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_removeNoIntraFreqCells,
-      { "removeNoIntraFreqCells", "rrc.removeNoIntraFreqCells",
+      { "removeNoIntraFreqCells", "rrc.removeNoIntraFreqCells_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_removeSomeIntraFreqCells_01,
@@ -174205,7 +174205,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_63", HFILL }},
     { &hf_rrc_RL_AdditionInfoList_item,
-      { "PrimaryCPICH-Info", "rrc.PrimaryCPICH_Info",
+      { "PrimaryCPICH-Info", "rrc.PrimaryCPICH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rl_AdditionInfoList,
@@ -174221,7 +174221,7 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M120_M25", HFILL }},
     { &hf_rrc_SatDataList_item,
-      { "SatData", "rrc.SatData",
+      { "SatData", "rrc.SatData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_iod_02,
@@ -174229,7 +174229,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_1023", HFILL }},
     { &hf_rrc_SatellitesListRelatedDataList_item,
-      { "SatellitesListRelatedData", "rrc.SatellitesListRelatedData",
+      { "SatellitesListRelatedData", "rrc.SatellitesListRelatedData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_t_oc_01,
@@ -174257,7 +174257,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_1", HFILL }},
     { &hf_rrc_Satellite_clock_modelList_item,
-      { "Satellite-clock-model", "rrc.Satellite_clock_model",
+      { "Satellite-clock-model", "rrc.Satellite_clock_model_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sbasAgfo,
@@ -174289,7 +174289,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_38399", HFILL }},
     { &hf_rrc_SIR_MeasurementList_item,
-      { "SIR-MeasurementResults", "rrc.SIR_MeasurementResults",
+      { "SIR-MeasurementResults", "rrc.SIR_MeasurementResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sir_TimeslotList,
@@ -174333,23 +174333,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_8191", HFILL }},
     { &hf_rrc_t30,
-      { "t30", "rrc.t30",
+      { "t30", "rrc.t30_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "N_CR_T_CRMaxHyst", HFILL }},
     { &hf_rrc_t60,
-      { "t60", "rrc.t60",
+      { "t60", "rrc.t60_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "N_CR_T_CRMaxHyst", HFILL }},
     { &hf_rrc_t120,
-      { "t120", "rrc.t120",
+      { "t120", "rrc.t120_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "N_CR_T_CRMaxHyst", HFILL }},
     { &hf_rrc_t180,
-      { "t180", "rrc.t180",
+      { "t180", "rrc.t180_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "N_CR_T_CRMaxHyst", HFILL }},
     { &hf_rrc_t240,
-      { "t240", "rrc.t240",
+      { "t240", "rrc.t240_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "N_CR_T_CRMaxHyst", HFILL }},
     { &hf_rrc_tce_Id_01,
@@ -174365,15 +174365,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TemporaryOffset2_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_ThreholdNonUsedFrequency_deltaList_item,
-      { "DeltaRSCPPerCell", "rrc.DeltaRSCPPerCell",
+      { "DeltaRSCPPerCell", "rrc.DeltaRSCPPerCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_TimeslotInfoList_item,
-      { "TimeslotInfo", "rrc.TimeslotInfo",
+      { "TimeslotInfo", "rrc.TimeslotInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_TimeslotInfoList_LCR_r4_item,
-      { "TimeslotInfo-LCR-r4", "rrc.TimeslotInfo_LCR_r4",
+      { "TimeslotInfo-LCR-r4", "rrc.TimeslotInfo_LCR_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd384_47,
@@ -174381,7 +174381,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxTS_OF_TimeslotInfo", HFILL }},
     { &hf_rrc_tdd384_item_01,
-      { "TimeslotInfo", "rrc.TimeslotInfo",
+      { "TimeslotInfo", "rrc.TimeslotInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd128_68,
@@ -174389,7 +174389,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxTS_LCR_OF_TimeslotInfo_LCR_r4", HFILL }},
     { &hf_rrc_tdd128_item_02,
-      { "TimeslotInfo-LCR-r4", "rrc.TimeslotInfo_LCR_r4",
+      { "TimeslotInfo-LCR-r4", "rrc.TimeslotInfo_LCR_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_TimeslotISCP_List_item,
@@ -174397,7 +174397,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_TimeslotListWithISCP_item,
-      { "TimeslotWithISCP", "rrc.TimeslotWithISCP",
+      { "TimeslotWithISCP", "rrc.TimeslotWithISCP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_timeslotISCP_01,
@@ -174437,7 +174437,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TrafficVolumeEventType_vals), 0,
         "TrafficVolumeEventType", HFILL }},
     { &hf_rrc_rlc_BufferPayload,
-      { "rlc-BufferPayload", "rrc.rlc_BufferPayload",
+      { "rlc-BufferPayload", "rrc.rlc_BufferPayload_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_averageRLC_BufferPayload,
@@ -174461,11 +174461,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TrafficVolumeMeasQuantity_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_trafficVolumeReportingQuantity,
-      { "trafficVolumeReportingQuantity", "rrc.trafficVolumeReportingQuantity",
+      { "trafficVolumeReportingQuantity", "rrc.trafficVolumeReportingQuantity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dummy_55,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TrafficVolumeReportingCriteria", HFILL }},
     { &hf_rrc_reportCriteriaSysInf,
@@ -174485,7 +174485,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_VarianceOfRLC_BufferPayload_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_TrafficVolumeMeasuredResultsList_item,
-      { "TrafficVolumeMeasuredResults", "rrc.TrafficVolumeMeasuredResults",
+      { "TrafficVolumeMeasuredResults", "rrc.TrafficVolumeMeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_reportCriteria_18,
@@ -174497,7 +174497,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UL_TrCH_Identity_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_trafficVolumeReportingCriteria,
-      { "trafficVolumeReportingCriteria", "rrc.trafficVolumeReportingCriteria",
+      { "trafficVolumeReportingCriteria", "rrc.trafficVolumeReportingCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_transChCriteriaList,
@@ -174525,11 +174525,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxMeasParEvent_OF_TrafficVolumeEventParam", HFILL }},
     { &hf_rrc_eventSpecificParameters_item,
-      { "TrafficVolumeEventParam", "rrc.TrafficVolumeEventParam",
+      { "TrafficVolumeEventParam", "rrc.TrafficVolumeEventParam_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_TransChCriteriaList_item,
-      { "TransChCriteria", "rrc.TransChCriteria",
+      { "TransChCriteria", "rrc.TransChCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_transmittedPowerThreshold,
@@ -174541,19 +174541,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_onWithNoReporting,
-      { "onWithNoReporting", "rrc.onWithNoReporting",
+      { "onWithNoReporting", "rrc.onWithNoReporting_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dummy2_13,
-      { "dummy2", "rrc.dummy2",
+      { "dummy2", "rrc.dummy2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RL_InformationLists", HFILL }},
     { &hf_rrc_event6a,
-      { "event6a", "rrc.event6a",
+      { "event6a", "rrc.event6a_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_6AB_Event", HFILL }},
     { &hf_rrc_event6b,
-      { "event6b", "rrc.event6b",
+      { "event6b", "rrc.event6b_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_6AB_Event", HFILL }},
     { &hf_rrc_event6c,
@@ -174569,11 +174569,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_TimeToTrigger_vals), 0,
         "TimeToTrigger", HFILL }},
     { &hf_rrc_event6f,
-      { "event6f", "rrc.event6f",
+      { "event6f", "rrc.event6f_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_6FG_Event", HFILL }},
     { &hf_rrc_event6g,
-      { "event6g", "rrc.event6g",
+      { "event6g", "rrc.event6g_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_6FG_Event", HFILL }},
     { &hf_rrc_UE_InternalEventParamList_item,
@@ -174581,31 +174581,31 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UE_InternalEventParam_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_event6a_01,
-      { "event6a", "rrc.event6a",
+      { "event6a", "rrc.event6a_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_event6b_01,
-      { "event6b", "rrc.event6b",
+      { "event6b", "rrc.event6b_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_event6c_01,
-      { "event6c", "rrc.event6c",
+      { "event6c", "rrc.event6c_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_event6d_01,
-      { "event6d", "rrc.event6d",
+      { "event6d", "rrc.event6d_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_event6e_01,
-      { "event6e", "rrc.event6e",
+      { "event6e", "rrc.event6e_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_event6f_01,
-      { "event6f", "rrc.event6f",
+      { "event6f", "rrc.event6f_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrimaryCPICH_Info", HFILL }},
     { &hf_rrc_event6g_01,
-      { "event6g", "rrc.event6g",
+      { "event6g", "rrc.event6g_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrimaryCPICH_Info", HFILL }},
     { &hf_rrc_measurementQuantity_07,
@@ -174617,7 +174617,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_131_vals), 0,
         "T_modeSpecificInfo_131", HFILL }},
     { &hf_rrc_fdd_170,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_164", HFILL }},
     { &hf_rrc_ue_TransmittedPowerFDD,
@@ -174629,7 +174629,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_121,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_113", HFILL }},
     { &hf_rrc_ue_TransmittedPowerTDD_List,
@@ -174641,7 +174641,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "UL_TimingAdvance", HFILL }},
     { &hf_rrc_t_ADVinfo,
-      { "t-ADVinfo", "rrc.t_ADVinfo",
+      { "t-ADVinfo", "rrc.t_ADVinfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_132,
@@ -174649,27 +174649,27 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_132_vals), 0,
         "T_modeSpecificInfo_132", HFILL }},
     { &hf_rrc_tdd384_768_03,
-      { "tdd384-768", "rrc.tdd384_768",
+      { "tdd384-768", "rrc.tdd384_768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_768_02", HFILL }},
     { &hf_rrc_appliedTA_01,
-      { "appliedTA", "rrc.appliedTA",
+      { "appliedTA", "rrc.appliedTA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EXT_UL_TimingAdvance", HFILL }},
     { &hf_rrc_tdd128_69,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_66", HFILL }},
     { &hf_rrc_t_ADVinfo_01,
-      { "t-ADVinfo", "rrc.t_ADVinfo",
+      { "t-ADVinfo", "rrc.t_ADVinfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ADVinfo_ext", HFILL }},
     { &hf_rrc_ue_InternalMeasQuantity,
-      { "ue-InternalMeasQuantity", "rrc.ue_InternalMeasQuantity",
+      { "ue-InternalMeasQuantity", "rrc.ue_InternalMeasQuantity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_InternalReportingQuantity,
-      { "ue-InternalReportingQuantity", "rrc.ue_InternalReportingQuantity",
+      { "ue-InternalReportingQuantity", "rrc.ue_InternalReportingQuantity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_reportCriteria_19,
@@ -174677,7 +174677,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UE_InternalReportCriteria_vals), 0,
         "UE_InternalReportCriteria", HFILL }},
     { &hf_rrc_ue_InternalReportingQuantity_01,
-      { "ue-InternalReportingQuantity", "rrc.ue_InternalReportingQuantity",
+      { "ue-InternalReportingQuantity", "rrc.ue_InternalReportingQuantity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_InternalReportingQuantity_r4", HFILL }},
     { &hf_rrc_ue_InternalMeasurementID,
@@ -174685,7 +174685,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MeasurementIdentity", HFILL }},
     { &hf_rrc_ue_InternalReportingCriteria,
-      { "ue-InternalReportingCriteria", "rrc.ue_InternalReportingCriteria",
+      { "ue-InternalReportingCriteria", "rrc.ue_InternalReportingCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_InternalEventParamList,
@@ -174701,7 +174701,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_133_vals), 0,
         "T_modeSpecificInfo_133", HFILL }},
     { &hf_rrc_fdd_171,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_165", HFILL }},
     { &hf_rrc_ue_RX_TX_TimeDifference,
@@ -174709,7 +174709,7 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_tdd_122,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_114", HFILL }},
     { &hf_rrc_appliedTA_02,
@@ -174721,11 +174721,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_134_vals), 0,
         "T_modeSpecificInfo_134", HFILL }},
     { &hf_rrc_fdd_172,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_166", HFILL }},
     { &hf_rrc_tdd_123,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_115", HFILL }},
     { &hf_rrc_tddOption_28,
@@ -174733,11 +174733,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tddOption_28_vals), 0,
         "T_tddOption_28", HFILL }},
     { &hf_rrc_tdd384_48,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_43", HFILL }},
     { &hf_rrc_tdd128_70,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_67", HFILL }},
     { &hf_rrc_t_ADVinfo_02,
@@ -174749,7 +174749,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UE_RX_TX_ReportEntryList_item,
-      { "UE-RX-TX-ReportEntry", "rrc.UE_RX_TX_ReportEntry",
+      { "UE-RX-TX-ReportEntry", "rrc.UE_RX_TX_ReportEntry_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_RX_TX_TimeDifferenceType2,
@@ -174761,7 +174761,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rachorcpch,
-      { "rachorcpch", "rrc.rachorcpch",
+      { "rachorcpch", "rrc.rachorcpch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cipheringKeyFlag,
@@ -174793,7 +174793,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UE_Positioning_ErrorCause_vals), 0,
         "UE_Positioning_ErrorCause", HFILL }},
     { &hf_rrc_ue_positioning_GPS_additionalAssistanceDataRequest,
-      { "ue-positioning-GPS-additionalAssistanceDataRequest", "rrc.ue_positioning_GPS_additionalAssistanceDataRequest",
+      { "ue-positioning-GPS-additionalAssistanceDataRequest", "rrc.ue_positioning_GPS_additionalAssistanceDataRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_errorReason_01,
@@ -174801,11 +174801,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UE_Positioning_ErrorCause_r7_vals), 0,
         "UE_Positioning_ErrorCause_r7", HFILL }},
     { &hf_rrc_ue_positioning_GANSS_additionalAssistanceDataRequest,
-      { "ue-positioning-GANSS-additionalAssistanceDataRequest", "rrc.ue_positioning_GANSS_additionalAssistanceDataRequest",
+      { "ue-positioning-GANSS-additionalAssistanceDataRequest", "rrc.ue_positioning_GANSS_additionalAssistanceDataRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_GANSS_additionalAssistanceDataRequest_01,
-      { "ue-positioning-GANSS-additionalAssistanceDataRequest", "rrc.ue_positioning_GANSS_additionalAssistanceDataRequest",
+      { "ue-positioning-GANSS-additionalAssistanceDataRequest", "rrc.ue_positioning_GANSS_additionalAssistanceDataRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_AdditionalAssistanceDataRequest_v860ext", HFILL }},
     { &hf_rrc_reportFirstFix,
@@ -174825,11 +174825,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UE_Positioning_EventSpecificInfo_r7_vals), 0,
         "UE_Positioning_EventSpecificInfo_r7", HFILL }},
     { &hf_rrc_UE_Positioning_EventParamList_item,
-      { "UE-Positioning-EventParam", "rrc.UE_Positioning_EventParam",
+      { "UE-Positioning-EventParam", "rrc.UE_Positioning_EventParam_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UE_Positioning_EventParamList_r7_item,
-      { "UE-Positioning-EventParam-r7", "rrc.UE_Positioning_EventParam_r7",
+      { "UE-Positioning-EventParam-r7", "rrc.UE_Positioning_EventParam_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_e7a,
@@ -174853,15 +174853,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_ThresholdSFN_GANSS_TOW_vals), 0,
         "ThresholdSFN_GANSS_TOW", HFILL }},
     { &hf_rrc_utcModel1,
-      { "utcModel1", "rrc.utcModel1",
+      { "utcModel1", "rrc.utcModel1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTCmodelSet1", HFILL }},
     { &hf_rrc_utcModel2,
-      { "utcModel2", "rrc.utcModel2",
+      { "utcModel2", "rrc.utcModel2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTCmodelSet2", HFILL }},
     { &hf_rrc_utcModel3,
-      { "utcModel3", "rrc.utcModel3",
+      { "utcModel3", "rrc.utcModel3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTCmodelSet3", HFILL }},
     { &hf_rrc_ganss_wk_number,
@@ -174869,27 +174869,27 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_255", HFILL }},
     { &hf_rrc_alm_keplerianParameters,
-      { "alm-keplerianParameters", "rrc.alm_keplerianParameters",
+      { "alm-keplerianParameters", "rrc.alm_keplerianParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_alm_keplerianNAVAlmanac,
-      { "alm-keplerianNAVAlmanac", "rrc.alm_keplerianNAVAlmanac",
+      { "alm-keplerianNAVAlmanac", "rrc.alm_keplerianNAVAlmanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ALM_NAVKeplerianSet", HFILL }},
     { &hf_rrc_alm_keplerianReducedAlmanac,
-      { "alm-keplerianReducedAlmanac", "rrc.alm_keplerianReducedAlmanac",
+      { "alm-keplerianReducedAlmanac", "rrc.alm_keplerianReducedAlmanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ALM_ReducedKeplerianSet", HFILL }},
     { &hf_rrc_alm_keplerianMidiAlmanac,
-      { "alm-keplerianMidiAlmanac", "rrc.alm_keplerianMidiAlmanac",
+      { "alm-keplerianMidiAlmanac", "rrc.alm_keplerianMidiAlmanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ALM_MidiAlmanacSet", HFILL }},
     { &hf_rrc_alm_keplerianGLONASS,
-      { "alm-keplerianGLONASS", "rrc.alm_keplerianGLONASS",
+      { "alm-keplerianGLONASS", "rrc.alm_keplerianGLONASS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ALM_GlonassAlmanacSet", HFILL }},
     { &hf_rrc_alm_ecefSBASAlmanac,
-      { "alm-ecefSBASAlmanac", "rrc.alm_ecefSBASAlmanac",
+      { "alm-ecefSBASAlmanac", "rrc.alm_ecefSBASAlmanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ALM_ECEFsbasAlmanacSet", HFILL }},
     { &hf_rrc_complete_Almanac_Provided,
@@ -174929,7 +174929,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_2", HFILL }},
     { &hf_rrc_alpha_beta_parameters,
-      { "alpha-beta-parameters", "rrc.alpha_beta_parameters",
+      { "alpha-beta-parameters", "rrc.alpha_beta_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GPS_IonosphericModel", HFILL }},
     { &hf_rrc_non_broadcastIndication,
@@ -174941,15 +174941,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Ganss_Sat_Info_AddNavList", HFILL }},
     { &hf_rrc_ue_positioning_GANSS_ReferenceTime,
-      { "ue-positioning-GANSS-ReferenceTime", "rrc.ue_positioning_GANSS_ReferenceTime",
+      { "ue-positioning-GANSS-ReferenceTime", "rrc.ue_positioning_GANSS_ReferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_uePositioningGanssReferencePosition,
-      { "uePositioningGanssReferencePosition", "rrc.uePositioningGanssReferencePosition",
+      { "uePositioningGanssReferencePosition", "rrc.uePositioningGanssReferencePosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReferenceLocationGANSS", HFILL }},
     { &hf_rrc_uePositioningGanssIonosphericModel,
-      { "uePositioningGanssIonosphericModel", "rrc.uePositioningGanssIonosphericModel",
+      { "uePositioningGanssIonosphericModel", "rrc.uePositioningGanssIonosphericModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_IonosphericModel", HFILL }},
     { &hf_rrc_ganssGenericDataList,
@@ -174957,11 +174957,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_uePositioningGanssAddIonoModel,
-      { "uePositioningGanssAddIonoModel", "rrc.uePositioningGanssAddIonoModel",
+      { "uePositioningGanssAddIonoModel", "rrc.uePositioningGanssAddIonoModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_AddIonoModel", HFILL }},
     { &hf_rrc_uePositioningGanssEarthOrientationPara,
-      { "uePositioningGanssEarthOrientationPara", "rrc.uePositioningGanssEarthOrientationPara",
+      { "uePositioningGanssEarthOrientationPara", "rrc.uePositioningGanssEarthOrientationPara_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_EarthOrientPara", HFILL }},
     { &hf_rrc_ganssGenericDataList_01,
@@ -174981,7 +174981,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GANSSGenericDataList_v920ext", HFILL }},
     { &hf_rrc_ue_positioning_GANSS_ReferenceTime_01,
-      { "ue-positioning-GANSS-ReferenceTime", "rrc.ue_positioning_GANSS_ReferenceTime",
+      { "ue-positioning-GANSS-ReferenceTime", "rrc.ue_positioning_GANSS_ReferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_ReferenceTime_va40ext", HFILL }},
     { &hf_rrc_ganssGenericDataList_05,
@@ -174989,7 +174989,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GANSSGenericDataList_va40ext", HFILL }},
     { &hf_rrc_ue_positioning_GANSS_ReferenceTime_02,
-      { "ue-positioning-GANSS-ReferenceTime", "rrc.ue_positioning_GANSS_ReferenceTime",
+      { "ue-positioning-GANSS-ReferenceTime", "rrc.ue_positioning_GANSS_ReferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_ReferenceTime_r10", HFILL }},
     { &hf_rrc_ganssGenericDataList_06,
@@ -175009,35 +175009,35 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_navClockModel,
-      { "navClockModel", "rrc.navClockModel",
+      { "navClockModel", "rrc.navClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cnavClockModel,
-      { "cnavClockModel", "rrc.cnavClockModel",
+      { "cnavClockModel", "rrc.cnavClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_glonassClockModel,
-      { "glonassClockModel", "rrc.glonassClockModel",
+      { "glonassClockModel", "rrc.glonassClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sbasClockModel,
-      { "sbasClockModel", "rrc.sbasClockModel",
+      { "sbasClockModel", "rrc.sbasClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_navKeplerianSet,
-      { "navKeplerianSet", "rrc.navKeplerianSet",
+      { "navKeplerianSet", "rrc.navKeplerianSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NavModel_NAVKeplerianSet", HFILL }},
     { &hf_rrc_cnavKeplerianSet,
-      { "cnavKeplerianSet", "rrc.cnavKeplerianSet",
+      { "cnavKeplerianSet", "rrc.cnavKeplerianSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NavModel_CNAVKeplerianSet", HFILL }},
     { &hf_rrc_glonassECEF,
-      { "glonassECEF", "rrc.glonassECEF",
+      { "glonassECEF", "rrc.glonassECEF_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NavModel_GLONASSecef", HFILL }},
     { &hf_rrc_sbasECEF,
-      { "sbasECEF", "rrc.sbasECEF",
+      { "sbasECEF", "rrc.sbasECEF_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NavModel_SBASecef", HFILL }},
     { &hf_rrc_ganss_tod,
@@ -175089,7 +175089,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_12", HFILL }},
     { &hf_rrc_gANSS_storm_flags,
-      { "gANSS-storm-flags", "rrc.gANSS_storm_flags",
+      { "gANSS-storm-flags", "rrc.gANSS_storm_flags_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSS_Storm_Flag", HFILL }},
     { &hf_rrc_referenceTime,
@@ -175097,11 +175097,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_referenceTime_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_utran_GANSSReferenceTimeResult,
-      { "utran-GANSSReferenceTimeResult", "rrc.utran_GANSSReferenceTimeResult",
+      { "utran-GANSSReferenceTimeResult", "rrc.utran_GANSSReferenceTimeResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTRAN_GANSSReferenceTime", HFILL }},
     { &hf_rrc_ganssReferenceTimeOnly,
-      { "ganssReferenceTimeOnly", "rrc.ganssReferenceTimeOnly",
+      { "ganssReferenceTimeOnly", "rrc.ganssReferenceTimeOnly_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ganssGenericMeasurementInfo,
@@ -175121,11 +175121,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Ganss_Sat_Info_NavList", HFILL }},
     { &hf_rrc_keplerianParameters,
-      { "keplerianParameters", "rrc.keplerianParameters",
+      { "keplerianParameters", "rrc.keplerianParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UE_Positioning_GANSS_RealTimeIntegrity_item,
-      { "UE-Positioning-GANSS-RealTimeIntegrity item", "rrc.UE_Positioning_GANSS_RealTimeIntegrity_item",
+      { "UE-Positioning-GANSS-RealTimeIntegrity item", "rrc.UE_Positioning_GANSS_RealTimeIntegrity_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_bad_ganss_satId,
@@ -175161,7 +175161,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_7", HFILL }},
     { &hf_rrc_utran_ganssreferenceTime,
-      { "utran-ganssreferenceTime", "rrc.utran_ganssreferenceTime",
+      { "utran-ganssreferenceTime", "rrc.utran_ganssreferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_timingOfCellFrames,
@@ -175173,15 +175173,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_mode_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_fdd_173,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_167", HFILL }},
     { &hf_rrc_primary_CPICH_Info,
-      { "primary-CPICH-Info", "rrc.primary_CPICH_Info",
+      { "primary-CPICH-Info", "rrc.primary_CPICH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrimaryCPICH_Info", HFILL }},
     { &hf_rrc_tdd_124,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_116", HFILL }},
     { &hf_rrc_cellParameters,
@@ -175201,7 +175201,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_7", HFILL }},
     { &hf_rrc_utran_ganssreferenceTime_01,
-      { "utran-ganssreferenceTime", "rrc.utran_ganssreferenceTime",
+      { "utran-ganssreferenceTime", "rrc.utran_ganssreferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_utran_ganssreferenceTime_01", HFILL }},
     { &hf_rrc_mode_01,
@@ -175209,11 +175209,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_mode_01_vals), 0,
         "T_mode_01", HFILL }},
     { &hf_rrc_fdd_174,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_168", HFILL }},
     { &hf_rrc_tdd_125,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_117", HFILL }},
     { &hf_rrc_ganss_timeModelreferenceTime,
@@ -175249,11 +175249,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_gnss_to_id_01_vals), 0,
         "T_gnss_to_id_01", HFILL }},
     { &hf_rrc_UE_Positioning_GANSS_TimeModels_item,
-      { "UE-Positioning-GANSS-TimeModel", "rrc.UE_Positioning_GANSS_TimeModel",
+      { "UE-Positioning-GANSS-TimeModel", "rrc.UE_Positioning_GANSS_TimeModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UE_Positioning_GANSS_TimeModels_va40ext_item,
-      { "UE-Positioning-GANSS-TimeModel-va40ext", "rrc.UE_Positioning_GANSS_TimeModel_va40ext",
+      { "UE-Positioning-GANSS-TimeModel-va40ext", "rrc.UE_Positioning_GANSS_TimeModel_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_a_one_utc,
@@ -175293,7 +175293,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GPS_TOW_1msec", HFILL }},
     { &hf_rrc_utran_GPSReferenceTime,
-      { "utran-GPSReferenceTime", "rrc.utran_GPSReferenceTime",
+      { "utran-GPSReferenceTime", "rrc.utran_GPSReferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_satelliteInformationList_03,
@@ -175349,7 +175349,7 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_navModelAddDataRequest,
-      { "navModelAddDataRequest", "rrc.navModelAddDataRequest",
+      { "navModelAddDataRequest", "rrc.navModelAddDataRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GPS_NavModelAddDataReq", HFILL }},
     { &hf_rrc_wn_a,
@@ -175365,35 +175365,35 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_364", HFILL }},
     { &hf_rrc_ue_positioning_GPS_ReferenceTime,
-      { "ue-positioning-GPS-ReferenceTime", "rrc.ue_positioning_GPS_ReferenceTime",
+      { "ue-positioning-GPS-ReferenceTime", "rrc.ue_positioning_GPS_ReferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_GPS_ReferenceLocation,
-      { "ue-positioning-GPS-ReferenceLocation", "rrc.ue_positioning_GPS_ReferenceLocation",
+      { "ue-positioning-GPS-ReferenceLocation", "rrc.ue_positioning_GPS_ReferenceLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReferenceLocation", HFILL }},
     { &hf_rrc_ue_positioning_GPS_DGPS_Corrections,
-      { "ue-positioning-GPS-DGPS-Corrections", "rrc.ue_positioning_GPS_DGPS_Corrections",
+      { "ue-positioning-GPS-DGPS-Corrections", "rrc.ue_positioning_GPS_DGPS_Corrections_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_GPS_NavigationModel,
-      { "ue-positioning-GPS-NavigationModel", "rrc.ue_positioning_GPS_NavigationModel",
+      { "ue-positioning-GPS-NavigationModel", "rrc.ue_positioning_GPS_NavigationModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_GPS_IonosphericModel,
-      { "ue-positioning-GPS-IonosphericModel", "rrc.ue_positioning_GPS_IonosphericModel",
+      { "ue-positioning-GPS-IonosphericModel", "rrc.ue_positioning_GPS_IonosphericModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_GPS_UTC_Model,
-      { "ue-positioning-GPS-UTC-Model", "rrc.ue_positioning_GPS_UTC_Model",
+      { "ue-positioning-GPS-UTC-Model", "rrc.ue_positioning_GPS_UTC_Model_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_GPS_Almanac,
-      { "ue-positioning-GPS-Almanac", "rrc.ue_positioning_GPS_Almanac",
+      { "ue-positioning-GPS-Almanac", "rrc.ue_positioning_GPS_Almanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_GPS_AcquisitionAssistance,
-      { "ue-positioning-GPS-AcquisitionAssistance", "rrc.ue_positioning_GPS_AcquisitionAssistance",
+      { "ue-positioning-GPS-AcquisitionAssistance", "rrc.ue_positioning_GPS_AcquisitionAssistance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_GPS_Real_timeIntegrity,
@@ -175401,55 +175401,55 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "BadSatList", HFILL }},
     { &hf_rrc_dummy_56,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GPS_ReferenceCellInfo", HFILL }},
     { &hf_rrc_ue_positioning_GPS_ReferenceTime_01,
-      { "ue-positioning-GPS-ReferenceTime", "rrc.ue_positioning_GPS_ReferenceTime",
+      { "ue-positioning-GPS-ReferenceTime", "rrc.ue_positioning_GPS_ReferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GPS_ReferenceTime_v770ext", HFILL }},
     { &hf_rrc_ue_positioning_GPS_AcquisitionAssistance_01,
-      { "ue-positioning-GPS-AcquisitionAssistance", "rrc.ue_positioning_GPS_AcquisitionAssistance",
+      { "ue-positioning-GPS-AcquisitionAssistance", "rrc.ue_positioning_GPS_AcquisitionAssistance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GPS_AcquisitionAssistance_v770ext", HFILL }},
     { &hf_rrc_ue_positioning_GPS_ReferenceTime_02,
-      { "ue-positioning-GPS-ReferenceTime", "rrc.ue_positioning_GPS_ReferenceTime",
+      { "ue-positioning-GPS-ReferenceTime", "rrc.ue_positioning_GPS_ReferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GPS_ReferenceTime_r7", HFILL }},
     { &hf_rrc_ue_positioning_GPS_AcquisitionAssistance_02,
-      { "ue-positioning-GPS-AcquisitionAssistance", "rrc.ue_positioning_GPS_AcquisitionAssistance",
+      { "ue-positioning-GPS-AcquisitionAssistance", "rrc.ue_positioning_GPS_AcquisitionAssistance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GPS_AcquisitionAssistance_r7", HFILL }},
     { &hf_rrc_ue_positioning_GPS_DGPS_Corrections_01,
-      { "ue-positioning-GPS-DGPS-Corrections", "rrc.ue_positioning_GPS_DGPS_Corrections",
+      { "ue-positioning-GPS-DGPS-Corrections", "rrc.ue_positioning_GPS_DGPS_Corrections_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GPS_DGPS_Corrections_r9", HFILL }},
     { &hf_rrc_ue_positioning_GPS_DGPS_Corrections_02,
-      { "ue-positioning-GPS-DGPS-Corrections", "rrc.ue_positioning_GPS_DGPS_Corrections",
+      { "ue-positioning-GPS-DGPS-Corrections", "rrc.ue_positioning_GPS_DGPS_Corrections_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GPS_DGPS_Corrections_v920ext", HFILL }},
     { &hf_rrc_ue_positioning_GPS_ReferenceTime_03,
-      { "ue-positioning-GPS-ReferenceTime", "rrc.ue_positioning_GPS_ReferenceTime",
+      { "ue-positioning-GPS-ReferenceTime", "rrc.ue_positioning_GPS_ReferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GPS_ReferenceTime_va40ext", HFILL }},
     { &hf_rrc_ue_positioning_GPS_Almanac_01,
-      { "ue-positioning-GPS-Almanac", "rrc.ue_positioning_GPS_Almanac",
+      { "ue-positioning-GPS-Almanac", "rrc.ue_positioning_GPS_Almanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GPS_Almanac_va40ext", HFILL }},
     { &hf_rrc_ue_positioning_GPS_AcquisitionAssistance_03,
-      { "ue-positioning-GPS-AcquisitionAssistance", "rrc.ue_positioning_GPS_AcquisitionAssistance",
+      { "ue-positioning-GPS-AcquisitionAssistance", "rrc.ue_positioning_GPS_AcquisitionAssistance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GPS_AcquisitionAssistance_va40ext", HFILL }},
     { &hf_rrc_ue_positioning_GPS_ReferenceTime_04,
-      { "ue-positioning-GPS-ReferenceTime", "rrc.ue_positioning_GPS_ReferenceTime",
+      { "ue-positioning-GPS-ReferenceTime", "rrc.ue_positioning_GPS_ReferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GPS_ReferenceTime_r10", HFILL }},
     { &hf_rrc_ue_positioning_GPS_Almanac_02,
-      { "ue-positioning-GPS-Almanac", "rrc.ue_positioning_GPS_Almanac",
+      { "ue-positioning-GPS-Almanac", "rrc.ue_positioning_GPS_Almanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GPS_Almanac_r10", HFILL }},
     { &hf_rrc_ue_positioning_GPS_AcquisitionAssistance_04,
-      { "ue-positioning-GPS-AcquisitionAssistance", "rrc.ue_positioning_GPS_AcquisitionAssistance",
+      { "ue-positioning-GPS-AcquisitionAssistance", "rrc.ue_positioning_GPS_AcquisitionAssistance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GPS_AcquisitionAssistance_r10", HFILL }},
     { &hf_rrc_gps_TOW,
@@ -175509,7 +175509,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_referenceTime_01_vals), 0,
         "T_referenceTime_01", HFILL }},
     { &hf_rrc_utran_GPSReferenceTimeResult,
-      { "utran-GPSReferenceTimeResult", "rrc.utran_GPSReferenceTimeResult",
+      { "utran-GPSReferenceTimeResult", "rrc.utran_GPSReferenceTimeResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_gps_ReferenceTimeOnly,
@@ -175545,15 +175545,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_135_vals), 0,
         "T_modeSpecificInfo_135", HFILL }},
     { &hf_rrc_fdd_175,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_169", HFILL }},
     { &hf_rrc_referenceIdentity,
-      { "referenceIdentity", "rrc.referenceIdentity",
+      { "referenceIdentity", "rrc.referenceIdentity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrimaryCPICH_Info", HFILL }},
     { &hf_rrc_tdd_126,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_118", HFILL }},
     { &hf_rrc_referenceIdentity_01,
@@ -175629,7 +175629,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_63", HFILL }},
     { &hf_rrc_burstModeParameters,
-      { "burstModeParameters", "rrc.burstModeParameters",
+      { "burstModeParameters", "rrc.burstModeParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_136,
@@ -175637,11 +175637,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_136_vals), 0,
         "T_modeSpecificInfo_136", HFILL }},
     { &hf_rrc_fdd_176,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_170", HFILL }},
     { &hf_rrc_tdd_127,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_119", HFILL }},
     { &hf_rrc_ip_Spacing_TDD,
@@ -175665,51 +175665,51 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_IP_Spacing_TDD_vals), 0,
         "IP_Spacing_TDD", HFILL }},
     { &hf_rrc_ue_positioning_OTDOA_Measurement,
-      { "ue-positioning-OTDOA-Measurement", "rrc.ue_positioning_OTDOA_Measurement",
+      { "ue-positioning-OTDOA-Measurement", "rrc.ue_positioning_OTDOA_Measurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_PositionEstimateInfo,
-      { "ue-positioning-PositionEstimateInfo", "rrc.ue_positioning_PositionEstimateInfo",
+      { "ue-positioning-PositionEstimateInfo", "rrc.ue_positioning_PositionEstimateInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_GPS_Measurement,
-      { "ue-positioning-GPS-Measurement", "rrc.ue_positioning_GPS_Measurement",
+      { "ue-positioning-GPS-Measurement", "rrc.ue_positioning_GPS_Measurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GPS_MeasurementResults", HFILL }},
     { &hf_rrc_ue_positioning_Error,
-      { "ue-positioning-Error", "rrc.ue_positioning_Error",
+      { "ue-positioning-Error", "rrc.ue_positioning_Error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_PositionEstimateInfo_01,
-      { "ue-positioning-PositionEstimateInfo", "rrc.ue_positioning_PositionEstimateInfo",
+      { "ue-positioning-PositionEstimateInfo", "rrc.ue_positioning_PositionEstimateInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_PositionEstimateInfo_v770ext", HFILL }},
     { &hf_rrc_ue_positioning_GPS_Measurement_01,
-      { "ue-positioning-GPS-Measurement", "rrc.ue_positioning_GPS_Measurement",
+      { "ue-positioning-GPS-Measurement", "rrc.ue_positioning_GPS_Measurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GPS_MeasurementResults_v770ext", HFILL }},
     { &hf_rrc_ue_positioning_Error_01,
-      { "ue-positioning-Error", "rrc.ue_positioning_Error",
+      { "ue-positioning-Error", "rrc.ue_positioning_Error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_Error_r7", HFILL }},
     { &hf_rrc_ue_positioning_Ganss_MeasuredResults,
-      { "ue-positioning-Ganss-MeasuredResults", "rrc.ue_positioning_Ganss_MeasuredResults",
+      { "ue-positioning-Ganss-MeasuredResults", "rrc.ue_positioning_Ganss_MeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_Positioning_OTDOA_Measurement_v390ext,
-      { "ue-Positioning-OTDOA-Measurement-v390ext", "rrc.ue_Positioning_OTDOA_Measurement_v390ext",
+      { "ue-Positioning-OTDOA-Measurement-v390ext", "rrc.ue_Positioning_OTDOA_Measurement_v390ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_Error_02,
-      { "ue-positioning-Error", "rrc.ue_positioning_Error",
+      { "ue-positioning-Error", "rrc.ue_positioning_Error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_Error_v860ext", HFILL }},
     { &hf_rrc_ue_positioning_Ganss_MeasurementResults,
-      { "ue-positioning-Ganss-MeasurementResults", "rrc.ue_positioning_Ganss_MeasurementResults",
+      { "ue-positioning-Ganss-MeasurementResults", "rrc.ue_positioning_Ganss_MeasurementResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_MeasuredResults_v860ext", HFILL }},
     { &hf_rrc_ue_positioning_ReportingQuantity,
-      { "ue-positioning-ReportingQuantity", "rrc.ue_positioning_ReportingQuantity",
+      { "ue-positioning-ReportingQuantity", "rrc.ue_positioning_ReportingQuantity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_reportCriteria_20,
@@ -175717,23 +175717,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UE_Positioning_ReportCriteria_vals), 0,
         "UE_Positioning_ReportCriteria", HFILL }},
     { &hf_rrc_ue_positioning_OTDOA_AssistanceData,
-      { "ue-positioning-OTDOA-AssistanceData", "rrc.ue_positioning_OTDOA_AssistanceData",
+      { "ue-positioning-OTDOA-AssistanceData", "rrc.ue_positioning_OTDOA_AssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_ReportingQuantity_v390ext,
-      { "ue-positioning-ReportingQuantity-v390ext", "rrc.ue_positioning_ReportingQuantity_v390ext",
+      { "ue-positioning-ReportingQuantity-v390ext", "rrc.ue_positioning_ReportingQuantity_v390ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_ReportingQuantity_01,
-      { "ue-positioning-ReportingQuantity", "rrc.ue_positioning_ReportingQuantity",
+      { "ue-positioning-ReportingQuantity", "rrc.ue_positioning_ReportingQuantity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_ReportingQuantity_r4", HFILL }},
     { &hf_rrc_ue_positioning_OTDOA_AssistanceData_01,
-      { "ue-positioning-OTDOA-AssistanceData", "rrc.ue_positioning_OTDOA_AssistanceData",
+      { "ue-positioning-OTDOA-AssistanceData", "rrc.ue_positioning_OTDOA_AssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_OTDOA_AssistanceData_r4", HFILL }},
     { &hf_rrc_ue_positioning_ReportingQuantity_02,
-      { "ue-positioning-ReportingQuantity", "rrc.ue_positioning_ReportingQuantity",
+      { "ue-positioning-ReportingQuantity", "rrc.ue_positioning_ReportingQuantity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_ReportingQuantity_r7", HFILL }},
     { &hf_rrc_reportCriteria_21,
@@ -175741,71 +175741,71 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UE_Positioning_ReportCriteria_r7_vals), 0,
         "UE_Positioning_ReportCriteria_r7", HFILL }},
     { &hf_rrc_ue_positioning_OTDOA_AssistanceData_02,
-      { "ue-positioning-OTDOA-AssistanceData", "rrc.ue_positioning_OTDOA_AssistanceData",
+      { "ue-positioning-OTDOA-AssistanceData", "rrc.ue_positioning_OTDOA_AssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_OTDOA_AssistanceData_r7", HFILL }},
     { &hf_rrc_ue_positioning_GPS_AssistanceData_01,
-      { "ue-positioning-GPS-AssistanceData", "rrc.ue_positioning_GPS_AssistanceData",
+      { "ue-positioning-GPS-AssistanceData", "rrc.ue_positioning_GPS_AssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GPS_AssistanceData_r7", HFILL }},
     { &hf_rrc_ue_positioning_ReportingQuantity_03,
-      { "ue-positioning-ReportingQuantity", "rrc.ue_positioning_ReportingQuantity",
+      { "ue-positioning-ReportingQuantity", "rrc.ue_positioning_ReportingQuantity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_ReportingQuantity_r8", HFILL }},
     { &hf_rrc_ue_positioning_GANSS_AssistanceData_01,
-      { "ue-positioning-GANSS-AssistanceData", "rrc.ue_positioning_GANSS_AssistanceData",
+      { "ue-positioning-GANSS-AssistanceData", "rrc.ue_positioning_GANSS_AssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_AssistanceData_r8", HFILL }},
     { &hf_rrc_ue_positioning_GPS_AssistanceData_02,
-      { "ue-positioning-GPS-AssistanceData", "rrc.ue_positioning_GPS_AssistanceData",
+      { "ue-positioning-GPS-AssistanceData", "rrc.ue_positioning_GPS_AssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GPS_AssistanceData_r9", HFILL }},
     { &hf_rrc_ue_positioning_GANSS_AssistanceData_02,
-      { "ue-positioning-GANSS-AssistanceData", "rrc.ue_positioning_GANSS_AssistanceData",
+      { "ue-positioning-GANSS-AssistanceData", "rrc.ue_positioning_GANSS_AssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_AssistanceData_r9", HFILL }},
     { &hf_rrc_ue_positioning_GPS_AssistanceData_03,
-      { "ue-positioning-GPS-AssistanceData", "rrc.ue_positioning_GPS_AssistanceData",
+      { "ue-positioning-GPS-AssistanceData", "rrc.ue_positioning_GPS_AssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GPS_AssistanceData_r10", HFILL }},
     { &hf_rrc_ue_positioning_GANSS_AssistanceData_03,
-      { "ue-positioning-GANSS-AssistanceData", "rrc.ue_positioning_GANSS_AssistanceData",
+      { "ue-positioning-GANSS-AssistanceData", "rrc.ue_positioning_GANSS_AssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_AssistanceData_r10", HFILL }},
     { &hf_rrc_event7a,
-      { "event7a", "rrc.event7a",
+      { "event7a", "rrc.event7a_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_PositionEstimateInfo", HFILL }},
     { &hf_rrc_event7b,
-      { "event7b", "rrc.event7b",
+      { "event7b", "rrc.event7b_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_OTDOA_Measurement", HFILL }},
     { &hf_rrc_event7c,
-      { "event7c", "rrc.event7c",
+      { "event7c", "rrc.event7c_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GPS_MeasurementResults", HFILL }},
     { &hf_rrc_additionalOrReplacedPosMeasEvent,
-      { "additionalOrReplacedPosMeasEvent", "rrc.additionalOrReplacedPosMeasEvent",
+      { "additionalOrReplacedPosMeasEvent", "rrc.additionalOrReplacedPosMeasEvent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_event7a_01,
-      { "event7a", "rrc.event7a",
+      { "event7a", "rrc.event7a_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_PositionEstimateInfo_v770ext", HFILL }},
     { &hf_rrc_event7c_01,
-      { "event7c", "rrc.event7c",
+      { "event7c", "rrc.event7c_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GPS_MeasurementResults_v770ext", HFILL }},
     { &hf_rrc_event7d,
-      { "event7d", "rrc.event7d",
+      { "event7d", "rrc.event7d_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_MeasuredResults", HFILL }},
     { &hf_rrc_event7d_01,
-      { "event7d", "rrc.event7d",
+      { "event7d", "rrc.event7d_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_MeasuredResults_v860ext", HFILL }},
     { &hf_rrc_ue_positioning_OTDOA_ReferenceCellInfo,
-      { "ue-positioning-OTDOA-ReferenceCellInfo", "rrc.ue_positioning_OTDOA_ReferenceCellInfo",
+      { "ue-positioning-OTDOA-ReferenceCellInfo", "rrc.ue_positioning_OTDOA_ReferenceCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_OTDOA_NeighbourCellList,
@@ -175813,7 +175813,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_OTDOA_ReferenceCellInfo_01,
-      { "ue-positioning-OTDOA-ReferenceCellInfo", "rrc.ue_positioning_OTDOA_ReferenceCellInfo",
+      { "ue-positioning-OTDOA-ReferenceCellInfo", "rrc.ue_positioning_OTDOA_ReferenceCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_OTDOA_ReferenceCellInfo_r4", HFILL }},
     { &hf_rrc_ue_positioning_OTDOA_NeighbourCellList_01,
@@ -175821,7 +175821,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "UE_Positioning_OTDOA_NeighbourCellList_r4", HFILL }},
     { &hf_rrc_ue_Positioning_IPDL_Parameters_TDD_r4_ext,
-      { "ue-Positioning-IPDL-Parameters-TDD-r4-ext", "rrc.ue_Positioning_IPDL_Parameters_TDD_r4_ext",
+      { "ue-Positioning-IPDL-Parameters-TDD-r4-ext", "rrc.ue_Positioning_IPDL_Parameters_TDD_r4_ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_Positioning_IPDL_Parameters_TDDList_r4_ext,
@@ -175829,7 +175829,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_OTDOA_ReferenceCellInfo_UEB,
-      { "ue-positioning-OTDOA-ReferenceCellInfo-UEB", "rrc.ue_positioning_OTDOA_ReferenceCellInfo_UEB",
+      { "ue-positioning-OTDOA-ReferenceCellInfo-UEB", "rrc.ue_positioning_OTDOA_ReferenceCellInfo_UEB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_OTDOA_NeighbourCellList_UEB,
@@ -175837,7 +175837,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_OTDOA_ReferenceCellInfo_UEB_ext,
-      { "ue-positioning-OTDOA-ReferenceCellInfo-UEB-ext", "rrc.ue_positioning_OTDOA_ReferenceCellInfo_UEB_ext",
+      { "ue-positioning-OTDOA-ReferenceCellInfo-UEB-ext", "rrc.ue_positioning_OTDOA_ReferenceCellInfo_UEB_ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_OTDOA_NeighbourCellList_UEB_ext,
@@ -175845,7 +175845,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_OTDOA_ReferenceCellInfo_02,
-      { "ue-positioning-OTDOA-ReferenceCellInfo", "rrc.ue_positioning_OTDOA_ReferenceCellInfo",
+      { "ue-positioning-OTDOA-ReferenceCellInfo", "rrc.ue_positioning_OTDOA_ReferenceCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_OTDOA_ReferenceCellInfo_r7", HFILL }},
     { &hf_rrc_ue_positioning_OTDOA_NeighbourCellList_02,
@@ -175853,7 +175853,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "UE_Positioning_OTDOA_NeighbourCellList_r7", HFILL }},
     { &hf_rrc_UE_Positioning_IPDL_Parameters_TDDList_r4_ext_item,
-      { "UE-Positioning-IPDL-Parameters-TDD-r4-ext", "rrc.UE_Positioning_IPDL_Parameters_TDD_r4_ext",
+      { "UE-Positioning-IPDL-Parameters-TDD-r4-ext", "rrc.UE_Positioning_IPDL_Parameters_TDD_r4_ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_neighbourList,
@@ -175865,19 +175865,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_137_vals), 0,
         "T_modeSpecificInfo_137", HFILL }},
     { &hf_rrc_fdd_177,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_171", HFILL }},
     { &hf_rrc_referenceCellIDentity,
-      { "referenceCellIDentity", "rrc.referenceCellIDentity",
+      { "referenceCellIDentity", "rrc.referenceCellIDentity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrimaryCPICH_Info", HFILL }},
     { &hf_rrc_ue_RX_TX_TimeDifferenceType2Info,
-      { "ue-RX-TX-TimeDifferenceType2Info", "rrc.ue_RX_TX_TimeDifferenceType2Info",
+      { "ue-RX-TX-TimeDifferenceType2Info", "rrc.ue_RX_TX_TimeDifferenceType2Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_128,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_120", HFILL }},
     { &hf_rrc_referenceCellIdentity,
@@ -175897,23 +175897,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_138_vals), 0,
         "T_modeSpecificInfo_138", HFILL }},
     { &hf_rrc_fdd_178,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_172", HFILL }},
     { &hf_rrc_tdd_129,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_121", HFILL }},
     { &hf_rrc_cellAndChannelIdentity,
-      { "cellAndChannelIdentity", "rrc.cellAndChannelIdentity",
+      { "cellAndChannelIdentity", "rrc.cellAndChannelIdentity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_IPDL_Paremeters,
-      { "ue-positioning-IPDL-Paremeters", "rrc.ue_positioning_IPDL_Paremeters",
+      { "ue-positioning-IPDL-Paremeters", "rrc.ue_positioning_IPDL_Paremeters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_IPDL_Parameters", HFILL }},
     { &hf_rrc_sfn_SFN_RelTimeDifference,
-      { "sfn-SFN-RelTimeDifference", "rrc.sfn_SFN_RelTimeDifference",
+      { "sfn-SFN-RelTimeDifference", "rrc.sfn_SFN_RelTimeDifference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SFN_SFN_RelTimeDifference1", HFILL }},
     { &hf_rrc_sfn_SFN_Drift,
@@ -175929,11 +175929,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_positioningMode_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_ueBased,
-      { "ueBased", "rrc.ueBased",
+      { "ueBased", "rrc.ueBased_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ueAssisted,
-      { "ueAssisted", "rrc.ueAssisted",
+      { "ueAssisted", "rrc.ueAssisted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_139,
@@ -175941,15 +175941,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_139_vals), 0,
         "T_modeSpecificInfo_139", HFILL }},
     { &hf_rrc_fdd_179,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_173", HFILL }},
     { &hf_rrc_tdd_130,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_122", HFILL }},
     { &hf_rrc_ue_positioning_IPDL_Paremeters_01,
-      { "ue-positioning-IPDL-Paremeters", "rrc.ue_positioning_IPDL_Paremeters",
+      { "ue-positioning-IPDL-Paremeters", "rrc.ue_positioning_IPDL_Paremeters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_IPDL_Parameters_r4", HFILL }},
     { &hf_rrc_positioningMode_01,
@@ -175957,7 +175957,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_positioningMode_01_vals), 0,
         "T_positioningMode_01", HFILL }},
     { &hf_rrc_ueBased_01,
-      { "ueBased", "rrc.ueBased",
+      { "ueBased", "rrc.ueBased_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueBased_01", HFILL }},
     { &hf_rrc_relativeNorth,
@@ -175981,7 +175981,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_32766", HFILL }},
     { &hf_rrc_ueAssisted_01,
-      { "ueAssisted", "rrc.ueAssisted",
+      { "ueAssisted", "rrc.ueAssisted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueAssisted_01", HFILL }},
     { &hf_rrc_modeSpecificInfo_140,
@@ -175989,11 +175989,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_140_vals), 0,
         "T_modeSpecificInfo_140", HFILL }},
     { &hf_rrc_fdd_180,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_174", HFILL }},
     { &hf_rrc_tdd_131,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_123", HFILL }},
     { &hf_rrc_roundTripTimeExtension,
@@ -176005,11 +176005,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_141_vals), 0,
         "T_modeSpecificInfo_141", HFILL }},
     { &hf_rrc_fdd_181,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_175", HFILL }},
     { &hf_rrc_tdd_132,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_124", HFILL }},
     { &hf_rrc_positioningMode_02,
@@ -176017,31 +176017,31 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_positioningMode_02_vals), 0,
         "T_positioningMode_02", HFILL }},
     { &hf_rrc_ueBased_02,
-      { "ueBased", "rrc.ueBased",
+      { "ueBased", "rrc.ueBased_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueBased_02", HFILL }},
     { &hf_rrc_ueAssisted_02,
-      { "ueAssisted", "rrc.ueAssisted",
+      { "ueAssisted", "rrc.ueAssisted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueAssisted_02", HFILL }},
     { &hf_rrc_UE_Positioning_OTDOA_NeighbourCellList_item,
-      { "UE-Positioning-OTDOA-NeighbourCellInfo", "rrc.UE_Positioning_OTDOA_NeighbourCellInfo",
+      { "UE-Positioning-OTDOA-NeighbourCellInfo", "rrc.UE_Positioning_OTDOA_NeighbourCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UE_Positioning_OTDOA_NeighbourCellList_r4_item,
-      { "UE-Positioning-OTDOA-NeighbourCellInfo-r4", "rrc.UE_Positioning_OTDOA_NeighbourCellInfo_r4",
+      { "UE-Positioning-OTDOA-NeighbourCellInfo-r4", "rrc.UE_Positioning_OTDOA_NeighbourCellInfo_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UE_Positioning_OTDOA_NeighbourCellList_UEB_item,
-      { "UE-Positioning-OTDOA-NeighbourCellInfo-UEB", "rrc.UE_Positioning_OTDOA_NeighbourCellInfo_UEB",
+      { "UE-Positioning-OTDOA-NeighbourCellInfo-UEB", "rrc.UE_Positioning_OTDOA_NeighbourCellInfo_UEB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UE_Positioning_OTDOA_NeighbourCellList_UEB_ext_item,
-      { "UE-Positioning-OTDOA-NeighbourCellInfo-UEB-ext", "rrc.UE_Positioning_OTDOA_NeighbourCellInfo_UEB_ext",
+      { "UE-Positioning-OTDOA-NeighbourCellInfo-UEB-ext", "rrc.UE_Positioning_OTDOA_NeighbourCellInfo_UEB_ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_UE_Positioning_OTDOA_NeighbourCellList_r7_item,
-      { "UE-Positioning-OTDOA-NeighbourCellInfo-r7", "rrc.UE_Positioning_OTDOA_NeighbourCellInfo_r7",
+      { "UE-Positioning-OTDOA-NeighbourCellInfo-r7", "rrc.UE_Positioning_OTDOA_NeighbourCellInfo_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_stdResolution,
@@ -176061,11 +176061,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_142_vals), 0,
         "T_modeSpecificInfo_142", HFILL }},
     { &hf_rrc_fdd_182,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_176", HFILL }},
     { &hf_rrc_tdd_133,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_125", HFILL }},
     { &hf_rrc_positioningMode_03,
@@ -176073,11 +176073,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_positioningMode_03_vals), 0,
         "T_positioningMode_03", HFILL }},
     { &hf_rrc_ueBased_03,
-      { "ueBased", "rrc.ueBased",
+      { "ueBased", "rrc.ueBased_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueBased_03", HFILL }},
     { &hf_rrc_ueAssisted_03,
-      { "ueAssisted", "rrc.ueAssisted",
+      { "ueAssisted", "rrc.ueAssisted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueAssisted_03", HFILL }},
     { &hf_rrc_modeSpecificInfo_143,
@@ -176085,11 +176085,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_143_vals), 0,
         "T_modeSpecificInfo_143", HFILL }},
     { &hf_rrc_fdd_183,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_177", HFILL }},
     { &hf_rrc_tdd_134,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_126", HFILL }},
     { &hf_rrc_positioningMode_04,
@@ -176097,7 +176097,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_positioningMode_04_vals), 0,
         "T_positioningMode_04", HFILL }},
     { &hf_rrc_ueBased_04,
-      { "ueBased", "rrc.ueBased",
+      { "ueBased", "rrc.ueBased_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueBased_04", HFILL }},
     { &hf_rrc_cellPosition,
@@ -176105,7 +176105,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_ReferenceCellPosition_vals), 0,
         "ReferenceCellPosition", HFILL }},
     { &hf_rrc_ueAssisted_04,
-      { "ueAssisted", "rrc.ueAssisted",
+      { "ueAssisted", "rrc.ueAssisted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueAssisted_04", HFILL }},
     { &hf_rrc_modeSpecificInfo_144,
@@ -176113,11 +176113,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_144_vals), 0,
         "T_modeSpecificInfo_144", HFILL }},
     { &hf_rrc_fdd_184,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_178", HFILL }},
     { &hf_rrc_tdd_135,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_127", HFILL }},
     { &hf_rrc_modeSpecificInfo_145,
@@ -176125,11 +176125,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_145_vals), 0,
         "T_modeSpecificInfo_145", HFILL }},
     { &hf_rrc_fdd_185,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_179", HFILL }},
     { &hf_rrc_tdd_136,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_128", HFILL }},
     { &hf_rrc_positioningMode_05,
@@ -176137,11 +176137,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_positioningMode_05_vals), 0,
         "T_positioningMode_05", HFILL }},
     { &hf_rrc_ueBased_05,
-      { "ueBased", "rrc.ueBased",
+      { "ueBased", "rrc.ueBased_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueBased_05", HFILL }},
     { &hf_rrc_ueAssisted_05,
-      { "ueAssisted", "rrc.ueAssisted",
+      { "ueAssisted", "rrc.ueAssisted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ueAssisted_05", HFILL }},
     { &hf_rrc_referenceTime_02,
@@ -176149,7 +176149,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_referenceTime_02_vals), 0,
         "T_referenceTime_02", HFILL }},
     { &hf_rrc_cell_Timing,
-      { "cell-Timing", "rrc.cell_Timing",
+      { "cell-Timing", "rrc.cell_Timing_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_146,
@@ -176157,11 +176157,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_146_vals), 0,
         "T_modeSpecificInfo_146", HFILL }},
     { &hf_rrc_fdd_186,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_180", HFILL }},
     { &hf_rrc_tdd_137,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_129", HFILL }},
     { &hf_rrc_positionEstimate,
@@ -176173,11 +176173,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_referenceTimeOptions_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_earlier_than_r7,
-      { "earlier-than-r7", "rrc.earlier_than_r7",
+      { "earlier-than-r7", "rrc.earlier_than_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_r7_15,
-      { "r7", "rrc.r7",
+      { "r7", "rrc.r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r7_15", HFILL }},
     { &hf_rrc_referenceTime_03,
@@ -176313,7 +176313,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_32", HFILL }},
     { &hf_rrc_deltaUT1_01,
-      { "deltaUT1", "rrc.deltaUT1",
+      { "deltaUT1", "rrc.deltaUT1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_kp,
@@ -176345,7 +176345,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_3", HFILL }},
     { &hf_rrc_ue_GANSSTimingOfCellFrames,
-      { "ue-GANSSTimingOfCellFrames", "rrc.ue_GANSSTimingOfCellFrames",
+      { "ue-GANSSTimingOfCellFrames", "rrc.ue_GANSSTimingOfCellFrames_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ms_Part,
@@ -176369,15 +176369,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_mode_02_vals), 0,
         "T_mode_02", HFILL }},
     { &hf_rrc_fdd_187,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_181", HFILL }},
     { &hf_rrc_tdd_138,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_130", HFILL }},
     { &hf_rrc_UTRAN_FDD_FrequencyList_item,
-      { "UTRAN-FDD-Frequency", "rrc.UTRAN_FDD_Frequency",
+      { "UTRAN-FDD-Frequency", "rrc.UTRAN_FDD_Frequency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_qQualMinFDD,
@@ -176389,7 +176389,7 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M60_M13", HFILL }},
     { &hf_rrc_UTRAN_TDD_FrequencyList_item,
-      { "UTRAN-TDD-Frequency", "rrc.UTRAN_TDD_Frequency",
+      { "UTRAN-TDD-Frequency", "rrc.UTRAN_TDD_Frequency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_qRxLevMinTDD,
@@ -176397,7 +176397,7 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M60_M13", HFILL }},
     { &hf_rrc_utran_GPSTimingOfCell,
-      { "utran-GPSTimingOfCell", "rrc.utran_GPSTimingOfCell",
+      { "utran-GPSTimingOfCell", "rrc.utran_GPSTimingOfCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ms_part,
@@ -176413,15 +176413,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_147_vals), 0,
         "T_modeSpecificInfo_147", HFILL }},
     { &hf_rrc_fdd_188,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_182", HFILL }},
     { &hf_rrc_tdd_139,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_131", HFILL }},
     { &hf_rrc_ue_GPSTimingOfCell,
-      { "ue-GPSTimingOfCell", "rrc.ue_GPSTimingOfCell",
+      { "ue-GPSTimingOfCell", "rrc.ue_GPSTimingOfCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ms_part_01,
@@ -176433,15 +176433,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_148_vals), 0,
         "T_modeSpecificInfo_148", HFILL }},
     { &hf_rrc_fdd_189,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_183", HFILL }},
     { &hf_rrc_tdd_140,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_132", HFILL }},
     { &hf_rrc_utra_ServingCell,
-      { "utra-ServingCell", "rrc.utra_ServingCell",
+      { "utra-ServingCell", "rrc.utra_ServingCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_s_PrioritySearch1,
@@ -176469,15 +176469,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_31", HFILL }},
     { &hf_rrc_horizontalWithVerticalVelocity,
-      { "horizontalWithVerticalVelocity", "rrc.horizontalWithVerticalVelocity",
+      { "horizontalWithVerticalVelocity", "rrc.horizontalWithVerticalVelocity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_horizontalVelocityWithUncertainty,
-      { "horizontalVelocityWithUncertainty", "rrc.horizontalVelocityWithUncertainty",
+      { "horizontalVelocityWithUncertainty", "rrc.horizontalVelocityWithUncertainty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_horizontalWithVerticalVelocityAndUncertainty,
-      { "horizontalWithVerticalVelocityAndUncertainty", "rrc.horizontalWithVerticalVelocityAndUncertainty",
+      { "horizontalWithVerticalVelocityAndUncertainty", "rrc.horizontalWithVerticalVelocityAndUncertainty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_bcch_ModificationTime,
@@ -176509,11 +176509,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_1_512", HFILL }},
     { &hf_rrc_CDMA2000_MessageList_item,
-      { "CDMA2000-Message", "rrc.CDMA2000_Message",
+      { "CDMA2000-Message", "rrc.CDMA2000_Message_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_CDMA2000_UMTS_Frequency_List_item,
-      { "FrequencyInfoCDMA2000", "rrc.FrequencyInfoCDMA2000",
+      { "FrequencyInfoCDMA2000", "rrc.FrequencyInfoCDMA2000_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dataTransmFreqGranularity,
@@ -176529,7 +176529,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_120", HFILL }},
     { &hf_rrc_dataTransmFrequency,
-      { "dataTransmFrequency", "rrc.dataTransmFrequency",
+      { "dataTransmFrequency", "rrc.dataTransmFrequency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dataVolumePerRB,
@@ -176541,7 +176541,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_4294967295", HFILL }},
     { &hf_rrc_DataVolumePerRB_List_item,
-      { "DataVolumePerRB", "rrc.DataVolumePerRB",
+      { "DataVolumePerRB", "rrc.DataVolumePerRB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_149,
@@ -176549,7 +176549,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_149_vals), 0,
         "T_modeSpecificInfo_149", HFILL }},
     { &hf_rrc_fdd_190,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_184", HFILL }},
     { &hf_rrc_intraFreqMeasQuantity_FDD_01,
@@ -176557,7 +176557,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_IntraFreqMeasQuantity_FDD_sib3_vals), 0,
         "IntraFreqMeasQuantity_FDD_sib3", HFILL }},
     { &hf_rrc_tdd_141,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_133", HFILL }},
     { &hf_rrc_intraFreqMeasQuantity_TDDList_01,
@@ -176577,7 +176577,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_2", HFILL }},
     { &hf_rrc_EUTRA_BlacklistedCellPerFreqList_item,
-      { "EUTRA-BlacklistedCell", "rrc.EUTRA_BlacklistedCell",
+      { "EUTRA-BlacklistedCell", "rrc.EUTRA_BlacklistedCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_EUTRA_Capability,
@@ -176585,11 +176585,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_EUTRA_TargetFreqInfoList_item,
-      { "EUTRA-TargetFreqInfo", "rrc.EUTRA_TargetFreqInfo",
+      { "EUTRA-TargetFreqInfo", "rrc.EUTRA_TargetFreqInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_EUTRA_TargetFreqInfoList_vb50ext_item,
-      { "EUTRA-TargetFreqInfo-vb50ext", "rrc.EUTRA_TargetFreqInfo_vb50ext",
+      { "EUTRA-TargetFreqInfo-vb50ext", "rrc.EUTRA_TargetFreqInfo_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dlEUTRACarrierFreq,
@@ -176605,7 +176605,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_SIB_TypeExtGANSS_vals), 0,
         "SIB_TypeExtGANSS", HFILL }},
     { &hf_rrc_schedulingInfo,
-      { "schedulingInfo", "rrc.schedulingInfo",
+      { "schedulingInfo", "rrc.schedulingInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SchedulingInformation", HFILL }},
     { &hf_rrc_valueTagInfo,
@@ -176613,7 +176613,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_ValueTagInfo_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_ExtGANSS_SIBTypeInfoSchedulingInfoList_item,
-      { "ExtGANSS-SIBTypeInfoSchedulingInfo", "rrc.ExtGANSS_SIBTypeInfoSchedulingInfo",
+      { "ExtGANSS-SIBTypeInfoSchedulingInfo", "rrc.ExtGANSS_SIBTypeInfoSchedulingInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ganssID,
@@ -176629,11 +176629,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxSIB_OF_ExtGANSS_SchedulingInfo", HFILL }},
     { &hf_rrc_ganssScheduling_item,
-      { "ExtGANSS-SchedulingInfo", "rrc.ExtGANSS_SchedulingInfo",
+      { "ExtGANSS-SchedulingInfo", "rrc.ExtGANSS_SchedulingInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ExtSIBTypeInfoSchedulingInfo_List_item,
-      { "ExtSIBTypeInfoSchedulingInfo", "rrc.ExtSIBTypeInfoSchedulingInfo",
+      { "ExtSIBTypeInfoSchedulingInfo", "rrc.ExtSIBTypeInfoSchedulingInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_extensionSIB_Type,
@@ -176641,7 +176641,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_SIB_TypeExt_vals), 0,
         "SIB_TypeExt", HFILL }},
     { &hf_rrc_ExtSIBTypeInfoSchedulingInfo_List2_item,
-      { "ExtSIBTypeInfoSchedulingInfo2", "rrc.ExtSIBTypeInfoSchedulingInfo2",
+      { "ExtSIBTypeInfoSchedulingInfo2", "rrc.ExtSIBTypeInfoSchedulingInfo2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_extensionSIB_Type2,
@@ -176649,7 +176649,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_SIB_TypeExt2_vals), 0,
         "SIB_TypeExt2", HFILL }},
     { &hf_rrc_FDD_UMTS_Frequency_List_item,
-      { "FrequencyInfoFDD", "rrc.FrequencyInfoFDD",
+      { "FrequencyInfoFDD", "rrc.FrequencyInfoFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_band_Class,
@@ -176673,7 +176673,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "UARFCN", HFILL }},
     { &hf_rrc_GSM_BA_Range_List_item,
-      { "GSM-BA-Range", "rrc.GSM_BA_Range",
+      { "GSM-BA-Range", "rrc.GSM_BA_Range_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_GSM_MessageList_item,
@@ -176681,7 +176681,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_GSM_TargetCellInfoList_item,
-      { "GSM-TargetCellInfo", "rrc.GSM_TargetCellInfo",
+      { "GSM-TargetCellInfo", "rrc.GSM_TargetCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_receivedMessageType,
@@ -176689,11 +176689,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_ReceivedMessageType_vals_ext, 0,
         NULL, HFILL }},
     { &hf_rrc_configurationUnacceptable,
-      { "configurationUnacceptable", "rrc.configurationUnacceptable",
+      { "configurationUnacceptable", "rrc.configurationUnacceptable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_unspecified,
-      { "unspecified", "rrc.unspecified",
+      { "unspecified", "rrc.unspecified_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_GERANIu_MessageList_item,
@@ -176701,7 +176701,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_1_32768", HFILL }},
     { &hf_rrc_gsm_18,
-      { "gsm", "rrc.gsm",
+      { "gsm", "rrc.gsm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_gsm_16", HFILL }},
     { &hf_rrc_gsm_Classmark2,
@@ -176713,7 +176713,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cdma2000_01,
-      { "cdma2000", "rrc.cdma2000",
+      { "cdma2000", "rrc.cdma2000_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_cdma2000_01", HFILL }},
     { &hf_rrc_InterRAT_UE_RadioAccessCapabilityList_item,
@@ -176733,11 +176733,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_eutra_RadioAccessCapability,
-      { "eutra-RadioAccessCapability", "rrc.eutra_RadioAccessCapability",
+      { "eutra-RadioAccessCapability", "rrc.eutra_RadioAccessCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_gsm_19,
-      { "gsm", "rrc.gsm",
+      { "gsm", "rrc.gsm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_gsm_17", HFILL }},
     { &hf_rrc_gsmSecurityCapability,
@@ -176749,7 +176749,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_InterRAT_UE_SecurityCapability_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_interRAT_ProtocolError,
-      { "interRAT-ProtocolError", "rrc.interRAT_ProtocolError",
+      { "interRAT-ProtocolError", "rrc.interRAT_ProtocolError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_plmn_Type,
@@ -176761,35 +176761,35 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_48,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_48", HFILL }},
     { &hf_rrc_masterInformationBlock_v690ext,
-      { "masterInformationBlock-v690ext", "rrc.masterInformationBlock_v690ext",
+      { "masterInformationBlock-v690ext", "rrc.masterInformationBlock_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_16,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6b0NonCriticalExtensions_15", HFILL }},
     { &hf_rrc_masterInformationBlock_v6b0ext,
-      { "masterInformationBlock-v6b0ext", "rrc.masterInformationBlock_v6b0ext",
+      { "masterInformationBlock-v6b0ext", "rrc.masterInformationBlock_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MasterInformationBlock_v6b0ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_26,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_26", HFILL }},
     { &hf_rrc_masterInformationBlock_v860ext,
-      { "masterInformationBlock-v860ext", "rrc.masterInformationBlock_v860ext",
+      { "masterInformationBlock-v860ext", "rrc.masterInformationBlock_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MasterInformationBlock_v860ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_196,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_196", HFILL }},
     { &hf_rrc_multiplePLMN_List,
-      { "multiplePLMN-List", "rrc.multiplePLMN_List",
+      { "multiplePLMN-List", "rrc.multiplePLMN_List_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MultiplePLMN_List_r6", HFILL }},
     { &hf_rrc_extSIBTypeInfoSchedulingInfo_List,
@@ -176817,7 +176817,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_diagnosticsType_01_vals), 0,
         "T_diagnosticsType_01", HFILL }},
     { &hf_rrc_type1_08,
-      { "type1", "rrc.type1",
+      { "type1", "rrc.type1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type1_07", HFILL }},
     { &hf_rrc_protocolErrorCause,
@@ -176849,7 +176849,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "TDD_UMTS_Frequency_List", HFILL }},
     { &hf_rrc_scheduling,
-      { "scheduling", "rrc.scheduling",
+      { "scheduling", "rrc.scheduling_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_segCount,
@@ -176913,7 +176913,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_SIB_TypeAndTag_vals_ext, 0,
         "SIB_TypeAndTag", HFILL }},
     { &hf_rrc_scheduling_01,
-      { "scheduling", "rrc.scheduling",
+      { "scheduling", "rrc.scheduling_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SchedulingInformation", HFILL }},
     { &hf_rrc_sibSb_Type,
@@ -176929,15 +176929,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SIB_ReferenceList_item,
-      { "SchedulingInformationSIB", "rrc.SchedulingInformationSIB",
+      { "SchedulingInformationSIB", "rrc.SchedulingInformationSIB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SIBSb_ReferenceList_item,
-      { "SchedulingInformationSIBSb", "rrc.SchedulingInformationSIBSb",
+      { "SchedulingInformationSIBSb", "rrc.SchedulingInformationSIBSb_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SIB_ReferenceListFACH_item,
-      { "SchedulingInformationSIB", "rrc.SchedulingInformationSIB",
+      { "SchedulingInformationSIB", "rrc.SchedulingInformationSIB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sysInfoType1_01,
@@ -176965,7 +176965,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CellValueTag", HFILL }},
     { &hf_rrc_sysInfoType7_01,
-      { "sysInfoType7", "rrc.sysInfoType7",
+      { "sysInfoType7", "rrc.sysInfoType7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dummy_57,
@@ -176973,11 +176973,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CellValueTag", HFILL }},
     { &hf_rrc_dummy2_14,
-      { "dummy2", "rrc.dummy2",
+      { "dummy2", "rrc.dummy2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dummy3_03,
-      { "dummy3", "rrc.dummy3",
+      { "dummy3", "rrc.dummy3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sysInfoType11_01,
@@ -177009,7 +177009,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CellValueTag", HFILL }},
     { &hf_rrc_sysInfoType14,
-      { "sysInfoType14", "rrc.sysInfoType14",
+      { "sysInfoType14", "rrc.sysInfoType14_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sysInfoType15,
@@ -177017,11 +177017,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CellValueTag", HFILL }},
     { &hf_rrc_sysInfoType16,
-      { "sysInfoType16", "rrc.sysInfoType16",
+      { "sysInfoType16", "rrc.sysInfoType16_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PredefinedConfigIdentityAndValueTag", HFILL }},
     { &hf_rrc_sysInfoType17,
-      { "sysInfoType17", "rrc.sysInfoType17",
+      { "sysInfoType17", "rrc.sysInfoType17_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sysInfoType15_1,
@@ -177029,11 +177029,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CellValueTag", HFILL }},
     { &hf_rrc_sysInfoType15_2,
-      { "sysInfoType15-2", "rrc.sysInfoType15_2",
+      { "sysInfoType15-2", "rrc.sysInfoType15_2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SIBOccurrenceIdentityAndValueTag", HFILL }},
     { &hf_rrc_sysInfoType15_3,
-      { "sysInfoType15-3", "rrc.sysInfoType15_3",
+      { "sysInfoType15-3", "rrc.sysInfoType15_3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SIBOccurrenceIdentityAndValueTag", HFILL }},
     { &hf_rrc_sysInfoType15_4,
@@ -177061,55 +177061,55 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CellValueTag", HFILL }},
     { &hf_rrc_systemInfoType11bis,
-      { "systemInfoType11bis", "rrc.systemInfoType11bis",
+      { "systemInfoType11bis", "rrc.systemInfoType11bis_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_systemInfoType15bis,
-      { "systemInfoType15bis", "rrc.systemInfoType15bis",
+      { "systemInfoType15bis", "rrc.systemInfoType15bis_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_systemInfoType15_1bis,
-      { "systemInfoType15-1bis", "rrc.systemInfoType15_1bis",
+      { "systemInfoType15-1bis", "rrc.systemInfoType15_1bis_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_systemInfoType15_2bis,
-      { "systemInfoType15-2bis", "rrc.systemInfoType15_2bis",
+      { "systemInfoType15-2bis", "rrc.systemInfoType15_2bis_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_systemInfoType15_3bis,
-      { "systemInfoType15-3bis", "rrc.systemInfoType15_3bis",
+      { "systemInfoType15-3bis", "rrc.systemInfoType15_3bis_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_systemInfoType15_6,
-      { "systemInfoType15-6", "rrc.systemInfoType15_6",
+      { "systemInfoType15-6", "rrc.systemInfoType15_6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_systemInfoType15_7,
-      { "systemInfoType15-7", "rrc.systemInfoType15_7",
+      { "systemInfoType15-7", "rrc.systemInfoType15_7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_systemInfoType15_8,
-      { "systemInfoType15-8", "rrc.systemInfoType15_8",
+      { "systemInfoType15-8", "rrc.systemInfoType15_8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_systemInfoType19,
-      { "systemInfoType19", "rrc.systemInfoType19",
+      { "systemInfoType19", "rrc.systemInfoType19_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_systemInfoType15_2ter,
-      { "systemInfoType15-2ter", "rrc.systemInfoType15_2ter",
+      { "systemInfoType15-2ter", "rrc.systemInfoType15_2ter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_systemInfoType20,
-      { "systemInfoType20", "rrc.systemInfoType20",
+      { "systemInfoType20", "rrc.systemInfoType20_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_systemInfoType21,
-      { "systemInfoType21", "rrc.systemInfoType21",
+      { "systemInfoType21", "rrc.systemInfoType21_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_systemInfoType22,
-      { "systemInfoType22", "rrc.systemInfoType22",
+      { "systemInfoType22", "rrc.systemInfoType22_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_SibOFF_List_item,
@@ -177125,31 +177125,31 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_IdleTimersAndConstants,
-      { "ue-IdleTimersAndConstants", "rrc.ue_IdleTimersAndConstants",
+      { "ue-IdleTimersAndConstants", "rrc.ue_IdleTimersAndConstants_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v3a0NonCriticalExtensions_12,
-      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions",
+      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v3a0NonCriticalExtensions_12", HFILL }},
     { &hf_rrc_sysInfoType1_v3a0ext,
-      { "sysInfoType1-v3a0ext", "rrc.sysInfoType1_v3a0ext",
+      { "sysInfoType1-v3a0ext", "rrc.sysInfoType1_v3a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType1_v3a0ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtentions_02,
-      { "v860NonCriticalExtentions", "rrc.v860NonCriticalExtentions",
+      { "v860NonCriticalExtentions", "rrc.v860NonCriticalExtentions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtentions_02", HFILL }},
     { &hf_rrc_sysInfoType1_v860ext,
-      { "sysInfoType1-v860ext", "rrc.sysInfoType1_v860ext",
+      { "sysInfoType1-v860ext", "rrc.sysInfoType1_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType1_v860ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_197,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_197", HFILL }},
     { &hf_rrc_ue_IdleTimersAndConstants_v3a0ext,
-      { "ue-IdleTimersAndConstants-v3a0ext", "rrc.ue_IdleTimersAndConstants_v3a0ext",
+      { "ue-IdleTimersAndConstants-v3a0ext", "rrc.ue_IdleTimersAndConstants_v3a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ura_IdentityList,
@@ -177157,7 +177157,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_nonCriticalExtensions_198,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_198", HFILL }},
     { &hf_rrc_sib4indicator,
@@ -177165,103 +177165,103 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_cellSelectReselectInfo,
-      { "cellSelectReselectInfo", "rrc.cellSelectReselectInfo",
+      { "cellSelectReselectInfo", "rrc.cellSelectReselectInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellSelectReselectInfoSIB_3_4", HFILL }},
     { &hf_rrc_cellAccessRestriction,
-      { "cellAccessRestriction", "rrc.cellAccessRestriction",
+      { "cellAccessRestriction", "rrc.cellAccessRestriction_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_17,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_17", HFILL }},
     { &hf_rrc_sysInfoType3_v4b0ext,
-      { "sysInfoType3-v4b0ext", "rrc.sysInfoType3_v4b0ext",
+      { "sysInfoType3-v4b0ext", "rrc.sysInfoType3_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType3_v4b0ext_IEs", HFILL }},
     { &hf_rrc_v590NonCriticalExtension,
-      { "v590NonCriticalExtension", "rrc.v590NonCriticalExtension",
+      { "v590NonCriticalExtension", "rrc.v590NonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sysInfoType3_v590ext,
-      { "sysInfoType3-v590ext", "rrc.sysInfoType3_v590ext",
+      { "sysInfoType3-v590ext", "rrc.sysInfoType3_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v5c0NoncriticalExtension,
-      { "v5c0NoncriticalExtension", "rrc.v5c0NoncriticalExtension",
+      { "v5c0NoncriticalExtension", "rrc.v5c0NoncriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sysInfoType3_v5c0ext,
-      { "sysInfoType3-v5c0ext", "rrc.sysInfoType3_v5c0ext",
+      { "sysInfoType3-v5c0ext", "rrc.sysInfoType3_v5c0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType3_v5c0ext_IEs", HFILL }},
     { &hf_rrc_v670NonCriticalExtension,
-      { "v670NonCriticalExtension", "rrc.v670NonCriticalExtension",
+      { "v670NonCriticalExtension", "rrc.v670NonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sysInfoType3_v670ext,
-      { "sysInfoType3-v670ext", "rrc.sysInfoType3_v670ext",
+      { "sysInfoType3-v670ext", "rrc.sysInfoType3_v670ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v770NonCriticalExtension_02,
-      { "v770NonCriticalExtension", "rrc.v770NonCriticalExtension",
+      { "v770NonCriticalExtension", "rrc.v770NonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtension_02", HFILL }},
     { &hf_rrc_sysInfoType3_v770ext,
-      { "sysInfoType3-v770ext", "rrc.sysInfoType3_v770ext",
+      { "sysInfoType3-v770ext", "rrc.sysInfoType3_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType3_v770ext_IEs", HFILL }},
     { &hf_rrc_v830NonCriticalExtension,
-      { "v830NonCriticalExtension", "rrc.v830NonCriticalExtension",
+      { "v830NonCriticalExtension", "rrc.v830NonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sysInfoType3_v830ext,
-      { "sysInfoType3-v830ext", "rrc.sysInfoType3_v830ext",
+      { "sysInfoType3-v830ext", "rrc.sysInfoType3_v830ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType3_v830ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtension_01,
-      { "v860NonCriticalExtension", "rrc.v860NonCriticalExtension",
+      { "v860NonCriticalExtension", "rrc.v860NonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtension_01", HFILL }},
     { &hf_rrc_sysInfoType3_v860ext,
-      { "sysInfoType3-v860ext", "rrc.sysInfoType3_v860ext",
+      { "sysInfoType3-v860ext", "rrc.sysInfoType3_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType3_v860ext_IEs", HFILL }},
     { &hf_rrc_v870NonCriticalExtension,
-      { "v870NonCriticalExtension", "rrc.v870NonCriticalExtension",
+      { "v870NonCriticalExtension", "rrc.v870NonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sysInfoType3_v870ext,
-      { "sysInfoType3-v870ext", "rrc.sysInfoType3_v870ext",
+      { "sysInfoType3-v870ext", "rrc.sysInfoType3_v870ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType3_v870ext_IEs", HFILL }},
     { &hf_rrc_v900NonCriticalExtension,
-      { "v900NonCriticalExtension", "rrc.v900NonCriticalExtension",
+      { "v900NonCriticalExtension", "rrc.v900NonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sysInfoType3_v920ext,
-      { "sysInfoType3-v920ext", "rrc.sysInfoType3_v920ext",
+      { "sysInfoType3-v920ext", "rrc.sysInfoType3_v920ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType3_v920ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_199,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_199", HFILL }},
     { &hf_rrc_mapping_LCR,
-      { "mapping-LCR", "rrc.mapping_LCR",
+      { "mapping-LCR", "rrc.mapping_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Mapping_LCR_r4", HFILL }},
     { &hf_rrc_cellSelectReselectInfo_v590ext,
-      { "cellSelectReselectInfo-v590ext", "rrc.cellSelectReselectInfo_v590ext",
+      { "cellSelectReselectInfo-v590ext", "rrc.cellSelectReselectInfo_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cellSelectReselectInfoTreselectionScaling_v5c0ext,
-      { "cellSelectReselectInfoTreselectionScaling-v5c0ext", "rrc.cellSelectReselectInfoTreselectionScaling_v5c0ext",
+      { "cellSelectReselectInfoTreselectionScaling-v5c0ext", "rrc.cellSelectReselectInfoTreselectionScaling_v5c0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_domainSpecificAccessRestrictionParametersForPLMNOfMIB,
-      { "domainSpecificAccessRestrictionParametersForPLMNOfMIB", "rrc.domainSpecificAccessRestrictionParametersForPLMNOfMIB",
+      { "domainSpecificAccessRestrictionParametersForPLMNOfMIB", "rrc.domainSpecificAccessRestrictionParametersForPLMNOfMIB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DomainSpecificAccessRestrictionParam_v670ext", HFILL }},
     { &hf_rrc_domainSpecificAccessRestictionForSharedNetwork,
@@ -177269,7 +177269,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_DomainSpecificAccessRestrictionForSharedNetwork_v670ext_vals), 0,
         "DomainSpecificAccessRestrictionForSharedNetwork_v670ext", HFILL }},
     { &hf_rrc_deferredMeasurementControlReadingSupport,
-      { "deferredMeasurementControlReadingSupport", "rrc.deferredMeasurementControlReadingSupport",
+      { "deferredMeasurementControlReadingSupport", "rrc.deferredMeasurementControlReadingSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_q_QualMin_Offset,
@@ -177285,7 +177285,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MBSFNOnlyService_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_pagingPermissionWithAccessControlParametersForPLMNOfMIB,
-      { "pagingPermissionWithAccessControlParametersForPLMNOfMIB", "rrc.pagingPermissionWithAccessControlParametersForPLMNOfMIB",
+      { "pagingPermissionWithAccessControlParametersForPLMNOfMIB", "rrc.pagingPermissionWithAccessControlParametersForPLMNOfMIB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PagingPermissionWithAccessControlParameters", HFILL }},
     { &hf_rrc_pagingPermissionWithAccessControlParametersForSharedNetwork,
@@ -177293,11 +177293,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_PagingPermissionWithAccessControlForSharedNetwork_vals), 0,
         "PagingPermissionWithAccessControlForSharedNetwork", HFILL }},
     { &hf_rrc_csg_PSCSplitInfo,
-      { "csg-PSCSplitInfo", "rrc.csg_PSCSplitInfo",
+      { "csg-PSCSplitInfo", "rrc.csg_PSCSplitInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cellAccessRestriction_01,
-      { "cellAccessRestriction", "rrc.cellAccessRestriction",
+      { "cellAccessRestriction", "rrc.cellAccessRestriction_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellAccessRestriction_v870ext", HFILL }},
     { &hf_rrc_imsEmergencySupportIndicator,
@@ -177305,43 +177305,43 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_imsEmergencySupportIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_18,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_18", HFILL }},
     { &hf_rrc_sysInfoType4_v4b0ext,
-      { "sysInfoType4-v4b0ext", "rrc.sysInfoType4_v4b0ext",
+      { "sysInfoType4-v4b0ext", "rrc.sysInfoType4_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType4_v4b0ext_IEs", HFILL }},
     { &hf_rrc_v590NonCriticalExtension_01,
-      { "v590NonCriticalExtension", "rrc.v590NonCriticalExtension",
+      { "v590NonCriticalExtension", "rrc.v590NonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtension_01", HFILL }},
     { &hf_rrc_sysInfoType4_v590ext,
-      { "sysInfoType4-v590ext", "rrc.sysInfoType4_v590ext",
+      { "sysInfoType4-v590ext", "rrc.sysInfoType4_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v5b0NonCriticalExtension,
-      { "v5b0NonCriticalExtension", "rrc.v5b0NonCriticalExtension",
+      { "v5b0NonCriticalExtension", "rrc.v5b0NonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sysInfoType4_v5b0ext,
-      { "sysInfoType4-v5b0ext", "rrc.sysInfoType4_v5b0ext",
+      { "sysInfoType4-v5b0ext", "rrc.sysInfoType4_v5b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType4_v5b0ext_IEs", HFILL }},
     { &hf_rrc_v5c0NonCriticalExtension,
-      { "v5c0NonCriticalExtension", "rrc.v5c0NonCriticalExtension",
+      { "v5c0NonCriticalExtension", "rrc.v5c0NonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sysInfoType4_v5c0ext,
-      { "sysInfoType4-v5c0ext", "rrc.sysInfoType4_v5c0ext",
+      { "sysInfoType4-v5c0ext", "rrc.sysInfoType4_v5c0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType4_v5c0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_200,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_200", HFILL }},
     { &hf_rrc_cellSelectReselectInfoPCHFACH_v5b0ext,
-      { "cellSelectReselectInfoPCHFACH-v5b0ext", "rrc.cellSelectReselectInfoPCHFACH_v5b0ext",
+      { "cellSelectReselectInfoPCHFACH-v5b0ext", "rrc.cellSelectReselectInfoPCHFACH_v5b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sib6indicator,
@@ -177357,7 +177357,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_150_vals), 0,
         "T_modeSpecificInfo_150", HFILL }},
     { &hf_rrc_fdd_191,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_185", HFILL }},
     { &hf_rrc_aich_PowerOffset,
@@ -177365,7 +177365,7 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd_142,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_134", HFILL }},
     { &hf_rrc_pusch_SysInfoList_SFN,
@@ -177377,7 +177377,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_openLoopPowerControl_TDD,
-      { "openLoopPowerControl-TDD", "rrc.openLoopPowerControl_TDD",
+      { "openLoopPowerControl-TDD", "rrc.openLoopPowerControl_TDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_prach_SystemInformationList,
@@ -177389,111 +177389,111 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cbs_DRX_Level1Information,
-      { "cbs-DRX-Level1Information", "rrc.cbs_DRX_Level1Information",
+      { "cbs-DRX-Level1Information", "rrc.cbs_DRX_Level1Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_19,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_19", HFILL }},
     { &hf_rrc_sysInfoType5_v4b0ext,
-      { "sysInfoType5-v4b0ext", "rrc.sysInfoType5_v4b0ext",
+      { "sysInfoType5-v4b0ext", "rrc.sysInfoType5_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType5_v4b0ext_IEs", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_28,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_28", HFILL }},
     { &hf_rrc_sysInfoType5_v590ext,
-      { "sysInfoType5-v590ext", "rrc.sysInfoType5_v590ext",
+      { "sysInfoType5-v590ext", "rrc.sysInfoType5_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType5_v590ext_IEs", HFILL }},
     { &hf_rrc_v650NonCriticalExtensions,
-      { "v650NonCriticalExtensions", "rrc.v650NonCriticalExtensions",
+      { "v650NonCriticalExtensions", "rrc.v650NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sysInfoType5_v650ext,
-      { "sysInfoType5-v650ext", "rrc.sysInfoType5_v650ext",
+      { "sysInfoType5-v650ext", "rrc.sysInfoType5_v650ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType5_v650ext_IEs", HFILL }},
     { &hf_rrc_v680NonCriticalExtensions_02,
-      { "v680NonCriticalExtensions", "rrc.v680NonCriticalExtensions",
+      { "v680NonCriticalExtensions", "rrc.v680NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v680NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_sysInfoType5_v680ext,
-      { "sysInfoType5-v680ext", "rrc.sysInfoType5_v680ext",
+      { "sysInfoType5-v680ext", "rrc.sysInfoType5_v680ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType5_v680ext_IEs", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_49,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_49", HFILL }},
     { &hf_rrc_sysInfoType5_v690ext,
-      { "sysInfoType5-v690ext", "rrc.sysInfoType5_v690ext",
+      { "sysInfoType5-v690ext", "rrc.sysInfoType5_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType5_v690ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_40,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_40", HFILL }},
     { &hf_rrc_sysInfoType5_v770ext,
-      { "sysInfoType5-v770ext", "rrc.sysInfoType5_v770ext",
+      { "sysInfoType5-v770ext", "rrc.sysInfoType5_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType5_v770ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_27,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_27", HFILL }},
     { &hf_rrc_sysInfoType5_v860ext,
-      { "sysInfoType5-v860ext", "rrc.sysInfoType5_v860ext",
+      { "sysInfoType5-v860ext", "rrc.sysInfoType5_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType5_v860ext_IEs", HFILL }},
     { &hf_rrc_v890NonCriticalExtensions_11,
-      { "v890NonCriticalExtensions", "rrc.v890NonCriticalExtensions",
+      { "v890NonCriticalExtensions", "rrc.v890NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v890NonCriticalExtensions_11", HFILL }},
     { &hf_rrc_sysInfoType5_v890ext,
-      { "sysInfoType5-v890ext", "rrc.sysInfoType5_v890ext",
+      { "sysInfoType5-v890ext", "rrc.sysInfoType5_v890ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType5_v890ext_IEs", HFILL }},
     { &hf_rrc_v8b0NonCriticalExtensions_01,
-      { "v8b0NonCriticalExtensions", "rrc.v8b0NonCriticalExtensions",
+      { "v8b0NonCriticalExtensions", "rrc.v8b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v8b0NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_sysInfoType5_v8b0ext,
-      { "sysInfoType5-v8b0ext", "rrc.sysInfoType5_v8b0ext",
+      { "sysInfoType5-v8b0ext", "rrc.sysInfoType5_v8b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType5_v8b0ext_IEs", HFILL }},
     { &hf_rrc_v8d0NonCriticalExtensions,
-      { "v8d0NonCriticalExtensions", "rrc.v8d0NonCriticalExtensions",
+      { "v8d0NonCriticalExtensions", "rrc.v8d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sysInfoType5_v8d0ext,
-      { "sysInfoType5-v8d0ext", "rrc.sysInfoType5_v8d0ext",
+      { "sysInfoType5-v8d0ext", "rrc.sysInfoType5_v8d0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType5_v8d0ext_IEs", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions_19,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va40NonCriticalExtensions_18", HFILL }},
     { &hf_rrc_sysInfoType5_va40ext,
-      { "sysInfoType5-va40ext", "rrc.sysInfoType5_va40ext",
+      { "sysInfoType5-va40ext", "rrc.sysInfoType5_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType5_va40ext_IEs", HFILL }},
     { &hf_rrc_va80NonCriticalExtensions_02,
-      { "va80NonCriticalExtensions", "rrc.va80NonCriticalExtensions",
+      { "va80NonCriticalExtensions", "rrc.va80NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va80NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_sysInfoType5_va80ext,
-      { "sysInfoType5-va80ext", "rrc.sysInfoType5_va80ext",
+      { "sysInfoType5-va80ext", "rrc.sysInfoType5_va80ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType5_va80ext_IEs", HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions_24,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType5_NonCriticalExtensions_vb50_IEs", HFILL }},
     { &hf_rrc_pNBSCH_Allocation_r4,
-      { "pNBSCH-Allocation-r4", "rrc.pNBSCH_Allocation_r4",
+      { "pNBSCH-Allocation-r4", "rrc.pNBSCH_Allocation_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_prach_SystemInformationList_LCR_r4,
@@ -177501,7 +177501,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd128SpecificInfo,
-      { "tdd128SpecificInfo", "rrc.tdd128SpecificInfo",
+      { "tdd128SpecificInfo", "rrc.tdd128SpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_pusch_SysInfoList_SFN_01,
@@ -177513,7 +177513,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PDSCH_SysInfoList_SFN_LCR_r4", HFILL }},
     { &hf_rrc_pCCPCH_LCR_Extensions,
-      { "pCCPCH-LCR-Extensions", "rrc.pCCPCH_LCR_Extensions",
+      { "pCCPCH-LCR-Extensions", "rrc.pCCPCH_LCR_Extensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrimaryCCPCH_Info_LCR_r4_ext", HFILL }},
     { &hf_rrc_sCCPCH_LCR_ExtensionsList,
@@ -177525,7 +177525,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_RadioFrequencyBandFDD_vals), 0,
         "RadioFrequencyBandFDD", HFILL }},
     { &hf_rrc_hcr_r5_SpecificInfo,
-      { "hcr-r5-SpecificInfo", "rrc.hcr_r5_SpecificInfo",
+      { "hcr-r5-SpecificInfo", "rrc.hcr_r5_SpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_pusch_SysInfoList_SFN_02,
@@ -177553,11 +177553,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_sccpch_SystemInformation_MBMS_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_mcchOnSCCPCHusedForNonMBMS,
-      { "mcchOnSCCPCHusedForNonMBMS", "rrc.mcchOnSCCPCHusedForNonMBMS",
+      { "mcchOnSCCPCHusedForNonMBMS", "rrc.mcchOnSCCPCHusedForNonMBMS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMS_MCCH_ConfigurationInfo_r6", HFILL }},
     { &hf_rrc_mcchOnSCCPCHusedOnlyForMBMS,
-      { "mcchOnSCCPCHusedOnlyForMBMS", "rrc.mcchOnSCCPCHusedOnlyForMBMS",
+      { "mcchOnSCCPCHusedOnlyForMBMS", "rrc.mcchOnSCCPCHusedOnlyForMBMS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SCCPCH_SystemInformation_MBMS_r6", HFILL }},
     { &hf_rrc_additionalPRACH_TF_and_TFCS_CCCH_List,
@@ -177573,19 +177573,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_151_vals), 0,
         "T_modeSpecificInfo_151", HFILL }},
     { &hf_rrc_fdd_192,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_186", HFILL }},
     { &hf_rrc_hs_dsch_CommonSystemInformation,
-      { "hs-dsch-CommonSystemInformation", "rrc.hs_dsch_CommonSystemInformation",
+      { "hs-dsch-CommonSystemInformation", "rrc.hs_dsch_CommonSystemInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_hs_dsch_PagingSystemInformation,
-      { "hs-dsch-PagingSystemInformation", "rrc.hs_dsch_PagingSystemInformation",
+      { "hs-dsch-PagingSystemInformation", "rrc.hs_dsch_PagingSystemInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd768_27,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd768_24", HFILL }},
     { &hf_rrc_pusch_SysInfoList_SFN_03,
@@ -177601,7 +177601,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PRACH_SystemInformationList_VHCR_r7", HFILL }},
     { &hf_rrc_tdd128_71,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_68", HFILL }},
     { &hf_rrc_prach_SystemInformationList_02,
@@ -177617,7 +177617,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_sccpch_SystemInformation_MBMS_01_vals), 0,
         "T_sccpch_SystemInformation_MBMS_01", HFILL }},
     { &hf_rrc_mcchOnSCCPCHusedOnlyForMBMS_01,
-      { "mcchOnSCCPCHusedOnlyForMBMS", "rrc.mcchOnSCCPCHusedOnlyForMBMS",
+      { "mcchOnSCCPCHusedOnlyForMBMS", "rrc.mcchOnSCCPCHusedOnlyForMBMS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SCCPCH_SystemInformation_MBMS_r7", HFILL }},
     { &hf_rrc_tDD_MBSFNInformation,
@@ -177625,7 +177625,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dummy_58,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_dummy_15", HFILL }},
     { &hf_rrc_modeSpecificInfo_152,
@@ -177633,35 +177633,35 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_152_vals), 0,
         "T_modeSpecificInfo_152", HFILL }},
     { &hf_rrc_fdd_193,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_187", HFILL }},
     { &hf_rrc_hs_dsch_DrxCellfach_info,
-      { "hs-dsch-DrxCellfach-info", "rrc.hs_dsch_DrxCellfach_info",
+      { "hs-dsch-DrxCellfach-info", "rrc.hs_dsch_DrxCellfach_info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd128_72,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_69", HFILL }},
     { &hf_rrc_hs_dsch_CommonSysInfo,
-      { "hs-dsch-CommonSysInfo", "rrc.hs_dsch_CommonSysInfo",
+      { "hs-dsch-CommonSysInfo", "rrc.hs_dsch_CommonSysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_hs_dsch_CommonSystemInformation_01,
-      { "hs-dsch-CommonSystemInformation", "rrc.hs_dsch_CommonSystemInformation",
+      { "hs-dsch-CommonSystemInformation", "rrc.hs_dsch_CommonSystemInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_DSCH_CommonSystemInformation_TDD128", HFILL }},
     { &hf_rrc_hs_dsch_PagingSystemInformation_01,
-      { "hs-dsch-PagingSystemInformation", "rrc.hs_dsch_PagingSystemInformation",
+      { "hs-dsch-PagingSystemInformation", "rrc.hs_dsch_PagingSystemInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_DSCH_PagingSystemInformation_TDD128", HFILL }},
     { &hf_rrc_hs_dsch_DrxCellfach_info_01,
-      { "hs-dsch-DrxCellfach-info", "rrc.hs_dsch_DrxCellfach_info",
+      { "hs-dsch-DrxCellfach-info", "rrc.hs_dsch_DrxCellfach_info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HS_DSCH_DrxCellfach_info_TDD128", HFILL }},
     { &hf_rrc_commonEDCHSystemInfo,
-      { "commonEDCHSystemInfo", "rrc.commonEDCHSystemInfo",
+      { "commonEDCHSystemInfo", "rrc.commonEDCHSystemInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tresetUsageIndicator,
@@ -177669,11 +177669,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_tresetUsageIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_commonEDCHSystemInfoFDD,
-      { "commonEDCHSystemInfoFDD", "rrc.commonEDCHSystemInfoFDD",
+      { "commonEDCHSystemInfoFDD", "rrc.commonEDCHSystemInfoFDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_frequencyBandsIndicatorSupport,
-      { "frequencyBandsIndicatorSupport", "rrc.frequencyBandsIndicatorSupport",
+      { "frequencyBandsIndicatorSupport", "rrc.frequencyBandsIndicatorSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_frequencyBandIndicator3,
@@ -177681,11 +177681,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_RadioFrequencyBandFDD3_vals_ext, 0,
         "RadioFrequencyBandFDD3", HFILL }},
     { &hf_rrc_sysInfoType5_vb50ext,
-      { "sysInfoType5-vb50ext", "rrc.sysInfoType5_vb50ext",
+      { "sysInfoType5-vb50ext", "rrc.sysInfoType5_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType5_vb50ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_201,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_201", HFILL }},
     { &hf_rrc_sib22indicator,
@@ -177701,7 +177701,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_153_vals), 0,
         "T_modeSpecificInfo_153", HFILL }},
     { &hf_rrc_fdd_194,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_188", HFILL }},
     { &hf_rrc_dummy_59,
@@ -177709,79 +177709,79 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "CSICH_PowerOffset", HFILL }},
     { &hf_rrc_tdd_143,
-      { "tdd", "rrc.tdd",
+      { "tdd", "rrc.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_135", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_20,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_20", HFILL }},
     { &hf_rrc_sysInfoType6_v4b0ext,
-      { "sysInfoType6-v4b0ext", "rrc.sysInfoType6_v4b0ext",
+      { "sysInfoType6-v4b0ext", "rrc.sysInfoType6_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType6_v4b0ext_IEs", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_29,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_29", HFILL }},
     { &hf_rrc_sysInfoType6_v590ext,
-      { "sysInfoType6-v590ext", "rrc.sysInfoType6_v590ext",
+      { "sysInfoType6-v590ext", "rrc.sysInfoType6_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType6_v590ext_IEs", HFILL }},
     { &hf_rrc_v650nonCriticalExtensions,
-      { "v650nonCriticalExtensions", "rrc.v650nonCriticalExtensions",
+      { "v650nonCriticalExtensions", "rrc.v650nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sysInfoType6_v650ext,
-      { "sysInfoType6-v650ext", "rrc.sysInfoType6_v650ext",
+      { "sysInfoType6-v650ext", "rrc.sysInfoType6_v650ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType6_v650ext_IEs", HFILL }},
     { &hf_rrc_v690nonCriticalExtensions,
-      { "v690nonCriticalExtensions", "rrc.v690nonCriticalExtensions",
+      { "v690nonCriticalExtensions", "rrc.v690nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sysInfoType6_v690ext,
-      { "sysInfoType6-v690ext", "rrc.sysInfoType6_v690ext",
+      { "sysInfoType6-v690ext", "rrc.sysInfoType6_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType6_v690ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_41,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_41", HFILL }},
     { &hf_rrc_sysInfoType6_v770ext,
-      { "sysInfoType6-v770ext", "rrc.sysInfoType6_v770ext",
+      { "sysInfoType6-v770ext", "rrc.sysInfoType6_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType6_v770ext_IEs", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions_20,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va40NonCriticalExtensions_19", HFILL }},
     { &hf_rrc_sysInfoType6_va40ext,
-      { "sysInfoType6-va40ext", "rrc.sysInfoType6_va40ext",
+      { "sysInfoType6-va40ext", "rrc.sysInfoType6_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType6_va40ext_IEs", HFILL }},
     { &hf_rrc_va80NonCriticalExtensions_03,
-      { "va80NonCriticalExtensions", "rrc.va80NonCriticalExtensions",
+      { "va80NonCriticalExtensions", "rrc.va80NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va80NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_sysInfoType6_va80ext,
-      { "sysInfoType6-va80ext", "rrc.sysInfoType6_va80ext",
+      { "sysInfoType6-va80ext", "rrc.sysInfoType6_va80ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType6_va80ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_202,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_202", HFILL }},
     { &hf_rrc_tdd128SpecificInfo_01,
-      { "tdd128SpecificInfo", "rrc.tdd128SpecificInfo",
+      { "tdd128SpecificInfo", "rrc.tdd128SpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128SpecificInfo_01", HFILL }},
     { &hf_rrc_hcr_r5_SpecificInfo_01,
-      { "hcr-r5-SpecificInfo", "rrc.hcr_r5_SpecificInfo",
+      { "hcr-r5-SpecificInfo", "rrc.hcr_r5_SpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_hcr_r5_SpecificInfo_01", HFILL }},
     { &hf_rrc_tdd768SpecificInfo,
-      { "tdd768SpecificInfo", "rrc.tdd768SpecificInfo",
+      { "tdd768SpecificInfo", "rrc.tdd768SpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_modeSpecificInfo_154,
@@ -177789,7 +177789,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_154_vals), 0,
         "T_modeSpecificInfo_154", HFILL }},
     { &hf_rrc_fdd_195,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_189", HFILL }},
     { &hf_rrc_ul_Interference,
@@ -177809,11 +177809,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_nonCriticalExtensions_203,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_203", HFILL }},
     { &hf_rrc_dummy1_07,
-      { "dummy1", "rrc.dummy1",
+      { "dummy1", "rrc.dummy1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CPCH_Parameters", HFILL }},
     { &hf_rrc_dummy2_15,
@@ -177825,7 +177825,7 @@ void proto_register_rrc(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "CSICH_PowerOffset", HFILL }},
     { &hf_rrc_nonCriticalExtensions_204,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_204", HFILL }},
     { &hf_rrc_dummy_60,
@@ -177833,7 +177833,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CPCH_PersistenceLevelsList", HFILL }},
     { &hf_rrc_nonCriticalExtensions_205,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_205", HFILL }},
     { &hf_rrc_dummy_61,
@@ -177841,7 +177841,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DRAC_SysInfoList", HFILL }},
     { &hf_rrc_nonCriticalExtensions_206,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_206", HFILL }},
     { &hf_rrc_sib12indicator,
@@ -177849,87 +177849,87 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_fach_MeasurementOccasionInfo,
-      { "fach-MeasurementOccasionInfo", "rrc.fach_MeasurementOccasionInfo",
+      { "fach-MeasurementOccasionInfo", "rrc.fach_MeasurementOccasionInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_measurementControlSysInfo,
-      { "measurementControlSysInfo", "rrc.measurementControlSysInfo",
+      { "measurementControlSysInfo", "rrc.measurementControlSysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_21,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_21", HFILL }},
     { &hf_rrc_sysInfoType11_v4b0ext,
-      { "sysInfoType11-v4b0ext", "rrc.sysInfoType11_v4b0ext",
+      { "sysInfoType11-v4b0ext", "rrc.sysInfoType11_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType11_v4b0ext_IEs", HFILL }},
     { &hf_rrc_v590NonCriticalExtension_02,
-      { "v590NonCriticalExtension", "rrc.v590NonCriticalExtension",
+      { "v590NonCriticalExtension", "rrc.v590NonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtension_02", HFILL }},
     { &hf_rrc_sysInfoType11_v590ext,
-      { "sysInfoType11-v590ext", "rrc.sysInfoType11_v590ext",
+      { "sysInfoType11-v590ext", "rrc.sysInfoType11_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType11_v590ext_IEs", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_50,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_50", HFILL }},
     { &hf_rrc_sysInfoType11_v690ext,
-      { "sysInfoType11-v690ext", "rrc.sysInfoType11_v690ext",
+      { "sysInfoType11-v690ext", "rrc.sysInfoType11_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType11_v690ext_IEs", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_17,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6b0NonCriticalExtensions_16", HFILL }},
     { &hf_rrc_sysInfoType11_v6b0ext,
-      { "sysInfoType11-v6b0ext", "rrc.sysInfoType11_v6b0ext",
+      { "sysInfoType11-v6b0ext", "rrc.sysInfoType11_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType11_v6b0ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_42,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_42", HFILL }},
     { &hf_rrc_sysInfoType11_v770ext,
-      { "sysInfoType11-v770ext", "rrc.sysInfoType11_v770ext",
+      { "sysInfoType11-v770ext", "rrc.sysInfoType11_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType11_v770ext_IEs", HFILL }},
     { &hf_rrc_v7b0NonCriticalExtensions_02,
-      { "v7b0NonCriticalExtensions", "rrc.v7b0NonCriticalExtensions",
+      { "v7b0NonCriticalExtensions", "rrc.v7b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7b0NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_sysInfoType11_v7b0ext,
-      { "sysInfoType11-v7b0ext", "rrc.sysInfoType11_v7b0ext",
+      { "sysInfoType11-v7b0ext", "rrc.sysInfoType11_v7b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType11_v7b0ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_28,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_28", HFILL }},
     { &hf_rrc_sysInfoType11_v860ext,
-      { "sysInfoType11-v860ext", "rrc.sysInfoType11_v860ext",
+      { "sysInfoType11-v860ext", "rrc.sysInfoType11_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType11_v860ext_IEs", HFILL }},
     { &hf_rrc_va80NonCriticalExtensions_04,
-      { "va80NonCriticalExtensions", "rrc.va80NonCriticalExtensions",
+      { "va80NonCriticalExtensions", "rrc.va80NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va80NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_sysInfoType11_va80ext,
-      { "sysInfoType11-va80ext", "rrc.sysInfoType11_va80ext",
+      { "sysInfoType11-va80ext", "rrc.sysInfoType11_va80ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType11_va80ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_207,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_207", HFILL }},
     { &hf_rrc_fach_MeasurementOccasionInfo_LCR_Ext,
-      { "fach-MeasurementOccasionInfo-LCR-Ext", "rrc.fach_MeasurementOccasionInfo_LCR_Ext",
+      { "fach-MeasurementOccasionInfo-LCR-Ext", "rrc.fach_MeasurementOccasionInfo_LCR_Ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FACH_MeasurementOccasionInfo_LCR_r4_ext", HFILL }},
     { &hf_rrc_measurementControlSysInfo_LCR,
-      { "measurementControlSysInfo-LCR", "rrc.measurementControlSysInfo_LCR",
+      { "measurementControlSysInfo-LCR", "rrc.measurementControlSysInfo_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementControlSysInfo_LCR_r4_ext", HFILL }},
     { &hf_rrc_newIntraFrequencyCellInfoList_v590ext,
@@ -177937,7 +177937,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxCellMeas_OF_CellSelectReselectInfo_v590ext", HFILL }},
     { &hf_rrc_newIntraFrequencyCellInfoList_v590ext_item,
-      { "CellSelectReselectInfo-v590ext", "rrc.CellSelectReselectInfo_v590ext",
+      { "CellSelectReselectInfo-v590ext", "rrc.CellSelectReselectInfo_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_newInterFrequencyCellInfoList_v590ext,
@@ -177945,7 +177945,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxCellMeas_OF_CellSelectReselectInfo_v590ext", HFILL }},
     { &hf_rrc_newInterFrequencyCellInfoList_v590ext_item,
-      { "CellSelectReselectInfo-v590ext", "rrc.CellSelectReselectInfo_v590ext",
+      { "CellSelectReselectInfo-v590ext", "rrc.CellSelectReselectInfo_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_newInterRATCellInfoList_v590ext,
@@ -177953,7 +177953,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxCellMeas_OF_CellSelectReselectInfo_v590ext", HFILL }},
     { &hf_rrc_newInterRATCellInfoList_v590ext_item,
-      { "CellSelectReselectInfo-v590ext", "rrc.CellSelectReselectInfo_v590ext",
+      { "CellSelectReselectInfo-v590ext", "rrc.CellSelectReselectInfo_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_intraFreqEventCriteriaList_v590ext,
@@ -177961,11 +177961,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Intra_FreqEventCriteriaList_v590ext", HFILL }},
     { &hf_rrc_dummy_62,
-      { "dummy", "rrc.dummy",
+      { "dummy", "rrc.dummy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Dummy_InterFreqRACHReportingInfo", HFILL }},
     { &hf_rrc_interFreqRACHReportingInfo,
-      { "interFreqRACHReportingInfo", "rrc.interFreqRACHReportingInfo",
+      { "interFreqRACHReportingInfo", "rrc.interFreqRACHReportingInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mbsfnFrequencyList,
@@ -177981,43 +177981,43 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_measurementControlSysInfo_01,
-      { "measurementControlSysInfo", "rrc.measurementControlSysInfo",
+      { "measurementControlSysInfo", "rrc.measurementControlSysInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementControlSysInfoExtension", HFILL }},
     { &hf_rrc_measurementControlSysInfo_LCR_01,
-      { "measurementControlSysInfo-LCR", "rrc.measurementControlSysInfo_LCR",
+      { "measurementControlSysInfo-LCR", "rrc.measurementControlSysInfo_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementControlSysInfoExtension_LCR_r4", HFILL }},
     { &hf_rrc_measurementControlSysInfoExtensionAddon_r5,
-      { "measurementControlSysInfoExtensionAddon-r5", "rrc.measurementControlSysInfoExtensionAddon_r5",
+      { "measurementControlSysInfoExtensionAddon-r5", "rrc.measurementControlSysInfoExtensionAddon_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v7b0NonCriticalExtensions_03,
-      { "v7b0NonCriticalExtensions", "rrc.v7b0NonCriticalExtensions",
+      { "v7b0NonCriticalExtensions", "rrc.v7b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7b0NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_sysInfoType11bis_v7b0ext,
-      { "sysInfoType11bis-v7b0ext", "rrc.sysInfoType11bis_v7b0ext",
+      { "sysInfoType11bis-v7b0ext", "rrc.sysInfoType11bis_v7b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType11bis_v7b0ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_29,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_29", HFILL }},
     { &hf_rrc_sysInfoType11bis_v860ext,
-      { "sysInfoType11bis-v860ext", "rrc.sysInfoType11bis_v860ext",
+      { "sysInfoType11bis-v860ext", "rrc.sysInfoType11bis_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType11bis_v860ext_IEs", HFILL }},
     { &hf_rrc_va80NonCriticalExtensions_05,
-      { "va80NonCriticalExtensions", "rrc.va80NonCriticalExtensions",
+      { "va80NonCriticalExtensions", "rrc.va80NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va80NonCriticalExtensions_05", HFILL }},
     { &hf_rrc_sysInfoType11bis_va80ext,
-      { "sysInfoType11bis-va80ext", "rrc.sysInfoType11bis_va80ext",
+      { "sysInfoType11bis-va80ext", "rrc.sysInfoType11bis_va80ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType11bis_va80ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_208,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_208", HFILL }},
     { &hf_rrc_csg_DedicatedFrequencyInfoList,
@@ -178025,87 +178025,87 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_22,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_22", HFILL }},
     { &hf_rrc_sysInfoType12_v4b0ext,
-      { "sysInfoType12-v4b0ext", "rrc.sysInfoType12_v4b0ext",
+      { "sysInfoType12-v4b0ext", "rrc.sysInfoType12_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType12_v4b0ext_IEs", HFILL }},
     { &hf_rrc_v590NonCriticalExtension_03,
-      { "v590NonCriticalExtension", "rrc.v590NonCriticalExtension",
+      { "v590NonCriticalExtension", "rrc.v590NonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtension_03", HFILL }},
     { &hf_rrc_sysInfoType12_v590ext,
-      { "sysInfoType12-v590ext", "rrc.sysInfoType12_v590ext",
+      { "sysInfoType12-v590ext", "rrc.sysInfoType12_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType12_v590ext_IEs", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_51,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_51", HFILL }},
     { &hf_rrc_sysInfoType12_v690ext,
-      { "sysInfoType12-v690ext", "rrc.sysInfoType12_v690ext",
+      { "sysInfoType12-v690ext", "rrc.sysInfoType12_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType12_v690ext_IEs", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_18,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6b0NonCriticalExtensions_17", HFILL }},
     { &hf_rrc_sysInfoType12_v6b0ext,
-      { "sysInfoType12-v6b0ext", "rrc.sysInfoType12_v6b0ext",
+      { "sysInfoType12-v6b0ext", "rrc.sysInfoType12_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType12_v6b0ext_IEs", HFILL }},
     { &hf_rrc_v7b0NonCriticalExtensions_04,
-      { "v7b0NonCriticalExtensions", "rrc.v7b0NonCriticalExtensions",
+      { "v7b0NonCriticalExtensions", "rrc.v7b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7b0NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_sysInfoType12_v7b0ext,
-      { "sysInfoType12-v7b0ext", "rrc.sysInfoType12_v7b0ext",
+      { "sysInfoType12-v7b0ext", "rrc.sysInfoType12_v7b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType12_v7b0ext_IEs", HFILL }},
     { &hf_rrc_va80NonCriticalExtensions_06,
-      { "va80NonCriticalExtensions", "rrc.va80NonCriticalExtensions",
+      { "va80NonCriticalExtensions", "rrc.va80NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va80NonCriticalExtensions_06", HFILL }},
     { &hf_rrc_sysInfoType12_va80ext,
-      { "sysInfoType12-va80ext", "rrc.sysInfoType12_va80ext",
+      { "sysInfoType12-va80ext", "rrc.sysInfoType12_va80ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType12_va80ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_209,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_209", HFILL }},
     { &hf_rrc_v3a0NonCriticalExtensions_13,
-      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions",
+      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v3a0NonCriticalExtensions_13", HFILL }},
     { &hf_rrc_sysInfoType13_v3a0ext,
-      { "sysInfoType13-v3a0ext", "rrc.sysInfoType13_v3a0ext",
+      { "sysInfoType13-v3a0ext", "rrc.sysInfoType13_v3a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType13_v3a0ext_IEs", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_23,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_23", HFILL }},
     { &hf_rrc_sysInfoType13_v4b0ext,
-      { "sysInfoType13-v4b0ext", "rrc.sysInfoType13_v4b0ext",
+      { "sysInfoType13-v4b0ext", "rrc.sysInfoType13_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType13_v4b0ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_43,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_43", HFILL }},
     { &hf_rrc_sysInfoType13_v770ext,
-      { "sysInfoType13-v770ext", "rrc.sysInfoType13_v770ext",
+      { "sysInfoType13-v770ext", "rrc.sysInfoType13_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType13_v770ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_210,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_210", HFILL }},
     { &hf_rrc_capabilityUpdateRequirement_r4Ext,
-      { "capabilityUpdateRequirement-r4Ext", "rrc.capabilityUpdateRequirement_r4Ext",
+      { "capabilityUpdateRequirement-r4Ext", "rrc.capabilityUpdateRequirement_r4Ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CapabilityUpdateRequirement_r4_ext", HFILL }},
     { &hf_rrc_ansi_41_RAND_Information,
@@ -178113,7 +178113,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_nonCriticalExtensions_211,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_211", HFILL }},
     { &hf_rrc_ansi_41_UserZoneID_Information,
@@ -178121,7 +178121,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_nonCriticalExtensions_212,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_212", HFILL }},
     { &hf_rrc_ansi_41_PrivateNeighbourListInfo,
@@ -178129,7 +178129,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_nonCriticalExtensions_213,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_213", HFILL }},
     { &hf_rrc_ansi_41_GlobalServiceRedirectInfo,
@@ -178137,123 +178137,123 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_nonCriticalExtensions_214,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_214", HFILL }},
     { &hf_rrc_nonCriticalExtensions_215,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_215", HFILL }},
     { &hf_rrc_ue_positioning_GPS_CipherParameters,
-      { "ue-positioning-GPS-CipherParameters", "rrc.ue_positioning_GPS_CipherParameters",
+      { "ue-positioning-GPS-CipherParameters", "rrc.ue_positioning_GPS_CipherParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_CipherParameters", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_24,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_24", HFILL }},
     { &hf_rrc_sysInfoType15_v4b0ext,
-      { "sysInfoType15-v4b0ext", "rrc.sysInfoType15_v4b0ext",
+      { "sysInfoType15-v4b0ext", "rrc.sysInfoType15_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType15_v4b0ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_44,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_44", HFILL }},
     { &hf_rrc_sysInfoType15_v770ext,
-      { "sysInfoType15-v770ext", "rrc.sysInfoType15_v770ext",
+      { "sysInfoType15-v770ext", "rrc.sysInfoType15_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType15_v770ext_IEs", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions_21,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va40NonCriticalExtensions_20", HFILL }},
     { &hf_rrc_sysInfoType15_va40ext,
-      { "sysInfoType15-va40ext", "rrc.sysInfoType15_va40ext",
+      { "sysInfoType15-va40ext", "rrc.sysInfoType15_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType15_va40ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_216,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_216", HFILL }},
     { &hf_rrc_up_Ipdl_Parameters_TDD,
-      { "up-Ipdl-Parameters-TDD", "rrc.up_Ipdl_Parameters_TDD",
+      { "up-Ipdl-Parameters-TDD", "rrc.up_Ipdl_Parameters_TDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_IPDL_Parameters_TDD_r4_ext", HFILL }},
     { &hf_rrc_ue_Positioning_GPS_ReferenceTime,
-      { "ue-Positioning-GPS-ReferenceTime", "rrc.ue_Positioning_GPS_ReferenceTime",
+      { "ue-Positioning-GPS-ReferenceTime", "rrc.ue_Positioning_GPS_ReferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GPS_ReferenceTime_v770ext", HFILL }},
     { &hf_rrc_ue_Positioning_GPS_ReferenceTime_01,
-      { "ue-Positioning-GPS-ReferenceTime", "rrc.ue_Positioning_GPS_ReferenceTime",
+      { "ue-Positioning-GPS-ReferenceTime", "rrc.ue_Positioning_GPS_ReferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GPS_ReferenceTime_va40ext", HFILL }},
     { &hf_rrc_ue_positioning_GANSS_ReferencePosition,
-      { "ue-positioning-GANSS-ReferencePosition", "rrc.ue_positioning_GANSS_ReferencePosition",
+      { "ue-positioning-GANSS-ReferencePosition", "rrc.ue_positioning_GANSS_ReferencePosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReferenceLocationGANSS", HFILL }},
     { &hf_rrc_ue_positioning_GANSS_IonosphericModel,
-      { "ue-positioning-GANSS-IonosphericModel", "rrc.ue_positioning_GANSS_IonosphericModel",
+      { "ue-positioning-GANSS-IonosphericModel", "rrc.ue_positioning_GANSS_IonosphericModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_30,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_30", HFILL }},
     { &hf_rrc_sysInfoType15bis_v860ext,
-      { "sysInfoType15bis-v860ext", "rrc.sysInfoType15bis_v860ext",
+      { "sysInfoType15bis-v860ext", "rrc.sysInfoType15bis_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType15bis_v860ext_IEs", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions_22,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va40NonCriticalExtensions_21", HFILL }},
     { &hf_rrc_sysInfoType15bis_va40ext,
-      { "sysInfoType15bis-va40ext", "rrc.sysInfoType15bis_va40ext",
+      { "sysInfoType15bis-va40ext", "rrc.sysInfoType15bis_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType15bis_va40ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_217,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_217", HFILL }},
     { &hf_rrc_ue_Positioning_GANSS_AddIonoModel,
-      { "ue-Positioning-GANSS-AddIonoModel", "rrc.ue_Positioning_GANSS_AddIonoModel",
+      { "ue-Positioning-GANSS-AddIonoModel", "rrc.ue_Positioning_GANSS_AddIonoModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_Positioning_GANSS_EarthOrientationPara,
-      { "ue-Positioning-GANSS-EarthOrientationPara", "rrc.ue_Positioning_GANSS_EarthOrientationPara",
+      { "ue-Positioning-GANSS-EarthOrientationPara", "rrc.ue_Positioning_GANSS_EarthOrientationPara_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_EarthOrientPara", HFILL }},
     { &hf_rrc_v920NonCriticalExtensions_04,
-      { "v920NonCriticalExtensions", "rrc.v920NonCriticalExtensions",
+      { "v920NonCriticalExtensions", "rrc.v920NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v920NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_sysInfoType15_1_v920ext,
-      { "sysInfoType15-1-v920ext", "rrc.sysInfoType15_1_v920ext",
+      { "sysInfoType15-1-v920ext", "rrc.sysInfoType15_1_v920ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType15_1_v920ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_218,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_218", HFILL }},
     { &hf_rrc_ue_positioning_GANSS_DGANSS_Corrections,
-      { "ue-positioning-GANSS-DGANSS-Corrections", "rrc.ue_positioning_GANSS_DGANSS_Corrections",
+      { "ue-positioning-GANSS-DGANSS-Corrections", "rrc.ue_positioning_GANSS_DGANSS_Corrections_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_DGANSSCorrections", HFILL }},
     { &hf_rrc_v920NonCriticalExtensions_05,
-      { "v920NonCriticalExtensions", "rrc.v920NonCriticalExtensions",
+      { "v920NonCriticalExtensions", "rrc.v920NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v920NonCriticalExtensions_05", HFILL }},
     { &hf_rrc_sysInfoType15_1bis_v920ext,
-      { "sysInfoType15-1bis-v920ext", "rrc.sysInfoType15_1bis_v920ext",
+      { "sysInfoType15-1bis-v920ext", "rrc.sysInfoType15_1bis_v920ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType15_1bis_v920ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_219,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_219", HFILL }},
     { &hf_rrc_ue_positioning_GANSS_DGANSS_Corrections_01,
-      { "ue-positioning-GANSS-DGANSS-Corrections", "rrc.ue_positioning_GANSS_DGANSS_Corrections",
+      { "ue-positioning-GANSS-DGANSS-Corrections", "rrc.ue_positioning_GANSS_DGANSS_Corrections_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_DGANSSCorrections_v920ext", HFILL }},
     { &hf_rrc_transmissionTOW,
@@ -178261,23 +178261,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GPS_TOW_1sec", HFILL }},
     { &hf_rrc_nonCriticalExtensions_220,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_220", HFILL }},
     { &hf_rrc_ue_positioning_GANSS_navigationModel,
-      { "ue-positioning-GANSS-navigationModel", "rrc.ue_positioning_GANSS_navigationModel",
+      { "ue-positioning-GANSS-navigationModel", "rrc.ue_positioning_GANSS_navigationModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_nonCriticalExtensions_221,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_221", HFILL }},
     { &hf_rrc_ue_positioning_GANSS_AddNavigationModels,
-      { "ue-positioning-GANSS-AddNavigationModels", "rrc.ue_positioning_GANSS_AddNavigationModels",
+      { "ue-positioning-GANSS-AddNavigationModels", "rrc.ue_positioning_GANSS_AddNavigationModels_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_nonCriticalExtensions_222,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_222", HFILL }},
     { &hf_rrc_satMask,
@@ -178289,19 +178289,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions_23,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va40NonCriticalExtensions_22", HFILL }},
     { &hf_rrc_sysInfoType15_3_va40ext,
-      { "sysInfoType15-3-va40ext", "rrc.sysInfoType15_3_va40ext",
+      { "sysInfoType15-3-va40ext", "rrc.sysInfoType15_3_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType15_3_va40ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_223,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_223", HFILL }},
     { &hf_rrc_ue_positioning_GANSS_Almanac,
-      { "ue-positioning-GANSS-Almanac", "rrc.ue_positioning_GANSS_Almanac",
+      { "ue-positioning-GANSS-Almanac", "rrc.ue_positioning_GANSS_Almanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_GANSS_TimeModels,
@@ -178309,35 +178309,35 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_positioning_GANSS_UTC_Model,
-      { "ue-positioning-GANSS-UTC-Model", "rrc.ue_positioning_GANSS_UTC_Model",
+      { "ue-positioning-GANSS-UTC-Model", "rrc.ue_positioning_GANSS_UTC_Model_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_UTCModel", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_31,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_31", HFILL }},
     { &hf_rrc_sysInfoType15_3bis_v860ext,
-      { "sysInfoType15-3bis-v860ext", "rrc.sysInfoType15_3bis_v860ext",
+      { "sysInfoType15-3bis-v860ext", "rrc.sysInfoType15_3bis_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType15_3bis_v860ext_IEs", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions_24,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va40NonCriticalExtensions_23", HFILL }},
     { &hf_rrc_sysInfoType15_3bis_va40ext,
-      { "sysInfoType15-3bis-va40ext", "rrc.sysInfoType15_3bis_va40ext",
+      { "sysInfoType15-3bis-va40ext", "rrc.sysInfoType15_3bis_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType15_3bis_va40ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_224,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_224", HFILL }},
     { &hf_rrc_ue_Positioning_GANSS_Almanac,
-      { "ue-Positioning-GANSS-Almanac", "rrc.ue_Positioning_GANSS_Almanac",
+      { "ue-Positioning-GANSS-Almanac", "rrc.ue_Positioning_GANSS_Almanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_Almanac_v860ext", HFILL }},
     { &hf_rrc_ue_Positioning_GANSS_AddUTCModels,
-      { "ue-Positioning-GANSS-AddUTCModels", "rrc.ue_Positioning_GANSS_AddUTCModels",
+      { "ue-Positioning-GANSS-AddUTCModels", "rrc.ue_Positioning_GANSS_AddUTCModels_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_Positioning_GANSS_AuxiliaryInfo,
@@ -178345,7 +178345,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_UE_Positioning_GANSS_AuxiliaryInfo_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_ue_Positioning_GANSS_Almanac_01,
-      { "ue-Positioning-GANSS-Almanac", "rrc.ue_Positioning_GANSS_Almanac",
+      { "ue-Positioning-GANSS-Almanac", "rrc.ue_Positioning_GANSS_Almanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_Almanac_va40ext", HFILL }},
     { &hf_rrc_ue_positioning_GANSS_TimeModels_01,
@@ -178353,47 +178353,47 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "UE_Positioning_GANSS_TimeModels_va40ext", HFILL }},
     { &hf_rrc_ue_positioning_OTDOA_CipherParameters,
-      { "ue-positioning-OTDOA-CipherParameters", "rrc.ue_positioning_OTDOA_CipherParameters",
+      { "ue-positioning-OTDOA-CipherParameters", "rrc.ue_positioning_OTDOA_CipherParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_CipherParameters", HFILL }},
     { &hf_rrc_v3a0NonCriticalExtensions_14,
-      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions",
+      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v3a0NonCriticalExtensions_14", HFILL }},
     { &hf_rrc_sysInfoType15_4_v3a0ext,
-      { "sysInfoType15-4-v3a0ext", "rrc.sysInfoType15_4_v3a0ext",
+      { "sysInfoType15-4-v3a0ext", "rrc.sysInfoType15_4_v3a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_25,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_25", HFILL }},
     { &hf_rrc_sysInfoType15_4_v4b0ext,
-      { "sysInfoType15-4-v4b0ext", "rrc.sysInfoType15_4_v4b0ext",
+      { "sysInfoType15-4-v4b0ext", "rrc.sysInfoType15_4_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_nonCriticalExtensions_225,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_225", HFILL }},
     { &hf_rrc_v3a0NonCriticalExtensions_15,
-      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions",
+      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v3a0NonCriticalExtensions_15", HFILL }},
     { &hf_rrc_sysInfoType15_5_v3a0ext,
-      { "sysInfoType15-5-v3a0ext", "rrc.sysInfoType15_5_v3a0ext",
+      { "sysInfoType15-5-v3a0ext", "rrc.sysInfoType15_5_v3a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_45,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_45", HFILL }},
     { &hf_rrc_sysInfoType15_5_v770ext,
-      { "sysInfoType15-5-v770ext", "rrc.sysInfoType15_5_v770ext",
+      { "sysInfoType15-5-v770ext", "rrc.sysInfoType15_5_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType15_5_v770ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_226,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_226", HFILL }},
     { &hf_rrc_ue_positioning_GANSS_TOD,
@@ -178401,35 +178401,35 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_86399", HFILL }},
     { &hf_rrc_ue_positioning_GANSS_ReferenceMeasurementInformation,
-      { "ue-positioning-GANSS-ReferenceMeasurementInformation", "rrc.ue_positioning_GANSS_ReferenceMeasurementInformation",
+      { "ue-positioning-GANSS-ReferenceMeasurementInformation", "rrc.ue_positioning_GANSS_ReferenceMeasurementInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_ReferenceMeasurementInfo", HFILL }},
     { &hf_rrc_va40NonCriticalExtensions_25,
-      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions",
+      { "va40NonCriticalExtensions", "rrc.va40NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va40NonCriticalExtensions_24", HFILL }},
     { &hf_rrc_sysInfoType15_6_va40ext,
-      { "sysInfoType15-6-va40ext", "rrc.sysInfoType15_6_va40ext",
+      { "sysInfoType15-6-va40ext", "rrc.sysInfoType15_6_va40ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType15_6_va40ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_227,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_227", HFILL }},
     { &hf_rrc_ue_positioning_GANSS_ReferenceMeasurementInformation_01,
-      { "ue-positioning-GANSS-ReferenceMeasurementInformation", "rrc.ue_positioning_GANSS_ReferenceMeasurementInformation",
+      { "ue-positioning-GANSS-ReferenceMeasurementInformation", "rrc.ue_positioning_GANSS_ReferenceMeasurementInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_ReferenceMeasurementInfo_va40ext", HFILL }},
     { &hf_rrc_ue_positioning_GANSS_DataBitAssistance,
-      { "ue-positioning-GANSS-DataBitAssistance", "rrc.ue_positioning_GANSS_DataBitAssistance",
+      { "ue-positioning-GANSS-DataBitAssistance", "rrc.ue_positioning_GANSS_DataBitAssistance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_GANSS_Data_Bit_Assistance", HFILL }},
     { &hf_rrc_nonCriticalExtensions_228,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_228", HFILL }},
     { &hf_rrc_ue_positioning_GANSS_DataCipheringInfo,
-      { "ue-positioning-GANSS-DataCipheringInfo", "rrc.ue_positioning_GANSS_DataCipheringInfo",
+      { "ue-positioning-GANSS-DataCipheringInfo", "rrc.ue_positioning_GANSS_DataCipheringInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_CipherParameters", HFILL }},
     { &hf_rrc_ue_positioning_GANSS_realTimeIntegrity,
@@ -178437,39 +178437,39 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_nonCriticalExtensions_229,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_229", HFILL }},
     { &hf_rrc_preDefinedRadioConfiguration,
-      { "preDefinedRadioConfiguration", "rrc.preDefinedRadioConfiguration",
+      { "preDefinedRadioConfiguration", "rrc.preDefinedRadioConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PreDefRadioConfiguration", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_46,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_46", HFILL }},
     { &hf_rrc_sysInfoType16_v770ext,
-      { "sysInfoType16-v770ext", "rrc.sysInfoType16_v770ext",
+      { "sysInfoType16-v770ext", "rrc.sysInfoType16_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType16_v770ext_IEs", HFILL }},
     { &hf_rrc_v920NonCriticalExtensions_06,
-      { "v920NonCriticalExtensions", "rrc.v920NonCriticalExtensions",
+      { "v920NonCriticalExtensions", "rrc.v920NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v920NonCriticalExtensions_06", HFILL }},
     { &hf_rrc_sysInfoType16_v920ext,
-      { "sysInfoType16-v920ext", "rrc.sysInfoType16_v920ext",
+      { "sysInfoType16-v920ext", "rrc.sysInfoType16_v920ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType16_v920ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_230,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_230", HFILL }},
     { &hf_rrc_preDefinedRadioConfiguration_01,
-      { "preDefinedRadioConfiguration", "rrc.preDefinedRadioConfiguration",
+      { "preDefinedRadioConfiguration", "rrc.preDefinedRadioConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PreDefRadioConfiguration_v770ext", HFILL }},
     { &hf_rrc_preDefinedRadioConfiguration_02,
-      { "preDefinedRadioConfiguration", "rrc.preDefinedRadioConfiguration",
+      { "preDefinedRadioConfiguration", "rrc.preDefinedRadioConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PreDefRadioConfiguration_v920ext", HFILL }},
     { &hf_rrc_pusch_SysInfoList,
@@ -178481,35 +178481,35 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_26,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_26", HFILL }},
     { &hf_rrc_sysInfoType17_v4b0ext,
-      { "sysInfoType17-v4b0ext", "rrc.sysInfoType17_v4b0ext",
+      { "sysInfoType17-v4b0ext", "rrc.sysInfoType17_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType17_v4b0ext_IEs", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_30,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_30", HFILL }},
     { &hf_rrc_sysInfoType17_v590ext,
-      { "sysInfoType17-v590ext", "rrc.sysInfoType17_v590ext",
+      { "sysInfoType17-v590ext", "rrc.sysInfoType17_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType17_v590ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_47,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_47", HFILL }},
     { &hf_rrc_sysInfoType17_v770ext,
-      { "sysInfoType17-v770ext", "rrc.sysInfoType17_v770ext",
+      { "sysInfoType17-v770ext", "rrc.sysInfoType17_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SysInfoType17_v770ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_231,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_231", HFILL }},
     { &hf_rrc_tdd128SpecificInfo_02,
-      { "tdd128SpecificInfo", "rrc.tdd128SpecificInfo",
+      { "tdd128SpecificInfo", "rrc.tdd128SpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128SpecificInfo_02", HFILL }},
     { &hf_rrc_pusch_SysInfoList_01,
@@ -178521,7 +178521,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PDSCH_SysInfoList_LCR_r4", HFILL }},
     { &hf_rrc_hcr_r5_SpecificInfo_02,
-      { "hcr-r5-SpecificInfo", "rrc.hcr_r5_SpecificInfo",
+      { "hcr-r5-SpecificInfo", "rrc.hcr_r5_SpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_hcr_r5_SpecificInfo_02", HFILL }},
     { &hf_rrc_pusch_SysInfoList_02,
@@ -178533,55 +178533,55 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PDSCH_SysInfoList_HCR_r5", HFILL }},
     { &hf_rrc_tdd768SpecificInfo_01,
-      { "tdd768SpecificInfo", "rrc.tdd768SpecificInfo",
+      { "tdd768SpecificInfo", "rrc.tdd768SpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd768SpecificInfo_01", HFILL }},
     { &hf_rrc_idleModePLMNIdentities,
-      { "idleModePLMNIdentities", "rrc.idleModePLMNIdentities",
+      { "idleModePLMNIdentities", "rrc.idleModePLMNIdentities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PLMNIdentitiesOfNeighbourCells", HFILL }},
     { &hf_rrc_connectedModePLMNIdentities,
-      { "connectedModePLMNIdentities", "rrc.connectedModePLMNIdentities",
+      { "connectedModePLMNIdentities", "rrc.connectedModePLMNIdentities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PLMNIdentitiesOfNeighbourCells", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_19,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6b0NonCriticalExtensions_18", HFILL }},
     { &hf_rrc_sysInfoType18_v6b0ext,
-      { "sysInfoType18-v6b0ext", "rrc.sysInfoType18_v6b0ext",
+      { "sysInfoType18-v6b0ext", "rrc.sysInfoType18_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_32,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_32", HFILL }},
     { &hf_rrc_sysInfoType18_v860ext,
-      { "sysInfoType18-v860ext", "rrc.sysInfoType18_v860ext",
+      { "sysInfoType18-v860ext", "rrc.sysInfoType18_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_nonCriticalExtensions_232,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_232", HFILL }},
     { &hf_rrc_idleModePLMNIdentitiesSIB11bis,
-      { "idleModePLMNIdentitiesSIB11bis", "rrc.idleModePLMNIdentitiesSIB11bis",
+      { "idleModePLMNIdentitiesSIB11bis", "rrc.idleModePLMNIdentitiesSIB11bis_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PLMNIdentitiesOfNeighbourCells", HFILL }},
     { &hf_rrc_connectedModePLMNIdentitiesSIB11bis,
-      { "connectedModePLMNIdentitiesSIB11bis", "rrc.connectedModePLMNIdentitiesSIB11bis",
+      { "connectedModePLMNIdentitiesSIB11bis", "rrc.connectedModePLMNIdentitiesSIB11bis_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PLMNIdentitiesOfNeighbourCells", HFILL }},
     { &hf_rrc_idleModePLMNIdentities_01,
-      { "idleModePLMNIdentities", "rrc.idleModePLMNIdentities",
+      { "idleModePLMNIdentities", "rrc.idleModePLMNIdentities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PLMNIdentitiesOfNeighbourCells_v860ext", HFILL }},
     { &hf_rrc_connectedModePLMNIdentities_01,
-      { "connectedModePLMNIdentities", "rrc.connectedModePLMNIdentities",
+      { "connectedModePLMNIdentities", "rrc.connectedModePLMNIdentities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PLMNIdentitiesOfNeighbourCells_v860ext", HFILL }},
     { &hf_rrc_utra_PriorityInfoList,
-      { "utra-PriorityInfoList", "rrc.utra_PriorityInfoList",
+      { "utra-PriorityInfoList", "rrc.utra_PriorityInfoList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_gsm_PriorityInfoList,
@@ -178593,43 +178593,43 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v920NonCriticalExtensions_07,
-      { "v920NonCriticalExtensions", "rrc.v920NonCriticalExtensions",
+      { "v920NonCriticalExtensions", "rrc.v920NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v920NonCriticalExtensions_07", HFILL }},
     { &hf_rrc_sysInfoType19_v920ext,
-      { "sysInfoType19-v920ext", "rrc.sysInfoType19_v920ext",
+      { "sysInfoType19-v920ext", "rrc.sysInfoType19_v920ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_va80NonCriticalExtensions_07,
-      { "va80NonCriticalExtensions", "rrc.va80NonCriticalExtensions",
+      { "va80NonCriticalExtensions", "rrc.va80NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_va80NonCriticalExtensions_07", HFILL }},
     { &hf_rrc_sysInfoType19_va80ext,
-      { "sysInfoType19-va80ext", "rrc.sysInfoType19_va80ext",
+      { "sysInfoType19-va80ext", "rrc.sysInfoType19_va80ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_vb30NonCriticalExtensions,
-      { "vb30NonCriticalExtensions", "rrc.vb30NonCriticalExtensions",
+      { "vb30NonCriticalExtensions", "rrc.vb30NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sysInfoType19_vb30ext,
-      { "sysInfoType19-vb30ext", "rrc.sysInfoType19_vb30ext",
+      { "sysInfoType19-vb30ext", "rrc.sysInfoType19_vb30ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_vb50NonCriticalExtensions_25,
-      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions",
+      { "vb50NonCriticalExtensions", "rrc.vb50NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vb50NonCriticalExtensions_24", HFILL }},
     { &hf_rrc_sysInfoType19_vb50ext,
-      { "sysInfoType19-vb50ext", "rrc.sysInfoType19_vb50ext",
+      { "sysInfoType19-vb50ext", "rrc.sysInfoType19_vb50ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_nonCriticalExtensions_233,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_233", HFILL }},
     { &hf_rrc_utra_PriorityInfoList_v920ext,
-      { "utra-PriorityInfoList-v920ext", "rrc.utra_PriorityInfoList_v920ext",
+      { "utra-PriorityInfoList-v920ext", "rrc.utra_PriorityInfoList_v920ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_eutra_FrequencyAndPriorityInfoList_v920ext,
@@ -178669,7 +178669,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_eutra_FrequencyRACHReportingInfo,
-      { "eutra-FrequencyRACHReportingInfo", "rrc.eutra_FrequencyRACHReportingInfo",
+      { "eutra-FrequencyRACHReportingInfo", "rrc.eutra_FrequencyRACHReportingInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_hNBName,
@@ -178677,7 +178677,7 @@ void proto_register_rrc(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_nonCriticalExtensions_234,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_234", HFILL }},
     { &hf_rrc_eab_Parameters,
@@ -178685,7 +178685,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_EAB_Parameters_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_nonCriticalExtensions_235,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_235", HFILL }},
     { &hf_rrc_prach_PreambleForEnhancedUplinkListType1Ext,
@@ -178701,27 +178701,27 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PRACH_PreambleForEnhancedUplinkExtList", HFILL }},
     { &hf_rrc_concurrent_Deployment_2ms_10ms_TTI,
-      { "concurrent-Deployment-2ms-10ms-TTI", "rrc.concurrent_Deployment_2ms_10ms_TTI",
+      { "concurrent-Deployment-2ms-10ms-TTI", "rrc.concurrent_Deployment_2ms_10ms_TTI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_nodeB_Trigger_HS_DPCCH_Transmission,
-      { "nodeB-Trigger-HS-DPCCH-Transmission", "rrc.nodeB_Trigger_HS_DPCCH_Transmission",
+      { "nodeB-Trigger-HS-DPCCH-Transmission", "rrc.nodeB_Trigger_HS_DPCCH_Transmission_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_fallback_R99_PRACH_info,
-      { "fallback-R99-PRACH-info", "rrc.fallback_R99_PRACH_info",
+      { "fallback-R99-PRACH-info", "rrc.fallback_R99_PRACH_info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Fallback_R99_PRACH_info_IEs", HFILL }},
     { &hf_rrc_commonEDCHResourceConfigInfoListExt,
-      { "commonEDCHResourceConfigInfoListExt", "rrc.commonEDCHResourceConfigInfoListExt",
+      { "commonEDCHResourceConfigInfoListExt", "rrc.commonEDCHResourceConfigInfoListExt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_hs_dsch_DrxCellfach_SecondDrx_info,
-      { "hs-dsch-DrxCellfach-SecondDrx-info", "rrc.hs_dsch_DrxCellfach_SecondDrx_info",
+      { "hs-dsch-DrxCellfach-SecondDrx-info", "rrc.hs_dsch_DrxCellfach_SecondDrx_info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_nonCriticalExtensions_236,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_236", HFILL }},
     { &hf_rrc_sib_ReferenceList,
@@ -178729,47 +178729,47 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_20,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6b0NonCriticalExtensions_19", HFILL }},
     { &hf_rrc_sysInfoTypeSB1_v6b0ext,
-      { "sysInfoTypeSB1-v6b0ext", "rrc.sysInfoTypeSB1_v6b0ext",
+      { "sysInfoTypeSB1-v6b0ext", "rrc.sysInfoTypeSB1_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_33,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_33", HFILL }},
     { &hf_rrc_sysInfoTypeSB1_v860ext,
-      { "sysInfoTypeSB1-v860ext", "rrc.sysInfoTypeSB1_v860ext",
+      { "sysInfoTypeSB1-v860ext", "rrc.sysInfoTypeSB1_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_nonCriticalExtensions_237,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_237", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_21,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6b0NonCriticalExtensions_20", HFILL }},
     { &hf_rrc_sysInfoTypeSB2_v6b0ext,
-      { "sysInfoTypeSB2-v6b0ext", "rrc.sysInfoTypeSB2_v6b0ext",
+      { "sysInfoTypeSB2-v6b0ext", "rrc.sysInfoTypeSB2_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_34,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_34", HFILL }},
     { &hf_rrc_sysInfoTypeSB2_v860ext,
-      { "sysInfoTypeSB2-v860ext", "rrc.sysInfoTypeSB2_v860ext",
+      { "sysInfoTypeSB2-v860ext", "rrc.sysInfoTypeSB2_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_nonCriticalExtensions_238,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_238", HFILL }},
     { &hf_rrc_TDD_UMTS_Frequency_List_item,
-      { "FrequencyInfoTDD", "rrc.FrequencyInfoTDD",
+      { "FrequencyInfoTDD", "rrc.FrequencyInfoTDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_InactivityPeriod,
@@ -178777,15 +178777,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_120", HFILL }},
     { &hf_rrc_ul_dataVolumeHistory,
-      { "ul-dataVolumeHistory", "rrc.ul_dataVolumeHistory",
+      { "ul-dataVolumeHistory", "rrc.ul_dataVolumeHistory_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DataVolumeHistory", HFILL }},
     { &hf_rrc_dl_dataVolumeHistory,
-      { "dl-dataVolumeHistory", "rrc.dl_dataVolumeHistory",
+      { "dl-dataVolumeHistory", "rrc.dl_dataVolumeHistory_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DataVolumeHistory", HFILL }},
     { &hf_rrc_none,
-      { "none", "rrc.none",
+      { "none", "rrc.none_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cellValueTag,
@@ -178797,7 +178797,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sIBOccurrenceIdentityAndValueTag,
-      { "sIBOccurrenceIdentityAndValueTag", "rrc.sIBOccurrenceIdentityAndValueTag",
+      { "sIBOccurrenceIdentityAndValueTag", "rrc.sIBOccurrenceIdentityAndValueTag_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_commonRBIdentity,
@@ -178805,11 +178805,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MBMS_CommonRBIdentity", HFILL }},
     { &hf_rrc_rlc_Info_05,
-      { "rlc-Info", "rrc.rlc_Info",
+      { "rlc-Info", "rrc.rlc_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLC_Info_MTCH_r6", HFILL }},
     { &hf_rrc_MBMS_CommonRBInformationList_r6_item,
-      { "MBMS-CommonRBInformation-r6", "rrc.MBMS_CommonRBInformation_r6",
+      { "MBMS-CommonRBInformation-r6", "rrc.MBMS_CommonRBInformation_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_countingForUraPCH,
@@ -178845,7 +178845,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MBMS_TrCHInformation_CurrList", HFILL }},
     { &hf_rrc_MBMS_CurrentCell_SCCPCHList_r6_item,
-      { "MBMS-CurrentCell-SCCPCH-r6", "rrc.MBMS_CurrentCell_SCCPCH_r6",
+      { "MBMS-CurrentCell-SCCPCH-r6", "rrc.MBMS_CurrentCell_SCCPCH_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MBMS_FACHCarryingMTCH_List_item,
@@ -178861,7 +178861,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mtch_L1CombiningPeriodList_item,
-      { "mtch-L1CombiningPeriodList item", "rrc.mtch_L1CombiningPeriodList_item",
+      { "mtch-L1CombiningPeriodList item", "rrc.mtch_L1CombiningPeriodList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_mtch_L1CombiningPeriodList_item", HFILL }},
     { &hf_rrc_periodStart,
@@ -178881,7 +178881,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_mtch_L1CombiningPeriodList_01", HFILL }},
     { &hf_rrc_mtch_L1CombiningPeriodList_item_01,
-      { "mtch-L1CombiningPeriodList item", "rrc.mtch_L1CombiningPeriodList_item",
+      { "mtch-L1CombiningPeriodList item", "rrc.mtch_L1CombiningPeriodList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_mtch_L1CombiningPeriodList_item_01", HFILL }},
     { &hf_rrc_periodStart_01,
@@ -178901,7 +178901,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_mtch_L1CombiningPeriodList_02", HFILL }},
     { &hf_rrc_mtch_L1CombiningPeriodList_item_02,
-      { "mtch-L1CombiningPeriodList item", "rrc.mtch_L1CombiningPeriodList_item",
+      { "mtch-L1CombiningPeriodList item", "rrc.mtch_L1CombiningPeriodList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_mtch_L1CombiningPeriodList_item_02", HFILL }},
     { &hf_rrc_periodStart_02,
@@ -178921,7 +178921,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_mtch_L1CombiningPeriodList_03", HFILL }},
     { &hf_rrc_mtch_L1CombiningPeriodList_item_03,
-      { "mtch-L1CombiningPeriodList item", "rrc.mtch_L1CombiningPeriodList_item",
+      { "mtch-L1CombiningPeriodList item", "rrc.mtch_L1CombiningPeriodList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_mtch_L1CombiningPeriodList_item_03", HFILL }},
     { &hf_rrc_periodStart_03,
@@ -178941,7 +178941,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_mtch_L1CombiningPeriodList_04", HFILL }},
     { &hf_rrc_mtch_L1CombiningPeriodList_item_04,
-      { "mtch-L1CombiningPeriodList item", "rrc.mtch_L1CombiningPeriodList_item",
+      { "mtch-L1CombiningPeriodList item", "rrc.mtch_L1CombiningPeriodList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_mtch_L1CombiningPeriodList_item_04", HFILL }},
     { &hf_rrc_periodStart_04,
@@ -178961,7 +178961,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_mtch_L1CombiningPeriodList_05", HFILL }},
     { &hf_rrc_mtch_L1CombiningPeriodList_item_05,
-      { "mtch-L1CombiningPeriodList item", "rrc.mtch_L1CombiningPeriodList_item",
+      { "mtch-L1CombiningPeriodList item", "rrc.mtch_L1CombiningPeriodList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_mtch_L1CombiningPeriodList_item_05", HFILL }},
     { &hf_rrc_periodStart_05,
@@ -178973,31 +178973,31 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_256", HFILL }},
     { &hf_rrc_cycleLength_32,
-      { "cycleLength-32", "rrc.cycleLength_32",
+      { "cycleLength-32", "rrc.cycleLength_32_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMS_L1CombiningSchedule_32", HFILL }},
     { &hf_rrc_cycleLength_64,
-      { "cycleLength-64", "rrc.cycleLength_64",
+      { "cycleLength-64", "rrc.cycleLength_64_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMS_L1CombiningSchedule_64", HFILL }},
     { &hf_rrc_cycleLength_128,
-      { "cycleLength-128", "rrc.cycleLength_128",
+      { "cycleLength-128", "rrc.cycleLength_128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMS_L1CombiningSchedule_128", HFILL }},
     { &hf_rrc_cycleLength_256,
-      { "cycleLength-256", "rrc.cycleLength_256",
+      { "cycleLength-256", "rrc.cycleLength_256_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMS_L1CombiningSchedule_256", HFILL }},
     { &hf_rrc_cycleLength_512,
-      { "cycleLength-512", "rrc.cycleLength_512",
+      { "cycleLength-512", "rrc.cycleLength_512_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMS_L1CombiningSchedule_512", HFILL }},
     { &hf_rrc_cycleLength_1024,
-      { "cycleLength-1024", "rrc.cycleLength_1024",
+      { "cycleLength-1024", "rrc.cycleLength_1024_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMS_L1CombiningSchedule_1024", HFILL }},
     { &hf_rrc_sameAsCurrent,
-      { "sameAsCurrent", "rrc.sameAsCurrent",
+      { "sameAsCurrent", "rrc.sameAsCurrent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_currentCell_SCCPCH,
@@ -179005,11 +179005,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MBMS_SCCPCHIdentity", HFILL }},
     { &hf_rrc_msch_ConfigurationInfo,
-      { "msch-ConfigurationInfo", "rrc.msch_ConfigurationInfo",
+      { "msch-ConfigurationInfo", "rrc.msch_ConfigurationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMS_MSCH_ConfigurationInfo_r6", HFILL }},
     { &hf_rrc_different,
-      { "different", "rrc.different",
+      { "different", "rrc.different_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_transpCHInformation_01,
@@ -179029,7 +179029,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_7_10", HFILL }},
     { &hf_rrc_rlc_Info_06,
-      { "rlc-Info", "rrc.rlc_Info",
+      { "rlc-Info", "rrc.rlc_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLC_Info_MCCH_r6", HFILL }},
     { &hf_rrc_tctf_Presence,
@@ -179045,7 +179045,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_mode_03_vals), 0,
         "T_mode_03", HFILL }},
     { &hf_rrc_fdd_196,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_190", HFILL }},
     { &hf_rrc_ni_CountPerFrame,
@@ -179053,7 +179053,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MBMS_NI_CountPerFrame_vals), 0,
         "MBMS_NI_CountPerFrame", HFILL }},
     { &hf_rrc_tdd384_49,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_44", HFILL }},
     { &hf_rrc_repetitionPeriodLengthOffset_01,
@@ -179065,7 +179065,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MBMS_MICHNotificationIndLength_vals), 0,
         "MBMS_MICHNotificationIndLength", HFILL }},
     { &hf_rrc_tdd128_73,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_70", HFILL }},
     { &hf_rrc_channelisationCodeList_02,
@@ -179081,19 +179081,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_mode_04_vals), 0,
         "T_mode_04", HFILL }},
     { &hf_rrc_tdd384_50,
-      { "tdd384", "rrc.tdd384",
+      { "tdd384", "rrc.tdd384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_45", HFILL }},
     { &hf_rrc_tdd768_28,
-      { "tdd768", "rrc.tdd768",
+      { "tdd768", "rrc.tdd768_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd768_25", HFILL }},
     { &hf_rrc_midambleShiftAndBurstType_06,
-      { "midambleShiftAndBurstType", "rrc.midambleShiftAndBurstType",
+      { "midambleShiftAndBurstType", "rrc.midambleShiftAndBurstType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MidambleShiftAndBurstType_VHCR", HFILL }},
     { &hf_rrc_tdd128_74,
-      { "tdd128", "rrc.tdd128",
+      { "tdd128", "rrc.tdd128_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_71", HFILL }},
     { &hf_rrc_mode_05,
@@ -179101,7 +179101,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_mode_05_vals), 0,
         "T_mode_05", HFILL }},
     { &hf_rrc_imb384,
-      { "imb384", "rrc.imb384",
+      { "imb384", "rrc.imb384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ni_CountPerFrame_01,
@@ -179109,7 +179109,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MBMS_NI_CountPerFrame_IMB384_vals), 0,
         "MBMS_NI_CountPerFrame_IMB384", HFILL }},
     { &hf_rrc_mbms_TransmissionIdentity,
-      { "mbms-TransmissionIdentity", "rrc.mbms_TransmissionIdentity",
+      { "mbms-TransmissionIdentity", "rrc.mbms_TransmissionIdentity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mbms_RequiredUEAction,
@@ -179125,7 +179125,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MBMS_PFLIndex", HFILL }},
     { &hf_rrc_dcch,
-      { "dcch", "rrc.dcch",
+      { "dcch", "rrc.dcch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMS_PFLInfo", HFILL }},
     { &hf_rrc_dummy_63,
@@ -179137,7 +179137,7 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_MBMS_ModifedServiceList_r6_item,
-      { "MBMS-ModifedService-r6", "rrc.MBMS_ModifedService_r6",
+      { "MBMS-ModifedService-r6", "rrc.MBMS_ModifedService_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mbsfnClusterFrequency,
@@ -179149,11 +179149,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MBMS_PTM_RBReleaseCause_LCR_r7_vals), 0,
         "MBMS_PTM_RBReleaseCause_LCR_r7", HFILL }},
     { &hf_rrc_MBMS_ModifiedServiceList_v770ext_item,
-      { "MBMS-ModifiedService-v770ext", "rrc.MBMS_ModifiedService_v770ext",
+      { "MBMS-ModifiedService-v770ext", "rrc.MBMS_ModifiedService_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MBMS_ModifiedServiceList_LCR_v7c0ext_item,
-      { "MBMS-ModifiedService-LCR-v7c0ext", "rrc.MBMS_ModifiedService_LCR_v7c0ext",
+      { "MBMS-ModifiedService-LCR-v7c0ext", "rrc.MBMS_ModifiedService_LCR_v7c0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mschShedulingInfo,
@@ -179161,7 +179161,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MBMS_MSCHSchedulingInfo_vals), 0,
         "MBMS_MSCHSchedulingInfo", HFILL }},
     { &hf_rrc_rlc_Info_07,
-      { "rlc-Info", "rrc.rlc_Info",
+      { "rlc-Info", "rrc.rlc_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLC_Info_MSCH_r6", HFILL }},
     { &hf_rrc_schedulingPeriod_32_Offset,
@@ -179197,7 +179197,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_layer1Combining_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_fdd_197,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_191", HFILL }},
     { &hf_rrc_mbms_L1CombiningTransmTimeDiff,
@@ -179213,7 +179213,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MBMS_L23Configuration_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_secondaryCCPCH_InfoDiff,
-      { "secondaryCCPCH-InfoDiff", "rrc.secondaryCCPCH_InfoDiff",
+      { "secondaryCCPCH-InfoDiff", "rrc.secondaryCCPCH_InfoDiff_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecondaryCCPCHInfoDiff_MBMS", HFILL }},
     { &hf_rrc_layer1Combining_01,
@@ -179221,15 +179221,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_layer1Combining_01_vals), 0,
         "T_layer1Combining_01", HFILL }},
     { &hf_rrc_fdd_198,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_192", HFILL }},
     { &hf_rrc_MBMS_NeighbouringCellSCCPCHList_r6_item,
-      { "MBMS-NeighbouringCellSCCPCH-r6", "rrc.MBMS_NeighbouringCellSCCPCH_r6",
+      { "MBMS-NeighbouringCellSCCPCH-r6", "rrc.MBMS_NeighbouringCellSCCPCH_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MBMS_NeighbouringCellSCCPCHList_v770ext_item,
-      { "MBMS-NeighbouringCellSCCPCH-v770ext", "rrc.MBMS_NeighbouringCellSCCPCH_v770ext",
+      { "MBMS-NeighbouringCellSCCPCH-v770ext", "rrc.MBMS_NeighbouringCellSCCPCH_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_networkStandardTime,
@@ -179245,19 +179245,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_secondaryCCPCHInfo_MBMS_02,
-      { "secondaryCCPCHInfo-MBMS", "rrc.secondaryCCPCHInfo_MBMS",
+      { "secondaryCCPCHInfo-MBMS", "rrc.secondaryCCPCHInfo_MBMS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SecondaryCCPCHFrameType2Info", HFILL }},
     { &hf_rrc_MBMS_PhyChInformationList_IMB384_item,
-      { "MBMS-PhyChInformation-IMB384", "rrc.MBMS_PhyChInformation_IMB384",
+      { "MBMS-PhyChInformation-IMB384", "rrc.MBMS_PhyChInformation_IMB384_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MBMS_PhyChInformationList_r6_item,
-      { "MBMS-PhyChInformation-r6", "rrc.MBMS_PhyChInformation_r6",
+      { "MBMS-PhyChInformation-r6", "rrc.MBMS_PhyChInformation_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MBMS_PhyChInformationList_r7_item,
-      { "MBMS-PhyChInformation-r7", "rrc.MBMS_PhyChInformation_r7",
+      { "MBMS-PhyChInformation-r7", "rrc.MBMS_PhyChInformation_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mbmsPreferredFrequency,
@@ -179277,7 +179277,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_7", HFILL }},
     { &hf_rrc_MBMS_PreferredFrequencyList_r6_item,
-      { "MBMS-PreferredFrequencyInfo-r6", "rrc.MBMS_PreferredFrequencyInfo_r6",
+      { "MBMS-PreferredFrequencyInfo-r6", "rrc.MBMS_PreferredFrequencyInfo_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rbInformation,
@@ -179293,7 +179293,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MBMS_LogicalChIdentity", HFILL }},
     { &hf_rrc_MBMS_PTM_RBInformation_CList_item,
-      { "MBMS-PTM-RBInformation-C", "rrc.MBMS_PTM_RBInformation_C",
+      { "MBMS-PTM-RBInformation-C", "rrc.MBMS_PTM_RBInformation_C_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_layer1_CombiningStatus,
@@ -179301,7 +179301,7 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_MBMS_PTM_RBInformation_NList_item,
-      { "MBMS-PTM-RBInformation-N", "rrc.MBMS_PTM_RBInformation_N",
+      { "MBMS-PTM-RBInformation-N", "rrc.MBMS_PTM_RBInformation_N_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_status,
@@ -179313,7 +179313,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MBMS_SelectedServicesListFull", HFILL }},
     { &hf_rrc_MBMS_SelectedServicesListFull_item,
-      { "MBMS-ServiceIdentity-r6", "rrc.MBMS_ServiceIdentity_r6",
+      { "MBMS-ServiceIdentity-r6", "rrc.MBMS_ServiceIdentity_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MBMS_SelectedServicesListShort_item,
@@ -179337,11 +179337,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rrc_MBMS_AccessProbabilityFactor_vals_ext, 0,
         "MBMS_AccessProbabilityFactor", HFILL }},
     { &hf_rrc_mbms_ConnectedModeCountingScope,
-      { "mbms-ConnectedModeCountingScope", "rrc.mbms_ConnectedModeCountingScope",
+      { "mbms-ConnectedModeCountingScope", "rrc.mbms_ConnectedModeCountingScope_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MBMS_ServiceAccessInfoList_r6_item,
-      { "MBMS-ServiceAccessInfo-r6", "rrc.MBMS_ServiceAccessInfo_r6",
+      { "MBMS-ServiceAccessInfo-r6", "rrc.MBMS_ServiceAccessInfo_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_serviceIdentity,
@@ -179353,7 +179353,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_plmn_Identity_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_sameAsMIB_PLMN_Id,
-      { "sameAsMIB-PLMN-Id", "rrc.sameAsMIB_PLMN_Id",
+      { "sameAsMIB-PLMN-Id", "rrc.sameAsMIB_PLMN_Id_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_other_01,
@@ -179365,7 +179365,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_5", HFILL }},
     { &hf_rrc_explicitPLMN_Id,
-      { "explicitPLMN-Id", "rrc.explicitPLMN_Id",
+      { "explicitPLMN-Id", "rrc.explicitPLMN_Id_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PLMN_Identity", HFILL }},
     { &hf_rrc_mbms_ServiceTransmInfoList,
@@ -179377,7 +179377,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_31", HFILL }},
     { &hf_rrc_MBMS_ServiceSchedulingInfoList_r6_item,
-      { "MBMS-ServiceSchedulingInfo-r6", "rrc.MBMS_ServiceSchedulingInfo_r6",
+      { "MBMS-ServiceSchedulingInfo-r6", "rrc.MBMS_ServiceSchedulingInfo_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_start,
@@ -179389,7 +179389,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_256", HFILL }},
     { &hf_rrc_MBMS_ServiceTransmInfoList_item,
-      { "MBMS-ServiceTransmInfo", "rrc.MBMS_ServiceTransmInfo",
+      { "MBMS-ServiceTransmInfo", "rrc.MBMS_ServiceTransmInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_transpCHInformation_02,
@@ -179397,7 +179397,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MBMS_TrCHInformation_SIB5List", HFILL }},
     { &hf_rrc_MBMS_SIBType5_SCCPCHList_r6_item,
-      { "MBMS-SIBType5-SCCPCH-r6", "rrc.MBMS_SIBType5_SCCPCH_r6",
+      { "MBMS-SIBType5-SCCPCH-r6", "rrc.MBMS_SIBType5_SCCPCH_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_t_318,
@@ -179405,7 +179405,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_318_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_mbms_ServiceIdentity_01,
-      { "mbms-ServiceIdentity", "rrc.mbms_ServiceIdentity",
+      { "mbms-ServiceIdentity", "rrc.mbms_ServiceIdentity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBMS_ServiceIdentity_r6", HFILL }},
     { &hf_rrc_commonCCTrChIdentity,
@@ -179413,11 +179413,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MBMS_CommonCCTrChIdentity", HFILL }},
     { &hf_rrc_MBMS_TranspChInfoForEachCCTrCh_r6_item,
-      { "MBMS-TranspChInfoForCCTrCh-r6", "rrc.MBMS_TranspChInfoForCCTrCh_r6",
+      { "MBMS-TranspChInfoForCCTrCh-r6", "rrc.MBMS_TranspChInfoForCCTrCh_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MBMS_TranspChInfoForEachTrCh_r6_item,
-      { "MBMS-TranspChInfoForTrCh-r6", "rrc.MBMS_TranspChInfoForTrCh_r6",
+      { "MBMS-TranspChInfoForTrCh-r6", "rrc.MBMS_TranspChInfoForTrCh_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_commonTrChIdentity,
@@ -179433,7 +179433,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MBMS_PTM_RBInformation_CList", HFILL }},
     { &hf_rrc_MBMS_TrCHInformation_CurrList_item,
-      { "MBMS-TrCHInformation-Curr", "rrc.MBMS_TrCHInformation_Curr",
+      { "MBMS-TrCHInformation-Curr", "rrc.MBMS_TrCHInformation_Curr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_transpCh_CombiningStatus,
@@ -179445,7 +179445,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MBMS_PTM_RBInformation_NList", HFILL }},
     { &hf_rrc_MBMS_TrCHInformation_NeighbList_item,
-      { "MBMS-TrCHInformation-Neighb", "rrc.MBMS_TrCHInformation_Neighb",
+      { "MBMS-TrCHInformation-Neighb", "rrc.MBMS_TrCHInformation_Neighb_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_transpCh_Identity,
@@ -179453,7 +179453,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_maxFACHPCH", HFILL }},
     { &hf_rrc_MBMS_TrCHInformation_SIB5List_item,
-      { "MBMS-TrCHInformation-SIB5", "rrc.MBMS_TrCHInformation_SIB5",
+      { "MBMS-TrCHInformation-SIB5", "rrc.MBMS_TrCHInformation_SIB5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mbms_RequiredUEAction_01,
@@ -179465,11 +179465,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "MBMS_PFLIndex", HFILL }},
     { &hf_rrc_MBMS_UnmodifiedServiceList_r6_item,
-      { "MBMS-UnmodifiedService-r6", "rrc.MBMS_UnmodifiedService_r6",
+      { "MBMS-UnmodifiedService-r6", "rrc.MBMS_UnmodifiedService_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MBMS_UnmodifiedServiceList_v770ext_item,
-      { "MBMS-UnmodifiedService-v770ext", "rrc.MBMS_UnmodifiedService_v770ext",
+      { "MBMS-UnmodifiedService-v770ext", "rrc.MBMS_UnmodifiedService_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_imb_Indication,
@@ -179477,11 +179477,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_imb_Indication_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_MBSFNFrequencyList_item,
-      { "MBSFNFrequency", "rrc.MBSFNFrequency",
+      { "MBSFNFrequency", "rrc.MBSFNFrequency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MBSFNFrequencyList_v860ext_item,
-      { "MBSFNFrequency-v860ext", "rrc.MBSFNFrequency_v860ext",
+      { "MBSFNFrequency-v860ext", "rrc.MBSFNFrequency_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_notificationOfAllMBSFNServicesInTheBand,
@@ -179489,7 +179489,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_notificationOfAllMBSFNServicesInTheBand_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_mbsfnFrequency,
-      { "mbsfnFrequency", "rrc.mbsfnFrequency",
+      { "mbsfnFrequency", "rrc.mbsfnFrequency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FrequencyInfo", HFILL }},
     { &hf_rrc_mbsfnServicesNotification,
@@ -179497,11 +179497,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_mbsfnServicesNotification_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_mbsfnServicesNotified,
-      { "mbsfnServicesNotified", "rrc.mbsfnServicesNotified",
+      { "mbsfnServicesNotified", "rrc.mbsfnServicesNotified_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_mbsfnServicesNotNotified,
-      { "mbsfnServicesNotNotified", "rrc.mbsfnServicesNotNotified",
+      { "mbsfnServicesNotNotified", "rrc.mbsfnServicesNotNotified_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MBSFNservicesNotNotified_r7", HFILL }},
     { &hf_rrc_imb_Indication_01,
@@ -179509,19 +179509,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_imb_Indication_01_vals), 0,
         "T_imb_Indication_01", HFILL }},
     { &hf_rrc_MBSFN_InterFrequencyNeighbourList_r7_item,
-      { "MBSFNInterFrequencyNeighbour-r7", "rrc.MBSFNInterFrequencyNeighbour_r7",
+      { "MBSFNInterFrequencyNeighbour-r7", "rrc.MBSFNInterFrequencyNeighbour_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MBSFN_InterFrequencyNeighbourList_v860ext_item,
-      { "MBSFNInterFrequencyNeighbour-v860ext", "rrc.MBSFNInterFrequencyNeighbour_v860ext",
+      { "MBSFNInterFrequencyNeighbour-v860ext", "rrc.MBSFNInterFrequencyNeighbour_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MBSFN_TDDInformation_item,
-      { "MBSFN-TDDTimeSlotInfo", "rrc.MBSFN_TDDTimeSlotInfo",
+      { "MBSFN-TDDTimeSlotInfo", "rrc.MBSFN_TDDTimeSlotInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_MBSFN_TDDInformation_LCR_item,
-      { "MBSFN-TDDTimeSlotInfo-LCR", "rrc.MBSFN_TDDTimeSlotInfo_LCR",
+      { "MBSFN-TDDTimeSlotInfo-LCR", "rrc.MBSFN_TDDTimeSlotInfo_LCR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_timeSlotNumber_01,
@@ -179549,7 +179549,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_8", HFILL }},
     { &hf_rrc_MBSFN_TDM_Info_List_item,
-      { "MBSFN-TDM-Info", "rrc.MBSFN_TDM_Info",
+      { "MBSFN-TDM-Info", "rrc.MBSFN_TDM_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interRATHandoverInfo,
@@ -179565,7 +179565,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_RFC3095_ContextInfo_r5_vals), 0,
         "RFC3095_ContextInfo_r5", HFILL }},
     { &hf_rrc_extension,
-      { "extension", "rrc.extension",
+      { "extension", "rrc.extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rrc_FailureInfo,
@@ -179577,51 +179577,51 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_r3_31,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_31", HFILL }},
     { &hf_rrc_interRATHandoverInfo_r3,
-      { "interRATHandoverInfo-r3", "rrc.interRATHandoverInfo_r3",
+      { "interRATHandoverInfo-r3", "rrc.interRATHandoverInfo_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfoWithInterRATCapabilities_r3_IEs", HFILL }},
     { &hf_rrc_v390NonCriticalExtensions_01,
-      { "v390NonCriticalExtensions", "rrc.v390NonCriticalExtensions",
+      { "v390NonCriticalExtensions", "rrc.v390NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v390NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_interRATHandoverInfoWithInterRATCapabilities_v390ext,
-      { "interRATHandoverInfoWithInterRATCapabilities-v390ext", "rrc.interRATHandoverInfoWithInterRATCapabilities_v390ext",
+      { "interRATHandoverInfoWithInterRATCapabilities-v390ext", "rrc.interRATHandoverInfoWithInterRATCapabilities_v390ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfoWithInterRATCapabilities_v390ext_IEs", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_52,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_52", HFILL }},
     { &hf_rrc_interRATHandoverInfoWithInterRATCapabilities_v690ext,
-      { "interRATHandoverInfoWithInterRATCapabilities-v690ext", "rrc.interRATHandoverInfoWithInterRATCapabilities_v690ext",
+      { "interRATHandoverInfoWithInterRATCapabilities-v690ext", "rrc.interRATHandoverInfoWithInterRATCapabilities_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfoWithInterRATCapabilities_v690ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_35,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_35", HFILL }},
     { &hf_rrc_interRATHandoverInfoWithInterRATCapabilities_v860ext,
-      { "interRATHandoverInfoWithInterRATCapabilities-v860ext", "rrc.interRATHandoverInfoWithInterRATCapabilities_v860ext",
+      { "interRATHandoverInfoWithInterRATCapabilities-v860ext", "rrc.interRATHandoverInfoWithInterRATCapabilities_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfoWithInterRATCapabilities_v860ext_IEs", HFILL }},
     { &hf_rrc_v920NonCriticalExtensions_08,
-      { "v920NonCriticalExtensions", "rrc.v920NonCriticalExtensions",
+      { "v920NonCriticalExtensions", "rrc.v920NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v920NonCriticalExtensions_08", HFILL }},
     { &hf_rrc_interRATHandoverInfoWithInterRATCapabilities_v920ext,
-      { "interRATHandoverInfoWithInterRATCapabilities-v920ext", "rrc.interRATHandoverInfoWithInterRATCapabilities_v920ext",
+      { "interRATHandoverInfoWithInterRATCapabilities-v920ext", "rrc.interRATHandoverInfoWithInterRATCapabilities_v920ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRATHandoverInfoWithInterRATCapabilities_v920ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_239,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_239", HFILL }},
     { &hf_rrc_criticalExtensions_141,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_140", HFILL }},
     { &hf_rrc_interRATHandoverInfo_01,
@@ -179629,7 +179629,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_RATSpecificCapability_01,
-      { "ue-RATSpecificCapability", "rrc.ue_RATSpecificCapability",
+      { "ue-RATSpecificCapability", "rrc.ue_RATSpecificCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRAT_UE_RadioAccessCapability_v860ext", HFILL }},
     { &hf_rrc_ue_Inactivity_Period,
@@ -179637,7 +179637,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_120", HFILL }},
     { &hf_rrc_r5_14,
-      { "r5", "rrc.r5",
+      { "r5", "rrc.r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r5_14", HFILL }},
     { &hf_rrc_rFC3095_ContextInfoList_r5,
@@ -179645,71 +179645,71 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_nonCriticalExtensions_240,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_240", HFILL }},
     { &hf_rrc_criticalExtensions_142,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_141", HFILL }},
     { &hf_rrc_RFC3095_ContextInfoList_r5_item,
-      { "RFC3095-ContextInfo", "rrc.RFC3095_ContextInfo",
+      { "RFC3095-ContextInfo", "rrc.RFC3095_ContextInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_r3_32,
-      { "r3", "rrc.r3",
+      { "r3", "rrc.r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r3_32", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_r3,
-      { "sRNC-RelocationInfo-r3", "rrc.sRNC_RelocationInfo_r3",
+      { "sRNC-RelocationInfo-r3", "rrc.sRNC_RelocationInfo_r3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_r3_IEs", HFILL }},
     { &hf_rrc_v380NonCriticalExtensions_02,
-      { "v380NonCriticalExtensions", "rrc.v380NonCriticalExtensions",
+      { "v380NonCriticalExtensions", "rrc.v380NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v380NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_v380ext,
-      { "sRNC-RelocationInfo-v380ext", "rrc.sRNC_RelocationInfo_v380ext",
+      { "sRNC-RelocationInfo-v380ext", "rrc.sRNC_RelocationInfo_v380ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_v380ext_IEs", HFILL }},
     { &hf_rrc_v390NonCriticalExtensions_02,
-      { "v390NonCriticalExtensions", "rrc.v390NonCriticalExtensions",
+      { "v390NonCriticalExtensions", "rrc.v390NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v390NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_v390ext,
-      { "sRNC-RelocationInfo-v390ext", "rrc.sRNC_RelocationInfo_v390ext",
+      { "sRNC-RelocationInfo-v390ext", "rrc.sRNC_RelocationInfo_v390ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_v390ext_IEs", HFILL }},
     { &hf_rrc_v3a0NonCriticalExtensions_16,
-      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions",
+      { "v3a0NonCriticalExtensions", "rrc.v3a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v3a0NonCriticalExtensions_16", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_v3a0ext,
-      { "sRNC-RelocationInfo-v3a0ext", "rrc.sRNC_RelocationInfo_v3a0ext",
+      { "sRNC-RelocationInfo-v3a0ext", "rrc.sRNC_RelocationInfo_v3a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_v3a0ext_IEs", HFILL }},
     { &hf_rrc_v3b0NonCriticalExtensions,
-      { "v3b0NonCriticalExtensions", "rrc.v3b0NonCriticalExtensions",
+      { "v3b0NonCriticalExtensions", "rrc.v3b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_v3b0ext,
-      { "sRNC-RelocationInfo-v3b0ext", "rrc.sRNC_RelocationInfo_v3b0ext",
+      { "sRNC-RelocationInfo-v3b0ext", "rrc.sRNC_RelocationInfo_v3b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_v3b0ext_IEs", HFILL }},
     { &hf_rrc_v3c0NonCriticalExtensions,
-      { "v3c0NonCriticalExtensions", "rrc.v3c0NonCriticalExtensions",
+      { "v3c0NonCriticalExtensions", "rrc.v3c0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_v3c0ext,
-      { "sRNC-RelocationInfo-v3c0ext", "rrc.sRNC_RelocationInfo_v3c0ext",
+      { "sRNC-RelocationInfo-v3c0ext", "rrc.sRNC_RelocationInfo_v3c0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_v3c0ext_IEs", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_68,
-      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
+      { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_laterNonCriticalExtensions_67", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_v3d0ext,
-      { "sRNC-RelocationInfo-v3d0ext", "rrc.sRNC_RelocationInfo_v3d0ext",
+      { "sRNC-RelocationInfo-v3d0ext", "rrc.sRNC_RelocationInfo_v3d0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_v3d0ext_IEs", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_r3_add_ext,
@@ -179717,95 +179717,95 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v3g0NonCriticalExtensions_02,
-      { "v3g0NonCriticalExtensions", "rrc.v3g0NonCriticalExtensions",
+      { "v3g0NonCriticalExtensions", "rrc.v3g0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v3g0NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_v3g0ext,
-      { "sRNC-RelocationInfo-v3g0ext", "rrc.sRNC_RelocationInfo_v3g0ext",
+      { "sRNC-RelocationInfo-v3g0ext", "rrc.sRNC_RelocationInfo_v3g0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_v3g0ext_IEs", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_27,
-      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
+      { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4b0NonCriticalExtensions_27", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_v4b0ext,
-      { "sRNC-RelocationInfo-v4b0ext", "rrc.sRNC_RelocationInfo_v4b0ext",
+      { "sRNC-RelocationInfo-v4b0ext", "rrc.sRNC_RelocationInfo_v4b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_v4b0ext_IEs", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_31,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_31", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_v590ext,
-      { "sRNC-RelocationInfo-v590ext", "rrc.sRNC_RelocationInfo_v590ext",
+      { "sRNC-RelocationInfo-v590ext", "rrc.sRNC_RelocationInfo_v590ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_v590ext_IEs", HFILL }},
     { &hf_rrc_v5a0NonCriticalExtensions,
-      { "v5a0NonCriticalExtensions", "rrc.v5a0NonCriticalExtensions",
+      { "v5a0NonCriticalExtensions", "rrc.v5a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_v5a0ext,
-      { "sRNC-RelocationInfo-v5a0ext", "rrc.sRNC_RelocationInfo_v5a0ext",
+      { "sRNC-RelocationInfo-v5a0ext", "rrc.sRNC_RelocationInfo_v5a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_v5a0ext_IEs", HFILL }},
     { &hf_rrc_v5b0NonCriticalExtensions_03,
-      { "v5b0NonCriticalExtensions", "rrc.v5b0NonCriticalExtensions",
+      { "v5b0NonCriticalExtensions", "rrc.v5b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v5b0NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_v5b0ext,
-      { "sRNC-RelocationInfo-v5b0ext", "rrc.sRNC_RelocationInfo_v5b0ext",
+      { "sRNC-RelocationInfo-v5b0ext", "rrc.sRNC_RelocationInfo_v5b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_v5b0ext_IEs", HFILL }},
     { &hf_rrc_v5c0NonCriticalExtensions_02,
-      { "v5c0NonCriticalExtensions", "rrc.v5c0NonCriticalExtensions",
+      { "v5c0NonCriticalExtensions", "rrc.v5c0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v5c0NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_v5c0ext,
-      { "sRNC-RelocationInfo-v5c0ext", "rrc.sRNC_RelocationInfo_v5c0ext",
+      { "sRNC-RelocationInfo-v5c0ext", "rrc.sRNC_RelocationInfo_v5c0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_v5c0ext_IEs", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_53,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_53", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_v690ext,
-      { "sRNC-RelocationInfo-v690ext", "rrc.sRNC_RelocationInfo_v690ext",
+      { "sRNC-RelocationInfo-v690ext", "rrc.sRNC_RelocationInfo_v690ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_v690ext_IEs", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_22,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6b0NonCriticalExtensions_21", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_v6b0ext,
-      { "sRNC-RelocationInfo-v6b0ext", "rrc.sRNC_RelocationInfo_v6b0ext",
+      { "sRNC-RelocationInfo-v6b0ext", "rrc.sRNC_RelocationInfo_v6b0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_v6b0ext_IEs", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_48,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_48", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_v770ext,
-      { "sRNC-RelocationInfo-v770ext", "rrc.sRNC_RelocationInfo_v770ext",
+      { "sRNC-RelocationInfo-v770ext", "rrc.sRNC_RelocationInfo_v770ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_v770ext_IEs", HFILL }},
     { &hf_rrc_v7e0NonCriticalExtensions_04,
-      { "v7e0NonCriticalExtensions", "rrc.v7e0NonCriticalExtensions",
+      { "v7e0NonCriticalExtensions", "rrc.v7e0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7e0NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_v7e0ext,
-      { "sRNC-RelocationInfo-v7e0ext", "rrc.sRNC_RelocationInfo_v7e0ext",
+      { "sRNC-RelocationInfo-v7e0ext", "rrc.sRNC_RelocationInfo_v7e0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_v7e0ext_IEs", HFILL }},
     { &hf_rrc_v7f0NonCriticalExtensions_17,
-      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions",
+      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7f0NonCriticalExtensions_17", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_v7f0ext,
-      { "sRNC-RelocationInfo-v7f0ext", "rrc.sRNC_RelocationInfo_v7f0ext",
+      { "sRNC-RelocationInfo-v7f0ext", "rrc.sRNC_RelocationInfo_v7f0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_v7f0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_241,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_241", HFILL }},
     { &hf_rrc_later_than_r3_28,
@@ -179813,19 +179813,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_later_than_r3_28_vals), 0,
         "T_later_than_r3_28", HFILL }},
     { &hf_rrc_r4_14,
-      { "r4", "rrc.r4",
+      { "r4", "rrc.r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r4_14", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_r4,
-      { "sRNC-RelocationInfo-r4", "rrc.sRNC_RelocationInfo_r4",
+      { "sRNC-RelocationInfo-r4", "rrc.sRNC_RelocationInfo_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_r4_IEs", HFILL }},
     { &hf_rrc_v4d0NonCriticalExtensions_14,
-      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions",
+      { "v4d0NonCriticalExtensions", "rrc.v4d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v4d0NonCriticalExtensions_14", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_v4d0ext,
-      { "sRNC-RelocationInfo-v4d0ext", "rrc.sRNC_RelocationInfo_v4d0ext",
+      { "sRNC-RelocationInfo-v4d0ext", "rrc.sRNC_RelocationInfo_v4d0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_v4d0ext_IEs", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_r4_add_ext,
@@ -179833,43 +179833,43 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_32,
-      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
+      { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v590NonCriticalExtensions_32", HFILL }},
     { &hf_rrc_v5a0NonCriticalExtensions_01,
-      { "v5a0NonCriticalExtensions", "rrc.v5a0NonCriticalExtensions",
+      { "v5a0NonCriticalExtensions", "rrc.v5a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v5a0NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_v5b0NonCriticalExtensions_04,
-      { "v5b0NonCriticalExtensions", "rrc.v5b0NonCriticalExtensions",
+      { "v5b0NonCriticalExtensions", "rrc.v5b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v5b0NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_v5c0NonCriticalExtensions_03,
-      { "v5c0NonCriticalExtensions", "rrc.v5c0NonCriticalExtensions",
+      { "v5c0NonCriticalExtensions", "rrc.v5c0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v5c0NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_54,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_54", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_23,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6b0NonCriticalExtensions_22", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_49,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_49", HFILL }},
     { &hf_rrc_v7e0NonCriticalExtensions_05,
-      { "v7e0NonCriticalExtensions", "rrc.v7e0NonCriticalExtensions",
+      { "v7e0NonCriticalExtensions", "rrc.v7e0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7e0NonCriticalExtensions_05", HFILL }},
     { &hf_rrc_v7f0NonCriticalExtensions_18,
-      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions",
+      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7f0NonCriticalExtensions_18", HFILL }},
     { &hf_rrc_nonCriticalExtensions_242,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_242", HFILL }},
     { &hf_rrc_criticalExtensions_143,
@@ -179877,11 +179877,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_142_vals), 0,
         "T_criticalExtensions_142", HFILL }},
     { &hf_rrc_r5_15,
-      { "r5", "rrc.r5",
+      { "r5", "rrc.r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r5_15", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_r5,
-      { "sRNC-RelocationInfo-r5", "rrc.sRNC_RelocationInfo_r5",
+      { "sRNC-RelocationInfo-r5", "rrc.sRNC_RelocationInfo_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_r5_IEs", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_r5_add_ext,
@@ -179889,39 +179889,39 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v5a0NonCriticalExtensions_02,
-      { "v5a0NonCriticalExtensions", "rrc.v5a0NonCriticalExtensions",
+      { "v5a0NonCriticalExtensions", "rrc.v5a0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v5a0NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_v5b0NonCriticalExtensions_05,
-      { "v5b0NonCriticalExtensions", "rrc.v5b0NonCriticalExtensions",
+      { "v5b0NonCriticalExtensions", "rrc.v5b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v5b0NonCriticalExtensions_05", HFILL }},
     { &hf_rrc_v5c0NonCriticalExtensions_04,
-      { "v5c0NonCriticalExtensions", "rrc.v5c0NonCriticalExtensions",
+      { "v5c0NonCriticalExtensions", "rrc.v5c0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v5c0NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_55,
-      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
+      { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v690NonCriticalExtensions_55", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_24,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6b0NonCriticalExtensions_23", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_50,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_50", HFILL }},
     { &hf_rrc_v7e0NonCriticalExtensions_06,
-      { "v7e0NonCriticalExtensions", "rrc.v7e0NonCriticalExtensions",
+      { "v7e0NonCriticalExtensions", "rrc.v7e0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7e0NonCriticalExtensions_06", HFILL }},
     { &hf_rrc_v7f0NonCriticalExtensions_19,
-      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions",
+      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7f0NonCriticalExtensions_19", HFILL }},
     { &hf_rrc_nonCriticalExtensions_243,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_243", HFILL }},
     { &hf_rrc_criticalExtensions_144,
@@ -179929,11 +179929,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_143_vals), 0,
         "T_criticalExtensions_143", HFILL }},
     { &hf_rrc_r6_12,
-      { "r6", "rrc.r6",
+      { "r6", "rrc.r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r6_12", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_r6,
-      { "sRNC-RelocationInfo-r6", "rrc.sRNC_RelocationInfo_r6",
+      { "sRNC-RelocationInfo-r6", "rrc.sRNC_RelocationInfo_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_r6_IEs", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_r6_add_ext,
@@ -179941,31 +179941,31 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_25,
-      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
+      { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v6b0NonCriticalExtensions_24", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_51,
-      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
+      { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v770NonCriticalExtensions_51", HFILL }},
     { &hf_rrc_v820NonCriticalExtensions_03,
-      { "v820NonCriticalExtensions", "rrc.v820NonCriticalExtensions",
+      { "v820NonCriticalExtensions", "rrc.v820NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v820NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_srnc_RelocationInfo_v820ext,
-      { "srnc-RelocationInfo-v820ext", "rrc.srnc_RelocationInfo_v820ext",
+      { "srnc-RelocationInfo-v820ext", "rrc.srnc_RelocationInfo_v820ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_v820ext_IEs", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_36,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_36", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_v860ext,
-      { "sRNC-RelocationInfo-v860ext", "rrc.sRNC_RelocationInfo_v860ext",
+      { "sRNC-RelocationInfo-v860ext", "rrc.sRNC_RelocationInfo_v860ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_v860ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_244,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_244", HFILL }},
     { &hf_rrc_criticalExtensions_145,
@@ -179973,11 +179973,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_144_vals), 0,
         "T_criticalExtensions_144", HFILL }},
     { &hf_rrc_r7_16,
-      { "r7", "rrc.r7",
+      { "r7", "rrc.r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r7_16", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_r7,
-      { "sRNC-RelocationInfo-r7", "rrc.sRNC_RelocationInfo_r7",
+      { "sRNC-RelocationInfo-r7", "rrc.sRNC_RelocationInfo_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_r7_IEs", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_r7_add_ext,
@@ -179985,15 +179985,15 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v820NonCriticalExtensions_04,
-      { "v820NonCriticalExtensions", "rrc.v820NonCriticalExtensions",
+      { "v820NonCriticalExtensions", "rrc.v820NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v820NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_v860NonCriticalExtensions_37,
-      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions",
+      { "v860NonCriticalExtensions", "rrc.v860NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v860NonCriticalExtensions_37", HFILL }},
     { &hf_rrc_nonCriticalExtensions_245,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_245", HFILL }},
     { &hf_rrc_criticalExtensions_146,
@@ -180001,11 +180001,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_145_vals), 0,
         "T_criticalExtensions_145", HFILL }},
     { &hf_rrc_r8_12,
-      { "r8", "rrc.r8",
+      { "r8", "rrc.r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r8_12", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_r8,
-      { "sRNC-RelocationInfo-r8", "rrc.sRNC_RelocationInfo_r8",
+      { "sRNC-RelocationInfo-r8", "rrc.sRNC_RelocationInfo_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_r8_IEs", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_r8_add_ext,
@@ -180013,23 +180013,23 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v7e0NonCriticalExtensions_07,
-      { "v7e0NonCriticalExtensions", "rrc.v7e0NonCriticalExtensions",
+      { "v7e0NonCriticalExtensions", "rrc.v7e0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7e0NonCriticalExtensions_07", HFILL }},
     { &hf_rrc_v7f0NonCriticalExtensions_20,
-      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions",
+      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7f0NonCriticalExtensions_20", HFILL }},
     { &hf_rrc_v8d0NonCriticalExtensions_01,
-      { "v8d0NonCriticalExtensions", "rrc.v8d0NonCriticalExtensions",
+      { "v8d0NonCriticalExtensions", "rrc.v8d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v8d0NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_v8d0ext,
-      { "sRNC-RelocationInfo-v8d0ext", "rrc.sRNC_RelocationInfo_v8d0ext",
+      { "sRNC-RelocationInfo-v8d0ext", "rrc.sRNC_RelocationInfo_v8d0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_v8d0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_246,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_246", HFILL }},
     { &hf_rrc_criticalExtensions_147,
@@ -180037,11 +180037,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_146_vals), 0,
         "T_criticalExtensions_146", HFILL }},
     { &hf_rrc_r9_11,
-      { "r9", "rrc.r9",
+      { "r9", "rrc.r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r9_11", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_r9,
-      { "sRNC-RelocationInfo-r9", "rrc.sRNC_RelocationInfo_r9",
+      { "sRNC-RelocationInfo-r9", "rrc.sRNC_RelocationInfo_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_r9_IEs", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_r9_add_ext,
@@ -180049,27 +180049,27 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v8d0NonCriticalExtensions_02,
-      { "v8d0NonCriticalExtensions", "rrc.v8d0NonCriticalExtensions",
+      { "v8d0NonCriticalExtensions", "rrc.v8d0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v8d0NonCriticalExtensions_02", HFILL }},
     { &hf_rrc_v970NonCriticalExtensions_04,
-      { "v970NonCriticalExtensions", "rrc.v970NonCriticalExtensions",
+      { "v970NonCriticalExtensions", "rrc.v970NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v970NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_v970ext,
-      { "sRNC-RelocationInfo-v970ext", "rrc.sRNC_RelocationInfo_v970ext",
+      { "sRNC-RelocationInfo-v970ext", "rrc.sRNC_RelocationInfo_v970ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_v970ext_IEs", HFILL }},
     { &hf_rrc_v9c0NonCriticalExtensions_13,
-      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions",
+      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v9c0NonCriticalExtensions_13", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_v9c0ext,
-      { "sRNC-RelocationInfo-v9c0ext", "rrc.sRNC_RelocationInfo_v9c0ext",
+      { "sRNC-RelocationInfo-v9c0ext", "rrc.sRNC_RelocationInfo_v9c0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_v9c0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_247,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_247", HFILL }},
     { &hf_rrc_criticalExtensions_148,
@@ -180077,11 +180077,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_147_vals), 0,
         "T_criticalExtensions_147", HFILL }},
     { &hf_rrc_r10_13,
-      { "r10", "rrc.r10",
+      { "r10", "rrc.r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r10_13", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_r10,
-      { "sRNC-RelocationInfo-r10", "rrc.sRNC_RelocationInfo_r10",
+      { "sRNC-RelocationInfo-r10", "rrc.sRNC_RelocationInfo_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_r10_IEs", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_r10_add_ext,
@@ -180089,19 +180089,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_v9c0NonCriticalExtensions_14,
-      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions",
+      { "v9c0NonCriticalExtensions", "rrc.v9c0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v9c0NonCriticalExtensions_14", HFILL }},
     { &hf_rrc_vab0NonCriticalExtensions_01,
-      { "vab0NonCriticalExtensions", "rrc.vab0NonCriticalExtensions",
+      { "vab0NonCriticalExtensions", "rrc.vab0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_vab0NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_vab0ext,
-      { "sRNC-RelocationInfo-vab0ext", "rrc.sRNC_RelocationInfo_vab0ext",
+      { "sRNC-RelocationInfo-vab0ext", "rrc.sRNC_RelocationInfo_vab0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_vab0ext_IEs", HFILL }},
     { &hf_rrc_nonCriticalExtensions_248,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_248", HFILL }},
     { &hf_rrc_criticalExtensions_149,
@@ -180109,11 +180109,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_criticalExtensions_148_vals), 0,
         "T_criticalExtensions_148", HFILL }},
     { &hf_rrc_r11_15,
-      { "r11", "rrc.r11",
+      { "r11", "rrc.r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_r11_15", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_r11,
-      { "sRNC-RelocationInfo-r11", "rrc.sRNC_RelocationInfo_r11",
+      { "sRNC-RelocationInfo-r11", "rrc.sRNC_RelocationInfo_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SRNC_RelocationInfo_r11_IEs", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_r11_add_ext,
@@ -180121,11 +180121,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_249,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_249", HFILL }},
     { &hf_rrc_criticalExtensions_150,
-      { "criticalExtensions", "rrc.criticalExtensions",
+      { "criticalExtensions", "rrc.criticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_criticalExtensions_149", HFILL }},
     { &hf_rrc_stateOfRRC,
@@ -180141,7 +180141,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_CipheringStatus_vals), 0,
         NULL, HFILL }},
     { &hf_rrc_calculationTimeForCiphering,
-      { "calculationTimeForCiphering", "rrc.calculationTimeForCiphering",
+      { "calculationTimeForCiphering", "rrc.calculationTimeForCiphering_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cipheringInfoPerRB_List,
@@ -180169,7 +180169,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ue_Positioning_LastKnownPos,
-      { "ue-Positioning-LastKnownPos", "rrc.ue_Positioning_LastKnownPos",
+      { "ue-Positioning-LastKnownPos", "rrc.ue_Positioning_LastKnownPos_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cn_CommonGSM_MAP_NAS_SysInfo_04,
@@ -180197,7 +180197,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_modeSpecificInfo_155_vals), 0,
         "T_modeSpecificInfo_155", HFILL }},
     { &hf_rrc_fdd_199,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_193", HFILL }},
     { &hf_rrc_dl_TransChInfoList,
@@ -180213,7 +180213,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_cipheringInfoForSRB1_v3a0ext,
-      { "cipheringInfoForSRB1-v3a0ext", "rrc.cipheringInfoForSRB1_v3a0ext",
+      { "cipheringInfoForSRB1-v3a0ext", "rrc.cipheringInfoForSRB1_v3a0ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CipheringInfoPerRB_List_v3a0ext", HFILL }},
     { &hf_rrc_startValueForCiphering_v3a0ext,
@@ -180233,23 +180233,23 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_nonCriticalExtension,
-      { "nonCriticalExtension", "rrc.nonCriticalExtension",
+      { "nonCriticalExtension", "rrc.nonCriticalExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_TPC_CombinationInfoList_item,
-      { "TPC-Combination-Info", "rrc.TPC_Combination_Info",
+      { "TPC-Combination-Info", "rrc.TPC_Combination_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_TPC_CombinationInfoList_r9_item,
-      { "TPC-Combination-Info-r9", "rrc.TPC_Combination_Info_r9",
+      { "TPC-Combination-Info-r9", "rrc.TPC_Combination_Info_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_STARTList2_item,
-      { "STARTSingle", "rrc.STARTSingle",
+      { "STARTSingle", "rrc.STARTSingle_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_storedCompressedModeInfo,
-      { "storedCompressedModeInfo", "rrc.storedCompressedModeInfo",
+      { "storedCompressedModeInfo", "rrc.storedCompressedModeInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_UM_SN,
@@ -180257,11 +180257,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_7", HFILL }},
     { &hf_rrc_CipheringStatusList_item,
-      { "CipheringStatusCNdomain", "rrc.CipheringStatusCNdomain",
+      { "CipheringStatusCNdomain", "rrc.CipheringStatusCNdomain_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_CodeChangeStatusList_item,
-      { "CodeChangeStatus", "rrc.CodeChangeStatus",
+      { "CodeChangeStatus", "rrc.CodeChangeStatus_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_storedTGP_SequenceList,
@@ -180277,11 +180277,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "StoredTGP_SequenceList_r8", HFILL }},
     { &hf_rrc_StoredTGP_SequenceList_item,
-      { "StoredTGP-Sequence", "rrc.StoredTGP_Sequence",
+      { "StoredTGP-Sequence", "rrc.StoredTGP_Sequence_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_StoredTGP_SequenceList_r8_item,
-      { "StoredTGP-Sequence-r8", "rrc.StoredTGP_Sequence_r8",
+      { "StoredTGP-Sequence-r8", "rrc.StoredTGP_Sequence_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_current_tgps_Status,
@@ -180289,11 +180289,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_current_tgps_Status_vals), 0,
         "T_current_tgps_Status", HFILL }},
     { &hf_rrc_active,
-      { "active", "rrc.active",
+      { "active", "rrc.active_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_inactive,
-      { "inactive", "rrc.inactive",
+      { "inactive", "rrc.inactive_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_current_tgps_Status_01,
@@ -180301,7 +180301,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_current_tgps_Status_01_vals), 0,
         "T_current_tgps_Status_01", HFILL }},
     { &hf_rrc_active_01,
-      { "active", "rrc.active",
+      { "active", "rrc.active_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_active_01", HFILL }},
     { &hf_rrc_cipheringStatusList_01,
@@ -180317,7 +180317,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CipheringInfoPerRB_List_r4", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_03,
-      { "ue-RadioAccessCapability", "rrc.ue_RadioAccessCapability",
+      { "ue-RadioAccessCapability", "rrc.ue_RadioAccessCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_r4", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_ext,
@@ -180341,7 +180341,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dummy_17_vals), 0,
         "T_dummy_17", HFILL }},
     { &hf_rrc_fdd_200,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_194", HFILL }},
     { &hf_rrc_dl_TransChInfoList_01,
@@ -180349,11 +180349,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DL_AddReconfTransChInfoList_r4", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_04,
-      { "ue-RadioAccessCapability", "rrc.ue_RadioAccessCapability",
+      { "ue-RadioAccessCapability", "rrc.ue_RadioAccessCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_r5", HFILL }},
     { &hf_rrc_ue_RATSpecificCapability_02,
-      { "ue-RATSpecificCapability", "rrc.ue_RATSpecificCapability",
+      { "ue-RATSpecificCapability", "rrc.ue_RATSpecificCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InterRAT_UE_RadioAccessCapabilityList_r5", HFILL }},
     { &hf_rrc_ongoingMeasRepList_02,
@@ -180373,7 +180373,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_dummy_18_vals), 0,
         "T_dummy_18", HFILL }},
     { &hf_rrc_fdd_201,
-      { "fdd", "rrc.fdd",
+      { "fdd", "rrc.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_195", HFILL }},
     { &hf_rrc_dl_TransChInfoList_02,
@@ -180393,11 +180393,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_intraFreqReportingCriteria_08,
-      { "intraFreqReportingCriteria", "rrc.intraFreqReportingCriteria",
+      { "intraFreqReportingCriteria", "rrc.intraFreqReportingCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IntraFreqReportingCriteria_r6_ext", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_05,
-      { "ue-RadioAccessCapability", "rrc.ue_RadioAccessCapability",
+      { "ue-RadioAccessCapability", "rrc.ue_RadioAccessCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_RadioAccessCapability_r6", HFILL }},
     { &hf_rrc_ueCapabilityContainer_03,
@@ -180433,11 +180433,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_v7f0NonCriticalExtensions_21,
-      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions",
+      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7f0NonCriticalExtensions_21", HFILL }},
     { &hf_rrc_nonCriticalExtensions_250,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_250", HFILL }},
     { &hf_rrc_ueCapabilityContainer_04,
@@ -180481,11 +180481,11 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "T_measurementReport_01", HFILL }},
     { &hf_rrc_v7f0NonCriticalExtensions_22,
-      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions",
+      { "v7f0NonCriticalExtensions", "rrc.v7f0NonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_v7f0NonCriticalExtensions_22", HFILL }},
     { &hf_rrc_nonCriticalExtensions_251,
-      { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
+      { "nonCriticalExtensions", "rrc.nonCriticalExtensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_nonCriticalExtensions_251", HFILL }},
     { &hf_rrc_thresholdSFN_GPS_TOW_us,
@@ -180525,7 +180525,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_storedCompressedModeInfo_01,
-      { "storedCompressedModeInfo", "rrc.storedCompressedModeInfo",
+      { "storedCompressedModeInfo", "rrc.storedCompressedModeInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "StoredCompressedModeInfo_r8", HFILL }},
     { &hf_rrc_measurementReport_03,
@@ -180533,7 +180533,7 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "T_measurementReport_02", HFILL }},
     { &hf_rrc_ue_HistoryInformation,
-      { "ue-HistoryInformation", "rrc.ue_HistoryInformation",
+      { "ue-HistoryInformation", "rrc.ue_HistoryInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_rab_InformationList_07,
@@ -180637,19 +180637,19 @@ void proto_register_rrc(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_20_25", HFILL }},
     { &hf_rrc_CipheringInfoPerRB_List_item,
-      { "CipheringInfoPerRB", "rrc.CipheringInfoPerRB",
+      { "CipheringInfoPerRB", "rrc.CipheringInfoPerRB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_CipheringInfoPerRB_List_r4_item,
-      { "CipheringInfoPerRB-r4", "rrc.CipheringInfoPerRB_r4",
+      { "CipheringInfoPerRB-r4", "rrc.CipheringInfoPerRB_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_CipheringStatusList_r4_item,
-      { "CipheringStatusCNdomain-r4", "rrc.CipheringStatusCNdomain_r4",
+      { "CipheringStatusCNdomain-r4", "rrc.CipheringStatusCNdomain_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_CN_DomainInformationList_v390ext_item,
-      { "CN-DomainInformation-v390ext", "rrc.CN_DomainInformation_v390ext",
+      { "CN-DomainInformation-v390ext", "rrc.CN_DomainInformation_v390ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd384_Measurements,
@@ -180657,7 +180657,7 @@ void proto_register_rrc(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_rrc_COUNT_C_List_item,
-      { "COUNT-CSingle", "rrc.COUNT_CSingle",
+      { "COUNT-CSingle", "rrc.COUNT_CSingle_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_count_C,
@@ -180673,7 +180673,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_fdd_hspdsch_01_vals), 0,
         "T_fdd_hspdsch_01", HFILL }},
     { &hf_rrc_supported_14,
-      { "supported", "rrc.supported",
+      { "supported", "rrc.supported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_supported_07", HFILL }},
     { &hf_rrc_tdd384_hspdsch_01,
@@ -180721,11 +180721,11 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_5", HFILL }},
     { &hf_rrc_E_RGCH_CombinationInfoList_item,
-      { "E-RGCH-Combination-Info", "rrc.E_RGCH_Combination_Info",
+      { "E-RGCH-Combination-Info", "rrc.E_RGCH_Combination_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_E_RGCH_CombinationInfoList_r9_item,
-      { "E-RGCH-Combination-Info-r9", "rrc.E_RGCH_Combination_Info_r9",
+      { "E-RGCH-Combination-Info-r9", "rrc.E_RGCH_Combination_Info_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_interRAT_UE_RadioAccessCapability,
@@ -180733,19 +180733,19 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "InterRAT_UE_RadioAccessCapabilityList", HFILL }},
     { &hf_rrc_event_06,
-      { "event", "rrc.event",
+      { "event", "rrc.event_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Event1j_r6", HFILL }},
     { &hf_rrc_downlinkCompressedMode_04,
-      { "downlinkCompressedMode", "rrc.downlinkCompressedMode",
+      { "downlinkCompressedMode", "rrc.downlinkCompressedMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CompressedModeMeasCapability_r4", HFILL }},
     { &hf_rrc_uplinkCompressedMode_01,
-      { "uplinkCompressedMode", "rrc.uplinkCompressedMode",
+      { "uplinkCompressedMode", "rrc.uplinkCompressedMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CompressedModeMeasCapability_r4", HFILL }},
     { &hf_rrc_modify_09,
-      { "modify", "rrc.modify",
+      { "modify", "rrc.modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_measurementCommandWithType,
@@ -180793,43 +180793,43 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_MeasurementCommandWithType_r11_vals), 0,
         "MeasurementCommandWithType_r11", HFILL }},
     { &hf_rrc_OngoingMeasRepList_item,
-      { "OngoingMeasRep", "rrc.OngoingMeasRep",
+      { "OngoingMeasRep", "rrc.OngoingMeasRep_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_OngoingMeasRepList_r4_item,
-      { "OngoingMeasRep-r4", "rrc.OngoingMeasRep_r4",
+      { "OngoingMeasRep-r4", "rrc.OngoingMeasRep_r4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_OngoingMeasRepList_r5_item,
-      { "OngoingMeasRep-r5", "rrc.OngoingMeasRep_r5",
+      { "OngoingMeasRep-r5", "rrc.OngoingMeasRep_r5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_OngoingMeasRepList_r6_item,
-      { "OngoingMeasRep-r6", "rrc.OngoingMeasRep_r6",
+      { "OngoingMeasRep-r6", "rrc.OngoingMeasRep_r6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_OngoingMeasRepList_r7_item,
-      { "OngoingMeasRep-r7", "rrc.OngoingMeasRep_r7",
+      { "OngoingMeasRep-r7", "rrc.OngoingMeasRep_r7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_OngoingMeasRepList_r8_item,
-      { "OngoingMeasRep-r8", "rrc.OngoingMeasRep_r8",
+      { "OngoingMeasRep-r8", "rrc.OngoingMeasRep_r8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_OngoingMeasRepList_r9_item,
-      { "OngoingMeasRep-r9", "rrc.OngoingMeasRep_r9",
+      { "OngoingMeasRep-r9", "rrc.OngoingMeasRep_r9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_OngoingMeasRepList_v970ext_IE_item,
-      { "OngoingMeasRep-v970ext-IEs", "rrc.OngoingMeasRep_v970ext_IEs",
+      { "OngoingMeasRep-v970ext-IEs", "rrc.OngoingMeasRep_v970ext_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_OngoingMeasRepList_r10_item,
-      { "OngoingMeasRep-r10", "rrc.OngoingMeasRep_r10",
+      { "OngoingMeasRep-r10", "rrc.OngoingMeasRep_r10_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_OngoingMeasRepList_r11_item,
-      { "OngoingMeasRep-r11", "rrc.OngoingMeasRep_r11",
+      { "OngoingMeasRep-r11", "rrc.OngoingMeasRep_r11_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_supportForRfc2507_01,
@@ -180841,7 +180841,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_supportForRfc3095_01_vals), 0,
         "T_supportForRfc3095_01", HFILL }},
     { &hf_rrc_supported_15,
-      { "supported", "rrc.supported",
+      { "supported", "rrc.supported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_supported_08", HFILL }},
     { &hf_rrc_supportForRfc2507_02,
@@ -180857,7 +180857,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_supportForRfc3095_02_vals), 0,
         "T_supportForRfc3095_02", HFILL }},
     { &hf_rrc_supported_17,
-      { "supported", "rrc.supported",
+      { "supported", "rrc.supported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_supported_09", HFILL }},
     { &hf_rrc_losslessDLRLC_PDUSizeChange_01,
@@ -180873,59 +180873,59 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_supportForRfc3095_03_vals), 0,
         "T_supportForRfc3095_03", HFILL }},
     { &hf_rrc_supported_18,
-      { "supported", "rrc.supported",
+      { "supported", "rrc.supported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_supported_10", HFILL }},
     { &hf_rrc_fddPhysChCapability_06,
-      { "fddPhysChCapability", "rrc.fddPhysChCapability",
+      { "fddPhysChCapability", "rrc.fddPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fddPhysChCapability_06", HFILL }},
     { &hf_rrc_downlinkPhysChCapability_13,
-      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability",
+      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_PhysChCapabilityFDD_r4", HFILL }},
     { &hf_rrc_tdd384_PhysChCapability,
-      { "tdd384-PhysChCapability", "rrc.tdd384_PhysChCapability",
+      { "tdd384-PhysChCapability", "rrc.tdd384_PhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_tdd128_PhysChCapability_01,
-      { "tdd128-PhysChCapability", "rrc.tdd128_PhysChCapability",
+      { "tdd128-PhysChCapability", "rrc.tdd128_PhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_PhysChCapability_01", HFILL }},
     { &hf_rrc_fddPhysChCapability_07,
-      { "fddPhysChCapability", "rrc.fddPhysChCapability",
+      { "fddPhysChCapability", "rrc.fddPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fddPhysChCapability_07", HFILL }},
     { &hf_rrc_downlinkPhysChCapability_14,
-      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability",
+      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_PhysChCapabilityFDD_r5", HFILL }},
     { &hf_rrc_tdd384_PhysChCapability_01,
-      { "tdd384-PhysChCapability", "rrc.tdd384_PhysChCapability",
+      { "tdd384-PhysChCapability", "rrc.tdd384_PhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_PhysChCapability_01", HFILL }},
     { &hf_rrc_downlinkPhysChCapability_15,
-      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability",
+      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_PhysChCapabilityTDD_r5", HFILL }},
     { &hf_rrc_tdd128_PhysChCapability_02,
-      { "tdd128-PhysChCapability", "rrc.tdd128_PhysChCapability",
+      { "tdd128-PhysChCapability", "rrc.tdd128_PhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_PhysChCapability_02", HFILL }},
     { &hf_rrc_downlinkPhysChCapability_16,
-      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability",
+      { "downlinkPhysChCapability", "rrc.downlinkPhysChCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DL_PhysChCapabilityTDD_LCR_r5", HFILL }},
     { &hf_rrc_fddRF_Capability_04,
-      { "fddRF-Capability", "rrc.fddRF_Capability",
+      { "fddRF-Capability", "rrc.fddRF_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fddRF_Capability_04", HFILL }},
     { &hf_rrc_tdd384_RF_Capability_02,
-      { "tdd384-RF-Capability", "rrc.tdd384_RF_Capability",
+      { "tdd384-RF-Capability", "rrc.tdd384_RF_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd384_RF_Capability_01", HFILL }},
     { &hf_rrc_tdd128_RF_Capability_03,
-      { "tdd128-RF-Capability", "rrc.tdd128_RF_Capability",
+      { "tdd128-RF-Capability", "rrc.tdd128_RF_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd128_RF_Capability_01", HFILL }},
     { &hf_rrc_rfc3095_Context_List,
@@ -180933,15 +180933,15 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_RFC3095_Context_List_item,
-      { "RFC3095-Context-List item", "rrc.RFC3095_Context_List_item",
+      { "RFC3095-Context-List item", "rrc.RFC3095_Context_List_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_dl_RFC3095_Context,
-      { "dl-RFC3095-Context", "rrc.dl_RFC3095_Context",
+      { "dl-RFC3095-Context", "rrc.dl_RFC3095_Context_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_ul_RFC3095_Context,
-      { "ul-RFC3095-Context", "rrc.ul_RFC3095_Context",
+      { "ul-RFC3095-Context", "rrc.ul_RFC3095_Context_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_totalRLC_AM_BufferSize_05,
@@ -180965,7 +180965,7 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RRC_MessageSequenceNumber", HFILL }},
     { &hf_rrc_SRB_SpecificIntegrityProtInfoList_item,
-      { "SRB-SpecificIntegrityProtInfo", "rrc.SRB_SpecificIntegrityProtInfo",
+      { "SRB-SpecificIntegrityProtInfo", "rrc.SRB_SpecificIntegrityProtInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrc_validity_CellPCH_UraPCH_01,
@@ -180977,43 +180977,43 @@ void proto_register_rrc(void) {
         FT_UINT32, BASE_DEC, VALS(rrc_T_sfn_sfnType2Capability_01_vals), 0,
         "T_sfn_sfnType2Capability_01", HFILL }},
     { &hf_rrc_pdcp_Capability_03,
-      { "pdcp-Capability", "rrc.pdcp_Capability",
+      { "pdcp-Capability", "rrc.pdcp_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PDCP_Capability_r4", HFILL }},
     { &hf_rrc_rf_Capability_04,
-      { "rf-Capability", "rrc.rf_Capability",
+      { "rf-Capability", "rrc.rf_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RF_Capability_r4", HFILL }},
     { &hf_rrc_physicalChannelCapability_08,
-      { "physicalChannelCapability", "rrc.physicalChannelCapability",
+      { "physicalChannelCapability", "rrc.physicalChannelCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelCapability_r4", HFILL }},
     { &hf_rrc_ue_positioning_Capability_01,
-      { "ue-positioning-Capability", "rrc.ue_positioning_Capability",
+      { "ue-positioning-Capability", "rrc.ue_positioning_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_Positioning_Capability_r4", HFILL }},
     { &hf_rrc_measurementCapability_06,
-      { "measurementCapability", "rrc.measurementCapability",
+      { "measurementCapability", "rrc.measurementCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MeasurementCapability_r4", HFILL }},
     { &hf_rrc_pdcp_Capability_04,
-      { "pdcp-Capability", "rrc.pdcp_Capability",
+      { "pdcp-Capability", "rrc.pdcp_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PDCP_Capability_r5", HFILL }},
     { &hf_rrc_rlc_Capability_05,
-      { "rlc-Capability", "rrc.rlc_Capability",
+      { "rlc-Capability", "rrc.rlc_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLC_Capability_r5", HFILL }},
     { &hf_rrc_physicalChannelCapability_09,
-      { "physicalChannelCapability", "rrc.physicalChannelCapability",
+      { "physicalChannelCapability", "rrc.physicalChannelCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PhysicalChannelCapability_r5", HFILL }},
     { &hf_rrc_ue_MultiModeRAT_Capability_01,
-      { "ue-MultiModeRAT-Capability", "rrc.ue_MultiModeRAT_Capability",
+      { "ue-MultiModeRAT-Capability", "rrc.ue_MultiModeRAT_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UE_MultiModeRAT_Capability_r5", HFILL }},
     { &hf_rrc_pdcp_Capability_05,
-      { "pdcp-Capability", "rrc.pdcp_Capability",
+      { "pdcp-Capability", "rrc.pdcp_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PDCP_Capability_r6", HFILL }},
     { &hf_rrc_ul_mode,
diff --git a/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c
index b29f28804d..c2bbb1cbda 100644
--- a/epan/dissectors/packet-rrlp.c
+++ b/epan/dissectors/packet-rrlp.c
@@ -6987,7 +6987,7 @@ void proto_register_rrlp(void) {
 /*--- Included file: packet-rrlp-hfarr.c ---*/
 #line 1 "../../asn1/rrlp/packet-rrlp-hfarr.c"
     { &hf_rrlp_PDU_PDU,
-      { "PDU", "rrlp.PDU",
+      { "PDU", "rrlp.PDU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_privateExtensionList,
@@ -6995,11 +6995,11 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_pcs_Extensions,
-      { "pcs-Extensions", "rrlp.pcs_Extensions",
+      { "pcs-Extensions", "rrlp.pcs_Extensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_PrivateExtensionList_item,
-      { "PrivateExtension", "rrlp.PrivateExtension",
+      { "PrivateExtension", "rrlp.PrivateExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_extId,
@@ -7007,7 +7007,7 @@ void proto_register_rrlp(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_rrlp_extType,
-      { "extType", "rrlp.extType",
+      { "extType", "rrlp.extType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_referenceNumber,
@@ -7019,103 +7019,103 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, VALS(rrlp_RRLP_Component_vals), 0,
         "RRLP_Component", HFILL }},
     { &hf_rrlp_msrPositionReq,
-      { "msrPositionReq", "rrlp.msrPositionReq",
+      { "msrPositionReq", "rrlp.msrPositionReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MsrPosition_Req", HFILL }},
     { &hf_rrlp_msrPositionRsp,
-      { "msrPositionRsp", "rrlp.msrPositionRsp",
+      { "msrPositionRsp", "rrlp.msrPositionRsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MsrPosition_Rsp", HFILL }},
     { &hf_rrlp_assistanceData,
-      { "assistanceData", "rrlp.assistanceData",
+      { "assistanceData", "rrlp.assistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_assistanceDataAck,
-      { "assistanceDataAck", "rrlp.assistanceDataAck",
+      { "assistanceDataAck", "rrlp.assistanceDataAck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_protocolError,
-      { "protocolError", "rrlp.protocolError",
+      { "protocolError", "rrlp.protocolError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_posCapabilityReq,
-      { "posCapabilityReq", "rrlp.posCapabilityReq",
+      { "posCapabilityReq", "rrlp.posCapabilityReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PosCapability_Req", HFILL }},
     { &hf_rrlp_posCapabilityRsp,
-      { "posCapabilityRsp", "rrlp.posCapabilityRsp",
+      { "posCapabilityRsp", "rrlp.posCapabilityRsp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PosCapability_Rsp", HFILL }},
     { &hf_rrlp_positionInstruct,
-      { "positionInstruct", "rrlp.positionInstruct",
+      { "positionInstruct", "rrlp.positionInstruct_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_referenceAssistData,
-      { "referenceAssistData", "rrlp.referenceAssistData",
+      { "referenceAssistData", "rrlp.referenceAssistData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_msrAssistData,
-      { "msrAssistData", "rrlp.msrAssistData",
+      { "msrAssistData", "rrlp.msrAssistData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_systemInfoAssistData,
-      { "systemInfoAssistData", "rrlp.systemInfoAssistData",
+      { "systemInfoAssistData", "rrlp.systemInfoAssistData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_gps_AssistData,
-      { "gps-AssistData", "rrlp.gps_AssistData",
+      { "gps-AssistData", "rrlp.gps_AssistData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_extensionContainer,
-      { "extensionContainer", "rrlp.extensionContainer",
+      { "extensionContainer", "rrlp.extensionContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_rel98_MsrPosition_Req_extension,
-      { "rel98-MsrPosition-Req-extension", "rrlp.rel98_MsrPosition_Req_extension",
+      { "rel98-MsrPosition-Req-extension", "rrlp.rel98_MsrPosition_Req_extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_rel5_MsrPosition_Req_extension,
-      { "rel5-MsrPosition-Req-extension", "rrlp.rel5_MsrPosition_Req_extension",
+      { "rel5-MsrPosition-Req-extension", "rrlp.rel5_MsrPosition_Req_extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_rel7_MsrPosition_Req_extension,
-      { "rel7-MsrPosition-Req-extension", "rrlp.rel7_MsrPosition_Req_extension",
+      { "rel7-MsrPosition-Req-extension", "rrlp.rel7_MsrPosition_Req_extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_multipleSets,
-      { "multipleSets", "rrlp.multipleSets",
+      { "multipleSets", "rrlp.multipleSets_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_referenceIdentity,
-      { "referenceIdentity", "rrlp.referenceIdentity",
+      { "referenceIdentity", "rrlp.referenceIdentity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_otd_MeasureInfo,
-      { "otd-MeasureInfo", "rrlp.otd_MeasureInfo",
+      { "otd-MeasureInfo", "rrlp.otd_MeasureInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_locationInfo,
-      { "locationInfo", "rrlp.locationInfo",
+      { "locationInfo", "rrlp.locationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_gps_MeasureInfo,
-      { "gps-MeasureInfo", "rrlp.gps_MeasureInfo",
+      { "gps-MeasureInfo", "rrlp.gps_MeasureInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_locationError,
-      { "locationError", "rrlp.locationError",
+      { "locationError", "rrlp.locationError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_rel_98_MsrPosition_Rsp_Extension,
-      { "rel-98-MsrPosition-Rsp-Extension", "rrlp.rel_98_MsrPosition_Rsp_Extension",
+      { "rel-98-MsrPosition-Rsp-Extension", "rrlp.rel_98_MsrPosition_Rsp_Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_rel_5_MsrPosition_Rsp_Extension,
-      { "rel-5-MsrPosition-Rsp-Extension", "rrlp.rel_5_MsrPosition_Rsp_Extension",
+      { "rel-5-MsrPosition-Rsp-Extension", "rrlp.rel_5_MsrPosition_Rsp_Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_rel_7_MsrPosition_Rsp_Extension,
-      { "rel-7-MsrPosition-Rsp-Extension", "rrlp.rel_7_MsrPosition_Rsp_Extension",
+      { "rel-7-MsrPosition-Rsp-Extension", "rrlp.rel_7_MsrPosition_Rsp_Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_moreAssDataToBeSent,
@@ -7123,15 +7123,15 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, VALS(rrlp_MoreAssDataToBeSent_vals), 0,
         NULL, HFILL }},
     { &hf_rrlp_rel98_AssistanceData_Extension,
-      { "rel98-AssistanceData-Extension", "rrlp.rel98_AssistanceData_Extension",
+      { "rel98-AssistanceData-Extension", "rrlp.rel98_AssistanceData_Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_rel5_AssistanceData_Extension,
-      { "rel5-AssistanceData-Extension", "rrlp.rel5_AssistanceData_Extension",
+      { "rel5-AssistanceData-Extension", "rrlp.rel5_AssistanceData_Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_rel7_AssistanceData_Extension,
-      { "rel7-AssistanceData-Extension", "rrlp.rel7_AssistanceData_Extension",
+      { "rel7-AssistanceData-Extension", "rrlp.rel7_AssistanceData_Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_errorCause,
@@ -7139,11 +7139,11 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, VALS(rrlp_ErrorCodes_vals), 0,
         "ErrorCodes", HFILL }},
     { &hf_rrlp_rel_5_ProtocolError_Extension,
-      { "rel-5-ProtocolError-Extension", "rrlp.rel_5_ProtocolError_Extension",
+      { "rel-5-ProtocolError-Extension", "rrlp.rel_5_ProtocolError_Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_extended_reference,
-      { "extended-reference", "rrlp.extended_reference",
+      { "extended-reference", "rrlp.extended_reference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_gANSSPositionMethods,
@@ -7151,15 +7151,15 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_posCapabilities,
-      { "posCapabilities", "rrlp.posCapabilities",
+      { "posCapabilities", "rrlp.posCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_assistanceSupported,
-      { "assistanceSupported", "rrlp.assistanceSupported",
+      { "assistanceSupported", "rrlp.assistanceSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_assistanceNeeded,
-      { "assistanceNeeded", "rrlp.assistanceNeeded",
+      { "assistanceNeeded", "rrlp.assistanceNeeded_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_methodType,
@@ -7183,7 +7183,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, VALS(rrlp_EnvironmentCharacter_vals), 0,
         NULL, HFILL }},
     { &hf_rrlp_msAssisted,
-      { "msAssisted", "rrlp.msAssisted",
+      { "msAssisted", "rrlp.msAssisted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AccuracyOpt", HFILL }},
     { &hf_rrlp_msBased,
@@ -7223,7 +7223,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOfMsrAssistBTS", HFILL }},
     { &hf_rrlp_SeqOfMsrAssistBTS_item,
-      { "MsrAssistBTS", "rrlp.MsrAssistBTS",
+      { "MsrAssistBTS", "rrlp.MsrAssistBTS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_multiFrameOffset,
@@ -7235,7 +7235,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_calcAssistanceBTS,
-      { "calcAssistanceBTS", "rrlp.calcAssistanceBTS",
+      { "calcAssistanceBTS", "rrlp.calcAssistanceBTS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_systemInfoAssistList,
@@ -7247,11 +7247,11 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, VALS(rrlp_SystemInfoAssistBTS_vals), 0,
         NULL, HFILL }},
     { &hf_rrlp_notPresent,
-      { "notPresent", "rrlp.notPresent",
+      { "notPresent", "rrlp.notPresent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_present,
-      { "present", "rrlp.present",
+      { "present", "rrlp.present_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AssistBTSData", HFILL }},
     { &hf_rrlp_fineRTD,
@@ -7259,7 +7259,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_referenceWGS84,
-      { "referenceWGS84", "rrlp.referenceWGS84",
+      { "referenceWGS84", "rrlp.referenceWGS84_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_relativeNorth,
@@ -7295,7 +7295,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, VALS(rrlp_ReferenceIdentityType_vals), 0,
         NULL, HFILL }},
     { &hf_rrlp_bsicAndCarrier,
-      { "bsicAndCarrier", "rrlp.bsicAndCarrier",
+      { "bsicAndCarrier", "rrlp.bsicAndCarrier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ci,
@@ -7311,7 +7311,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ciAndLAC,
-      { "ciAndLAC", "rrlp.ciAndLAC",
+      { "ciAndLAC", "rrlp.ciAndLAC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellIDAndLAC", HFILL }},
     { &hf_rrlp_carrier,
@@ -7327,7 +7327,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CellID", HFILL }},
     { &hf_rrlp_otdMsrFirstSets,
-      { "otdMsrFirstSets", "rrlp.otdMsrFirstSets",
+      { "otdMsrFirstSets", "rrlp.otdMsrFirstSets_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OTD_MsrElementFirst", HFILL }},
     { &hf_rrlp_otdMsrRestSets,
@@ -7335,7 +7335,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOfOTD_MsrElementRest", HFILL }},
     { &hf_rrlp_SeqOfOTD_MsrElementRest_item,
-      { "OTD-MsrElementRest", "rrlp.OTD_MsrElementRest",
+      { "OTD-MsrElementRest", "rrlp.OTD_MsrElementRest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_refFrameNumber,
@@ -7347,7 +7347,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ModuloTimeSlot", HFILL }},
     { &hf_rrlp_toaMeasurementsOfRef,
-      { "toaMeasurementsOfRef", "rrlp.toaMeasurementsOfRef",
+      { "toaMeasurementsOfRef", "rrlp.toaMeasurementsOfRef_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TOA_MeasurementsOfRef", HFILL }},
     { &hf_rrlp_stdResolution,
@@ -7363,7 +7363,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOfOTD_FirstSetMsrs", HFILL }},
     { &hf_rrlp_SeqOfOTD_FirstSetMsrs_item,
-      { "OTD-FirstSetMsrs", "rrlp.OTD_FirstSetMsrs",
+      { "OTD-FirstSetMsrs", "rrlp.OTD_FirstSetMsrs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_otd_MsrsOfOtherSets,
@@ -7383,11 +7383,11 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_identityNotPresent,
-      { "identityNotPresent", "rrlp.identityNotPresent",
+      { "identityNotPresent", "rrlp.identityNotPresent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OTD_Measurement", HFILL }},
     { &hf_rrlp_identityPresent,
-      { "identityPresent", "rrlp.identityPresent",
+      { "identityPresent", "rrlp.identityPresent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OTD_MeasurementWithID", HFILL }},
     { &hf_rrlp_nborTimeSlot,
@@ -7395,7 +7395,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ModuloTimeSlot", HFILL }},
     { &hf_rrlp_eotdQuality,
-      { "eotdQuality", "rrlp.eotdQuality",
+      { "eotdQuality", "rrlp.eotdQuality_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_otdValue,
@@ -7415,7 +7415,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_31", HFILL }},
     { &hf_rrlp_multiFrameCarrier,
-      { "multiFrameCarrier", "rrlp.multiFrameCarrier",
+      { "multiFrameCarrier", "rrlp.multiFrameCarrier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_refFrame,
@@ -7439,7 +7439,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOfGPS_MsrSetElement", HFILL }},
     { &hf_rrlp_SeqOfGPS_MsrSetElement_item,
-      { "GPS-MsrSetElement", "rrlp.GPS_MsrSetElement",
+      { "GPS-MsrSetElement", "rrlp.GPS_MsrSetElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_gpsTOW_01,
@@ -7451,7 +7451,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOfGPS_MsrElement", HFILL }},
     { &hf_rrlp_SeqOfGPS_MsrElement_item,
-      { "GPS-MsrElement", "rrlp.GPS_MsrElement",
+      { "GPS-MsrElement", "rrlp.GPS_MsrElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_satelliteID,
@@ -7487,7 +7487,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, VALS(rrlp_LocErrorReason_vals), 0,
         NULL, HFILL }},
     { &hf_rrlp_additionalAssistanceData,
-      { "additionalAssistanceData", "rrlp.additionalAssistanceData",
+      { "additionalAssistanceData", "rrlp.additionalAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_gpsAssistanceData,
@@ -7499,39 +7499,39 @@ void proto_register_rrlp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_controlHeader,
-      { "controlHeader", "rrlp.controlHeader",
+      { "controlHeader", "rrlp.controlHeader_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_referenceTime,
-      { "referenceTime", "rrlp.referenceTime",
+      { "referenceTime", "rrlp.referenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_refLocation,
-      { "refLocation", "rrlp.refLocation",
+      { "refLocation", "rrlp.refLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_dgpsCorrections,
-      { "dgpsCorrections", "rrlp.dgpsCorrections",
+      { "dgpsCorrections", "rrlp.dgpsCorrections_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_navigationModel,
-      { "navigationModel", "rrlp.navigationModel",
+      { "navigationModel", "rrlp.navigationModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ionosphericModel,
-      { "ionosphericModel", "rrlp.ionosphericModel",
+      { "ionosphericModel", "rrlp.ionosphericModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_utcModel,
-      { "utcModel", "rrlp.utcModel",
+      { "utcModel", "rrlp.utcModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_almanac,
-      { "almanac", "rrlp.almanac",
+      { "almanac", "rrlp.almanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_acquisAssist,
-      { "acquisAssist", "rrlp.acquisAssist",
+      { "acquisAssist", "rrlp.acquisAssist_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_realTimeIntegrity,
@@ -7539,11 +7539,11 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOf_BadSatelliteSet", HFILL }},
     { &hf_rrlp_gpsTime,
-      { "gpsTime", "rrlp.gpsTime",
+      { "gpsTime", "rrlp.gpsTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_gsmTime,
-      { "gsmTime", "rrlp.gsmTime",
+      { "gsmTime", "rrlp.gsmTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_gpsTowAssist,
@@ -7559,7 +7559,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_GPSTOWAssist_item,
-      { "GPSTOWAssistElement", "rrlp.GPSTOWAssistElement",
+      { "GPSTOWAssistElement", "rrlp.GPSTOWAssistElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_tlmWord,
@@ -7607,7 +7607,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOfSatElement", HFILL }},
     { &hf_rrlp_SeqOfSatElement_item,
-      { "SatElement", "rrlp.SatElement",
+      { "SatElement", "rrlp.SatElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_iode,
@@ -7647,7 +7647,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOfNavModelElement", HFILL }},
     { &hf_rrlp_SeqOfNavModelElement_item,
-      { "NavModelElement", "rrlp.NavModelElement",
+      { "NavModelElement", "rrlp.NavModelElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_satStatus,
@@ -7655,15 +7655,15 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, VALS(rrlp_SatStatus_vals), 0,
         NULL, HFILL }},
     { &hf_rrlp_newSatelliteAndModelUC,
-      { "newSatelliteAndModelUC", "rrlp.newSatelliteAndModelUC",
+      { "newSatelliteAndModelUC", "rrlp.newSatelliteAndModelUC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UncompressedEphemeris", HFILL }},
     { &hf_rrlp_oldSatelliteAndModel,
-      { "oldSatelliteAndModel", "rrlp.oldSatelliteAndModel",
+      { "oldSatelliteAndModel", "rrlp.oldSatelliteAndModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_newNaviModelUC,
-      { "newNaviModelUC", "rrlp.newNaviModelUC",
+      { "newNaviModelUC", "rrlp.newNaviModelUC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UncompressedEphemeris", HFILL }},
     { &hf_rrlp_ephemCodeOnL2,
@@ -7687,7 +7687,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_1", HFILL }},
     { &hf_rrlp_ephemSF1Rsvd,
-      { "ephemSF1Rsvd", "rrlp.ephemSF1Rsvd",
+      { "ephemSF1Rsvd", "rrlp.ephemSF1Rsvd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EphemerisSubframe1Reserved", HFILL }},
     { &hf_rrlp_ephemTgd,
@@ -7871,7 +7871,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOfAlmanacElement", HFILL }},
     { &hf_rrlp_SeqOfAlmanacElement_item,
-      { "AlmanacElement", "rrlp.AlmanacElement",
+      { "AlmanacElement", "rrlp.AlmanacElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_almanacE,
@@ -7919,7 +7919,7 @@ void proto_register_rrlp(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M1024_1023", HFILL }},
     { &hf_rrlp_timeRelation,
-      { "timeRelation", "rrlp.timeRelation",
+      { "timeRelation", "rrlp.timeRelation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_acquisList,
@@ -7927,7 +7927,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOfAcquisElement", HFILL }},
     { &hf_rrlp_SeqOfAcquisElement_item,
-      { "AcquisElement", "rrlp.AcquisElement",
+      { "AcquisElement", "rrlp.AcquisElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_gpsTOW_03,
@@ -7943,7 +7943,7 @@ void proto_register_rrlp(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M2048_2047", HFILL }},
     { &hf_rrlp_addionalDoppler,
-      { "addionalDoppler", "rrlp.addionalDoppler",
+      { "addionalDoppler", "rrlp.addionalDoppler_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AddionalDopplerFields", HFILL }},
     { &hf_rrlp_codePhase,
@@ -7963,7 +7963,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_15", HFILL }},
     { &hf_rrlp_addionalAngle,
-      { "addionalAngle", "rrlp.addionalAngle",
+      { "addionalAngle", "rrlp.addionalAngle_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AddionalAngleFields", HFILL }},
     { &hf_rrlp_doppler1,
@@ -7987,11 +7987,11 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_rel98_Ext_ExpOTD,
-      { "rel98-Ext-ExpOTD", "rrlp.rel98_Ext_ExpOTD",
+      { "rel98-Ext-ExpOTD", "rrlp.rel98_Ext_ExpOTD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_gpsTimeAssistanceMeasurementRequest,
-      { "gpsTimeAssistanceMeasurementRequest", "rrlp.gpsTimeAssistanceMeasurementRequest",
+      { "gpsTimeAssistanceMeasurementRequest", "rrlp.gpsTimeAssistanceMeasurementRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_gpsReferenceTimeUncertainty,
@@ -7999,11 +7999,11 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_msrAssistData_R98_ExpOTD,
-      { "msrAssistData-R98-ExpOTD", "rrlp.msrAssistData_R98_ExpOTD",
+      { "msrAssistData-R98-ExpOTD", "rrlp.msrAssistData_R98_ExpOTD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_systemInfoAssistData_R98_ExpOTD,
-      { "systemInfoAssistData-R98-ExpOTD", "rrlp.systemInfoAssistData_R98_ExpOTD",
+      { "systemInfoAssistData-R98-ExpOTD", "rrlp.systemInfoAssistData_R98_ExpOTD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_msrAssistList_R98_ExpOTD,
@@ -8011,7 +8011,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOfMsrAssistBTS_R98_ExpOTD", HFILL }},
     { &hf_rrlp_SeqOfMsrAssistBTS_R98_ExpOTD_item,
-      { "MsrAssistBTS-R98-ExpOTD", "rrlp.MsrAssistBTS_R98_ExpOTD",
+      { "MsrAssistBTS-R98-ExpOTD", "rrlp.MsrAssistBTS_R98_ExpOTD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_expectedOTD,
@@ -8031,7 +8031,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, VALS(rrlp_SystemInfoAssistBTS_R98_ExpOTD_vals), 0,
         NULL, HFILL }},
     { &hf_rrlp_present_01,
-      { "present", "rrlp.present",
+      { "present", "rrlp.present_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AssistBTSData_R98_ExpOTD", HFILL }},
     { &hf_rrlp_expOTDuncertainty,
@@ -8051,19 +8051,19 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_127", HFILL }},
     { &hf_rrlp_rel_98_Ext_MeasureInfo,
-      { "rel-98-Ext-MeasureInfo", "rrlp.rel_98_Ext_MeasureInfo",
+      { "rel-98-Ext-MeasureInfo", "rrlp.rel_98_Ext_MeasureInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_rel_98_Ext_MeasureInfo", HFILL }},
     { &hf_rrlp_otd_MeasureInfo_R98_Ext,
-      { "otd-MeasureInfo-R98-Ext", "rrlp.otd_MeasureInfo_R98_Ext",
+      { "otd-MeasureInfo-R98-Ext", "rrlp.otd_MeasureInfo_R98_Ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_timeAssistanceMeasurements,
-      { "timeAssistanceMeasurements", "rrlp.timeAssistanceMeasurements",
+      { "timeAssistanceMeasurements", "rrlp.timeAssistanceMeasurements_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GPSTimeAssistanceMeasurements", HFILL }},
     { &hf_rrlp_otdMsrFirstSets_R98_Ext,
-      { "otdMsrFirstSets-R98-Ext", "rrlp.otdMsrFirstSets_R98_Ext",
+      { "otdMsrFirstSets-R98-Ext", "rrlp.otdMsrFirstSets_R98_Ext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OTD_MsrElementFirst_R98_Ext", HFILL }},
     { &hf_rrlp_otd_FirstSetMsrs_R98_Ext,
@@ -8071,7 +8071,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOfOTD_FirstSetMsrs_R98_Ext", HFILL }},
     { &hf_rrlp_SeqOfOTD_FirstSetMsrs_R98_Ext_item,
-      { "OTD-FirstSetMsrs", "rrlp.OTD_FirstSetMsrs",
+      { "OTD-FirstSetMsrs", "rrlp.OTD_FirstSetMsrs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_otd_MeasureInfo_5_Ext,
@@ -8091,7 +8091,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_262143", HFILL }},
     { &hf_rrlp_velocityRequested,
-      { "velocityRequested", "rrlp.velocityRequested",
+      { "velocityRequested", "rrlp.velocityRequested_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssPositionMethod,
@@ -8099,15 +8099,15 @@ void proto_register_rrlp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "GANSSPositioningMethod", HFILL }},
     { &hf_rrlp_ganss_AssistData,
-      { "ganss-AssistData", "rrlp.ganss_AssistData",
+      { "ganss-AssistData", "rrlp.ganss_AssistData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssCarrierPhaseMeasurementRequest,
-      { "ganssCarrierPhaseMeasurementRequest", "rrlp.ganssCarrierPhaseMeasurementRequest",
+      { "ganssCarrierPhaseMeasurementRequest", "rrlp.ganssCarrierPhaseMeasurementRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssTODGSMTimeAssociationMeasurementRequest,
-      { "ganssTODGSMTimeAssociationMeasurementRequest", "rrlp.ganssTODGSMTimeAssociationMeasurementRequest",
+      { "ganssTODGSMTimeAssociationMeasurementRequest", "rrlp.ganssTODGSMTimeAssociationMeasurementRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_requiredResponseTime,
@@ -8115,19 +8115,19 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_add_GPS_AssistData,
-      { "add-GPS-AssistData", "rrlp.add_GPS_AssistData",
+      { "add-GPS-AssistData", "rrlp.add_GPS_AssistData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssMultiFreqMeasurementRequest,
-      { "ganssMultiFreqMeasurementRequest", "rrlp.ganssMultiFreqMeasurementRequest",
+      { "ganssMultiFreqMeasurementRequest", "rrlp.ganssMultiFreqMeasurementRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganss_controlHeader,
-      { "ganss-controlHeader", "rrlp.ganss_controlHeader",
+      { "ganss-controlHeader", "rrlp.ganss_controlHeader_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssCommonAssistData,
-      { "ganssCommonAssistData", "rrlp.ganssCommonAssistData",
+      { "ganssCommonAssistData", "rrlp.ganssCommonAssistData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssGenericAssistDataList,
@@ -8135,27 +8135,27 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOfGANSSGenericAssistDataElement", HFILL }},
     { &hf_rrlp_ganssReferenceTime,
-      { "ganssReferenceTime", "rrlp.ganssReferenceTime",
+      { "ganssReferenceTime", "rrlp.ganssReferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssRefLocation,
-      { "ganssRefLocation", "rrlp.ganssRefLocation",
+      { "ganssRefLocation", "rrlp.ganssRefLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssIonosphericModel,
-      { "ganssIonosphericModel", "rrlp.ganssIonosphericModel",
+      { "ganssIonosphericModel", "rrlp.ganssIonosphericModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssAddIonosphericModel,
-      { "ganssAddIonosphericModel", "rrlp.ganssAddIonosphericModel",
+      { "ganssAddIonosphericModel", "rrlp.ganssAddIonosphericModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssEarthOrientParam,
-      { "ganssEarthOrientParam", "rrlp.ganssEarthOrientParam",
+      { "ganssEarthOrientParam", "rrlp.ganssEarthOrientParam_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_SeqOfGANSSGenericAssistDataElement_item,
-      { "GANSSGenericAssistDataElement", "rrlp.GANSSGenericAssistDataElement",
+      { "GANSSGenericAssistDataElement", "rrlp.GANSSGenericAssistDataElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssID,
@@ -8167,39 +8167,39 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOfGANSSTimeModel", HFILL }},
     { &hf_rrlp_ganssDiffCorrections,
-      { "ganssDiffCorrections", "rrlp.ganssDiffCorrections",
+      { "ganssDiffCorrections", "rrlp.ganssDiffCorrections_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssNavigationModel,
-      { "ganssNavigationModel", "rrlp.ganssNavigationModel",
+      { "ganssNavigationModel", "rrlp.ganssNavigationModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSSNavModel", HFILL }},
     { &hf_rrlp_ganssRealTimeIntegrity,
-      { "ganssRealTimeIntegrity", "rrlp.ganssRealTimeIntegrity",
+      { "ganssRealTimeIntegrity", "rrlp.ganssRealTimeIntegrity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssDataBitAssist,
-      { "ganssDataBitAssist", "rrlp.ganssDataBitAssist",
+      { "ganssDataBitAssist", "rrlp.ganssDataBitAssist_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssRefMeasurementAssist,
-      { "ganssRefMeasurementAssist", "rrlp.ganssRefMeasurementAssist",
+      { "ganssRefMeasurementAssist", "rrlp.ganssRefMeasurementAssist_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssAlmanacModel,
-      { "ganssAlmanacModel", "rrlp.ganssAlmanacModel",
+      { "ganssAlmanacModel", "rrlp.ganssAlmanacModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssUTCModel,
-      { "ganssUTCModel", "rrlp.ganssUTCModel",
+      { "ganssUTCModel", "rrlp.ganssUTCModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssEphemerisExtension,
-      { "ganssEphemerisExtension", "rrlp.ganssEphemerisExtension",
+      { "ganssEphemerisExtension", "rrlp.ganssEphemerisExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssEphemerisExtCheck,
-      { "ganssEphemerisExtCheck", "rrlp.ganssEphemerisExtCheck",
+      { "ganssEphemerisExtCheck", "rrlp.ganssEphemerisExtCheck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSSEphemerisExtensionCheck", HFILL }},
     { &hf_rrlp_sbasID,
@@ -8219,11 +8219,11 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssRefTimeInfo,
-      { "ganssRefTimeInfo", "rrlp.ganssRefTimeInfo",
+      { "ganssRefTimeInfo", "rrlp.ganssRefTimeInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssTOD_GSMTimeAssociation,
-      { "ganssTOD-GSMTimeAssociation", "rrlp.ganssTOD_GSMTimeAssociation",
+      { "ganssTOD-GSMTimeAssociation", "rrlp.ganssTOD_GSMTimeAssociation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssDay,
@@ -8247,11 +8247,11 @@ void proto_register_rrlp(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssIonoModel,
-      { "ganssIonoModel", "rrlp.ganssIonoModel",
+      { "ganssIonoModel", "rrlp.ganssIonoModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSSIonosphereModel", HFILL }},
     { &hf_rrlp_ganssIonoStormFlags,
-      { "ganssIonoStormFlags", "rrlp.ganssIonoStormFlags",
+      { "ganssIonoStormFlags", "rrlp.ganssIonoStormFlags_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ai0,
@@ -8291,7 +8291,7 @@ void proto_register_rrlp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_2", HFILL }},
     { &hf_rrlp_ionoModel,
-      { "ionoModel", "rrlp.ionoModel",
+      { "ionoModel", "rrlp.ionoModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IonosphericModel", HFILL }},
     { &hf_rrlp_teop,
@@ -8323,7 +8323,7 @@ void proto_register_rrlp(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M262144_262143", HFILL }},
     { &hf_rrlp_SeqOfGANSSTimeModel_item,
-      { "GANSSTimeModelElement", "rrlp.GANSSTimeModelElement",
+      { "GANSSTimeModelElement", "rrlp.GANSSTimeModelElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssTimeModelRefTime,
@@ -8359,7 +8359,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOfSgnTypeElement", HFILL }},
     { &hf_rrlp_SeqOfSgnTypeElement_item,
-      { "SgnTypeElement", "rrlp.SgnTypeElement",
+      { "SgnTypeElement", "rrlp.SgnTypeElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssSignalID,
@@ -8375,7 +8375,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOfDGANSSSgnElement", HFILL }},
     { &hf_rrlp_SeqOfDGANSSSgnElement_item,
-      { "DGANSSSgnElement", "rrlp.DGANSSSgnElement",
+      { "DGANSSSgnElement", "rrlp.DGANSSSgnElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_svID,
@@ -8395,7 +8395,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOfGANSSSatelliteElement", HFILL }},
     { &hf_rrlp_SeqOfGANSSSatelliteElement_item,
-      { "GANSSSatelliteElement", "rrlp.GANSSSatelliteElement",
+      { "GANSSSatelliteElement", "rrlp.GANSSSatelliteElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_svHealth,
@@ -8419,23 +8419,23 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_1", HFILL }},
     { &hf_rrlp_keplerianSet,
-      { "keplerianSet", "rrlp.keplerianSet",
+      { "keplerianSet", "rrlp.keplerianSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NavModel_KeplerianSet", HFILL }},
     { &hf_rrlp_navKeplerianSet,
-      { "navKeplerianSet", "rrlp.navKeplerianSet",
+      { "navKeplerianSet", "rrlp.navKeplerianSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NavModel_NAVKeplerianSet", HFILL }},
     { &hf_rrlp_cnavKeplerianSet,
-      { "cnavKeplerianSet", "rrlp.cnavKeplerianSet",
+      { "cnavKeplerianSet", "rrlp.cnavKeplerianSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NavModel_CNAVKeplerianSet", HFILL }},
     { &hf_rrlp_glonassECEF,
-      { "glonassECEF", "rrlp.glonassECEF",
+      { "glonassECEF", "rrlp.glonassECEF_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NavModel_GLONASSecef", HFILL }},
     { &hf_rrlp_sbasECEF,
-      { "sbasECEF", "rrlp.sbasECEF",
+      { "sbasECEF", "rrlp.sbasECEF_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NavModel_SBASecef", HFILL }},
     { &hf_rrlp_keplerToe,
@@ -8751,23 +8751,23 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOfStandardClockModelElement", HFILL }},
     { &hf_rrlp_navClockModel,
-      { "navClockModel", "rrlp.navClockModel",
+      { "navClockModel", "rrlp.navClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_cnavClockModel,
-      { "cnavClockModel", "rrlp.cnavClockModel",
+      { "cnavClockModel", "rrlp.cnavClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_glonassClockModel,
-      { "glonassClockModel", "rrlp.glonassClockModel",
+      { "glonassClockModel", "rrlp.glonassClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_sbasClockModel,
-      { "sbasClockModel", "rrlp.sbasClockModel",
+      { "sbasClockModel", "rrlp.sbasClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_SeqOfStandardClockModelElement_item,
-      { "StandardClockModelElement", "rrlp.StandardClockModelElement",
+      { "StandardClockModelElement", "rrlp.StandardClockModelElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_stanClockToc,
@@ -8895,7 +8895,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOfBadSignalElement", HFILL }},
     { &hf_rrlp_SeqOfBadSignalElement_item,
-      { "BadSignalElement", "rrlp.BadSignalElement",
+      { "BadSignalElement", "rrlp.BadSignalElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_badSVID,
@@ -8915,7 +8915,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOfGanssDataBitsElement", HFILL }},
     { &hf_rrlp_SeqOfGanssDataBitsElement_item,
-      { "GanssDataBitsElement", "rrlp.GanssDataBitsElement",
+      { "GanssDataBitsElement", "rrlp.GanssDataBitsElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssDataBitsSgnList,
@@ -8923,7 +8923,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Seq_OfGANSSDataBitsSgn", HFILL }},
     { &hf_rrlp_Seq_OfGANSSDataBitsSgn_item,
-      { "GANSSDataBitsSgnElement", "rrlp.GANSSDataBitsSgnElement",
+      { "GANSSDataBitsSgnElement", "rrlp.GANSSDataBitsSgnElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssSignalType,
@@ -8943,11 +8943,11 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOfGANSSRefMeasurementElement", HFILL }},
     { &hf_rrlp_SeqOfGANSSRefMeasurementElement_item,
-      { "GANSSRefMeasurementElement", "rrlp.GANSSRefMeasurementElement",
+      { "GANSSRefMeasurementElement", "rrlp.GANSSRefMeasurementElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_additionalDoppler,
-      { "additionalDoppler", "rrlp.additionalDoppler",
+      { "additionalDoppler", "rrlp.additionalDoppler_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AdditionalDopplerFields", HFILL }},
     { &hf_rrlp_intCodePhase_01,
@@ -8959,7 +8959,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_31", HFILL }},
     { &hf_rrlp_additionalAngle,
-      { "additionalAngle", "rrlp.additionalAngle",
+      { "additionalAngle", "rrlp.additionalAngle_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AddionalAngleFields", HFILL }},
     { &hf_rrlp_dopplerUncertainty_01,
@@ -8987,27 +8987,27 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, VALS(rrlp_GANSSAlmanacElement_vals), 0,
         NULL, HFILL }},
     { &hf_rrlp_keplerianAlmanacSet,
-      { "keplerianAlmanacSet", "rrlp.keplerianAlmanacSet",
+      { "keplerianAlmanacSet", "rrlp.keplerianAlmanacSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Almanac_KeplerianSet", HFILL }},
     { &hf_rrlp_keplerianNAVAlmanac,
-      { "keplerianNAVAlmanac", "rrlp.keplerianNAVAlmanac",
+      { "keplerianNAVAlmanac", "rrlp.keplerianNAVAlmanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Almanac_NAVKeplerianSet", HFILL }},
     { &hf_rrlp_keplerianReducedAlmanac,
-      { "keplerianReducedAlmanac", "rrlp.keplerianReducedAlmanac",
+      { "keplerianReducedAlmanac", "rrlp.keplerianReducedAlmanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Almanac_ReducedKeplerianSet", HFILL }},
     { &hf_rrlp_keplerianMidiAlmanac,
-      { "keplerianMidiAlmanac", "rrlp.keplerianMidiAlmanac",
+      { "keplerianMidiAlmanac", "rrlp.keplerianMidiAlmanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Almanac_MidiAlmanacSet", HFILL }},
     { &hf_rrlp_keplerianGLONASS,
-      { "keplerianGLONASS", "rrlp.keplerianGLONASS",
+      { "keplerianGLONASS", "rrlp.keplerianGLONASS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Almanac_GlonassAlmanacSet", HFILL }},
     { &hf_rrlp_ecefSBASAlmanac,
-      { "ecefSBASAlmanac", "rrlp.ecefSBASAlmanac",
+      { "ecefSBASAlmanac", "rrlp.ecefSBASAlmanac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Almanac_ECEFsbasAlmanacSet", HFILL }},
     { &hf_rrlp_kepAlmanacE,
@@ -9283,7 +9283,7 @@ void proto_register_rrlp(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M128_127", HFILL }},
     { &hf_rrlp_ganssEphemerisHeader,
-      { "ganssEphemerisHeader", "rrlp.ganssEphemerisHeader",
+      { "ganssEphemerisHeader", "rrlp.ganssEphemerisHeader_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSSEphemerisExtensionHeader", HFILL }},
     { &hf_rrlp_ganssReferenceSet,
@@ -9295,7 +9295,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GANSSEphemerisDeltaMatrix", HFILL }},
     { &hf_rrlp_timeAtEstimation,
-      { "timeAtEstimation", "rrlp.timeAtEstimation",
+      { "timeAtEstimation", "rrlp.timeAtEstimation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSSEphemerisExtensionTime", HFILL }},
     { &hf_rrlp_validityPeriod,
@@ -9323,19 +9323,19 @@ void proto_register_rrlp(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_SeqOfGANSSRefOrbit_item,
-      { "GANSSReferenceOrbit", "rrlp.GANSSReferenceOrbit",
+      { "GANSSReferenceOrbit", "rrlp.GANSSReferenceOrbit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssOrbitModel_01,
-      { "ganssOrbitModel", "rrlp.ganssOrbitModel",
+      { "ganssOrbitModel", "rrlp.ganssOrbitModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReferenceNavModel", HFILL }},
     { &hf_rrlp_GANSSEphemerisDeltaMatrix_item,
-      { "GANSSEphemerisDeltaEpoch", "rrlp.GANSSEphemerisDeltaEpoch",
+      { "GANSSEphemerisDeltaEpoch", "rrlp.GANSSEphemerisDeltaEpoch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssDeltaEpochHeader,
-      { "ganssDeltaEpochHeader", "rrlp.ganssDeltaEpochHeader",
+      { "ganssDeltaEpochHeader", "rrlp.ganssDeltaEpochHeader_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssDeltaElementList,
@@ -9343,11 +9343,11 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ephemerisDeltaSizes,
-      { "ephemerisDeltaSizes", "rrlp.ephemerisDeltaSizes",
+      { "ephemerisDeltaSizes", "rrlp.ephemerisDeltaSizes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSSEphemerisDeltaBitSizes", HFILL }},
     { &hf_rrlp_ephemerisDeltaScales,
-      { "ephemerisDeltaScales", "rrlp.ephemerisDeltaScales",
+      { "ephemerisDeltaScales", "rrlp.ephemerisDeltaScales_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSSEphemerisDeltaScales", HFILL }},
     { &hf_rrlp_GANSSDeltaElementList_item,
@@ -9491,15 +9491,15 @@ void proto_register_rrlp(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M16_15", HFILL }},
     { &hf_rrlp_ganssBeginTime,
-      { "ganssBeginTime", "rrlp.ganssBeginTime",
+      { "ganssBeginTime", "rrlp.ganssBeginTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSSEphemerisExtensionTime", HFILL }},
     { &hf_rrlp_ganssEndTime,
-      { "ganssEndTime", "rrlp.ganssEndTime",
+      { "ganssEndTime", "rrlp.ganssEndTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSSEphemerisExtensionTime", HFILL }},
     { &hf_rrlp_ganssSatEventsInfo,
-      { "ganssSatEventsInfo", "rrlp.ganssSatEventsInfo",
+      { "ganssSatEventsInfo", "rrlp.ganssSatEventsInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_eventOccured,
@@ -9511,15 +9511,15 @@ void proto_register_rrlp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_64", HFILL }},
     { &hf_rrlp_utcModel2,
-      { "utcModel2", "rrlp.utcModel2",
+      { "utcModel2", "rrlp.utcModel2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTCmodelSet2", HFILL }},
     { &hf_rrlp_utcModel3,
-      { "utcModel3", "rrlp.utcModel3",
+      { "utcModel3", "rrlp.utcModel3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTCmodelSet3", HFILL }},
     { &hf_rrlp_utcModel4,
-      { "utcModel4", "rrlp.utcModel4",
+      { "utcModel4", "rrlp.utcModel4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UTCmodelSet4", HFILL }},
     { &hf_rrlp_utcA0_01,
@@ -9587,7 +9587,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GANSS_ID3", HFILL }},
     { &hf_rrlp_GANSS_ID1_item,
-      { "GANSS-ID1-element", "rrlp.GANSS_ID1_element",
+      { "GANSS-ID1-element", "rrlp.GANSS_ID1_element_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_signalsAvailable,
@@ -9595,7 +9595,7 @@ void proto_register_rrlp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "GANSSSignals", HFILL }},
     { &hf_rrlp_GANSS_ID3_item,
-      { "GANSS-ID3-element", "rrlp.GANSS_ID3_element",
+      { "GANSS-ID3-element", "rrlp.GANSS_ID3_element_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_channelNumber,
@@ -9603,7 +9603,7 @@ void proto_register_rrlp(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M7_13", HFILL }},
     { &hf_rrlp_GANSSDiffCorrectionsValidityPeriod_item,
-      { "DGANSSExtensionSgnTypeElement", "rrlp.DGANSSExtensionSgnTypeElement",
+      { "DGANSSExtensionSgnTypeElement", "rrlp.DGANSSExtensionSgnTypeElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_dganssExtensionSgnList,
@@ -9611,7 +9611,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOfDGANSSExtensionSgnElement", HFILL }},
     { &hf_rrlp_SeqOfDGANSSExtensionSgnElement_item,
-      { "DGANSSExtensionSgnElement", "rrlp.DGANSSExtensionSgnElement",
+      { "DGANSSExtensionSgnElement", "rrlp.DGANSSExtensionSgnElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_udreGrowthRate,
@@ -9623,15 +9623,15 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_7", HFILL }},
     { &hf_rrlp_add_GPS_controlHeader,
-      { "add-GPS-controlHeader", "rrlp.add_GPS_controlHeader",
+      { "add-GPS-controlHeader", "rrlp.add_GPS_controlHeader_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_gpsEphemerisExtension,
-      { "gpsEphemerisExtension", "rrlp.gpsEphemerisExtension",
+      { "gpsEphemerisExtension", "rrlp.gpsEphemerisExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_gpsEphemerisExtensionCheck,
-      { "gpsEphemerisExtensionCheck", "rrlp.gpsEphemerisExtensionCheck",
+      { "gpsEphemerisExtensionCheck", "rrlp.gpsEphemerisExtensionCheck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_dgpsCorrectionsValidityPeriod,
@@ -9655,7 +9655,7 @@ void proto_register_rrlp(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M128_127", HFILL }},
     { &hf_rrlp_gpsEphemerisHeader,
-      { "gpsEphemerisHeader", "rrlp.gpsEphemerisHeader",
+      { "gpsEphemerisHeader", "rrlp.gpsEphemerisHeader_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GPSEphemerisExtensionHeader", HFILL }},
     { &hf_rrlp_gpsReferenceSet,
@@ -9667,27 +9667,27 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_timeofEstimation,
-      { "timeofEstimation", "rrlp.timeofEstimation",
+      { "timeofEstimation", "rrlp.timeofEstimation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GPSEphemerisExtensionTime", HFILL }},
     { &hf_rrlp_SeqOfGPSRefOrbit_item,
-      { "GPSReferenceOrbit", "rrlp.GPSReferenceOrbit",
+      { "GPSReferenceOrbit", "rrlp.GPSReferenceOrbit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_gpsOrbitModel,
-      { "gpsOrbitModel", "rrlp.gpsOrbitModel",
+      { "gpsOrbitModel", "rrlp.gpsOrbitModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReferenceNavModel", HFILL }},
     { &hf_rrlp_gpsClockModel,
-      { "gpsClockModel", "rrlp.gpsClockModel",
+      { "gpsClockModel", "rrlp.gpsClockModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_GPSEphemerisDeltaMatrix_item,
-      { "GPSEphemerisDeltaEpoch", "rrlp.GPSEphemerisDeltaEpoch",
+      { "GPSEphemerisDeltaEpoch", "rrlp.GPSEphemerisDeltaEpoch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_gpsDeltaEpochHeader,
-      { "gpsDeltaEpochHeader", "rrlp.gpsDeltaEpochHeader",
+      { "gpsDeltaEpochHeader", "rrlp.gpsDeltaEpochHeader_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_gpsDeltaElementList,
@@ -9695,11 +9695,11 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ephemerisDeltaSizes_01,
-      { "ephemerisDeltaSizes", "rrlp.ephemerisDeltaSizes",
+      { "ephemerisDeltaSizes", "rrlp.ephemerisDeltaSizes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GPSEphemerisDeltaBitSizes", HFILL }},
     { &hf_rrlp_ephemerisDeltaScales_01,
-      { "ephemerisDeltaScales", "rrlp.ephemerisDeltaScales",
+      { "ephemerisDeltaScales", "rrlp.ephemerisDeltaScales_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GPSEphemerisDeltaScales", HFILL }},
     { &hf_rrlp_GPSDeltaElementList_item,
@@ -9715,15 +9715,15 @@ void proto_register_rrlp(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M16_15", HFILL }},
     { &hf_rrlp_gpsBeginTime,
-      { "gpsBeginTime", "rrlp.gpsBeginTime",
+      { "gpsBeginTime", "rrlp.gpsBeginTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GPSEphemerisExtensionTime", HFILL }},
     { &hf_rrlp_gpsEndTime,
-      { "gpsEndTime", "rrlp.gpsEndTime",
+      { "gpsEndTime", "rrlp.gpsEndTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GPSEphemerisExtensionTime", HFILL }},
     { &hf_rrlp_gpsSatEventsInfo,
-      { "gpsSatEventsInfo", "rrlp.gpsSatEventsInfo",
+      { "gpsSatEventsInfo", "rrlp.gpsSatEventsInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_eventOccured_01,
@@ -9735,7 +9735,7 @@ void proto_register_rrlp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_32", HFILL }},
     { &hf_rrlp_DGPSCorrectionsValidityPeriod_item,
-      { "DGPSExtensionSatElement", "rrlp.DGPSExtensionSatElement",
+      { "DGPSExtensionSatElement", "rrlp.DGPSExtensionSatElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_velEstimate,
@@ -9743,15 +9743,15 @@ void proto_register_rrlp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "VelocityEstimate", HFILL }},
     { &hf_rrlp_ganssLocationInfo,
-      { "ganssLocationInfo", "rrlp.ganssLocationInfo",
+      { "ganssLocationInfo", "rrlp.ganssLocationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssMeasureInfo,
-      { "ganssMeasureInfo", "rrlp.ganssMeasureInfo",
+      { "ganssMeasureInfo", "rrlp.ganssMeasureInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_referenceFrame,
-      { "referenceFrame", "rrlp.referenceFrame",
+      { "referenceFrame", "rrlp.referenceFrame_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssTODm,
@@ -9783,7 +9783,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOfGANSS_MsrSetElement", HFILL }},
     { &hf_rrlp_SeqOfGANSS_MsrSetElement_item,
-      { "GANSS-MsrSetElement", "rrlp.GANSS_MsrSetElement",
+      { "GANSS-MsrSetElement", "rrlp.GANSS_MsrSetElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_deltaGANSSTOD,
@@ -9795,7 +9795,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOfGANSS_MsrElement", HFILL }},
     { &hf_rrlp_SeqOfGANSS_MsrElement_item,
-      { "GANSS-MsrElement", "rrlp.GANSS_MsrElement",
+      { "GANSS-MsrElement", "rrlp.GANSS_MsrElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganss_SgnTypeList,
@@ -9803,7 +9803,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOfGANSS_SgnTypeElement", HFILL }},
     { &hf_rrlp_SeqOfGANSS_SgnTypeElement_item,
-      { "GANSS-SgnTypeElement", "rrlp.GANSS_SgnTypeElement",
+      { "GANSS-SgnTypeElement", "rrlp.GANSS_SgnTypeElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssCodePhaseAmbiguity,
@@ -9815,7 +9815,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SeqOfGANSS_SgnElement", HFILL }},
     { &hf_rrlp_SeqOfGANSS_SgnElement_item,
-      { "GANSS-SgnElement", "rrlp.GANSS_SgnElement",
+      { "GANSS-SgnElement", "rrlp.GANSS_SgnElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_mpathDet,
@@ -9851,7 +9851,7 @@ void proto_register_rrlp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_GANSSPositionMethods_item,
-      { "GANSSPositionMethod", "rrlp.GANSSPositionMethod",
+      { "GANSSPositionMethod", "rrlp.GANSSPositionMethod_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_gANSSPositioningMethodTypes,
@@ -9871,7 +9871,7 @@ void proto_register_rrlp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_gANSSAssistanceSet,
-      { "gANSSAssistanceSet", "rrlp.gANSSAssistanceSet",
+      { "gANSSAssistanceSet", "rrlp.gANSSAssistanceSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_gANSSAdditionalAssistanceChoices,
@@ -9887,7 +9887,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_SpecificGANSSAssistance_item,
-      { "GANSSAssistanceForOneGANSS", "rrlp.GANSSAssistanceForOneGANSS",
+      { "GANSSAssistanceForOneGANSS", "rrlp.GANSSAssistanceForOneGANSS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_gANSSAssistance,
@@ -9895,7 +9895,7 @@ void proto_register_rrlp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_GANSSAdditionalAssistanceChoices_item,
-      { "GANSSAdditionalAssistanceChoicesForOneGANSS", "rrlp.GANSSAdditionalAssistanceChoicesForOneGANSS",
+      { "GANSSAdditionalAssistanceChoicesForOneGANSS", "rrlp.GANSSAdditionalAssistanceChoicesForOneGANSS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rrlp_ganssClockModelChoice,
diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c
index 945de0117a..b16dd08406 100644
--- a/epan/dissectors/packet-rtse.c
+++ b/epan/dissectors/packet-rtse.c
@@ -906,15 +906,15 @@ void proto_register_rtse(void) {
 /*--- Included file: packet-rtse-hfarr.c ---*/
 #line 1 "../../asn1/rtse/packet-rtse-hfarr.c"
     { &hf_rtse_rtorq_apdu,
-      { "rtorq-apdu", "rtse.rtorq_apdu",
+      { "rtorq-apdu", "rtse.rtorq_apdu_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RTORQapdu", HFILL }},
     { &hf_rtse_rtoac_apdu,
-      { "rtoac-apdu", "rtse.rtoac_apdu",
+      { "rtoac-apdu", "rtse.rtoac_apdu_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RTOACapdu", HFILL }},
     { &hf_rtse_rtorj_apdu,
-      { "rtorj-apdu", "rtse.rtorj_apdu",
+      { "rtorj-apdu", "rtse.rtorj_apdu_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RTORJapdu", HFILL }},
     { &hf_rtse_rttp_apdu,
@@ -926,7 +926,7 @@ void proto_register_rtse(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "RTTRapdu", HFILL }},
     { &hf_rtse_rtab_apdu,
-      { "rtab-apdu", "rtse.rtab_apdu",
+      { "rtab-apdu", "rtse.rtab_apdu_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RTABapdu", HFILL }},
     { &hf_rtse_checkpointSize,
@@ -958,7 +958,7 @@ void proto_register_rtse(void) {
         FT_INT32, BASE_DEC, VALS(rtse_RefuseReason_vals), 0,
         NULL, HFILL }},
     { &hf_rtse_userDataRJ,
-      { "userDataRJ", "rtse.userDataRJ",
+      { "userDataRJ", "rtse.userDataRJ_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rtse_abortReason,
@@ -970,15 +970,15 @@ void proto_register_rtse(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_rtse_userdataAB,
-      { "userdataAB", "rtse.userdataAB",
+      { "userdataAB", "rtse.userdataAB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rtse_open,
-      { "open", "rtse.open",
+      { "open", "rtse.open_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rtse_recover,
-      { "recover", "rtse.recover",
+      { "recover", "rtse.recover_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SessionConnectionIdentifier", HFILL }},
     { &hf_rtse_callingSSuserReference,
diff --git a/epan/dissectors/packet-rua.c b/epan/dissectors/packet-rua.c
index 38ccf8ef7b..8602178b0f 100644
--- a/epan/dissectors/packet-rua.c
+++ b/epan/dissectors/packet-rua.c
@@ -1430,7 +1430,7 @@ module_t *rua_module;
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_IntraDomainNasNodeSelector_PDU,
-      { "IntraDomainNasNodeSelector", "rua.IntraDomainNasNodeSelector",
+      { "IntraDomainNasNodeSelector", "rua.IntraDomainNasNodeSelector_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_RANAP_Message_PDU,
@@ -1442,31 +1442,31 @@ module_t *rua_module;
         FT_UINT32, BASE_DEC, VALS(rua_Cause_vals), 0,
         NULL, HFILL }},
     { &hf_rua_CriticalityDiagnostics_PDU,
-      { "CriticalityDiagnostics", "rua.CriticalityDiagnostics",
+      { "CriticalityDiagnostics", "rua.CriticalityDiagnostics_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_Connect_PDU,
-      { "Connect", "rua.Connect",
+      { "Connect", "rua.Connect_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_DirectTransfer_PDU,
-      { "DirectTransfer", "rua.DirectTransfer",
+      { "DirectTransfer", "rua.DirectTransfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_Disconnect_PDU,
-      { "Disconnect", "rua.Disconnect",
+      { "Disconnect", "rua.Disconnect_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_ConnectionlessTransfer_PDU,
-      { "ConnectionlessTransfer", "rua.ConnectionlessTransfer",
+      { "ConnectionlessTransfer", "rua.ConnectionlessTransfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_ErrorIndication_PDU,
-      { "ErrorIndication", "rua.ErrorIndication",
+      { "ErrorIndication", "rua.ErrorIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_PrivateMessage_PDU,
-      { "PrivateMessage", "rua.PrivateMessage",
+      { "PrivateMessage", "rua.PrivateMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_RUA_PDU_PDU,
@@ -1482,7 +1482,7 @@ module_t *rua_module;
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_rua_ProtocolIE_Container_item,
-      { "ProtocolIE-Field", "rua.ProtocolIE_Field",
+      { "ProtocolIE-Field", "rua.ProtocolIE_Field_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_protocol_ie_field_id,
@@ -1494,11 +1494,11 @@ module_t *rua_module;
         FT_UINT32, BASE_DEC, VALS(rua_Criticality_vals), 0,
         NULL, HFILL }},
     { &hf_rua_ie_field_value,
-      { "value", "rua.value",
+      { "value", "rua.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProtocolIE_Field_value", HFILL }},
     { &hf_rua_ProtocolExtensionContainer_item,
-      { "ProtocolExtensionField", "rua.ProtocolExtensionField",
+      { "ProtocolExtensionField", "rua.ProtocolExtensionField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_id,
@@ -1506,11 +1506,11 @@ module_t *rua_module;
         FT_UINT32, BASE_DEC, VALS(rua_ProtocolIE_ID_vals), 0,
         "ProtocolIE_ID", HFILL }},
     { &hf_rua_extensionValue,
-      { "extensionValue", "rua.extensionValue",
+      { "extensionValue", "rua.extensionValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_PrivateIE_Container_item,
-      { "PrivateIE-Field", "rua.PrivateIE_Field",
+      { "PrivateIE-Field", "rua.PrivateIE_Field_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_private_ie_field_id,
@@ -1518,7 +1518,7 @@ module_t *rua_module;
         FT_UINT32, BASE_DEC, VALS(rua_PrivateIE_ID_vals), 0,
         "PrivateIE_ID", HFILL }},
     { &hf_rua_private_value,
-      { "value", "rua.value",
+      { "value", "rua.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrivateIE_Field_value", HFILL }},
     { &hf_rua_version,
@@ -1526,7 +1526,7 @@ module_t *rua_module;
         FT_UINT32, BASE_DEC, VALS(rua_T_version_vals), 0,
         NULL, HFILL }},
     { &hf_rua_release99,
-      { "release99", "rua.release99",
+      { "release99", "rua.release99_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_cn_Type,
@@ -1534,7 +1534,7 @@ module_t *rua_module;
         FT_UINT32, BASE_DEC, VALS(rua_T_cn_Type_vals), 0,
         NULL, HFILL }},
     { &hf_rua_gsm_Map_IDNNS,
-      { "gsm-Map-IDNNS", "rua.gsm_Map_IDNNS",
+      { "gsm-Map-IDNNS", "rua.gsm_Map_IDNNS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_ansi_41_IDNNS,
@@ -1542,7 +1542,7 @@ module_t *rua_module;
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_later,
-      { "later", "rua.later",
+      { "later", "rua.later_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_futurecoding,
@@ -1554,7 +1554,7 @@ module_t *rua_module;
         FT_UINT32, BASE_DEC, VALS(rua_T_routingbasis_vals), 0,
         NULL, HFILL }},
     { &hf_rua_localPTMSI,
-      { "localPTMSI", "rua.localPTMSI",
+      { "localPTMSI", "rua.localPTMSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_routingparameter,
@@ -1562,31 +1562,31 @@ module_t *rua_module;
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_tMSIofsamePLMN,
-      { "tMSIofsamePLMN", "rua.tMSIofsamePLMN",
+      { "tMSIofsamePLMN", "rua.tMSIofsamePLMN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_tMSIofdifferentPLMN,
-      { "tMSIofdifferentPLMN", "rua.tMSIofdifferentPLMN",
+      { "tMSIofdifferentPLMN", "rua.tMSIofdifferentPLMN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_iMSIresponsetopaging,
-      { "iMSIresponsetopaging", "rua.iMSIresponsetopaging",
+      { "iMSIresponsetopaging", "rua.iMSIresponsetopaging_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_iMSIcauseUEinitiatedEvent,
-      { "iMSIcauseUEinitiatedEvent", "rua.iMSIcauseUEinitiatedEvent",
+      { "iMSIcauseUEinitiatedEvent", "rua.iMSIcauseUEinitiatedEvent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_iMEI,
-      { "iMEI", "rua.iMEI",
+      { "iMEI", "rua.iMEI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_spare2,
-      { "spare2", "rua.spare2",
+      { "spare2", "rua.spare2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_spare1,
-      { "spare1", "rua.spare1",
+      { "spare1", "rua.spare1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_dummy,
@@ -1630,7 +1630,7 @@ module_t *rua_module;
         FT_UINT32, BASE_DEC, NULL, 0,
         "ProtocolExtensionContainer", HFILL }},
     { &hf_rua_CriticalityDiagnostics_IE_List_item,
-      { "CriticalityDiagnostics-IE-List item", "rua.CriticalityDiagnostics_IE_List_item",
+      { "CriticalityDiagnostics-IE-List item", "rua.CriticalityDiagnostics_IE_List_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_iECriticality,
@@ -1658,27 +1658,27 @@ module_t *rua_module;
         FT_UINT32, BASE_DEC, NULL, 0,
         "PrivateIE_Container", HFILL }},
     { &hf_rua_initiatingMessage,
-      { "initiatingMessage", "rua.initiatingMessage",
+      { "initiatingMessage", "rua.initiatingMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_successfulOutcome,
-      { "successfulOutcome", "rua.successfulOutcome",
+      { "successfulOutcome", "rua.successfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_unsuccessfulOutcome,
-      { "unsuccessfulOutcome", "rua.unsuccessfulOutcome",
+      { "unsuccessfulOutcome", "rua.unsuccessfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_rua_initiatingMessagevalue,
-      { "value", "rua.value",
+      { "value", "rua.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InitiatingMessage_value", HFILL }},
     { &hf_rua_successfulOutcome_value,
-      { "value", "rua.value",
+      { "value", "rua.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SuccessfulOutcome_value", HFILL }},
     { &hf_rua_unsuccessfulOutcome_value,
-      { "value", "rua.value",
+      { "value", "rua.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UnsuccessfulOutcome_value", HFILL }},
 
diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c
index 4aa717dc4b..9515a83756 100644
--- a/epan/dissectors/packet-s1ap.c
+++ b/epan/dissectors/packet-s1ap.c
@@ -9481,7 +9481,7 @@ void proto_register_s1ap(void) {
 /*--- Included file: packet-s1ap-hfarr.c ---*/
 #line 1 "../../asn1/s1ap/packet-s1ap-hfarr.c"
     { &hf_s1ap_Bearers_SubjectToStatusTransfer_Item_PDU,
-      { "Bearers-SubjectToStatusTransfer-Item", "s1ap.Bearers_SubjectToStatusTransfer_Item",
+      { "Bearers-SubjectToStatusTransfer-Item", "s1ap.Bearers_SubjectToStatusTransfer_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_BroadcastCancelledAreaList_PDU,
@@ -9521,7 +9521,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_Cdma2000HORequiredIndication_vals), 0,
         NULL, HFILL }},
     { &hf_s1ap_Cdma2000OneXSRVCCInfo_PDU,
-      { "Cdma2000OneXSRVCCInfo", "s1ap.Cdma2000OneXSRVCCInfo",
+      { "Cdma2000OneXSRVCCInfo", "s1ap.Cdma2000OneXSRVCCInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_Cdma2000OneXRAND_PDU,
@@ -9557,7 +9557,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_CSGMembershipStatus_vals), 0,
         NULL, HFILL }},
     { &hf_s1ap_CriticalityDiagnostics_PDU,
-      { "CriticalityDiagnostics", "s1ap.CriticalityDiagnostics",
+      { "CriticalityDiagnostics", "s1ap.CriticalityDiagnostics_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_DataCodingScheme_PDU,
@@ -9573,7 +9573,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_Data_Forwarding_Not_Possible_vals), 0,
         NULL, HFILL }},
     { &hf_s1ap_s1ap_Global_ENB_ID_PDU,
-      { "Global-ENB-ID", "s1ap.Global_ENB_ID",
+      { "Global-ENB-ID", "s1ap.Global_ENB_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_GUMMEIList_PDU,
@@ -9581,7 +9581,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_s1ap_ENB_StatusTransfer_TransparentContainer_PDU,
-      { "ENB-StatusTransfer-TransparentContainer", "s1ap.ENB_StatusTransfer_TransparentContainer",
+      { "ENB-StatusTransfer-TransparentContainer", "s1ap.ENB_StatusTransfer_TransparentContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_ENB_UE_S1AP_ID_PDU,
@@ -9593,7 +9593,7 @@ void proto_register_s1ap(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABInformationListItem_PDU,
-      { "E-RABInformationListItem", "s1ap.E_RABInformationListItem",
+      { "E-RABInformationListItem", "s1ap.E_RABInformationListItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABList_PDU,
@@ -9601,11 +9601,11 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABItem_PDU,
-      { "E-RABItem", "s1ap.E_RABItem",
+      { "E-RABItem", "s1ap.E_RABItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_EUTRAN_CGI_PDU,
-      { "EUTRAN-CGI", "s1ap.EUTRAN_CGI",
+      { "EUTRAN-CGI", "s1ap.EUTRAN_CGI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_EUTRANRoundTripDelayEstimationInfo_PDU,
@@ -9617,7 +9617,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_GUMMEI_PDU,
-      { "GUMMEI", "s1ap.GUMMEI",
+      { "GUMMEI", "s1ap.GUMMEI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_GWContextReleaseIndication_PDU,
@@ -9625,7 +9625,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_GWContextReleaseIndication_vals), 0,
         NULL, HFILL }},
     { &hf_s1ap_HandoverRestrictionList_PDU,
-      { "HandoverRestrictionList", "s1ap.HandoverRestrictionList",
+      { "HandoverRestrictionList", "s1ap.HandoverRestrictionList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_HandoverType_PDU,
@@ -9633,7 +9633,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_HandoverType_vals), 0,
         NULL, HFILL }},
     { &hf_s1ap_LAI_PDU,
-      { "LAI", "s1ap.LAI",
+      { "LAI", "s1ap.LAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_LPPa_PDU_PDU,
@@ -9641,7 +9641,7 @@ void proto_register_s1ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_MDT_Configuration_PDU,
-      { "MDT-Configuration", "s1ap.MDT_Configuration",
+      { "MDT-Configuration", "s1ap.MDT_Configuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_ManagementBasedMDTAllowed_PDU,
@@ -9713,7 +9713,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_RelayNode_Indicator_vals), 0,
         NULL, HFILL }},
     { &hf_s1ap_RequestType_PDU,
-      { "RequestType", "s1ap.RequestType",
+      { "RequestType", "s1ap.RequestType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_RepetitionPeriod_PDU,
@@ -9733,7 +9733,7 @@ void proto_register_s1ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_SecurityContext_PDU,
-      { "SecurityContext", "s1ap.SecurityContext",
+      { "SecurityContext", "s1ap.SecurityContext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_SerialNumber_PDU,
@@ -9741,7 +9741,7 @@ void proto_register_s1ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_SONConfigurationTransfer_PDU,
-      { "SONConfigurationTransfer", "s1ap.SONConfigurationTransfer",
+      { "SONConfigurationTransfer", "s1ap.SONConfigurationTransfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_Source_ToTarget_TransparentContainer_PDU,
@@ -9757,7 +9757,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_SRVCCHOIndication_vals), 0,
         NULL, HFILL }},
     { &hf_s1ap_SourceeNB_ToTargeteNB_TransparentContainer_PDU,
-      { "SourceeNB-ToTargeteNB-TransparentContainer", "s1ap.SourceeNB_ToTargeteNB_TransparentContainer",
+      { "SourceeNB-ToTargeteNB-TransparentContainer", "s1ap.SourceeNB_ToTargeteNB_TransparentContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_ServedGUMMEIs_PDU,
@@ -9777,15 +9777,15 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_TimeSynchronizationInfo_PDU,
-      { "TimeSynchronizationInfo", "s1ap.TimeSynchronizationInfo",
+      { "TimeSynchronizationInfo", "s1ap.TimeSynchronizationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_S_TMSI_PDU,
-      { "S-TMSI", "s1ap.S_TMSI",
+      { "S-TMSI", "s1ap.S_TMSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_TAI_PDU,
-      { "TAI", "s1ap.TAI",
+      { "TAI", "s1ap.TAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_TargetID_PDU,
@@ -9793,7 +9793,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_TargetID_vals), 0,
         NULL, HFILL }},
     { &hf_s1ap_TargeteNB_ToSourceeNB_TransparentContainer_PDU,
-      { "TargeteNB-ToSourceeNB-TransparentContainer", "s1ap.TargeteNB_ToSourceeNB_TransparentContainer",
+      { "TargeteNB-ToSourceeNB-TransparentContainer", "s1ap.TargeteNB_ToSourceeNB_TransparentContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_Target_ToSource_TransparentContainer_PDU,
@@ -9809,7 +9809,7 @@ void proto_register_s1ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_TraceActivation_PDU,
-      { "TraceActivation", "s1ap.TraceActivation",
+      { "TraceActivation", "s1ap.TraceActivation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_TrafficLoadReductionIndication_PDU,
@@ -9817,7 +9817,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_UEAggregateMaximumBitrate_PDU,
-      { "UEAggregateMaximumBitrate", "s1ap.UEAggregateMaximumBitrate",
+      { "UEAggregateMaximumBitrate", "s1ap.UEAggregateMaximumBitrate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_UE_S1AP_IDs_PDU,
@@ -9825,7 +9825,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_UE_S1AP_IDs_vals), 0,
         NULL, HFILL }},
     { &hf_s1ap_UE_associatedLogicalS1_ConnectionItem_PDU,
-      { "UE-associatedLogicalS1-ConnectionItem", "s1ap.UE_associatedLogicalS1_ConnectionItem",
+      { "UE-associatedLogicalS1-ConnectionItem", "s1ap.UE_associatedLogicalS1_ConnectionItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_UEIdentityIndexValue_PDU,
@@ -9841,7 +9841,7 @@ void proto_register_s1ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_UESecurityCapabilities_PDU,
-      { "UESecurityCapabilities", "s1ap.UESecurityCapabilities",
+      { "UESecurityCapabilities", "s1ap.UESecurityCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_WarningAreaList_PDU,
@@ -9861,7 +9861,7 @@ void proto_register_s1ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_X2TNLConfigurationInfo_PDU,
-      { "X2TNLConfigurationInfo", "s1ap.X2TNLConfigurationInfo",
+      { "X2TNLConfigurationInfo", "s1ap.X2TNLConfigurationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_ENBX2ExtTLAs_PDU,
@@ -9869,11 +9869,11 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_HandoverRequired_PDU,
-      { "HandoverRequired", "s1ap.HandoverRequired",
+      { "HandoverRequired", "s1ap.HandoverRequired_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_HandoverCommand_PDU,
-      { "HandoverCommand", "s1ap.HandoverCommand",
+      { "HandoverCommand", "s1ap.HandoverCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABSubjecttoDataForwardingList_PDU,
@@ -9881,15 +9881,15 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABDataForwardingItem_PDU,
-      { "E-RABDataForwardingItem", "s1ap.E_RABDataForwardingItem",
+      { "E-RABDataForwardingItem", "s1ap.E_RABDataForwardingItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_HandoverPreparationFailure_PDU,
-      { "HandoverPreparationFailure", "s1ap.HandoverPreparationFailure",
+      { "HandoverPreparationFailure", "s1ap.HandoverPreparationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_HandoverRequest_PDU,
-      { "HandoverRequest", "s1ap.HandoverRequest",
+      { "HandoverRequest", "s1ap.HandoverRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABToBeSetupListHOReq_PDU,
@@ -9897,11 +9897,11 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABToBeSetupItemHOReq_PDU,
-      { "E-RABToBeSetupItemHOReq", "s1ap.E_RABToBeSetupItemHOReq",
+      { "E-RABToBeSetupItemHOReq", "s1ap.E_RABToBeSetupItemHOReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_HandoverRequestAcknowledge_PDU,
-      { "HandoverRequestAcknowledge", "s1ap.HandoverRequestAcknowledge",
+      { "HandoverRequestAcknowledge", "s1ap.HandoverRequestAcknowledge_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABAdmittedList_PDU,
@@ -9909,7 +9909,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABAdmittedItem_PDU,
-      { "E-RABAdmittedItem", "s1ap.E_RABAdmittedItem",
+      { "E-RABAdmittedItem", "s1ap.E_RABAdmittedItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABFailedtoSetupListHOReqAck_PDU,
@@ -9917,19 +9917,19 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABFailedToSetupItemHOReqAck_PDU,
-      { "E-RABFailedToSetupItemHOReqAck", "s1ap.E_RABFailedToSetupItemHOReqAck",
+      { "E-RABFailedToSetupItemHOReqAck", "s1ap.E_RABFailedToSetupItemHOReqAck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_HandoverFailure_PDU,
-      { "HandoverFailure", "s1ap.HandoverFailure",
+      { "HandoverFailure", "s1ap.HandoverFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_HandoverNotify_PDU,
-      { "HandoverNotify", "s1ap.HandoverNotify",
+      { "HandoverNotify", "s1ap.HandoverNotify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_PathSwitchRequest_PDU,
-      { "PathSwitchRequest", "s1ap.PathSwitchRequest",
+      { "PathSwitchRequest", "s1ap.PathSwitchRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABToBeSwitchedDLList_PDU,
@@ -9937,11 +9937,11 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABToBeSwitchedDLItem_PDU,
-      { "E-RABToBeSwitchedDLItem", "s1ap.E_RABToBeSwitchedDLItem",
+      { "E-RABToBeSwitchedDLItem", "s1ap.E_RABToBeSwitchedDLItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_PathSwitchRequestAcknowledge_PDU,
-      { "PathSwitchRequestAcknowledge", "s1ap.PathSwitchRequestAcknowledge",
+      { "PathSwitchRequestAcknowledge", "s1ap.PathSwitchRequestAcknowledge_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABToBeSwitchedULList_PDU,
@@ -9949,23 +9949,23 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABToBeSwitchedULItem_PDU,
-      { "E-RABToBeSwitchedULItem", "s1ap.E_RABToBeSwitchedULItem",
+      { "E-RABToBeSwitchedULItem", "s1ap.E_RABToBeSwitchedULItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_PathSwitchRequestFailure_PDU,
-      { "PathSwitchRequestFailure", "s1ap.PathSwitchRequestFailure",
+      { "PathSwitchRequestFailure", "s1ap.PathSwitchRequestFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_HandoverCancel_PDU,
-      { "HandoverCancel", "s1ap.HandoverCancel",
+      { "HandoverCancel", "s1ap.HandoverCancel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_HandoverCancelAcknowledge_PDU,
-      { "HandoverCancelAcknowledge", "s1ap.HandoverCancelAcknowledge",
+      { "HandoverCancelAcknowledge", "s1ap.HandoverCancelAcknowledge_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABSetupRequest_PDU,
-      { "E-RABSetupRequest", "s1ap.E_RABSetupRequest",
+      { "E-RABSetupRequest", "s1ap.E_RABSetupRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABToBeSetupListBearerSUReq_PDU,
@@ -9973,11 +9973,11 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABToBeSetupItemBearerSUReq_PDU,
-      { "E-RABToBeSetupItemBearerSUReq", "s1ap.E_RABToBeSetupItemBearerSUReq",
+      { "E-RABToBeSetupItemBearerSUReq", "s1ap.E_RABToBeSetupItemBearerSUReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABSetupResponse_PDU,
-      { "E-RABSetupResponse", "s1ap.E_RABSetupResponse",
+      { "E-RABSetupResponse", "s1ap.E_RABSetupResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABSetupListBearerSURes_PDU,
@@ -9985,11 +9985,11 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABSetupItemBearerSURes_PDU,
-      { "E-RABSetupItemBearerSURes", "s1ap.E_RABSetupItemBearerSURes",
+      { "E-RABSetupItemBearerSURes", "s1ap.E_RABSetupItemBearerSURes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABModifyRequest_PDU,
-      { "E-RABModifyRequest", "s1ap.E_RABModifyRequest",
+      { "E-RABModifyRequest", "s1ap.E_RABModifyRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABToBeModifiedListBearerModReq_PDU,
@@ -9997,11 +9997,11 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABToBeModifiedItemBearerModReq_PDU,
-      { "E-RABToBeModifiedItemBearerModReq", "s1ap.E_RABToBeModifiedItemBearerModReq",
+      { "E-RABToBeModifiedItemBearerModReq", "s1ap.E_RABToBeModifiedItemBearerModReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABModifyResponse_PDU,
-      { "E-RABModifyResponse", "s1ap.E_RABModifyResponse",
+      { "E-RABModifyResponse", "s1ap.E_RABModifyResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABModifyListBearerModRes_PDU,
@@ -10009,15 +10009,15 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABModifyItemBearerModRes_PDU,
-      { "E-RABModifyItemBearerModRes", "s1ap.E_RABModifyItemBearerModRes",
+      { "E-RABModifyItemBearerModRes", "s1ap.E_RABModifyItemBearerModRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABReleaseCommand_PDU,
-      { "E-RABReleaseCommand", "s1ap.E_RABReleaseCommand",
+      { "E-RABReleaseCommand", "s1ap.E_RABReleaseCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABReleaseResponse_PDU,
-      { "E-RABReleaseResponse", "s1ap.E_RABReleaseResponse",
+      { "E-RABReleaseResponse", "s1ap.E_RABReleaseResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABReleaseListBearerRelComp_PDU,
@@ -10025,15 +10025,15 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABReleaseItemBearerRelComp_PDU,
-      { "E-RABReleaseItemBearerRelComp", "s1ap.E_RABReleaseItemBearerRelComp",
+      { "E-RABReleaseItemBearerRelComp", "s1ap.E_RABReleaseItemBearerRelComp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABReleaseIndication_PDU,
-      { "E-RABReleaseIndication", "s1ap.E_RABReleaseIndication",
+      { "E-RABReleaseIndication", "s1ap.E_RABReleaseIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_InitialContextSetupRequest_PDU,
-      { "InitialContextSetupRequest", "s1ap.InitialContextSetupRequest",
+      { "InitialContextSetupRequest", "s1ap.InitialContextSetupRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABToBeSetupListCtxtSUReq_PDU,
@@ -10041,11 +10041,11 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABToBeSetupItemCtxtSUReq_PDU,
-      { "E-RABToBeSetupItemCtxtSUReq", "s1ap.E_RABToBeSetupItemCtxtSUReq",
+      { "E-RABToBeSetupItemCtxtSUReq", "s1ap.E_RABToBeSetupItemCtxtSUReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_InitialContextSetupResponse_PDU,
-      { "InitialContextSetupResponse", "s1ap.InitialContextSetupResponse",
+      { "InitialContextSetupResponse", "s1ap.InitialContextSetupResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABSetupListCtxtSURes_PDU,
@@ -10053,15 +10053,15 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABSetupItemCtxtSURes_PDU,
-      { "E-RABSetupItemCtxtSURes", "s1ap.E_RABSetupItemCtxtSURes",
+      { "E-RABSetupItemCtxtSURes", "s1ap.E_RABSetupItemCtxtSURes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_InitialContextSetupFailure_PDU,
-      { "InitialContextSetupFailure", "s1ap.InitialContextSetupFailure",
+      { "InitialContextSetupFailure", "s1ap.InitialContextSetupFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_Paging_PDU,
-      { "Paging", "s1ap.Paging",
+      { "Paging", "s1ap.Paging_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_TAIList_PDU,
@@ -10069,51 +10069,51 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_TAIItem_PDU,
-      { "TAIItem", "s1ap.TAIItem",
+      { "TAIItem", "s1ap.TAIItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_UEContextReleaseRequest_PDU,
-      { "UEContextReleaseRequest", "s1ap.UEContextReleaseRequest",
+      { "UEContextReleaseRequest", "s1ap.UEContextReleaseRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_UEContextReleaseCommand_PDU,
-      { "UEContextReleaseCommand", "s1ap.UEContextReleaseCommand",
+      { "UEContextReleaseCommand", "s1ap.UEContextReleaseCommand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_UEContextReleaseComplete_PDU,
-      { "UEContextReleaseComplete", "s1ap.UEContextReleaseComplete",
+      { "UEContextReleaseComplete", "s1ap.UEContextReleaseComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_UEContextModificationRequest_PDU,
-      { "UEContextModificationRequest", "s1ap.UEContextModificationRequest",
+      { "UEContextModificationRequest", "s1ap.UEContextModificationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_UEContextModificationResponse_PDU,
-      { "UEContextModificationResponse", "s1ap.UEContextModificationResponse",
+      { "UEContextModificationResponse", "s1ap.UEContextModificationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_UEContextModificationFailure_PDU,
-      { "UEContextModificationFailure", "s1ap.UEContextModificationFailure",
+      { "UEContextModificationFailure", "s1ap.UEContextModificationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_DownlinkNASTransport_PDU,
-      { "DownlinkNASTransport", "s1ap.DownlinkNASTransport",
+      { "DownlinkNASTransport", "s1ap.DownlinkNASTransport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_InitialUEMessage_PDU,
-      { "InitialUEMessage", "s1ap.InitialUEMessage",
+      { "InitialUEMessage", "s1ap.InitialUEMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_UplinkNASTransport_PDU,
-      { "UplinkNASTransport", "s1ap.UplinkNASTransport",
+      { "UplinkNASTransport", "s1ap.UplinkNASTransport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_NASNonDeliveryIndication_PDU,
-      { "NASNonDeliveryIndication", "s1ap.NASNonDeliveryIndication",
+      { "NASNonDeliveryIndication", "s1ap.NASNonDeliveryIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_Reset_PDU,
-      { "Reset", "s1ap.Reset",
+      { "Reset", "s1ap.Reset_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_ResetType_PDU,
@@ -10121,7 +10121,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_ResetType_vals), 0,
         NULL, HFILL }},
     { &hf_s1ap_ResetAcknowledge_PDU,
-      { "ResetAcknowledge", "s1ap.ResetAcknowledge",
+      { "ResetAcknowledge", "s1ap.ResetAcknowledge_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_UE_associatedLogicalS1_ConnectionListResAck_PDU,
@@ -10129,111 +10129,111 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_ErrorIndication_PDU,
-      { "ErrorIndication", "s1ap.ErrorIndication",
+      { "ErrorIndication", "s1ap.ErrorIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_S1SetupRequest_PDU,
-      { "S1SetupRequest", "s1ap.S1SetupRequest",
+      { "S1SetupRequest", "s1ap.S1SetupRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_S1SetupResponse_PDU,
-      { "S1SetupResponse", "s1ap.S1SetupResponse",
+      { "S1SetupResponse", "s1ap.S1SetupResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_S1SetupFailure_PDU,
-      { "S1SetupFailure", "s1ap.S1SetupFailure",
+      { "S1SetupFailure", "s1ap.S1SetupFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_ENBConfigurationUpdate_PDU,
-      { "ENBConfigurationUpdate", "s1ap.ENBConfigurationUpdate",
+      { "ENBConfigurationUpdate", "s1ap.ENBConfigurationUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_ENBConfigurationUpdateAcknowledge_PDU,
-      { "ENBConfigurationUpdateAcknowledge", "s1ap.ENBConfigurationUpdateAcknowledge",
+      { "ENBConfigurationUpdateAcknowledge", "s1ap.ENBConfigurationUpdateAcknowledge_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_ENBConfigurationUpdateFailure_PDU,
-      { "ENBConfigurationUpdateFailure", "s1ap.ENBConfigurationUpdateFailure",
+      { "ENBConfigurationUpdateFailure", "s1ap.ENBConfigurationUpdateFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_MMEConfigurationUpdate_PDU,
-      { "MMEConfigurationUpdate", "s1ap.MMEConfigurationUpdate",
+      { "MMEConfigurationUpdate", "s1ap.MMEConfigurationUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_MMEConfigurationUpdateAcknowledge_PDU,
-      { "MMEConfigurationUpdateAcknowledge", "s1ap.MMEConfigurationUpdateAcknowledge",
+      { "MMEConfigurationUpdateAcknowledge", "s1ap.MMEConfigurationUpdateAcknowledge_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_MMEConfigurationUpdateFailure_PDU,
-      { "MMEConfigurationUpdateFailure", "s1ap.MMEConfigurationUpdateFailure",
+      { "MMEConfigurationUpdateFailure", "s1ap.MMEConfigurationUpdateFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_DownlinkS1cdma2000tunneling_PDU,
-      { "DownlinkS1cdma2000tunneling", "s1ap.DownlinkS1cdma2000tunneling",
+      { "DownlinkS1cdma2000tunneling", "s1ap.DownlinkS1cdma2000tunneling_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_UplinkS1cdma2000tunneling_PDU,
-      { "UplinkS1cdma2000tunneling", "s1ap.UplinkS1cdma2000tunneling",
+      { "UplinkS1cdma2000tunneling", "s1ap.UplinkS1cdma2000tunneling_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_UECapabilityInfoIndication_PDU,
-      { "UECapabilityInfoIndication", "s1ap.UECapabilityInfoIndication",
+      { "UECapabilityInfoIndication", "s1ap.UECapabilityInfoIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_ENBStatusTransfer_PDU,
-      { "ENBStatusTransfer", "s1ap.ENBStatusTransfer",
+      { "ENBStatusTransfer", "s1ap.ENBStatusTransfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_MMEStatusTransfer_PDU,
-      { "MMEStatusTransfer", "s1ap.MMEStatusTransfer",
+      { "MMEStatusTransfer", "s1ap.MMEStatusTransfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_TraceStart_PDU,
-      { "TraceStart", "s1ap.TraceStart",
+      { "TraceStart", "s1ap.TraceStart_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_TraceFailureIndication_PDU,
-      { "TraceFailureIndication", "s1ap.TraceFailureIndication",
+      { "TraceFailureIndication", "s1ap.TraceFailureIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_DeactivateTrace_PDU,
-      { "DeactivateTrace", "s1ap.DeactivateTrace",
+      { "DeactivateTrace", "s1ap.DeactivateTrace_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_CellTrafficTrace_PDU,
-      { "CellTrafficTrace", "s1ap.CellTrafficTrace",
+      { "CellTrafficTrace", "s1ap.CellTrafficTrace_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_LocationReportingControl_PDU,
-      { "LocationReportingControl", "s1ap.LocationReportingControl",
+      { "LocationReportingControl", "s1ap.LocationReportingControl_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_LocationReportingFailureIndication_PDU,
-      { "LocationReportingFailureIndication", "s1ap.LocationReportingFailureIndication",
+      { "LocationReportingFailureIndication", "s1ap.LocationReportingFailureIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_LocationReport_PDU,
-      { "LocationReport", "s1ap.LocationReport",
+      { "LocationReport", "s1ap.LocationReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_OverloadStart_PDU,
-      { "OverloadStart", "s1ap.OverloadStart",
+      { "OverloadStart", "s1ap.OverloadStart_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_OverloadStop_PDU,
-      { "OverloadStop", "s1ap.OverloadStop",
+      { "OverloadStop", "s1ap.OverloadStop_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_WriteReplaceWarningRequest_PDU,
-      { "WriteReplaceWarningRequest", "s1ap.WriteReplaceWarningRequest",
+      { "WriteReplaceWarningRequest", "s1ap.WriteReplaceWarningRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_WriteReplaceWarningResponse_PDU,
-      { "WriteReplaceWarningResponse", "s1ap.WriteReplaceWarningResponse",
+      { "WriteReplaceWarningResponse", "s1ap.WriteReplaceWarningResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_ENBDirectInformationTransfer_PDU,
-      { "ENBDirectInformationTransfer", "s1ap.ENBDirectInformationTransfer",
+      { "ENBDirectInformationTransfer", "s1ap.ENBDirectInformationTransfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_Inter_SystemInformationTransferType_PDU,
@@ -10241,43 +10241,43 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_Inter_SystemInformationTransferType_vals), 0,
         NULL, HFILL }},
     { &hf_s1ap_MMEDirectInformationTransfer_PDU,
-      { "MMEDirectInformationTransfer", "s1ap.MMEDirectInformationTransfer",
+      { "MMEDirectInformationTransfer", "s1ap.MMEDirectInformationTransfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_ENBConfigurationTransfer_PDU,
-      { "ENBConfigurationTransfer", "s1ap.ENBConfigurationTransfer",
+      { "ENBConfigurationTransfer", "s1ap.ENBConfigurationTransfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_MMEConfigurationTransfer_PDU,
-      { "MMEConfigurationTransfer", "s1ap.MMEConfigurationTransfer",
+      { "MMEConfigurationTransfer", "s1ap.MMEConfigurationTransfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_PrivateMessage_PDU,
-      { "PrivateMessage", "s1ap.PrivateMessage",
+      { "PrivateMessage", "s1ap.PrivateMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_KillRequest_PDU,
-      { "KillRequest", "s1ap.KillRequest",
+      { "KillRequest", "s1ap.KillRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_KillResponse_PDU,
-      { "KillResponse", "s1ap.KillResponse",
+      { "KillResponse", "s1ap.KillResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_DownlinkUEAssociatedLPPaTransport_PDU,
-      { "DownlinkUEAssociatedLPPaTransport", "s1ap.DownlinkUEAssociatedLPPaTransport",
+      { "DownlinkUEAssociatedLPPaTransport", "s1ap.DownlinkUEAssociatedLPPaTransport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_UplinkUEAssociatedLPPaTransport_PDU,
-      { "UplinkUEAssociatedLPPaTransport", "s1ap.UplinkUEAssociatedLPPaTransport",
+      { "UplinkUEAssociatedLPPaTransport", "s1ap.UplinkUEAssociatedLPPaTransport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_DownlinkNonUEAssociatedLPPaTransport_PDU,
-      { "DownlinkNonUEAssociatedLPPaTransport", "s1ap.DownlinkNonUEAssociatedLPPaTransport",
+      { "DownlinkNonUEAssociatedLPPaTransport", "s1ap.DownlinkNonUEAssociatedLPPaTransport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_UplinkNonUEAssociatedLPPaTransport_PDU,
-      { "UplinkNonUEAssociatedLPPaTransport", "s1ap.UplinkNonUEAssociatedLPPaTransport",
+      { "UplinkNonUEAssociatedLPPaTransport", "s1ap.UplinkNonUEAssociatedLPPaTransport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_S1AP_PDU_PDU,
@@ -10309,7 +10309,7 @@ void proto_register_s1ap(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_s1ap_ProtocolIE_Container_item,
-      { "ProtocolIE-Field", "s1ap.ProtocolIE_Field",
+      { "ProtocolIE-Field", "s1ap.ProtocolIE_Field_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_id,
@@ -10321,15 +10321,15 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_Criticality_vals), 0,
         NULL, HFILL }},
     { &hf_s1ap_ie_field_value,
-      { "value", "s1ap.value",
+      { "value", "s1ap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ie_field_value", HFILL }},
     { &hf_s1ap_ProtocolIE_ContainerList_item,
-      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_ProtocolExtensionContainer_item,
-      { "ProtocolExtensionField", "s1ap.ProtocolExtensionField",
+      { "ProtocolExtensionField", "s1ap.ProtocolExtensionField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_ext_id,
@@ -10337,11 +10337,11 @@ void proto_register_s1ap(void) {
         FT_UINT8, BASE_DEC|BASE_EXT_STRING, &s1ap_ProtocolIE_ID_vals_ext, 0,
         "ProtocolExtensionID", HFILL }},
     { &hf_s1ap_extensionValue,
-      { "extensionValue", "s1ap.extensionValue",
+      { "extensionValue", "s1ap.extensionValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_PrivateIE_Container_item,
-      { "PrivateIE-Field", "s1ap.PrivateIE_Field",
+      { "PrivateIE-Field", "s1ap.PrivateIE_Field_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_private_id,
@@ -10349,19 +10349,19 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_PrivateIE_ID_vals), 0,
         "PrivateIE_ID", HFILL }},
     { &hf_s1ap_value,
-      { "value", "s1ap.value",
+      { "value", "s1ap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_cellBased,
-      { "cellBased", "s1ap.cellBased",
+      { "cellBased", "s1ap.cellBased_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellBasedMDT", HFILL }},
     { &hf_s1ap_tABased,
-      { "tABased", "s1ap.tABased",
+      { "tABased", "s1ap.tABased_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TABasedMDT", HFILL }},
     { &hf_s1ap_pLMNWide,
-      { "pLMNWide", "s1ap.pLMNWide",
+      { "pLMNWide", "s1ap.pLMNWide_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_priorityLevel,
@@ -10381,7 +10381,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ProtocolExtensionContainer", HFILL }},
     { &hf_s1ap_Bearers_SubjectToStatusTransferList_item,
-      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_e_RAB_ID,
@@ -10389,11 +10389,11 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_uL_COUNTvalue,
-      { "uL-COUNTvalue", "s1ap.uL_COUNTvalue",
+      { "uL-COUNTvalue", "s1ap.uL_COUNTvalue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "COUNTvalue", HFILL }},
     { &hf_s1ap_dL_COUNTvalue,
-      { "dL-COUNTvalue", "s1ap.dL_COUNTvalue",
+      { "dL-COUNTvalue", "s1ap.dL_COUNTvalue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "COUNTvalue", HFILL }},
     { &hf_s1ap_receiveStatusofULPDCPSDUs,
@@ -10429,11 +10429,11 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_CancelledCellinEAI_item,
-      { "CancelledCellinEAI-Item", "s1ap.CancelledCellinEAI_Item",
+      { "CancelledCellinEAI-Item", "s1ap.CancelledCellinEAI_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_eCGI,
-      { "eCGI", "s1ap.eCGI",
+      { "eCGI", "s1ap.eCGI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EUTRAN_CGI", HFILL }},
     { &hf_s1ap_numberOfBroadcasts,
@@ -10441,7 +10441,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_CancelledCellinTAI_item,
-      { "CancelledCellinTAI-Item", "s1ap.CancelledCellinTAI_Item",
+      { "CancelledCellinTAI-Item", "s1ap.CancelledCellinTAI_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_radioNetwork,
@@ -10465,11 +10465,11 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_CauseMisc_vals), 0,
         "CauseMisc", HFILL }},
     { &hf_s1ap_CellID_Broadcast_item,
-      { "CellID-Broadcast-Item", "s1ap.CellID_Broadcast_Item",
+      { "CellID-Broadcast-Item", "s1ap.CellID_Broadcast_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_CellID_Cancelled_item,
-      { "CellID-Cancelled-Item", "s1ap.CellID_Cancelled_Item",
+      { "CellID-Cancelled-Item", "s1ap.CellID_Cancelled_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_cellIdListforMDT,
@@ -10477,7 +10477,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_CellIdListforMDT_item,
-      { "EUTRAN-CGI", "s1ap.EUTRAN_CGI",
+      { "EUTRAN-CGI", "s1ap.EUTRAN_CGI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_cdma2000OneXMEID,
@@ -10513,7 +10513,7 @@ void proto_register_s1ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_CSG_IdList_item,
-      { "CSG-IdList-Item", "s1ap.CSG_IdList_Item",
+      { "CSG-IdList-Item", "s1ap.CSG_IdList_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_cSG_Id,
@@ -10545,7 +10545,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CriticalityDiagnostics_IE_List", HFILL }},
     { &hf_s1ap_CriticalityDiagnostics_IE_List_item,
-      { "CriticalityDiagnostics-IE-Item", "s1ap.CriticalityDiagnostics_IE_Item",
+      { "CriticalityDiagnostics-IE-Item", "s1ap.CriticalityDiagnostics_IE_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_iECriticality,
@@ -10561,7 +10561,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_TypeOfError_vals), 0,
         NULL, HFILL }},
     { &hf_s1ap_ECGIList_item,
-      { "EUTRAN-CGI", "s1ap.EUTRAN_CGI",
+      { "EUTRAN-CGI", "s1ap.EUTRAN_CGI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_EmergencyAreaIDList_item,
@@ -10569,7 +10569,7 @@ void proto_register_s1ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_EmergencyAreaID_Broadcast_item,
-      { "EmergencyAreaID-Broadcast-Item", "s1ap.EmergencyAreaID_Broadcast_Item",
+      { "EmergencyAreaID-Broadcast-Item", "s1ap.EmergencyAreaID_Broadcast_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_emergencyAreaID,
@@ -10581,7 +10581,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_EmergencyAreaID_Cancelled_item,
-      { "EmergencyAreaID-Cancelled-Item", "s1ap.EmergencyAreaID_Cancelled_Item",
+      { "EmergencyAreaID-Cancelled-Item", "s1ap.EmergencyAreaID_Cancelled_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_cancelledCellinEAI,
@@ -10589,7 +10589,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_CompletedCellinEAI_item,
-      { "CompletedCellinEAI-Item", "s1ap.CompletedCellinEAI_Item",
+      { "CompletedCellinEAI-Item", "s1ap.CompletedCellinEAI_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_macroENB_ID,
@@ -10601,7 +10601,7 @@ void proto_register_s1ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_28", HFILL }},
     { &hf_s1ap_lAI,
-      { "lAI", "s1ap.lAI",
+      { "lAI", "s1ap.lAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_eNB_ID,
@@ -10609,7 +10609,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_ENB_ID_vals), 0,
         NULL, HFILL }},
     { &hf_s1ap_GUMMEIList_item,
-      { "GUMMEI", "s1ap.GUMMEI",
+      { "GUMMEI", "s1ap.GUMMEI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_bearers_SubjectToStatusTransferList,
@@ -10625,7 +10625,7 @@ void proto_register_s1ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABInformationList_item,
-      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_dL_Forwarding,
@@ -10633,7 +10633,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_DL_Forwarding_vals), 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABList_item,
-      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_cause,
@@ -10645,11 +10645,11 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_allocationRetentionPriority,
-      { "allocationRetentionPriority", "s1ap.allocationRetentionPriority",
+      { "allocationRetentionPriority", "s1ap.allocationRetentionPriority_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AllocationAndRetentionPriority", HFILL }},
     { &hf_s1ap_gbrQosInformation,
-      { "gbrQosInformation", "s1ap.gbrQosInformation",
+      { "gbrQosInformation", "s1ap.gbrQosInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GBR_QosInformation", HFILL }},
     { &hf_s1ap_cell_ID,
@@ -10657,7 +10657,7 @@ void proto_register_s1ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "CellIdentity", HFILL }},
     { &hf_s1ap_ForbiddenTAs_item,
-      { "ForbiddenTAs-Item", "s1ap.ForbiddenTAs_Item",
+      { "ForbiddenTAs-Item", "s1ap.ForbiddenTAs_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_pLMN_Identity,
@@ -10673,7 +10673,7 @@ void proto_register_s1ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_ForbiddenLAs_item,
-      { "ForbiddenLAs-Item", "s1ap.ForbiddenLAs_Item",
+      { "ForbiddenLAs-Item", "s1ap.ForbiddenLAs_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_forbiddenLACs,
@@ -10737,15 +10737,15 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_ReportingTriggerMDT_vals), 0,
         NULL, HFILL }},
     { &hf_s1ap_thresholdeventA2,
-      { "thresholdeventA2", "s1ap.thresholdeventA2",
+      { "thresholdeventA2", "s1ap.thresholdeventA2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_periodicReportingMDT,
-      { "periodicReportingMDT", "s1ap.periodicReportingMDT",
+      { "periodicReportingMDT", "s1ap.periodicReportingMDT_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_e_UTRAN_Cell,
-      { "e-UTRAN-Cell", "s1ap.e_UTRAN_Cell",
+      { "e-UTRAN-Cell", "s1ap.e_UTRAN_Cell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LastVisitedEUTRANCellInformation", HFILL }},
     { &hf_s1ap_uTRAN_Cell,
@@ -10757,11 +10757,11 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_LastVisitedGERANCellInformation_vals), 0,
         "LastVisitedGERANCellInformation", HFILL }},
     { &hf_s1ap_global_Cell_ID,
-      { "global-Cell-ID", "s1ap.global_Cell_ID",
+      { "global-Cell-ID", "s1ap.global_Cell_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EUTRAN_CGI", HFILL }},
     { &hf_s1ap_cellType,
-      { "cellType", "s1ap.cellType",
+      { "cellType", "s1ap.cellType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_time_UE_StayedInCell,
@@ -10769,7 +10769,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_undefined,
-      { "undefined", "s1ap.undefined",
+      { "undefined", "s1ap.undefined_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_loggingInterval,
@@ -10793,11 +10793,11 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_MDTMode_vals), 0,
         NULL, HFILL }},
     { &hf_s1ap_immediateMDT,
-      { "immediateMDT", "s1ap.immediateMDT",
+      { "immediateMDT", "s1ap.immediateMDT_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_loggedMDT,
-      { "loggedMDT", "s1ap.loggedMDT",
+      { "loggedMDT", "s1ap.loggedMDT_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_threshold_RSRP,
@@ -10837,11 +10837,11 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_RIMRoutingAddress_vals), 0,
         NULL, HFILL }},
     { &hf_s1ap_gERAN_Cell_ID,
-      { "gERAN-Cell-ID", "s1ap.gERAN_Cell_ID",
+      { "gERAN-Cell-ID", "s1ap.gERAN_Cell_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_targetRNC_ID,
-      { "targetRNC-ID", "s1ap.targetRNC_ID",
+      { "targetRNC-ID", "s1ap.targetRNC_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_nextHopChainingCount,
@@ -10857,19 +10857,19 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_SONInformationRequest_vals), 0,
         NULL, HFILL }},
     { &hf_s1ap_sONInformationReply,
-      { "sONInformationReply", "s1ap.sONInformationReply",
+      { "sONInformationReply", "s1ap.sONInformationReply_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_x2TNLConfigurationInfo,
-      { "x2TNLConfigurationInfo", "s1ap.x2TNLConfigurationInfo",
+      { "x2TNLConfigurationInfo", "s1ap.x2TNLConfigurationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_targeteNB_ID,
-      { "targeteNB-ID", "s1ap.targeteNB_ID",
+      { "targeteNB-ID", "s1ap.targeteNB_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_sourceeNB_ID,
-      { "sourceeNB-ID", "s1ap.sourceeNB_ID",
+      { "sourceeNB-ID", "s1ap.sourceeNB_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_sONInformation,
@@ -10877,11 +10877,11 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_SONInformation_vals), 0,
         NULL, HFILL }},
     { &hf_s1ap_global_ENB_ID,
-      { "global-ENB-ID", "s1ap.global_ENB_ID",
+      { "global-ENB-ID", "s1ap.global_ENB_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_selected_TAI,
-      { "selected-TAI", "s1ap.selected_TAI",
+      { "selected-TAI", "s1ap.selected_TAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TAI", HFILL }},
     { &hf_s1ap_rRC_Container,
@@ -10893,7 +10893,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_targetCell_ID,
-      { "targetCell-ID", "s1ap.targetCell_ID",
+      { "targetCell-ID", "s1ap.targetCell_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EUTRAN_CGI", HFILL }},
     { &hf_s1ap_subscriberProfileIDforRFP,
@@ -10905,7 +10905,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_ServedGUMMEIs_item,
-      { "ServedGUMMEIsItem", "s1ap.ServedGUMMEIsItem",
+      { "ServedGUMMEIsItem", "s1ap.ServedGUMMEIsItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_servedPLMNs,
@@ -10933,7 +10933,7 @@ void proto_register_s1ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_SupportedTAs_item,
-      { "SupportedTAs-Item", "s1ap.SupportedTAs_Item",
+      { "SupportedTAs-Item", "s1ap.SupportedTAs_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_tAC,
@@ -10961,15 +10961,15 @@ void proto_register_s1ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_TAIListforWarning_item,
-      { "TAI", "s1ap.TAI",
+      { "TAI", "s1ap.TAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_TAI_Broadcast_item,
-      { "TAI-Broadcast-Item", "s1ap.TAI_Broadcast_Item",
+      { "TAI-Broadcast-Item", "s1ap.TAI_Broadcast_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_tAI,
-      { "tAI", "s1ap.tAI",
+      { "tAI", "s1ap.tAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_completedCellinTAI,
@@ -10977,7 +10977,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_TAI_Cancelled_item,
-      { "TAI-Cancelled-Item", "s1ap.TAI_Cancelled_Item",
+      { "TAI-Cancelled-Item", "s1ap.TAI_Cancelled_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_cancelledCellinTAI,
@@ -10993,11 +10993,11 @@ void proto_register_s1ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_CompletedCellinTAI_item,
-      { "CompletedCellinTAI-Item", "s1ap.CompletedCellinTAI_Item",
+      { "CompletedCellinTAI-Item", "s1ap.CompletedCellinTAI_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_cGI,
-      { "cGI", "s1ap.cGI",
+      { "cGI", "s1ap.cGI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_rNC_ID,
@@ -11037,7 +11037,7 @@ void proto_register_s1ap(void) {
         FT_UINT64, BASE_DEC, NULL, 0,
         "BitRate", HFILL }},
     { &hf_s1ap_uE_S1AP_ID_pair,
-      { "uE-S1AP-ID-pair", "s1ap.uE_S1AP_ID_pair",
+      { "uE-S1AP-ID-pair", "s1ap.uE_S1AP_ID_pair_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_mME_UE_S1AP_ID,
@@ -11053,7 +11053,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_LastVisitedCell_Item_vals), 0,
         NULL, HFILL }},
     { &hf_s1ap_s_TMSI,
-      { "s-TMSI", "s1ap.s_TMSI",
+      { "s-TMSI", "s1ap.s_TMSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_iMSI,
@@ -11085,7 +11085,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ENBX2TLAs", HFILL }},
     { &hf_s1ap_ENBX2ExtTLAs_item,
-      { "ENBX2ExtTLA", "s1ap.ENBX2ExtTLA",
+      { "ENBX2ExtTLA", "s1ap.ENBX2ExtTLA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_iPsecTLA,
@@ -11129,15 +11129,15 @@ void proto_register_s1ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_e_RABlevelQosParameters,
-      { "e-RABlevelQosParameters", "s1ap.e_RABlevelQosParameters",
+      { "e-RABlevelQosParameters", "s1ap.e_RABlevelQosParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABToBeSetupListBearerSUReq_item,
-      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_e_RABlevelQoSParameters,
-      { "e-RABlevelQoSParameters", "s1ap.e_RABlevelQoSParameters",
+      { "e-RABlevelQoSParameters", "s1ap.e_RABlevelQoSParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_nAS_PDU,
@@ -11145,35 +11145,35 @@ void proto_register_s1ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABSetupListBearerSURes_item,
-      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABToBeModifiedListBearerModReq_item,
-      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_e_RABLevelQoSParameters,
-      { "e-RABLevelQoSParameters", "s1ap.e_RABLevelQoSParameters",
+      { "e-RABLevelQoSParameters", "s1ap.e_RABLevelQoSParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABModifyListBearerModRes_item,
-      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABReleaseListBearerRelComp_item,
-      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABToBeSetupListCtxtSUReq_item,
-      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_E_RABSetupListCtxtSURes_item,
-      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_TAIList_item,
-      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_s1_Interface,
@@ -11185,15 +11185,15 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "UE_associatedLogicalS1_ConnectionListRes", HFILL }},
     { &hf_s1ap_UE_associatedLogicalS1_ConnectionListRes_item,
-      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_UE_associatedLogicalS1_ConnectionListResAck_item,
-      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_rIMTransfer,
-      { "rIMTransfer", "s1ap.rIMTransfer",
+      { "rIMTransfer", "s1ap.rIMTransfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_privateIEs,
@@ -11201,43 +11201,43 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PrivateIE_Container", HFILL }},
     { &hf_s1ap_initiatingMessage,
-      { "initiatingMessage", "s1ap.initiatingMessage",
+      { "initiatingMessage", "s1ap.initiatingMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_successfulOutcome,
-      { "successfulOutcome", "s1ap.successfulOutcome",
+      { "successfulOutcome", "s1ap.successfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_unsuccessfulOutcome,
-      { "unsuccessfulOutcome", "s1ap.unsuccessfulOutcome",
+      { "unsuccessfulOutcome", "s1ap.unsuccessfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_initiatingMessagevalue,
-      { "value", "s1ap.value",
+      { "value", "s1ap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InitiatingMessage_value", HFILL }},
     { &hf_s1ap_successfulOutcome_value,
-      { "value", "s1ap.value",
+      { "value", "s1ap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SuccessfulOutcome_value", HFILL }},
     { &hf_s1ap_unsuccessfulOutcome_value,
-      { "value", "s1ap.value",
+      { "value", "s1ap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UnsuccessfulOutcome_value", HFILL }},
     { &hf_s1ap_cellLoadReporting,
-      { "cellLoadReporting", "s1ap.cellLoadReporting",
+      { "cellLoadReporting", "s1ap.cellLoadReporting_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_multiCellLoadReporting,
-      { "multiCellLoadReporting", "s1ap.multiCellLoadReporting",
+      { "multiCellLoadReporting", "s1ap.multiCellLoadReporting_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MultiCellLoadReportingRequest", HFILL }},
     { &hf_s1ap_eventTriggeredCellLoadReporting,
-      { "eventTriggeredCellLoadReporting", "s1ap.eventTriggeredCellLoadReporting",
+      { "eventTriggeredCellLoadReporting", "s1ap.eventTriggeredCellLoadReporting_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EventTriggeredCellLoadReportingRequest", HFILL }},
     { &hf_s1ap_hOReporting,
-      { "hOReporting", "s1ap.hOReporting",
+      { "hOReporting", "s1ap.hOReporting_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HOReport", HFILL }},
     { &hf_s1ap_cellLoadReporting_01,
@@ -11245,15 +11245,15 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_CellLoadReportingResponse_vals), 0,
         "CellLoadReportingResponse", HFILL }},
     { &hf_s1ap_multiCellLoadReporting_01,
-      { "multiCellLoadReporting", "s1ap.multiCellLoadReporting",
+      { "multiCellLoadReporting", "s1ap.multiCellLoadReporting_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MultiCellLoadReportingResponse", HFILL }},
     { &hf_s1ap_eventTriggeredCellLoadReporting_01,
-      { "eventTriggeredCellLoadReporting", "s1ap.eventTriggeredCellLoadReporting",
+      { "eventTriggeredCellLoadReporting", "s1ap.eventTriggeredCellLoadReporting_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EventTriggeredCellLoadReportingResponse", HFILL }},
     { &hf_s1ap_hOReporting_01,
-      { "hOReporting", "s1ap.hOReporting",
+      { "hOReporting", "s1ap.hOReporting_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_cellLoadReporting_02,
@@ -11273,7 +11273,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_HOReportingCause_vals), 0,
         "HOReportingCause", HFILL }},
     { &hf_s1ap_eUTRAN,
-      { "eUTRAN", "s1ap.eUTRAN",
+      { "eUTRAN", "s1ap.eUTRAN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EUTRANcellLoadReportingResponse", HFILL }},
     { &hf_s1ap_uTRAN,
@@ -11289,7 +11289,7 @@ void proto_register_s1ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_eUTRAN_01,
-      { "eUTRAN", "s1ap.eUTRAN",
+      { "eUTRAN", "s1ap.eUTRAN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EUTRAN_CGI", HFILL }},
     { &hf_s1ap_RequestedCellList_item,
@@ -11305,7 +11305,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_IRAT_Cell_ID_vals), 0,
         "IRAT_Cell_ID", HFILL }},
     { &hf_s1ap_ReportingCellList_item,
-      { "ReportingCellList-Item", "s1ap.ReportingCellList_Item",
+      { "ReportingCellList-Item", "s1ap.ReportingCellList_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_reportingCellList,
diff --git a/epan/dissectors/packet-sabp.c b/epan/dissectors/packet-sabp.c
index 0c0a1908b0..d47a22ad7a 100644
--- a/epan/dissectors/packet-sabp.c
+++ b/epan/dissectors/packet-sabp.c
@@ -1903,7 +1903,7 @@ void proto_register_sabp(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &sabp_Cause_vals_ext, 0,
         NULL, HFILL }},
     { &hf_sabp_Criticality_Diagnostics_PDU,
-      { "Criticality-Diagnostics", "sabp.Criticality_Diagnostics",
+      { "Criticality-Diagnostics", "sabp.Criticality_Diagnostics_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_MessageStructure_PDU,
@@ -1975,75 +1975,75 @@ void proto_register_sabp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_Write_Replace_PDU,
-      { "Write-Replace", "sabp.Write_Replace",
+      { "Write-Replace", "sabp.Write_Replace_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_Write_Replace_Complete_PDU,
-      { "Write-Replace-Complete", "sabp.Write_Replace_Complete",
+      { "Write-Replace-Complete", "sabp.Write_Replace_Complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_Write_Replace_Failure_PDU,
-      { "Write-Replace-Failure", "sabp.Write_Replace_Failure",
+      { "Write-Replace-Failure", "sabp.Write_Replace_Failure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_Kill_PDU,
-      { "Kill", "sabp.Kill",
+      { "Kill", "sabp.Kill_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_Kill_Complete_PDU,
-      { "Kill-Complete", "sabp.Kill_Complete",
+      { "Kill-Complete", "sabp.Kill_Complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_Kill_Failure_PDU,
-      { "Kill-Failure", "sabp.Kill_Failure",
+      { "Kill-Failure", "sabp.Kill_Failure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_Load_Query_PDU,
-      { "Load-Query", "sabp.Load_Query",
+      { "Load-Query", "sabp.Load_Query_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_Load_Query_Complete_PDU,
-      { "Load-Query-Complete", "sabp.Load_Query_Complete",
+      { "Load-Query-Complete", "sabp.Load_Query_Complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_Load_Query_Failure_PDU,
-      { "Load-Query-Failure", "sabp.Load_Query_Failure",
+      { "Load-Query-Failure", "sabp.Load_Query_Failure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_Message_Status_Query_PDU,
-      { "Message-Status-Query", "sabp.Message_Status_Query",
+      { "Message-Status-Query", "sabp.Message_Status_Query_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_Message_Status_Query_Complete_PDU,
-      { "Message-Status-Query-Complete", "sabp.Message_Status_Query_Complete",
+      { "Message-Status-Query-Complete", "sabp.Message_Status_Query_Complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_Message_Status_Query_Failure_PDU,
-      { "Message-Status-Query-Failure", "sabp.Message_Status_Query_Failure",
+      { "Message-Status-Query-Failure", "sabp.Message_Status_Query_Failure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_Reset_PDU,
-      { "Reset", "sabp.Reset",
+      { "Reset", "sabp.Reset_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_Reset_Complete_PDU,
-      { "Reset-Complete", "sabp.Reset_Complete",
+      { "Reset-Complete", "sabp.Reset_Complete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_Reset_Failure_PDU,
-      { "Reset-Failure", "sabp.Reset_Failure",
+      { "Reset-Failure", "sabp.Reset_Failure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_Restart_PDU,
-      { "Restart", "sabp.Restart",
+      { "Restart", "sabp.Restart_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_Failure_PDU,
-      { "Failure", "sabp.Failure",
+      { "Failure", "sabp.Failure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_Error_Indication_PDU,
-      { "Error-Indication", "sabp.Error_Indication",
+      { "Error-Indication", "sabp.Error_Indication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_SABP_PDU_PDU,
@@ -2051,7 +2051,7 @@ void proto_register_sabp(void) {
         FT_UINT32, BASE_DEC, VALS(sabp_SABP_PDU_vals), 0,
         NULL, HFILL }},
     { &hf_sabp_ProtocolIE_Container_item,
-      { "ProtocolIE-Field", "sabp.ProtocolIE_Field",
+      { "ProtocolIE-Field", "sabp.ProtocolIE_Field_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_id,
@@ -2063,11 +2063,11 @@ void proto_register_sabp(void) {
         FT_UINT32, BASE_DEC, VALS(sabp_Criticality_vals), 0,
         NULL, HFILL }},
     { &hf_sabp_protocolIE_Field_value,
-      { "value", "sabp.value",
+      { "value", "sabp.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProtocolIE_Field_value", HFILL }},
     { &hf_sabp_ProtocolExtensionContainer_item,
-      { "ProtocolExtensionField", "sabp.ProtocolExtensionField",
+      { "ProtocolExtensionField", "sabp.ProtocolExtensionField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_ext_id,
@@ -2075,7 +2075,7 @@ void proto_register_sabp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ProtocolExtensionID", HFILL }},
     { &hf_sabp_extensionValue,
-      { "extensionValue", "sabp.extensionValue",
+      { "extensionValue", "sabp.extensionValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_procedureCode,
@@ -2099,7 +2099,7 @@ void proto_register_sabp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ProtocolExtensionContainer", HFILL }},
     { &hf_sabp_CriticalityDiagnostics_IE_List_item,
-      { "CriticalityDiagnostics-IE-List item", "sabp.CriticalityDiagnostics_IE_List_item",
+      { "CriticalityDiagnostics-IE-List item", "sabp.CriticalityDiagnostics_IE_List_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_iECriticality,
@@ -2115,7 +2115,7 @@ void proto_register_sabp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RepetitionNumber0", HFILL }},
     { &hf_sabp_MessageStructure_item,
-      { "MessageStructure item", "sabp.MessageStructure_item",
+      { "MessageStructure item", "sabp.MessageStructure_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_repetitionNumber1,
@@ -2123,11 +2123,11 @@ void proto_register_sabp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RepetitionNumber1", HFILL }},
     { &hf_sabp_Failure_List_item,
-      { "Failure-List-Item", "sabp.Failure_List_Item",
+      { "Failure-List-Item", "sabp.Failure_List_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_service_area_identifier,
-      { "service-area-identifier", "sabp.service_area_identifier",
+      { "service-area-identifier", "sabp.service_area_identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_cause,
@@ -2135,7 +2135,7 @@ void proto_register_sabp(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &sabp_Cause_vals_ext, 0,
         NULL, HFILL }},
     { &hf_sabp_Number_of_Broadcasts_Completed_List_item,
-      { "Number-of-Broadcasts-Completed-List-Item", "sabp.Number_of_Broadcasts_Completed_List_Item",
+      { "Number-of-Broadcasts-Completed-List-Item", "sabp.Number_of_Broadcasts_Completed_List_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_number_of_broadcasts_completed,
@@ -2147,7 +2147,7 @@ void proto_register_sabp(void) {
         FT_UINT32, BASE_DEC, VALS(sabp_Number_Of_Broadcasts_Completed_Info_vals), 0,
         NULL, HFILL }},
     { &hf_sabp_Radio_Resource_Loading_List_item,
-      { "Radio-Resource-Loading-List-Item", "sabp.Radio_Resource_Loading_List_Item",
+      { "Radio-Resource-Loading-List-Item", "sabp.Radio_Resource_Loading_List_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_available_bandwidth,
@@ -2167,7 +2167,7 @@ void proto_register_sabp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_2", HFILL }},
     { &hf_sabp_Service_Areas_List_item,
-      { "Service-Area-Identifier", "sabp.Service_Area_Identifier",
+      { "Service-Area-Identifier", "sabp.Service_Area_Identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_protocolIEs,
@@ -2179,27 +2179,27 @@ void proto_register_sabp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ProtocolExtensionContainer", HFILL }},
     { &hf_sabp_initiatingMessage,
-      { "initiatingMessage", "sabp.initiatingMessage",
+      { "initiatingMessage", "sabp.initiatingMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_successfulOutcome,
-      { "successfulOutcome", "sabp.successfulOutcome",
+      { "successfulOutcome", "sabp.successfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_unsuccessfulOutcome,
-      { "unsuccessfulOutcome", "sabp.unsuccessfulOutcome",
+      { "unsuccessfulOutcome", "sabp.unsuccessfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sabp_initiatingMessage_value,
-      { "value", "sabp.value",
+      { "value", "sabp.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InitiatingMessage_value", HFILL }},
     { &hf_sabp_successfulOutcome_value,
-      { "value", "sabp.value",
+      { "value", "sabp.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SuccessfulOutcome_value", HFILL }},
     { &hf_sabp_unsuccessfulOutcome_value,
-      { "value", "sabp.value",
+      { "value", "sabp.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UnsuccessfulOutcome_value", HFILL }},
 
diff --git a/epan/dissectors/packet-sbc-ap.c b/epan/dissectors/packet-sbc-ap.c
index 5ef8b9521f..d6287e47c0 100644
--- a/epan/dissectors/packet-sbc-ap.c
+++ b/epan/dissectors/packet-sbc-ap.c
@@ -1205,7 +1205,7 @@ void proto_register_sbc_ap(void) {
         FT_UINT32, BASE_DEC, VALS(sbc_ap_Concurrent_Warning_Message_Indicator_vals), 0,
         NULL, HFILL }},
     { &hf_sbc_ap_Criticality_Diagnostics_PDU,
-      { "Criticality-Diagnostics", "sbc-ap.Criticality_Diagnostics",
+      { "Criticality-Diagnostics", "sbc-ap.Criticality_Diagnostics_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sbc_ap_Data_Coding_Scheme_PDU,
@@ -1257,19 +1257,19 @@ void proto_register_sbc_ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sbc_ap_Write_Replace_Warning_Request_PDU,
-      { "Write-Replace-Warning-Request", "sbc-ap.Write_Replace_Warning_Request",
+      { "Write-Replace-Warning-Request", "sbc-ap.Write_Replace_Warning_Request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sbc_ap_Write_Replace_Warning_Response_PDU,
-      { "Write-Replace-Warning-Response", "sbc-ap.Write_Replace_Warning_Response",
+      { "Write-Replace-Warning-Response", "sbc-ap.Write_Replace_Warning_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sbc_ap_Stop_Warning_Request_PDU,
-      { "Stop-Warning-Request", "sbc-ap.Stop_Warning_Request",
+      { "Stop-Warning-Request", "sbc-ap.Stop_Warning_Request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sbc_ap_Stop_Warning_Response_PDU,
-      { "Stop-Warning-Response", "sbc-ap.Stop_Warning_Response",
+      { "Stop-Warning-Response", "sbc-ap.Stop_Warning_Response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sbc_ap_SBC_AP_PDU_PDU,
@@ -1277,7 +1277,7 @@ void proto_register_sbc_ap(void) {
         FT_UINT32, BASE_DEC, VALS(sbc_ap_SBC_AP_PDU_vals), 0,
         NULL, HFILL }},
     { &hf_sbc_ap_ProtocolIE_Container_item,
-      { "ProtocolIE-Field", "sbc-ap.ProtocolIE_Field",
+      { "ProtocolIE-Field", "sbc-ap.ProtocolIE_Field_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sbc_ap_id,
@@ -1289,11 +1289,11 @@ void proto_register_sbc_ap(void) {
         FT_UINT32, BASE_DEC, VALS(sbc_ap_Criticality_vals), 0,
         NULL, HFILL }},
     { &hf_sbc_ap_ie_field_value,
-      { "value", "sbc-ap.value",
+      { "value", "sbc-ap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ie_field_value", HFILL }},
     { &hf_sbc_ap_ProtocolExtensionContainer_item,
-      { "ProtocolExtensionField", "sbc-ap.ProtocolExtensionField",
+      { "ProtocolExtensionField", "sbc-ap.ProtocolExtensionField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sbc_ap_ext_id,
@@ -1301,7 +1301,7 @@ void proto_register_sbc_ap(void) {
         FT_UINT8, BASE_DEC, VALS(sbc_ap_ProtocolIE_ID_vals), 0,
         "ProtocolExtensionID", HFILL }},
     { &hf_sbc_ap_extensionValue,
-      { "extensionValue", "sbc-ap.extensionValue",
+      { "extensionValue", "sbc-ap.extensionValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sbc_ap_procedureCode,
@@ -1325,7 +1325,7 @@ void proto_register_sbc_ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ProtocolExtensionContainer", HFILL }},
     { &hf_sbc_ap_CriticalityDiagnostics_IE_List_item,
-      { "CriticalityDiagnostics-IE-List item", "sbc-ap.CriticalityDiagnostics_IE_List_item",
+      { "CriticalityDiagnostics-IE-List item", "sbc-ap.CriticalityDiagnostics_IE_List_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sbc_ap_iECriticality,
@@ -1341,7 +1341,7 @@ void proto_register_sbc_ap(void) {
         FT_UINT32, BASE_DEC, VALS(sbc_ap_TypeOfError_vals), 0,
         NULL, HFILL }},
     { &hf_sbc_ap_ECGIList_item,
-      { "EUTRAN-CGI", "sbc-ap.EUTRAN_CGI",
+      { "EUTRAN-CGI", "sbc-ap.EUTRAN_CGI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sbc_ap_Emergency_Area_ID_List_item,
@@ -1357,15 +1357,15 @@ void proto_register_sbc_ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "CellIdentity", HFILL }},
     { &hf_sbc_ap_List_of_TAIs_item,
-      { "List-of-TAIs item", "sbc-ap.List_of_TAIs_item",
+      { "List-of-TAIs item", "sbc-ap.List_of_TAIs_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sbc_ap_tai,
-      { "tai", "sbc-ap.tai",
+      { "tai", "sbc-ap.tai_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sbc_ap_TAI_List_for_Warning_item,
-      { "TAI", "sbc-ap.TAI",
+      { "TAI", "sbc-ap.TAI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sbc_ap_tAC,
@@ -1393,27 +1393,27 @@ void proto_register_sbc_ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ProtocolExtensionContainer", HFILL }},
     { &hf_sbc_ap_initiatingMessage,
-      { "initiatingMessage", "sbc-ap.initiatingMessage",
+      { "initiatingMessage", "sbc-ap.initiatingMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sbc_ap_successfulOutcome,
-      { "successfulOutcome", "sbc-ap.successfulOutcome",
+      { "successfulOutcome", "sbc-ap.successfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sbc_ap_unsuccessfulOutcome,
-      { "unsuccessfulOutcome", "sbc-ap.unsuccessfulOutcome",
+      { "unsuccessfulOutcome", "sbc-ap.unsuccessfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sbc_ap_initiatingMessagevalue,
-      { "value", "sbc-ap.value",
+      { "value", "sbc-ap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InitiatingMessage_value", HFILL }},
     { &hf_sbc_ap_successfulOutcome_value,
-      { "value", "sbc-ap.value",
+      { "value", "sbc-ap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SuccessfulOutcome_value", HFILL }},
     { &hf_sbc_ap_unsuccessfulOutcome_value,
-      { "value", "sbc-ap.value",
+      { "value", "sbc-ap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UnsuccessfulOutcome_value", HFILL }},
 
diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c
index 55a441c1c9..b611b134f7 100644
--- a/epan/dissectors/packet-smrse.c
+++ b/epan/dissectors/packet-smrse.c
@@ -590,7 +590,7 @@ void proto_register_smrse(void) {
 /*--- Included file: packet-smrse-hfarr.c ---*/
 #line 1 "../../asn1/smrse/packet-smrse-hfarr.c"
     { &hf_smrse_sc_address,
-      { "sc-address", "smrse.sc_address",
+      { "sc-address", "smrse.sc_address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SMS_Address", HFILL }},
     { &hf_smrse_password,
@@ -630,11 +630,11 @@ void proto_register_smrse(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RP_MR", HFILL }},
     { &hf_smrse_mt_originating_address,
-      { "mt-originating-address", "smrse.mt_originating_address",
+      { "mt-originating-address", "smrse.mt_originating_address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SMS_Address", HFILL }},
     { &hf_smrse_mt_destination_address,
-      { "mt-destination-address", "smrse.mt_destination_address",
+      { "mt-destination-address", "smrse.mt_destination_address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SMS_Address", HFILL }},
     { &hf_smrse_mt_user_data,
@@ -642,7 +642,7 @@ void proto_register_smrse(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "RP_UD", HFILL }},
     { &hf_smrse_mt_origVMSCAddr,
-      { "mt-origVMSCAddr", "smrse.mt_origVMSCAddr",
+      { "mt-origVMSCAddr", "smrse.mt_origVMSCAddr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SMS_Address", HFILL }},
     { &hf_smrse_mt_tariffClass,
@@ -654,7 +654,7 @@ void proto_register_smrse(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RP_MR", HFILL }},
     { &hf_smrse_mo_originating_address,
-      { "mo-originating-address", "smrse.mo_originating_address",
+      { "mo-originating-address", "smrse.mo_originating_address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SMS_Address", HFILL }},
     { &hf_smrse_mo_user_data,
@@ -662,7 +662,7 @@ void proto_register_smrse(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "RP_UD", HFILL }},
     { &hf_smrse_origVMSCAddr,
-      { "origVMSCAddr", "smrse.origVMSCAddr",
+      { "origVMSCAddr", "smrse.origVMSCAddr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SMS_Address", HFILL }},
     { &hf_smrse_moimsi,
@@ -682,7 +682,7 @@ void proto_register_smrse(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_smrse_alerting_MS_ISDN,
-      { "alerting-MS-ISDN", "smrse.alerting_MS_ISDN",
+      { "alerting-MS-ISDN", "smrse.alerting_MS_ISDN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SMS_Address", HFILL }},
     { &hf_smrse_sm_diag_info,
@@ -690,7 +690,7 @@ void proto_register_smrse(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "RP_UD", HFILL }},
     { &hf_smrse_ms_address,
-      { "ms-address", "smrse.ms_address",
+      { "ms-address", "smrse.ms_address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SMS_Address", HFILL }},
 
diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c
index 96e66422c6..231f88b06b 100644
--- a/epan/dissectors/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
@@ -3578,7 +3578,7 @@ void proto_register_snmp(void) {
         FT_INT32, BASE_DEC, VALS(snmp_Version_vals), 0,
         "Version", HFILL }},
     { &hf_snmp_msgGlobalData,
-      { "msgGlobalData", "snmp.msgGlobalData",
+      { "msgGlobalData", "snmp.msgGlobalData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HeaderData", HFILL }},
     { &hf_snmp_msgSecurityParameters,
@@ -3606,7 +3606,7 @@ void proto_register_snmp(void) {
         FT_UINT32, BASE_DEC, VALS(sec_models), 0,
         NULL, HFILL }},
     { &hf_snmp_plaintext,
-      { "plaintext", "snmp.plaintext",
+      { "plaintext", "snmp.plaintext_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ScopedPDU", HFILL }},
     { &hf_snmp_encryptedPDU,
@@ -3622,39 +3622,39 @@ void proto_register_snmp(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_snmp_get_request,
-      { "get-request", "snmp.get_request",
+      { "get-request", "snmp.get_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetRequest_PDU", HFILL }},
     { &hf_snmp_get_next_request,
-      { "get-next-request", "snmp.get_next_request",
+      { "get-next-request", "snmp.get_next_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetNextRequest_PDU", HFILL }},
     { &hf_snmp_get_response,
-      { "get-response", "snmp.get_response",
+      { "get-response", "snmp.get_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetResponse_PDU", HFILL }},
     { &hf_snmp_set_request,
-      { "set-request", "snmp.set_request",
+      { "set-request", "snmp.set_request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SetRequest_PDU", HFILL }},
     { &hf_snmp_trap,
-      { "trap", "snmp.trap",
+      { "trap", "snmp.trap_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Trap_PDU", HFILL }},
     { &hf_snmp_getBulkRequest,
-      { "getBulkRequest", "snmp.getBulkRequest",
+      { "getBulkRequest", "snmp.getBulkRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GetBulkRequest_PDU", HFILL }},
     { &hf_snmp_informRequest,
-      { "informRequest", "snmp.informRequest",
+      { "informRequest", "snmp.informRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InformRequest_PDU", HFILL }},
     { &hf_snmp_snmpV2_trap,
-      { "snmpV2-trap", "snmp.snmpV2_trap",
+      { "snmpV2-trap", "snmp.snmpV2_trap_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SNMPv2_Trap_PDU", HFILL }},
     { &hf_snmp_report,
-      { "report", "snmp.report",
+      { "report", "snmp.report_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Report_PDU", HFILL }},
     { &hf_snmp_request_id,
@@ -3710,11 +3710,11 @@ void proto_register_snmp(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "ObjectName", HFILL }},
     { &hf_snmp_valueType,
-      { "valueType", "snmp.valueType",
+      { "valueType", "snmp.valueType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_snmp_VarBindList_item,
-      { "VarBind", "snmp.VarBind",
+      { "VarBind", "snmp.VarBind_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_snmp_open,
@@ -3726,7 +3726,7 @@ void proto_register_snmp(void) {
         FT_INT32, BASE_DEC, VALS(snmp_ClosePDU_U_vals), 0,
         "ClosePDU", HFILL }},
     { &hf_snmp_registerRequest,
-      { "registerRequest", "snmp.registerRequest",
+      { "registerRequest", "snmp.registerRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RReqPDU", HFILL }},
     { &hf_snmp_registerResponse,
@@ -3746,7 +3746,7 @@ void proto_register_snmp(void) {
         FT_UINT32, BASE_DEC, VALS(snmp_PDUs_vals), 0,
         NULL, HFILL }},
     { &hf_snmp_smux_simple,
-      { "smux-simple", "snmp.smux_simple",
+      { "smux-simple", "snmp.smux_simple_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SimpleOpen", HFILL }},
     { &hf_snmp_smux_version,
diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c
index ca53d97d03..9c26e03188 100644
--- a/epan/dissectors/packet-spnego.c
+++ b/epan/dissectors/packet-spnego.c
@@ -1872,11 +1872,11 @@ void proto_register_spnego(void) {
 /*--- Included file: packet-spnego-hfarr.c ---*/
 #line 1 "../../asn1/spnego/packet-spnego-hfarr.c"
     { &hf_spnego_negTokenInit,
-      { "negTokenInit", "spnego.negTokenInit",
+      { "negTokenInit", "spnego.negTokenInit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_spnego_negTokenTarg,
-      { "negTokenTarg", "spnego.negTokenTarg",
+      { "negTokenTarg", "spnego.negTokenTarg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_spnego_MechTypeList_item,
@@ -1924,7 +1924,7 @@ void proto_register_spnego(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "MechType", HFILL }},
     { &hf_spnego_innerContextToken,
-      { "innerContextToken", "spnego.innerContextToken",
+      { "innerContextToken", "spnego.innerContextToken_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_spnego_ContextFlags_delegFlag,
diff --git a/epan/dissectors/packet-sv.c b/epan/dissectors/packet-sv.c
index 8f1cc89f2b..a10f73cb03 100644
--- a/epan/dissectors/packet-sv.c
+++ b/epan/dissectors/packet-sv.c
@@ -569,7 +569,7 @@ void proto_register_sv(void) {
 /*--- Included file: packet-sv-hfarr.c ---*/
 #line 1 "../../asn1/sv/packet-sv-hfarr.c"
     { &hf_sv_savPdu,
-      { "savPdu", "sv.savPdu",
+      { "savPdu", "sv.savPdu_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sv_noASDU,
@@ -581,7 +581,7 @@ void proto_register_sv(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ASDU", HFILL }},
     { &hf_sv_seqASDU_item,
-      { "ASDU", "sv.ASDU",
+      { "ASDU", "sv.ASDU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_sv_svID,
diff --git a/epan/dissectors/packet-t124.c b/epan/dissectors/packet-t124.c
index c633c38860..f2b72831b7 100644
--- a/epan/dissectors/packet-t124.c
+++ b/epan/dissectors/packet-t124.c
@@ -1,7 +1,7 @@
 /* Do not modify this file. Changes will be overwritten.                      */
 /* Generated automatically by the ASN.1 to Wireshark dissector compiler       */
 /* packet-t124.c                                                              */
-/* /home/pascal/wireshark/trunk/tools/asn2wrs.py -p t124 -c /home/pascal/wireshark/trunk/asn1/t124/t124.cnf -s /home/pascal/wireshark/trunk/asn1/t124/packet-t124-template -D /home/pascal/wireshark/trunk/asn1/t124 -O /home/pascal/wireshark/trunk/epan/dissectors GCC-PROTOCOL.asn ../t125/MCS-PROTOCOL.asn */
+/* ../../tools/asn2wrs.py -p t124 -c ./t124.cnf -s ./packet-t124-template -D . -O ../../epan/dissectors GCC-PROTOCOL.asn ../t125/MCS-PROTOCOL.asn */
 
 /* Input file: packet-t124-template.c */
 
@@ -3027,7 +3027,7 @@ void proto_register_t124(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_t124_UserData_item,
-      { "UserData item", "t124.UserData_item",
+      { "UserData item", "t124.UserData_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_value,
@@ -3055,11 +3055,11 @@ void proto_register_t124(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "UserData", HFILL }},
     { &hf_t124_passwordInTheClear,
-      { "passwordInTheClear", "t124.passwordInTheClear",
+      { "passwordInTheClear", "t124.passwordInTheClear_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_nonStandardAlgorithm,
-      { "nonStandardAlgorithm", "t124.nonStandardAlgorithm",
+      { "nonStandardAlgorithm", "t124.nonStandardAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_t124_responseAlgorithm,
@@ -3079,7 +3079,7 @@ void proto_register_t124(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_ChallengeItem", HFILL }},
     { &hf_t124_challengeSet_item,
-      { "ChallengeItem", "t124.ChallengeItem",
+      { "ChallengeItem", "t124.ChallengeItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_responseItem,
@@ -3091,19 +3091,19 @@ void proto_register_t124(void) {
         FT_UINT32, BASE_DEC, VALS(t124_PasswordSelector_vals), 0,
         "PasswordSelector", HFILL }},
     { &hf_t124_challengeRequestResponse,
-      { "challengeRequestResponse", "t124.challengeRequestResponse",
+      { "challengeRequestResponse", "t124.challengeRequestResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_challengeRequest,
-      { "challengeRequest", "t124.challengeRequest",
+      { "challengeRequest", "t124.challengeRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_challengeResponse,
-      { "challengeResponse", "t124.challengeResponse",
+      { "challengeResponse", "t124.challengeResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_nonStandardScheme,
-      { "nonStandardScheme", "t124.nonStandardScheme",
+      { "nonStandardScheme", "t124.nonStandardScheme_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_t124_priority,
@@ -3115,43 +3115,43 @@ void proto_register_t124(void) {
         FT_UINT32, BASE_DEC, VALS(t124_ConferencePriorityScheme_vals), 0,
         "ConferencePriorityScheme", HFILL }},
     { &hf_t124_conventional,
-      { "conventional", "t124.conventional",
+      { "conventional", "t124.conventional_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_counted,
-      { "counted", "t124.counted",
+      { "counted", "t124.counted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_anonymous,
-      { "anonymous", "t124.anonymous",
+      { "anonymous", "t124.anonymous_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_nonStandardCategory,
-      { "nonStandardCategory", "t124.nonStandardCategory",
+      { "nonStandardCategory", "t124.nonStandardCategory_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_t124_conventional_only,
-      { "conventional-only", "t124.conventional_only",
+      { "conventional-only", "t124.conventional_only_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_counted_only,
-      { "counted-only", "t124.counted_only",
+      { "counted-only", "t124.counted_only_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_anonymous_only,
-      { "anonymous-only", "t124.anonymous_only",
+      { "anonymous-only", "t124.anonymous_only_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_conventional_control,
-      { "conventional-control", "t124.conventional_control",
+      { "conventional-control", "t124.conventional_control_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_unrestricted_mode,
-      { "unrestricted-mode", "t124.unrestricted_mode",
+      { "unrestricted-mode", "t124.unrestricted_mode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_non_standard_mode,
-      { "non-standard-mode", "t124.non_standard_mode",
+      { "non-standard-mode", "t124.non_standard_mode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_t124_NetworkAddress_item,
@@ -3159,11 +3159,11 @@ void proto_register_t124(void) {
         FT_UINT32, BASE_DEC, VALS(t124_NetworkAddress_item_vals), 0,
         NULL, HFILL }},
     { &hf_t124_aggregatedChannel,
-      { "aggregatedChannel", "t124.aggregatedChannel",
+      { "aggregatedChannel", "t124.aggregatedChannel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_transferModes,
-      { "transferModes", "t124.transferModes",
+      { "transferModes", "t124.transferModes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_speech,
@@ -3251,7 +3251,7 @@ void proto_register_t124(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "ExtraDiallingString", HFILL }},
     { &hf_t124_highLayerCompatibility,
-      { "highLayerCompatibility", "t124.highLayerCompatibility",
+      { "highLayerCompatibility", "t124.highLayerCompatibility_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_telephony3kHz,
@@ -3283,7 +3283,7 @@ void proto_register_t124(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_t124_transportConnection,
-      { "transportConnection", "t124.transportConnection",
+      { "transportConnection", "t124.transportConnection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_nsapAddress,
@@ -3295,15 +3295,15 @@ void proto_register_t124(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_t124_nonStandard,
-      { "nonStandard", "t124.nonStandard",
+      { "nonStandard", "t124.nonStandard_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NonStandardParameter", HFILL }},
     { &hf_t124_callingNode,
-      { "callingNode", "t124.callingNode",
+      { "callingNode", "t124.callingNode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_calledNode,
-      { "calledNode", "t124.calledNode",
+      { "calledNode", "t124.calledNode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_unknown,
@@ -3311,7 +3311,7 @@ void proto_register_t124(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_4294967295", HFILL }},
     { &hf_t124_conferenceName,
-      { "conferenceName", "t124.conferenceName",
+      { "conferenceName", "t124.conferenceName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_conferenceNameModifier,
@@ -3343,11 +3343,11 @@ void proto_register_t124(void) {
         FT_UINT32, BASE_DEC, VALS(t124_ConferenceMode_vals), 0,
         NULL, HFILL }},
     { &hf_t124_convenerPassword,
-      { "convenerPassword", "t124.convenerPassword",
+      { "convenerPassword", "t124.convenerPassword_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Password", HFILL }},
     { &hf_t124_password,
-      { "password", "t124.password",
+      { "password", "t124.password_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_listedConference,
@@ -3395,7 +3395,7 @@ void proto_register_t124(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_conferencePriority,
-      { "conferencePriority", "t124.conferencePriority",
+      { "conferencePriority", "t124.conferencePriority_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_nodeID,
@@ -3423,7 +3423,7 @@ void proto_register_t124(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_ConferenceDescriptor", HFILL }},
     { &hf_t124_conferenceList_item,
-      { "ConferenceDescriptor", "t124.ConferenceDescriptor",
+      { "ConferenceDescriptor", "t124.ConferenceDescriptor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_queryResponseResult,
@@ -3479,35 +3479,35 @@ void proto_register_t124(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_conferenceCreateRequest,
-      { "conferenceCreateRequest", "t124.conferenceCreateRequest",
+      { "conferenceCreateRequest", "t124.conferenceCreateRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_conferenceCreateResponse,
-      { "conferenceCreateResponse", "t124.conferenceCreateResponse",
+      { "conferenceCreateResponse", "t124.conferenceCreateResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_conferenceQueryRequest,
-      { "conferenceQueryRequest", "t124.conferenceQueryRequest",
+      { "conferenceQueryRequest", "t124.conferenceQueryRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_conferenceQueryResponse,
-      { "conferenceQueryResponse", "t124.conferenceQueryResponse",
+      { "conferenceQueryResponse", "t124.conferenceQueryResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_conferenceJoinRequest,
-      { "conferenceJoinRequest", "t124.conferenceJoinRequest",
+      { "conferenceJoinRequest", "t124.conferenceJoinRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_conferenceJoinResponse,
-      { "conferenceJoinResponse", "t124.conferenceJoinResponse",
+      { "conferenceJoinResponse", "t124.conferenceJoinResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_conferenceInviteRequest,
-      { "conferenceInviteRequest", "t124.conferenceInviteRequest",
+      { "conferenceInviteRequest", "t124.conferenceInviteRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_conferenceInviteResponse,
-      { "conferenceInviteResponse", "t124.conferenceInviteResponse",
+      { "conferenceInviteResponse", "t124.conferenceInviteResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_heightLimit,
@@ -3523,7 +3523,7 @@ void proto_register_t124(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_MAX", HFILL }},
     { &hf_t124_static,
-      { "static", "t124.static",
+      { "static", "t124.static_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_channelId,
@@ -3531,7 +3531,7 @@ void proto_register_t124(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "StaticChannelId", HFILL }},
     { &hf_t124_userId,
-      { "userId", "t124.userId",
+      { "userId", "t124.userId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_joined,
@@ -3543,7 +3543,7 @@ void proto_register_t124(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_private,
-      { "private", "t124.private",
+      { "private", "t124.private_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_channelId_01,
@@ -3563,7 +3563,7 @@ void proto_register_t124(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_assigned,
-      { "assigned", "t124.assigned",
+      { "assigned", "t124.assigned_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_channelId_02,
@@ -3595,7 +3595,7 @@ void proto_register_t124(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_grabbed,
-      { "grabbed", "t124.grabbed",
+      { "grabbed", "t124.grabbed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_tokenId,
@@ -3607,7 +3607,7 @@ void proto_register_t124(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "UserId", HFILL }},
     { &hf_t124_inhibited,
-      { "inhibited", "t124.inhibited",
+      { "inhibited", "t124.inhibited_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_inhibitors,
@@ -3619,7 +3619,7 @@ void proto_register_t124(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_giving,
-      { "giving", "t124.giving",
+      { "giving", "t124.giving_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_recipient,
@@ -3627,11 +3627,11 @@ void proto_register_t124(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "UserId", HFILL }},
     { &hf_t124_ungivable,
-      { "ungivable", "t124.ungivable",
+      { "ungivable", "t124.ungivable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_given,
-      { "given", "t124.given",
+      { "given", "t124.given_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_mergeTokens,
@@ -3719,175 +3719,175 @@ void proto_register_t124(void) {
         FT_UINT32, BASE_DEC, VALS(t124_TokenStatus_vals), 0,
         NULL, HFILL }},
     { &hf_t124_plumbDomainIndication,
-      { "plumbDomainIndication", "t124.plumbDomainIndication",
+      { "plumbDomainIndication", "t124.plumbDomainIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_erectDomainRequest,
-      { "erectDomainRequest", "t124.erectDomainRequest",
+      { "erectDomainRequest", "t124.erectDomainRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_mergeChannelsRequest,
-      { "mergeChannelsRequest", "t124.mergeChannelsRequest",
+      { "mergeChannelsRequest", "t124.mergeChannelsRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_mergeChannelsConfirm,
-      { "mergeChannelsConfirm", "t124.mergeChannelsConfirm",
+      { "mergeChannelsConfirm", "t124.mergeChannelsConfirm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_purgeChannelsIndication,
-      { "purgeChannelsIndication", "t124.purgeChannelsIndication",
+      { "purgeChannelsIndication", "t124.purgeChannelsIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_mergeTokensRequest,
-      { "mergeTokensRequest", "t124.mergeTokensRequest",
+      { "mergeTokensRequest", "t124.mergeTokensRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_mergeTokensConfirm,
-      { "mergeTokensConfirm", "t124.mergeTokensConfirm",
+      { "mergeTokensConfirm", "t124.mergeTokensConfirm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_purgeTokensIndication,
-      { "purgeTokensIndication", "t124.purgeTokensIndication",
+      { "purgeTokensIndication", "t124.purgeTokensIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_disconnectProviderUltimatum,
-      { "disconnectProviderUltimatum", "t124.disconnectProviderUltimatum",
+      { "disconnectProviderUltimatum", "t124.disconnectProviderUltimatum_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_rejectMCSPDUUltimatum,
-      { "rejectMCSPDUUltimatum", "t124.rejectMCSPDUUltimatum",
+      { "rejectMCSPDUUltimatum", "t124.rejectMCSPDUUltimatum_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_attachUserRequest,
-      { "attachUserRequest", "t124.attachUserRequest",
+      { "attachUserRequest", "t124.attachUserRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_attachUserConfirm,
-      { "attachUserConfirm", "t124.attachUserConfirm",
+      { "attachUserConfirm", "t124.attachUserConfirm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_detachUserRequest,
-      { "detachUserRequest", "t124.detachUserRequest",
+      { "detachUserRequest", "t124.detachUserRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_detachUserIndication,
-      { "detachUserIndication", "t124.detachUserIndication",
+      { "detachUserIndication", "t124.detachUserIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_channelJoinRequest,
-      { "channelJoinRequest", "t124.channelJoinRequest",
+      { "channelJoinRequest", "t124.channelJoinRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_channelJoinConfirm,
-      { "channelJoinConfirm", "t124.channelJoinConfirm",
+      { "channelJoinConfirm", "t124.channelJoinConfirm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_channelLeaveRequest,
-      { "channelLeaveRequest", "t124.channelLeaveRequest",
+      { "channelLeaveRequest", "t124.channelLeaveRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_channelConveneRequest,
-      { "channelConveneRequest", "t124.channelConveneRequest",
+      { "channelConveneRequest", "t124.channelConveneRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_channelConveneConfirm,
-      { "channelConveneConfirm", "t124.channelConveneConfirm",
+      { "channelConveneConfirm", "t124.channelConveneConfirm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_channelDisbandRequest,
-      { "channelDisbandRequest", "t124.channelDisbandRequest",
+      { "channelDisbandRequest", "t124.channelDisbandRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_channelDisbandIndication,
-      { "channelDisbandIndication", "t124.channelDisbandIndication",
+      { "channelDisbandIndication", "t124.channelDisbandIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_channelAdmitRequest,
-      { "channelAdmitRequest", "t124.channelAdmitRequest",
+      { "channelAdmitRequest", "t124.channelAdmitRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_channelAdmitIndication,
-      { "channelAdmitIndication", "t124.channelAdmitIndication",
+      { "channelAdmitIndication", "t124.channelAdmitIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_channelExpelRequest,
-      { "channelExpelRequest", "t124.channelExpelRequest",
+      { "channelExpelRequest", "t124.channelExpelRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_channelExpelIndication,
-      { "channelExpelIndication", "t124.channelExpelIndication",
+      { "channelExpelIndication", "t124.channelExpelIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_sendDataRequest,
-      { "sendDataRequest", "t124.sendDataRequest",
+      { "sendDataRequest", "t124.sendDataRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_sendDataIndication,
-      { "sendDataIndication", "t124.sendDataIndication",
+      { "sendDataIndication", "t124.sendDataIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_uniformSendDataRequest,
-      { "uniformSendDataRequest", "t124.uniformSendDataRequest",
+      { "uniformSendDataRequest", "t124.uniformSendDataRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_uniformSendDataIndication,
-      { "uniformSendDataIndication", "t124.uniformSendDataIndication",
+      { "uniformSendDataIndication", "t124.uniformSendDataIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_tokenGrabRequest,
-      { "tokenGrabRequest", "t124.tokenGrabRequest",
+      { "tokenGrabRequest", "t124.tokenGrabRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_tokenGrabConfirm,
-      { "tokenGrabConfirm", "t124.tokenGrabConfirm",
+      { "tokenGrabConfirm", "t124.tokenGrabConfirm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_tokenInhibitRequest,
-      { "tokenInhibitRequest", "t124.tokenInhibitRequest",
+      { "tokenInhibitRequest", "t124.tokenInhibitRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_tokenInhibitConfirm,
-      { "tokenInhibitConfirm", "t124.tokenInhibitConfirm",
+      { "tokenInhibitConfirm", "t124.tokenInhibitConfirm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_tokenGiveRequest,
-      { "tokenGiveRequest", "t124.tokenGiveRequest",
+      { "tokenGiveRequest", "t124.tokenGiveRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_tokenGiveIndication,
-      { "tokenGiveIndication", "t124.tokenGiveIndication",
+      { "tokenGiveIndication", "t124.tokenGiveIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_tokenGiveResponse,
-      { "tokenGiveResponse", "t124.tokenGiveResponse",
+      { "tokenGiveResponse", "t124.tokenGiveResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_tokenGiveConfirm,
-      { "tokenGiveConfirm", "t124.tokenGiveConfirm",
+      { "tokenGiveConfirm", "t124.tokenGiveConfirm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_tokenPleaseRequest,
-      { "tokenPleaseRequest", "t124.tokenPleaseRequest",
+      { "tokenPleaseRequest", "t124.tokenPleaseRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_tokenPleaseIndication,
-      { "tokenPleaseIndication", "t124.tokenPleaseIndication",
+      { "tokenPleaseIndication", "t124.tokenPleaseIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_tokenReleaseRequest,
-      { "tokenReleaseRequest", "t124.tokenReleaseRequest",
+      { "tokenReleaseRequest", "t124.tokenReleaseRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_tokenReleaseConfirm,
-      { "tokenReleaseConfirm", "t124.tokenReleaseConfirm",
+      { "tokenReleaseConfirm", "t124.tokenReleaseConfirm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_tokenTestRequest,
-      { "tokenTestRequest", "t124.tokenTestRequest",
+      { "tokenTestRequest", "t124.tokenTestRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_tokenTestConfirm,
-      { "tokenTestConfirm", "t124.tokenTestConfirm",
+      { "tokenTestConfirm", "t124.tokenTestConfirm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t124_Segmentation_begin,
diff --git a/epan/dissectors/packet-t124.h b/epan/dissectors/packet-t124.h
index 75b83e5128..92e4f41418 100644
--- a/epan/dissectors/packet-t124.h
+++ b/epan/dissectors/packet-t124.h
@@ -1,7 +1,7 @@
 /* Do not modify this file. Changes will be overwritten.                      */
 /* Generated automatically by the ASN.1 to Wireshark dissector compiler       */
 /* packet-t124.h                                                              */
-/* /home/pascal/wireshark/trunk/tools/asn2wrs.py -p t124 -c /home/pascal/wireshark/trunk/asn1/t124/t124.cnf -s /home/pascal/wireshark/trunk/asn1/t124/packet-t124-template -D /home/pascal/wireshark/trunk/asn1/t124 -O /home/pascal/wireshark/trunk/epan/dissectors GCC-PROTOCOL.asn ../t125/MCS-PROTOCOL.asn */
+/* ../../tools/asn2wrs.py -p t124 -c ./t124.cnf -s ./packet-t124-template -D . -O ../../epan/dissectors GCC-PROTOCOL.asn ../t125/MCS-PROTOCOL.asn */
 
 /* Input file: packet-t124-template.h */
 
diff --git a/epan/dissectors/packet-t125.c b/epan/dissectors/packet-t125.c
index 2cdf8280e6..0ecadf2608 100644
--- a/epan/dissectors/packet-t125.c
+++ b/epan/dissectors/packet-t125.c
@@ -536,15 +536,15 @@ void proto_register_t125(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_t125_targetParameters,
-      { "targetParameters", "t125.targetParameters",
+      { "targetParameters", "t125.targetParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DomainParameters", HFILL }},
     { &hf_t125_minimumParameters,
-      { "minimumParameters", "t125.minimumParameters",
+      { "minimumParameters", "t125.minimumParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DomainParameters", HFILL }},
     { &hf_t125_maximumParameters,
-      { "maximumParameters", "t125.maximumParameters",
+      { "maximumParameters", "t125.maximumParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DomainParameters", HFILL }},
     { &hf_t125_userData,
@@ -560,7 +560,7 @@ void proto_register_t125(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_MAX", HFILL }},
     { &hf_t125_domainParameters,
-      { "domainParameters", "t125.domainParameters",
+      { "domainParameters", "t125.domainParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t125_userData_01,
@@ -572,19 +572,19 @@ void proto_register_t125(void) {
         FT_UINT32, BASE_DEC, VALS(t125_DataPriority_vals), 0,
         NULL, HFILL }},
     { &hf_t125_connect_initial,
-      { "connect-initial", "t125.connect_initial",
+      { "connect-initial", "t125.connect_initial_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t125_connect_response,
-      { "connect-response", "t125.connect_response",
+      { "connect-response", "t125.connect_response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t125_connect_additional,
-      { "connect-additional", "t125.connect_additional",
+      { "connect-additional", "t125.connect_additional_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t125_connect_result,
-      { "connect-result", "t125.connect_result",
+      { "connect-result", "t125.connect_result_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c
index 3dc5358462..36a97d6a26 100644
--- a/epan/dissectors/packet-t38.c
+++ b/epan/dissectors/packet-t38.c
@@ -1260,11 +1260,11 @@ proto_register_t38(void)
 /*--- Included file: packet-t38-hfarr.c ---*/
 #line 1 "../../asn1/t38/packet-t38-hfarr.c"
     { &hf_t38_IFPPacket_PDU,
-      { "IFPPacket", "t38.IFPPacket",
+      { "IFPPacket", "t38.IFPPacket_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t38_UDPTLPacket_PDU,
-      { "UDPTLPacket", "t38.UDPTLPacket",
+      { "UDPTLPacket", "t38.UDPTLPacket_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t38_type_of_msg,
@@ -1284,7 +1284,7 @@ proto_register_t38(void)
         FT_UINT32, BASE_DEC, VALS(t38_T30_data_vals), 0,
         NULL, HFILL }},
     { &hf_t38_Data_Field_item,
-      { "Data-Field item", "t38.Data_Field_item",
+      { "Data-Field item", "t38.Data_Field_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t38_field_type,
@@ -1300,7 +1300,7 @@ proto_register_t38(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_t38_primary_ifp_packet,
-      { "primary-ifp-packet", "t38.primary_ifp_packet",
+      { "primary-ifp-packet", "t38.primary_ifp_packet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t38_error_recovery,
@@ -1312,11 +1312,11 @@ proto_register_t38(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_t38_secondary_ifp_packets_item,
-      { "secondary-ifp-packets item", "t38.secondary_ifp_packets_item",
+      { "secondary-ifp-packets item", "t38.secondary_ifp_packets_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OpenType_IFPPacket", HFILL }},
     { &hf_t38_fec_info,
-      { "fec-info", "t38.fec_info",
+      { "fec-info", "t38.fec_info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_t38_fec_npackets,
diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c
index 0eda960224..904c02a0c3 100644
--- a/epan/dissectors/packet-tcap.c
+++ b/epan/dissectors/packet-tcap.c
@@ -1624,23 +1624,23 @@ proto_register_tcap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         "Dialog1", HFILL }},
     { &hf_tcap_unidirectional,
-      { "unidirectional", "tcap.unidirectional",
+      { "unidirectional", "tcap.unidirectional_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tcap_begin,
-      { "begin", "tcap.begin",
+      { "begin", "tcap.begin_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tcap_end,
-      { "end", "tcap.end",
+      { "end", "tcap.end_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tcap_continue,
-      { "continue", "tcap.continue",
+      { "continue", "tcap.continue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tcap_abort,
-      { "abort", "tcap.abort",
+      { "abort", "tcap.abort_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tcap_dialoguePortion,
@@ -1676,23 +1676,23 @@ proto_register_tcap(void)
         FT_UINT32, BASE_DEC, VALS(tcap_Component_vals), 0,
         NULL, HFILL }},
     { &hf_tcap_invoke,
-      { "invoke", "tcap.invoke",
+      { "invoke", "tcap.invoke_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tcap_returnResultLast,
-      { "returnResultLast", "tcap.returnResultLast",
+      { "returnResultLast", "tcap.returnResultLast_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReturnResult", HFILL }},
     { &hf_tcap_returnError,
-      { "returnError", "tcap.returnError",
+      { "returnError", "tcap.returnError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tcap_reject,
-      { "reject", "tcap.reject",
+      { "reject", "tcap.reject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tcap_returnResultNotLast,
-      { "returnResultNotLast", "tcap.returnResultNotLast",
+      { "returnResultNotLast", "tcap.returnResultNotLast_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReturnResult", HFILL }},
     { &hf_tcap_invokeID,
@@ -1708,11 +1708,11 @@ proto_register_tcap(void)
         FT_UINT32, BASE_DEC, VALS(tcap_OPERATION_vals), 0,
         "OPERATION", HFILL }},
     { &hf_tcap_parameter,
-      { "parameter", "tcap.parameter",
+      { "parameter", "tcap.parameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tcap_resultretres,
-      { "resultretres", "tcap.resultretres",
+      { "resultretres", "tcap.resultretres_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tcap_errorCode,
@@ -1728,7 +1728,7 @@ proto_register_tcap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         "InvokeIdType", HFILL }},
     { &hf_tcap_not_derivable,
-      { "not-derivable", "tcap.not_derivable",
+      { "not-derivable", "tcap.not_derivable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tcap_problem,
@@ -1768,7 +1768,7 @@ proto_register_tcap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_tcap_unidialoguePDU,
-      { "unidialoguePDU", "tcap.unidialoguePDU",
+      { "unidialoguePDU", "tcap.unidialoguePDU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AUDT_apdu", HFILL }},
     { &hf_tcap_audt_protocol_version,
@@ -1784,19 +1784,19 @@ proto_register_tcap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "AUDT_user_information", HFILL }},
     { &hf_tcap_audt_user_information_item,
-      { "user-information item", "tcap.user_information_item",
+      { "user-information item", "tcap.user_information_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EXTERNAL", HFILL }},
     { &hf_tcap_dialogueRequest,
-      { "dialogueRequest", "tcap.dialogueRequest",
+      { "dialogueRequest", "tcap.dialogueRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AARQ_apdu", HFILL }},
     { &hf_tcap_dialogueResponse,
-      { "dialogueResponse", "tcap.dialogueResponse",
+      { "dialogueResponse", "tcap.dialogueResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AARE_apdu", HFILL }},
     { &hf_tcap_dialogueAbort,
-      { "dialogueAbort", "tcap.dialogueAbort",
+      { "dialogueAbort", "tcap.dialogueAbort_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ABRT_apdu", HFILL }},
     { &hf_tcap_aarq_protocol_version,
@@ -1812,7 +1812,7 @@ proto_register_tcap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "AARQ_user_information", HFILL }},
     { &hf_tcap_aarq_user_information_item,
-      { "user-information item", "tcap.user_information_item",
+      { "user-information item", "tcap.user_information_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EXTERNAL", HFILL }},
     { &hf_tcap_aare_protocol_version,
@@ -1836,7 +1836,7 @@ proto_register_tcap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "AARE_user_information", HFILL }},
     { &hf_tcap_aare_user_information_item,
-      { "user-information item", "tcap.user_information_item",
+      { "user-information item", "tcap.user_information_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EXTERNAL", HFILL }},
     { &hf_tcap_abort_source,
@@ -1848,7 +1848,7 @@ proto_register_tcap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "ABRT_user_information", HFILL }},
     { &hf_tcap_abrt_user_information_item,
-      { "user-information item", "tcap.user_information_item",
+      { "user-information item", "tcap.user_information_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EXTERNAL", HFILL }},
     { &hf_tcap_dialogue_service_user,
diff --git a/epan/dissectors/packet-tetra.c b/epan/dissectors/packet-tetra.c
index 352f797eec..1e77ff4c44 100644
--- a/epan/dissectors/packet-tetra.c
+++ b/epan/dissectors/packet-tetra.c
@@ -9293,59 +9293,59 @@ void proto_register_tetra (void)
 /*--- Included file: packet-tetra-hfarr.c ---*/
 #line 1 "../../asn1/tetra/packet-tetra-hfarr.c"
     { &hf_tetra_AACH_PDU,
-      { "AACH", "tetra.AACH",
+      { "AACH", "tetra.AACH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_BSCH_PDU,
-      { "BSCH", "tetra.BSCH",
+      { "BSCH", "tetra.BSCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_BNCH_PDU,
-      { "BNCH", "tetra.BNCH",
+      { "BNCH", "tetra.BNCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_MAC_ACCESS_PDU,
-      { "MAC-ACCESS", "tetra.MAC_ACCESS",
+      { "MAC-ACCESS", "tetra.MAC_ACCESS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_MAC_DATA_PDU,
-      { "MAC-DATA", "tetra.MAC_DATA",
+      { "MAC-DATA", "tetra.MAC_DATA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_MAC_FRAG_PDU,
-      { "MAC-FRAG", "tetra.MAC_FRAG",
+      { "MAC-FRAG", "tetra.MAC_FRAG_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_MAC_FRAG120_PDU,
-      { "MAC-FRAG120", "tetra.MAC_FRAG120",
+      { "MAC-FRAG120", "tetra.MAC_FRAG120_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_MAC_END_UPLINK_PDU,
-      { "MAC-END-UPLINK", "tetra.MAC_END_UPLINK",
+      { "MAC-END-UPLINK", "tetra.MAC_END_UPLINK_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_MAC_END_UP114_PDU,
-      { "MAC-END-UP114", "tetra.MAC_END_UP114",
+      { "MAC-END-UP114", "tetra.MAC_END_UP114_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_MAC_END_HU_PDU,
-      { "MAC-END-HU", "tetra.MAC_END_HU",
+      { "MAC-END-HU", "tetra.MAC_END_HU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_MAC_END_DOWNLINK_PDU,
-      { "MAC-END-DOWNLINK", "tetra.MAC_END_DOWNLINK",
+      { "MAC-END-DOWNLINK", "tetra.MAC_END_DOWNLINK_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_MAC_END_DOWN111_PDU,
-      { "MAC-END-DOWN111", "tetra.MAC_END_DOWN111",
+      { "MAC-END-DOWN111", "tetra.MAC_END_DOWN111_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_MAC_RESOURCE_PDU,
-      { "MAC-RESOURCE", "tetra.MAC_RESOURCE",
+      { "MAC-RESOURCE", "tetra.MAC_RESOURCE_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_MAC_ACCESS_DEFINE_PDU,
-      { "MAC-ACCESS-DEFINE", "tetra.MAC_ACCESS_DEFINE",
+      { "MAC-ACCESS-DEFINE", "tetra.MAC_ACCESS_DEFINE_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_function,
@@ -9401,7 +9401,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_Reserved_vals), 0,
         NULL, HFILL }},
     { &hf_tetra_tm_sdu,
-      { "tm-sdu", "tetra.tm_sdu",
+      { "tm-sdu", "tetra.tm_sdu_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MLE_Sync", HFILL }},
     { &hf_tetra_mcc,
@@ -9489,19 +9489,19 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_optional_params_vals), 0,
         NULL, HFILL }},
     { &hf_tetra_even_multiframe,
-      { "even-multiframe", "tetra.even_multiframe",
+      { "even-multiframe", "tetra.even_multiframe_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TS_COMMON_FRAMES", HFILL }},
     { &hf_tetra_odd_multiframe,
-      { "odd-multiframe", "tetra.odd_multiframe",
+      { "odd-multiframe", "tetra.odd_multiframe_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TS_COMMON_FRAMES", HFILL }},
     { &hf_tetra_access_a_code,
-      { "access-a-code", "tetra.access_a_code",
+      { "access-a-code", "tetra.access_a_code_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Default_Code_A", HFILL }},
     { &hf_tetra_extend_service,
-      { "extend-service", "tetra.extend_service",
+      { "extend-service", "tetra.extend_service_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Extended_Services_Broadcast", HFILL }},
     { &hf_tetra_la,
@@ -9673,7 +9673,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_section_vals), 0,
         NULL, HFILL }},
     { &hf_tetra_present_1,
-      { "present-1", "tetra.present_1",
+      { "present-1", "tetra.present_1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PRESENT1", HFILL }},
     { &hf_tetra_present_2,
@@ -9733,7 +9733,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_U_LLC_PDU_vals), 0,
         "U_LLC_PDU", HFILL }},
     { &hf_tetra_sdu2,
-      { "sdu2", "tetra.sdu2",
+      { "sdu2", "tetra.sdu2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ComplexSDU", HFILL }},
     { &hf_tetra_ssi,
@@ -9753,11 +9753,11 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_16777215", HFILL }},
     { &hf_tetra_bl_adata,
-      { "bl-adata", "tetra.bl_adata",
+      { "bl-adata", "tetra.bl_adata_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "U_BL_ADATA", HFILL }},
     { &hf_tetra_bl_data,
-      { "bl-data", "tetra.bl_data",
+      { "bl-data", "tetra.bl_data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "U_BL_DATA", HFILL }},
     { &hf_tetra_bl_udata,
@@ -9765,55 +9765,55 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_U_MLE_PDU_vals), 0,
         "U_MLE_PDU", HFILL }},
     { &hf_tetra_bl_ack,
-      { "bl-ack", "tetra.bl_ack",
+      { "bl-ack", "tetra.bl_ack_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "U_BL_ACK", HFILL }},
     { &hf_tetra_bl_adata_fcs,
-      { "bl-adata-fcs", "tetra.bl_adata_fcs",
+      { "bl-adata-fcs", "tetra.bl_adata_fcs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "U_BL_ADATA_FCS", HFILL }},
     { &hf_tetra_bl_data_fcs,
-      { "bl-data-fcs", "tetra.bl_data_fcs",
+      { "bl-data-fcs", "tetra.bl_data_fcs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "U_BL_DATA_FCS", HFILL }},
     { &hf_tetra_bl_udata_fcs,
-      { "bl-udata-fcs", "tetra.bl_udata_fcs",
+      { "bl-udata-fcs", "tetra.bl_udata_fcs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "U_MLE_PDU_FCS", HFILL }},
     { &hf_tetra_bl_ack_fcs,
-      { "bl-ack-fcs", "tetra.bl_ack_fcs",
+      { "bl-ack-fcs", "tetra.bl_ack_fcs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "U_BL_ACK_FCS", HFILL }},
     { &hf_tetra_al_setup,
-      { "al-setup", "tetra.al_setup",
+      { "al-setup", "tetra.al_setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_al_data,
-      { "al-data", "tetra.al_data",
+      { "al-data", "tetra.al_data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_al_udata,
-      { "al-udata", "tetra.al_udata",
+      { "al-udata", "tetra.al_udata_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_al_ack,
-      { "al-ack", "tetra.al_ack",
+      { "al-ack", "tetra.al_ack_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_al_reconnect,
-      { "al-reconnect", "tetra.al_reconnect",
+      { "al-reconnect", "tetra.al_reconnect_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_reserve1,
-      { "reserve1", "tetra.reserve1",
+      { "reserve1", "tetra.reserve1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_reserve2,
-      { "reserve2", "tetra.reserve2",
+      { "reserve2", "tetra.reserve2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_al_disc,
-      { "al-disc", "tetra.al_disc",
+      { "al-disc", "tetra.al_disc_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_nr,
@@ -9837,7 +9837,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_1", HFILL }},
     { &hf_tetra_u_mle_reserved1,
-      { "u-mle-reserved1", "tetra.u_mle_reserved1",
+      { "u-mle-reserved1", "tetra.u_mle_reserved1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_mm,
@@ -9849,11 +9849,11 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_U_CMCE_PDU_vals), 0,
         "U_CMCE_PDU", HFILL }},
     { &hf_tetra_u_mle_reserved2,
-      { "u-mle-reserved2", "tetra.u_mle_reserved2",
+      { "u-mle-reserved2", "tetra.u_mle_reserved2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_sndcp,
-      { "sndcp", "tetra.sndcp",
+      { "sndcp", "tetra.sndcp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_mle,
@@ -9861,11 +9861,11 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_UMLE_PDU_vals), 0,
         "UMLE_PDU", HFILL }},
     { &hf_tetra_tetra_management_entity_protocol,
-      { "tetra-management-entity-protocol", "tetra.tetra_management_entity_protocol",
+      { "tetra-management-entity-protocol", "tetra.tetra_management_entity_protocol_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_mle_reserved3,
-      { "u-mle-reserved3", "tetra.u_mle_reserved3",
+      { "u-mle-reserved3", "tetra.u_mle_reserved3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_lengthIndicationOrCapacityRequest,
@@ -9877,7 +9877,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_LengthIndication_vals), 0,
         NULL, HFILL }},
     { &hf_tetra_capacityRequest,
-      { "capacityRequest", "tetra.capacityRequest",
+      { "capacityRequest", "tetra.capacityRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FRAG", HFILL }},
     { &hf_tetra_tm_sdu_01,
@@ -9901,7 +9901,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_LengthIndicationMacData_vals), 0,
         "LengthIndicationMacData", HFILL }},
     { &hf_tetra_capacityRequest_01,
-      { "capacityRequest", "tetra.capacityRequest",
+      { "capacityRequest", "tetra.capacityRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FRAG6", HFILL }},
     { &hf_tetra_sub_type,
@@ -9957,11 +9957,11 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_slot_granting_vals), 0,
         "T_slot_granting", HFILL }},
     { &hf_tetra_none,
-      { "none", "tetra.none",
+      { "none", "tetra.none_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_slot_granting_param,
-      { "slot-granting-param", "tetra.slot_granting_param",
+      { "slot-granting-param", "tetra.slot_granting_param_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SlotGranting", HFILL }},
     { &hf_tetra_channel_allocation,
@@ -9969,7 +9969,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_channel_allocation_vals), 0,
         NULL, HFILL }},
     { &hf_tetra_channel_allocation_element,
-      { "channel-allocation-element", "tetra.channel_allocation_element",
+      { "channel-allocation-element", "tetra.channel_allocation_element_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChannelAllocation", HFILL }},
     { &hf_tetra_tm_sdu_07,
@@ -10013,7 +10013,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_extend_carrier_flag_vals), 0,
         NULL, HFILL }},
     { &hf_tetra_extended,
-      { "extended", "tetra.extended",
+      { "extended", "tetra.extended_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Extended_carrier_flag", HFILL }},
     { &hf_tetra_monitoring_pattern,
@@ -10025,15 +10025,15 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_Monitoring_pattern_vals), 0,
         "Monitoring_pattern", HFILL }},
     { &hf_tetra_none1,
-      { "none1", "tetra.none1",
+      { "none1", "tetra.none1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_none2,
-      { "none2", "tetra.none2",
+      { "none2", "tetra.none2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_none3,
-      { "none3", "tetra.none3",
+      { "none3", "tetra.none3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_offset_01,
@@ -10105,39 +10105,39 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_D_LLC_PDU_vals), 0,
         "D_LLC_PDU", HFILL }},
     { &hf_tetra_null_pdu,
-      { "null-pdu", "tetra.null_pdu",
+      { "null-pdu", "tetra.null_pdu_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_ssi_01,
-      { "ssi", "tetra.ssi",
+      { "ssi", "tetra.ssi_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SSI_NEED", HFILL }},
     { &hf_tetra_eventLabel_01,
-      { "eventLabel", "tetra.eventLabel",
+      { "eventLabel", "tetra.eventLabel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EVENT_NEED", HFILL }},
     { &hf_tetra_ussi_01,
-      { "ussi", "tetra.ussi",
+      { "ussi", "tetra.ussi_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "USSI_NEED", HFILL }},
     { &hf_tetra_smi_01,
-      { "smi", "tetra.smi",
+      { "smi", "tetra.smi_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SMI_NEED", HFILL }},
     { &hf_tetra_ssi_eventLabel,
-      { "ssi-eventLabel", "tetra.ssi_eventLabel",
+      { "ssi-eventLabel", "tetra.ssi_eventLabel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SSI_EVENT_NEED", HFILL }},
     { &hf_tetra_ssi_usage_maker,
-      { "ssi-usage-maker", "tetra.ssi_usage_maker",
+      { "ssi-usage-maker", "tetra.ssi_usage_maker_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SSI_USAGE_NEED", HFILL }},
     { &hf_tetra_smi_eventLabel,
-      { "smi-eventLabel", "tetra.smi_eventLabel",
+      { "smi-eventLabel", "tetra.smi_eventLabel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SMI_EVENT_NEED", HFILL }},
     { &hf_tetra_other,
-      { "other", "tetra.other",
+      { "other", "tetra.other_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OTHER_DATA", HFILL }},
     { &hf_tetra_eventlabel,
@@ -10201,7 +10201,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_33554431", HFILL }},
     { &hf_tetra_reserved_03,
-      { "reserved", "tetra.reserved",
+      { "reserved", "tetra.reserved_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_filler_bits,
@@ -10209,11 +10209,11 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_7", HFILL }},
     { &hf_tetra_bl_adata_01,
-      { "bl-adata", "tetra.bl_adata",
+      { "bl-adata", "tetra.bl_adata_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "D_BL_ADATA", HFILL }},
     { &hf_tetra_bl_data_01,
-      { "bl-data", "tetra.bl_data",
+      { "bl-data", "tetra.bl_data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "D_BL_DATA", HFILL }},
     { &hf_tetra_bl_udata_01,
@@ -10221,23 +10221,23 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_D_MLE_PDU_vals), 0,
         "D_MLE_PDU", HFILL }},
     { &hf_tetra_bl_ack_01,
-      { "bl-ack", "tetra.bl_ack",
+      { "bl-ack", "tetra.bl_ack_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "D_BL_ACK", HFILL }},
     { &hf_tetra_bl_adata_fcs_01,
-      { "bl-adata-fcs", "tetra.bl_adata_fcs",
+      { "bl-adata-fcs", "tetra.bl_adata_fcs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "D_BL_ADATA_FCS", HFILL }},
     { &hf_tetra_bl_data_fcs_01,
-      { "bl-data-fcs", "tetra.bl_data_fcs",
+      { "bl-data-fcs", "tetra.bl_data_fcs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "D_BL_DATA_FCS", HFILL }},
     { &hf_tetra_bl_udata_fcs_01,
-      { "bl-udata-fcs", "tetra.bl_udata_fcs",
+      { "bl-udata-fcs", "tetra.bl_udata_fcs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "D_MLE_PDU_FCS", HFILL }},
     { &hf_tetra_bl_ack_fcs_01,
-      { "bl-ack-fcs", "tetra.bl_ack_fcs",
+      { "bl-ack-fcs", "tetra.bl_ack_fcs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "D_BL_ACK_FCS", HFILL }},
     { &hf_tetra_tl_sdu_01,
@@ -10261,67 +10261,67 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_DMLE_PDU_vals), 0,
         "DMLE_PDU", HFILL }},
     { &hf_tetra_u_prepare,
-      { "u-prepare", "tetra.u_prepare",
+      { "u-prepare", "tetra.u_prepare_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_umle_reserved1,
-      { "umle-reserved1", "tetra.umle_reserved1",
+      { "umle-reserved1", "tetra.umle_reserved1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_umle_reserved2,
-      { "umle-reserved2", "tetra.umle_reserved2",
+      { "umle-reserved2", "tetra.umle_reserved2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_umle_reserved3,
-      { "umle-reserved3", "tetra.umle_reserved3",
+      { "umle-reserved3", "tetra.umle_reserved3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_restore,
-      { "u-restore", "tetra.u_restore",
+      { "u-restore", "tetra.u_restore_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_umle_reserved4,
-      { "umle-reserved4", "tetra.umle_reserved4",
+      { "umle-reserved4", "tetra.umle_reserved4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_umle_reserved5,
-      { "umle-reserved5", "tetra.umle_reserved5",
+      { "umle-reserved5", "tetra.umle_reserved5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_umle_reserved6,
-      { "umle-reserved6", "tetra.umle_reserved6",
+      { "umle-reserved6", "tetra.umle_reserved6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_new_cell,
-      { "d-new-cell", "tetra.d_new_cell",
+      { "d-new-cell", "tetra.d_new_cell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_prepare_fail,
-      { "d-prepare-fail", "tetra.d_prepare_fail",
+      { "d-prepare-fail", "tetra.d_prepare_fail_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_nwrk_broadcast,
-      { "d-nwrk-broadcast", "tetra.d_nwrk_broadcast",
+      { "d-nwrk-broadcast", "tetra.d_nwrk_broadcast_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "D_NWRK_BRDADCAST", HFILL }},
     { &hf_tetra_dmle_reserved1,
-      { "dmle-reserved1", "tetra.dmle_reserved1",
+      { "dmle-reserved1", "tetra.dmle_reserved1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_restore_ack,
-      { "d-restore-ack", "tetra.d_restore_ack",
+      { "d-restore-ack", "tetra.d_restore_ack_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_restore_fail,
-      { "d-restore-fail", "tetra.d_restore_fail",
+      { "d-restore-fail", "tetra.d_restore_fail_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_dmle_reserved2,
-      { "dmle-reserved2", "tetra.dmle_reserved2",
+      { "dmle-reserved2", "tetra.dmle_reserved2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_dmle_reserved3,
-      { "dmle-reserved3", "tetra.dmle_reserved3",
+      { "dmle-reserved3", "tetra.dmle_reserved3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_optional_elements,
@@ -10329,11 +10329,11 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_optional_elements_vals), 0,
         NULL, HFILL }},
     { &hf_tetra_no_type2,
-      { "no-type2", "tetra.no_type2",
+      { "no-type2", "tetra.no_type2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_type2_parameters,
-      { "type2-parameters", "tetra.type2_parameters",
+      { "type2-parameters", "tetra.type2_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_cell_number,
@@ -10353,7 +10353,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_optional_elements_01_vals), 0,
         "T_optional_elements_01", HFILL }},
     { &hf_tetra_type2_parameters_01,
-      { "type2-parameters", "tetra.type2_parameters",
+      { "type2-parameters", "tetra.type2_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_parameters_01", HFILL }},
     { &hf_tetra_mcc_01,
@@ -10393,7 +10393,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_optional_elements_04_vals), 0,
         "T_optional_elements_04", HFILL }},
     { &hf_tetra_type2_parameters_02,
-      { "type2-parameters", "tetra.type2_parameters",
+      { "type2-parameters", "tetra.type2_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_parameters_02", HFILL }},
     { &hf_tetra_tetra_network_time,
@@ -10401,7 +10401,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_tetra_network_time_vals), 0,
         NULL, HFILL }},
     { &hf_tetra_tetra_network_time_01,
-      { "tetra-network-time", "tetra.tetra_network_time",
+      { "tetra-network-time", "tetra.tetra_network_time_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_number_of_neighbour_cells,
@@ -10433,131 +10433,131 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_Authentication,
-      { "u-Authentication", "tetra.u_Authentication",
+      { "u-Authentication", "tetra.u_Authentication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_Itsi_Detach,
-      { "u-Itsi-Detach", "tetra.u_Itsi_Detach",
+      { "u-Itsi-Detach", "tetra.u_Itsi_Detach_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_Location_Update_Demand,
-      { "u-Location-Update-Demand", "tetra.u_Location_Update_Demand",
+      { "u-Location-Update-Demand", "tetra.u_Location_Update_Demand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_MM_Status,
-      { "u-MM-Status", "tetra.u_MM_Status",
+      { "u-MM-Status", "tetra.u_MM_Status_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_MM_reserved1,
-      { "u-MM-reserved1", "tetra.u_MM_reserved1",
+      { "u-MM-reserved1", "tetra.u_MM_reserved1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_WK,
-      { "u-WK", "tetra.u_WK",
+      { "u-WK", "tetra.u_WK_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_MM_reserved3,
-      { "u-MM-reserved3", "tetra.u_MM_reserved3",
+      { "u-MM-reserved3", "tetra.u_MM_reserved3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_Attach_Detach_Group_Identity,
-      { "u-Attach-Detach-Group-Identity", "tetra.u_Attach_Detach_Group_Identity",
+      { "u-Attach-Detach-Group-Identity", "tetra.u_Attach_Detach_Group_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_Attach_Detach_Group_Identity_Ack,
-      { "u-Attach-Detach-Group-Identity-Ack", "tetra.u_Attach_Detach_Group_Identity_Ack",
+      { "u-Attach-Detach-Group-Identity-Ack", "tetra.u_Attach_Detach_Group_Identity_Ack_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_TEI_Provide,
-      { "u-TEI-Provide", "tetra.u_TEI_Provide",
+      { "u-TEI-Provide", "tetra.u_TEI_Provide_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_MM_reserved6,
-      { "u-MM-reserved6", "tetra.u_MM_reserved6",
+      { "u-MM-reserved6", "tetra.u_MM_reserved6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_Disabled_Status,
-      { "u-Disabled-Status", "tetra.u_Disabled_Status",
+      { "u-Disabled-Status", "tetra.u_Disabled_Status_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_MM_reserved7,
-      { "u-MM-reserved7", "tetra.u_MM_reserved7",
+      { "u-MM-reserved7", "tetra.u_MM_reserved7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_MM_reserved8,
-      { "u-MM-reserved8", "tetra.u_MM_reserved8",
+      { "u-MM-reserved8", "tetra.u_MM_reserved8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_MM_reserved9,
-      { "u-MM-reserved9", "tetra.u_MM_reserved9",
+      { "u-MM-reserved9", "tetra.u_MM_reserved9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_MM_Function_Not_Support,
-      { "u-MM-Function-Not-Support", "tetra.u_MM_Function_Not_Support",
+      { "u-MM-Function-Not-Support", "tetra.u_MM_Function_Not_Support_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Otar,
-      { "d-Otar", "tetra.d_Otar",
+      { "d-Otar", "tetra.d_Otar_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Authentication,
-      { "d-Authentication", "tetra.d_Authentication",
+      { "d-Authentication", "tetra.d_Authentication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Authentication_Reject,
-      { "d-Authentication-Reject", "tetra.d_Authentication_Reject",
+      { "d-Authentication-Reject", "tetra.d_Authentication_Reject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Disable,
-      { "d-Disable", "tetra.d_Disable",
+      { "d-Disable", "tetra.d_Disable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Enable,
-      { "d-Enable", "tetra.d_Enable",
+      { "d-Enable", "tetra.d_Enable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Location_Update_Accept,
-      { "d-Location-Update-Accept", "tetra.d_Location_Update_Accept",
+      { "d-Location-Update-Accept", "tetra.d_Location_Update_Accept_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Location_Update_Command,
-      { "d-Location-Update-Command", "tetra.d_Location_Update_Command",
+      { "d-Location-Update-Command", "tetra.d_Location_Update_Command_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Location_Update_Reject,
-      { "d-Location-Update-Reject", "tetra.d_Location_Update_Reject",
+      { "d-Location-Update-Reject", "tetra.d_Location_Update_Reject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_MM_reserved2,
-      { "d-MM-reserved2", "tetra.d_MM_reserved2",
+      { "d-MM-reserved2", "tetra.d_MM_reserved2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Location_Update_Proceeding,
-      { "d-Location-Update-Proceeding", "tetra.d_Location_Update_Proceeding",
+      { "d-Location-Update-Proceeding", "tetra.d_Location_Update_Proceeding_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Attach_Detach_Group_Identity,
-      { "d-Attach-Detach-Group-Identity", "tetra.d_Attach_Detach_Group_Identity",
+      { "d-Attach-Detach-Group-Identity", "tetra.d_Attach_Detach_Group_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Attach_Detach_Group_Identity_Ack,
-      { "d-Attach-Detach-Group-Identity-Ack", "tetra.d_Attach_Detach_Group_Identity_Ack",
+      { "d-Attach-Detach-Group-Identity-Ack", "tetra.d_Attach_Detach_Group_Identity_Ack_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_MM_Status,
-      { "d-MM-Status", "tetra.d_MM_Status",
+      { "d-MM-Status", "tetra.d_MM_Status_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_MM_reserved5,
-      { "d-MM-reserved5", "tetra.d_MM_reserved5",
+      { "d-MM-reserved5", "tetra.d_MM_reserved5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_MM_reserved6,
-      { "d-MM-reserved6", "tetra.d_MM_reserved6",
+      { "d-MM-reserved6", "tetra.d_MM_reserved6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_MM_Function_Not_Support,
-      { "d-MM-Function-Not-Support", "tetra.d_MM_Function_Not_Support",
+      { "d-MM-Function-Not-Support", "tetra.d_MM_Function_Not_Support_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_attach_detach_identifiet,
@@ -10565,7 +10565,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_attach_detach_identifiet_vals), 0,
         NULL, HFILL }},
     { &hf_tetra_attach,
-      { "attach", "tetra.attach",
+      { "attach", "tetra.attach_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_lifetime,
@@ -10577,7 +10577,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_7", HFILL }},
     { &hf_tetra_detach,
-      { "detach", "tetra.detach",
+      { "detach", "tetra.detach_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_detach_downlike,
@@ -10593,7 +10593,7 @@ void proto_register_tetra (void)
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_3", HFILL }},
     { &hf_tetra_gssi_extension,
-      { "gssi-extension", "tetra.gssi_extension",
+      { "gssi-extension", "tetra.gssi_extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_extension,
@@ -10609,11 +10609,11 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_attach_detach_identifiet_01_vals), 0,
         "T_attach_detach_identifiet_01", HFILL }},
     { &hf_tetra_attach_01,
-      { "attach", "tetra.attach",
+      { "attach", "tetra.attach_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_attach_01", HFILL }},
     { &hf_tetra_detach_01,
-      { "detach", "tetra.detach",
+      { "detach", "tetra.detach_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_detach_01", HFILL }},
     { &hf_tetra_detach_uplike,
@@ -10625,7 +10625,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_address_type_01_vals), 0,
         "T_address_type_01", HFILL }},
     { &hf_tetra_gssi_extension_01,
-      { "gssi-extension", "tetra.gssi_extension",
+      { "gssi-extension", "tetra.gssi_extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_gssi_extension_01", HFILL }},
     { &hf_tetra_location_update_type,
@@ -10637,7 +10637,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_optional_elements_05_vals), 0,
         "T_optional_elements_05", HFILL }},
     { &hf_tetra_type2_parameters_03,
-      { "type2-parameters", "tetra.type2_parameters",
+      { "type2-parameters", "tetra.type2_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_parameters_03", HFILL }},
     { &hf_tetra_ssi_02,
@@ -10681,11 +10681,11 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_type3_vals), 0,
         NULL, HFILL }},
     { &hf_tetra_no_type3,
-      { "no-type3", "tetra.no_type3",
+      { "no-type3", "tetra.no_type3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_type3_elements,
-      { "type3-elements", "tetra.type3_elements",
+      { "type3-elements", "tetra.type3_elements_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_type2_existance,
@@ -10757,71 +10757,71 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_63", HFILL }},
     { &hf_tetra_u_Alert,
-      { "u-Alert", "tetra.u_Alert",
+      { "u-Alert", "tetra.u_Alert_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_reserved1,
-      { "reserved1", "tetra.reserved1",
+      { "reserved1", "tetra.reserved1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_Connect,
-      { "u-Connect", "tetra.u_Connect",
+      { "u-Connect", "tetra.u_Connect_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_reserved2,
-      { "reserved2", "tetra.reserved2",
+      { "reserved2", "tetra.reserved2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_Disconnect,
-      { "u-Disconnect", "tetra.u_Disconnect",
+      { "u-Disconnect", "tetra.u_Disconnect_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_Info,
-      { "u-Info", "tetra.u_Info",
+      { "u-Info", "tetra.u_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_Release,
-      { "u-Release", "tetra.u_Release",
+      { "u-Release", "tetra.u_Release_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_Setup,
-      { "u-Setup", "tetra.u_Setup",
+      { "u-Setup", "tetra.u_Setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_Status,
-      { "u-Status", "tetra.u_Status",
+      { "u-Status", "tetra.u_Status_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_Tx_Ceased,
-      { "u-Tx-Ceased", "tetra.u_Tx_Ceased",
+      { "u-Tx-Ceased", "tetra.u_Tx_Ceased_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_Tx_Demand,
-      { "u-Tx-Demand", "tetra.u_Tx_Demand",
+      { "u-Tx-Demand", "tetra.u_Tx_Demand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_reserved3,
-      { "reserved3", "tetra.reserved3",
+      { "reserved3", "tetra.reserved3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_reserved4,
-      { "reserved4", "tetra.reserved4",
+      { "reserved4", "tetra.reserved4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_reserved5,
-      { "reserved5", "tetra.reserved5",
+      { "reserved5", "tetra.reserved5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_Call_Restore,
-      { "u-Call-Restore", "tetra.u_Call_Restore",
+      { "u-Call-Restore", "tetra.u_Call_Restore_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_SDS_Data,
-      { "u-SDS-Data", "tetra.u_SDS_Data",
+      { "u-SDS-Data", "tetra.u_SDS_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_u_Facility,
-      { "u-Facility", "tetra.u_Facility",
+      { "u-Facility", "tetra.u_Facility_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_call_identifier,
@@ -10893,71 +10893,71 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_1", HFILL }},
     { &hf_tetra_d_Alert,
-      { "d-Alert", "tetra.d_Alert",
+      { "d-Alert", "tetra.d_Alert_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Call_Proceeding,
-      { "d-Call-Proceeding", "tetra.d_Call_Proceeding",
+      { "d-Call-Proceeding", "tetra.d_Call_Proceeding_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Connect,
-      { "d-Connect", "tetra.d_Connect",
+      { "d-Connect", "tetra.d_Connect_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Connect_Ack,
-      { "d-Connect-Ack", "tetra.d_Connect_Ack",
+      { "d-Connect-Ack", "tetra.d_Connect_Ack_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Disconnect,
-      { "d-Disconnect", "tetra.d_Disconnect",
+      { "d-Disconnect", "tetra.d_Disconnect_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Info,
-      { "d-Info", "tetra.d_Info",
+      { "d-Info", "tetra.d_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Release,
-      { "d-Release", "tetra.d_Release",
+      { "d-Release", "tetra.d_Release_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Setup,
-      { "d-Setup", "tetra.d_Setup",
+      { "d-Setup", "tetra.d_Setup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Status,
-      { "d-Status", "tetra.d_Status",
+      { "d-Status", "tetra.d_Status_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Tx_Ceased,
-      { "d-Tx-Ceased", "tetra.d_Tx_Ceased",
+      { "d-Tx-Ceased", "tetra.d_Tx_Ceased_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Tx_Continue,
-      { "d-Tx-Continue", "tetra.d_Tx_Continue",
+      { "d-Tx-Continue", "tetra.d_Tx_Continue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Tx_Granted,
-      { "d-Tx-Granted", "tetra.d_Tx_Granted",
+      { "d-Tx-Granted", "tetra.d_Tx_Granted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Tx_Wait,
-      { "d-Tx-Wait", "tetra.d_Tx_Wait",
+      { "d-Tx-Wait", "tetra.d_Tx_Wait_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Tx_Interrupt,
-      { "d-Tx-Interrupt", "tetra.d_Tx_Interrupt",
+      { "d-Tx-Interrupt", "tetra.d_Tx_Interrupt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Call_Restore,
-      { "d-Call-Restore", "tetra.d_Call_Restore",
+      { "d-Call-Restore", "tetra.d_Call_Restore_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_SDS_Data,
-      { "d-SDS-Data", "tetra.d_SDS_Data",
+      { "d-SDS-Data", "tetra.d_SDS_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_d_Facility,
-      { "d-Facility", "tetra.d_Facility",
+      { "d-Facility", "tetra.d_Facility_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_calling_party_type_identifier,
@@ -11009,7 +11009,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_cipher_control_vals), 0,
         NULL, HFILL }},
     { &hf_tetra_no_cipher,
-      { "no-cipher", "tetra.no_cipher",
+      { "no-cipher", "tetra.no_cipher_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_ciphering_parameters,
@@ -11021,7 +11021,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_optional_elements_06_vals), 0,
         "T_optional_elements_06", HFILL }},
     { &hf_tetra_type2_parameters_04,
-      { "type2-parameters", "tetra.type2_parameters",
+      { "type2-parameters", "tetra.type2_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_parameters_04", HFILL }},
     { &hf_tetra_class_of_MS,
@@ -11057,7 +11057,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_type3_01_vals), 0,
         "T_type3_01", HFILL }},
     { &hf_tetra_type3_elements_01,
-      { "type3-elements", "tetra.type3_elements",
+      { "type3-elements", "tetra.type3_elements_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type3_elements_01", HFILL }},
     { &hf_tetra_group_identity_location_demand,
@@ -11101,7 +11101,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_optional_elements_07_vals), 0,
         "T_optional_elements_07", HFILL }},
     { &hf_tetra_type2_element,
-      { "type2-element", "tetra.type2_element",
+      { "type2-element", "tetra.type2_element_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_type3_02,
@@ -11109,7 +11109,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_type3_02_vals), 0,
         "T_type3_02", HFILL }},
     { &hf_tetra_type3_elements_02,
-      { "type3-elements", "tetra.type3_elements",
+      { "type3-elements", "tetra.type3_elements_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type3_elements_02", HFILL }},
     { &hf_tetra_length,
@@ -11121,7 +11121,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_63", HFILL }},
     { &hf_tetra_group_identity_uplink_02,
-      { "group-identity-uplink", "tetra.group_identity_uplink",
+      { "group-identity-uplink", "tetra.group_identity_uplink_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_group_identity_ack_type,
@@ -11133,7 +11133,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_optional_elements_08_vals), 0,
         "T_optional_elements_08", HFILL }},
     { &hf_tetra_type2_element_01,
-      { "type2-element", "tetra.type2_element",
+      { "type2-element", "tetra.type2_element_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_element_01", HFILL }},
     { &hf_tetra_type3_03,
@@ -11141,7 +11141,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_type3_03_vals), 0,
         "T_type3_03", HFILL }},
     { &hf_tetra_type3_elements_03,
-      { "type3-elements", "tetra.type3_elements",
+      { "type3-elements", "tetra.type3_elements_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type3_elements_03", HFILL }},
     { &hf_tetra_hook_method_selection,
@@ -11153,7 +11153,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_simple_duplex_selection_vals), 0,
         NULL, HFILL }},
     { &hf_tetra_basic_service_information,
-      { "basic-service-information", "tetra.basic_service_information",
+      { "basic-service-information", "tetra.basic_service_information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_request_transmit_send_data,
@@ -11177,7 +11177,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_optional_elements_09_vals), 0,
         "T_optional_elements_09", HFILL }},
     { &hf_tetra_type2_parameters_05,
-      { "type2-parameters", "tetra.type2_parameters",
+      { "type2-parameters", "tetra.type2_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_parameters_05", HFILL }},
     { &hf_tetra_external_subscriber_number,
@@ -11193,7 +11193,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_prop_vals), 0,
         NULL, HFILL }},
     { &hf_tetra_prop_01,
-      { "prop", "tetra.prop",
+      { "prop", "tetra.prop_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Proprietary", HFILL }},
     { &hf_tetra_circuit_mode,
@@ -11225,7 +11225,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_optional_elements_10_vals), 0,
         "T_optional_elements_10", HFILL }},
     { &hf_tetra_type2_parameters_06,
-      { "type2-parameters", "tetra.type2_parameters",
+      { "type2-parameters", "tetra.type2_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_parameters_06", HFILL }},
     { &hf_tetra_basic_service_information_01,
@@ -11245,7 +11245,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_optional_elements_11_vals), 0,
         "T_optional_elements_11", HFILL }},
     { &hf_tetra_type2_parameters_07,
-      { "type2-parameters", "tetra.type2_parameters",
+      { "type2-parameters", "tetra.type2_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_parameters_07", HFILL }},
     { &hf_tetra_basic_service_information_02,
@@ -11261,7 +11261,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_optional_elements_12_vals), 0,
         "T_optional_elements_12", HFILL }},
     { &hf_tetra_type2_parameters_08,
-      { "type2-parameters", "tetra.type2_parameters",
+      { "type2-parameters", "tetra.type2_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_parameters_08", HFILL }},
     { &hf_tetra_prop_04,
@@ -11281,7 +11281,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_optional_elements_13_vals), 0,
         "T_optional_elements_13", HFILL }},
     { &hf_tetra_type2_parameters_09,
-      { "type2-parameters", "tetra.type2_parameters",
+      { "type2-parameters", "tetra.type2_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_parameters_09", HFILL }},
     { &hf_tetra_prop_05,
@@ -11293,7 +11293,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_optional_elements_14_vals), 0,
         "T_optional_elements_14", HFILL }},
     { &hf_tetra_type2_parameters_10,
-      { "type2-parameters", "tetra.type2_parameters",
+      { "type2-parameters", "tetra.type2_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_parameters_10", HFILL }},
     { &hf_tetra_prop_06,
@@ -11313,7 +11313,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_optional_elements_15_vals), 0,
         "T_optional_elements_15", HFILL }},
     { &hf_tetra_type2_parameters_11,
-      { "type2-parameters", "tetra.type2_parameters",
+      { "type2-parameters", "tetra.type2_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_parameters_11", HFILL }},
     { &hf_tetra_prop_07,
@@ -11341,7 +11341,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_optional_elements_16_vals), 0,
         "T_optional_elements_16", HFILL }},
     { &hf_tetra_type2_parameters_12,
-      { "type2-parameters", "tetra.type2_parameters",
+      { "type2-parameters", "tetra.type2_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_parameters_12", HFILL }},
     { &hf_tetra_calling_party_address,
@@ -11377,7 +11377,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_optional_elements_17_vals), 0,
         "T_optional_elements_17", HFILL }},
     { &hf_tetra_type2_parameters_13,
-      { "type2-parameters", "tetra.type2_parameters",
+      { "type2-parameters", "tetra.type2_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_parameters_13", HFILL }},
     { &hf_tetra_basic_service_information_03,
@@ -11417,7 +11417,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_optional_elements_18_vals), 0,
         "T_optional_elements_18", HFILL }},
     { &hf_tetra_type2_parameters_14,
-      { "type2-parameters", "tetra.type2_parameters",
+      { "type2-parameters", "tetra.type2_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_parameters_14", HFILL }},
     { &hf_tetra_basic_service_infomation,
@@ -11425,7 +11425,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_basic_service_infomation_vals), 0,
         NULL, HFILL }},
     { &hf_tetra_basic_service_infomation_01,
-      { "basic-service-infomation", "tetra.basic_service_infomation",
+      { "basic-service-infomation", "tetra.basic_service_infomation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Basic_service_information", HFILL }},
     { &hf_tetra_notification_indicator_02,
@@ -11453,7 +11453,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_optional_elements_19_vals), 0,
         "T_optional_elements_19", HFILL }},
     { &hf_tetra_type2_parameters_15,
-      { "type2-parameters", "tetra.type2_parameters",
+      { "type2-parameters", "tetra.type2_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_parameters_15", HFILL }},
     { &hf_tetra_call_priority_01,
@@ -11485,7 +11485,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_optional_elements_20_vals), 0,
         "T_optional_elements_20", HFILL }},
     { &hf_tetra_type2_parameters_16,
-      { "type2-parameters", "tetra.type2_parameters",
+      { "type2-parameters", "tetra.type2_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_parameters_16", HFILL }},
     { &hf_tetra_notification_indicator_04,
@@ -11501,7 +11501,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_optional_elements_21_vals), 0,
         "T_optional_elements_21", HFILL }},
     { &hf_tetra_type2_parameters_17,
-      { "type2-parameters", "tetra.type2_parameters",
+      { "type2-parameters", "tetra.type2_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_parameters_17", HFILL }},
     { &hf_tetra_notification_indicator_05,
@@ -11521,7 +11521,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_optional_elements_22_vals), 0,
         "T_optional_elements_22", HFILL }},
     { &hf_tetra_type2_parameters_18,
-      { "type2-parameters", "tetra.type2_parameters",
+      { "type2-parameters", "tetra.type2_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_parameters_18", HFILL }},
     { &hf_tetra_new_call_identifier,
@@ -11549,7 +11549,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_modify_vals), 0,
         NULL, HFILL }},
     { &hf_tetra_modify_01,
-      { "modify", "tetra.modify",
+      { "modify", "tetra.modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Modify_type", HFILL }},
     { &hf_tetra_notification_indicator_06,
@@ -11565,7 +11565,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_optional_elements_23_vals), 0,
         "T_optional_elements_23", HFILL }},
     { &hf_tetra_type2_parameters_19,
-      { "type2-parameters", "tetra.type2_parameters",
+      { "type2-parameters", "tetra.type2_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_parameters_19", HFILL }},
     { &hf_tetra_notification_indicator_07,
@@ -11585,7 +11585,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_optional_elements_24_vals), 0,
         "T_optional_elements_24", HFILL }},
     { &hf_tetra_type2_element_02,
-      { "type2-element", "tetra.type2_element",
+      { "type2-element", "tetra.type2_element_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_element_02", HFILL }},
     { &hf_tetra_type3_04,
@@ -11593,11 +11593,11 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_type3_04_vals), 0,
         "T_type3_04", HFILL }},
     { &hf_tetra_type3_elements_04,
-      { "type3-elements", "tetra.type3_elements",
+      { "type3-elements", "tetra.type3_elements_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type3_elements_04", HFILL }},
     { &hf_tetra_group_identity_downlink_02,
-      { "group-identity-downlink", "tetra.group_identity_downlink",
+      { "group-identity-downlink", "tetra.group_identity_downlink_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_group_identity_attach_detach_accept,
@@ -11609,7 +11609,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_optional_elements_25_vals), 0,
         "T_optional_elements_25", HFILL }},
     { &hf_tetra_type2_element_03,
-      { "type2-element", "tetra.type2_element",
+      { "type2-element", "tetra.type2_element_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type2_element_03", HFILL }},
     { &hf_tetra_type3_05,
@@ -11617,7 +11617,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_type3_05_vals), 0,
         "T_type3_05", HFILL }},
     { &hf_tetra_type3_elements_05,
-      { "type3-elements", "tetra.type3_elements",
+      { "type3-elements", "tetra.type3_elements_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_type3_elements_05", HFILL }},
     { &hf_tetra_called_party_sna,
@@ -11629,7 +11629,7 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_16777215", HFILL }},
     { &hf_tetra_called_party_ssi_extention,
-      { "called-party-ssi-extention", "tetra.called_party_ssi_extention",
+      { "called-party-ssi-extention", "tetra.called_party_ssi_extention_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_tetra_called_party_extention,
@@ -11641,11 +11641,11 @@ void proto_register_tetra (void)
         FT_UINT32, BASE_DEC, VALS(tetra_T_data_01_vals), 0,
         "T_data_01", HFILL }},
     { &hf_tetra_element1,
-      { "element1", "tetra.element1",
+      { "element1", "tetra.element1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Type1", HFILL }},
     { &hf_tetra_element,
-      { "element", "tetra.element",
+      { "element", "tetra.element_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Type2", HFILL }},
     { &hf_tetra_proprietary_element_owner,
diff --git a/epan/dissectors/packet-ulp.c b/epan/dissectors/packet-ulp.c
index e42f918d81..ddfca739d6 100644
--- a/epan/dissectors/packet-ulp.c
+++ b/epan/dissectors/packet-ulp.c
@@ -6300,7 +6300,7 @@ void proto_register_ulp(void) {
 /*--- Included file: packet-ulp-hfarr.c ---*/
 #line 1 "../../asn1/ulp/packet-ulp-hfarr.c"
     { &hf_ulp_ULP_PDU_PDU,
-      { "ULP-PDU", "ulp.ULP_PDU",
+      { "ULP-PDU", "ulp.ULP_PDU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_length,
@@ -6308,11 +6308,11 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_65535", HFILL }},
     { &hf_ulp_version,
-      { "version", "ulp.version",
+      { "version", "ulp.version_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_sessionID,
-      { "sessionID", "ulp.sessionID",
+      { "sessionID", "ulp.sessionID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_message,
@@ -6320,63 +6320,63 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_UlpMessage_vals), 0,
         "UlpMessage", HFILL }},
     { &hf_ulp_msSUPLINIT,
-      { "msSUPLINIT", "ulp.msSUPLINIT",
+      { "msSUPLINIT", "ulp.msSUPLINIT_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SUPLINIT", HFILL }},
     { &hf_ulp_msSUPLSTART,
-      { "msSUPLSTART", "ulp.msSUPLSTART",
+      { "msSUPLSTART", "ulp.msSUPLSTART_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SUPLSTART", HFILL }},
     { &hf_ulp_msSUPLRESPONSE,
-      { "msSUPLRESPONSE", "ulp.msSUPLRESPONSE",
+      { "msSUPLRESPONSE", "ulp.msSUPLRESPONSE_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SUPLRESPONSE", HFILL }},
     { &hf_ulp_msSUPLPOSINIT,
-      { "msSUPLPOSINIT", "ulp.msSUPLPOSINIT",
+      { "msSUPLPOSINIT", "ulp.msSUPLPOSINIT_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SUPLPOSINIT", HFILL }},
     { &hf_ulp_msSUPLPOS,
-      { "msSUPLPOS", "ulp.msSUPLPOS",
+      { "msSUPLPOS", "ulp.msSUPLPOS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SUPLPOS", HFILL }},
     { &hf_ulp_msSUPLEND,
-      { "msSUPLEND", "ulp.msSUPLEND",
+      { "msSUPLEND", "ulp.msSUPLEND_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SUPLEND", HFILL }},
     { &hf_ulp_msSUPLAUTHREQ,
-      { "msSUPLAUTHREQ", "ulp.msSUPLAUTHREQ",
+      { "msSUPLAUTHREQ", "ulp.msSUPLAUTHREQ_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SUPLAUTHREQ", HFILL }},
     { &hf_ulp_msSUPLAUTHRESP,
-      { "msSUPLAUTHRESP", "ulp.msSUPLAUTHRESP",
+      { "msSUPLAUTHRESP", "ulp.msSUPLAUTHRESP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SUPLAUTHRESP", HFILL }},
     { &hf_ulp_msSUPLTRIGGEREDSTART,
-      { "msSUPLTRIGGEREDSTART", "ulp.msSUPLTRIGGEREDSTART",
+      { "msSUPLTRIGGEREDSTART", "ulp.msSUPLTRIGGEREDSTART_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ver2_SUPLTRIGGEREDSTART", HFILL }},
     { &hf_ulp_msSUPLTRIGGEREDRESPONSE,
-      { "msSUPLTRIGGEREDRESPONSE", "ulp.msSUPLTRIGGEREDRESPONSE",
+      { "msSUPLTRIGGEREDRESPONSE", "ulp.msSUPLTRIGGEREDRESPONSE_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ver2_SUPLTRIGGEREDRESPONSE", HFILL }},
     { &hf_ulp_msSUPLTRIGGEREDSTOP,
-      { "msSUPLTRIGGEREDSTOP", "ulp.msSUPLTRIGGEREDSTOP",
+      { "msSUPLTRIGGEREDSTOP", "ulp.msSUPLTRIGGEREDSTOP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ver2_SUPLTRIGGEREDSTOP", HFILL }},
     { &hf_ulp_msSUPLNOTIFY,
-      { "msSUPLNOTIFY", "ulp.msSUPLNOTIFY",
+      { "msSUPLNOTIFY", "ulp.msSUPLNOTIFY_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ver2_SUPLNOTIFY", HFILL }},
     { &hf_ulp_msSUPLNOTIFYRESPONSE,
-      { "msSUPLNOTIFYRESPONSE", "ulp.msSUPLNOTIFYRESPONSE",
+      { "msSUPLNOTIFYRESPONSE", "ulp.msSUPLNOTIFYRESPONSE_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ver2_SUPLNOTIFYRESPONSE", HFILL }},
     { &hf_ulp_msSUPLSETINIT,
-      { "msSUPLSETINIT", "ulp.msSUPLSETINIT",
+      { "msSUPLSETINIT", "ulp.msSUPLSETINIT_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ver2_SUPLSETINIT", HFILL }},
     { &hf_ulp_msSUPLREPORT,
-      { "msSUPLREPORT", "ulp.msSUPLREPORT",
+      { "msSUPLREPORT", "ulp.msSUPLREPORT_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ver2_SUPLREPORT", HFILL }},
     { &hf_ulp_posMethod,
@@ -6384,7 +6384,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_PosMethod_vals), 0,
         NULL, HFILL }},
     { &hf_ulp_notification,
-      { "notification", "ulp.notification",
+      { "notification", "ulp.notification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_sLPAddress,
@@ -6392,7 +6392,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_SLPAddress_vals), 0,
         NULL, HFILL }},
     { &hf_ulp_qoP,
-      { "qoP", "ulp.qoP",
+      { "qoP", "ulp.qoP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_sLPMode,
@@ -6408,7 +6408,7 @@ void proto_register_ulp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_ver2_SUPL_INIT_extension,
-      { "ver2-SUPL-INIT-extension", "ulp.ver2_SUPL_INIT_extension",
+      { "ver2-SUPL-INIT-extension", "ulp.ver2_SUPL_INIT_extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_notificationType,
@@ -6436,23 +6436,23 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_FormatIndicator_vals), 0,
         "FormatIndicator", HFILL }},
     { &hf_ulp_ver2_Notification_extension,
-      { "ver2-Notification-extension", "ulp.ver2_Notification_extension",
+      { "ver2-Notification-extension", "ulp.ver2_Notification_extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_sETCapabilities,
-      { "sETCapabilities", "ulp.sETCapabilities",
+      { "sETCapabilities", "ulp.sETCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_locationId,
-      { "locationId", "ulp.locationId",
+      { "locationId", "ulp.locationId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_ver2_SUPL_START_extension,
-      { "ver2-SUPL-START-extension", "ulp.ver2_SUPL_START_extension",
+      { "ver2-SUPL-START-extension", "ulp.ver2_SUPL_START_extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_posTechnology,
-      { "posTechnology", "ulp.posTechnology",
+      { "posTechnology", "ulp.posTechnology_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_prefMethod,
@@ -6460,11 +6460,11 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_PrefMethod_vals), 0,
         NULL, HFILL }},
     { &hf_ulp_posProtocol,
-      { "posProtocol", "ulp.posProtocol",
+      { "posProtocol", "ulp.posProtocol_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_ver2_SETCapabilities_extension,
-      { "ver2-SETCapabilities-extension", "ulp.ver2_SETCapabilities_extension",
+      { "ver2-SETCapabilities-extension", "ulp.ver2_SETCapabilities_extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_agpsSETassisted,
@@ -6496,7 +6496,7 @@ void proto_register_ulp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_ulp_ver2_PosTechnology_extension,
-      { "ver2-PosTechnology-extension", "ulp.ver2_PosTechnology_extension",
+      { "ver2-PosTechnology-extension", "ulp.ver2_PosTechnology_extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_tia801,
@@ -6512,7 +6512,7 @@ void proto_register_ulp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_ulp_ver2_PosProtocol_extension,
-      { "ver2-PosProtocol-extension", "ulp.ver2_PosProtocol_extension",
+      { "ver2-PosProtocol-extension", "ulp.ver2_PosProtocol_extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_sETAuthKey,
@@ -6524,7 +6524,7 @@ void proto_register_ulp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_ver2_SUPL_RESPONSE_extension,
-      { "ver2-SUPL-RESPONSE-extension", "ulp.ver2_SUPL_RESPONSE_extension",
+      { "ver2-SUPL-RESPONSE-extension", "ulp.ver2_SUPL_RESPONSE_extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_shortKey,
@@ -6536,15 +6536,15 @@ void proto_register_ulp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_256", HFILL }},
     { &hf_ulp_requestedAssistData,
-      { "requestedAssistData", "ulp.requestedAssistData",
+      { "requestedAssistData", "ulp.requestedAssistData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_position,
-      { "position", "ulp.position",
+      { "position", "ulp.position_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_sUPLPOS,
-      { "sUPLPOS", "ulp.sUPLPOS",
+      { "sUPLPOS", "ulp.sUPLPOS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_ver,
@@ -6552,7 +6552,7 @@ void proto_register_ulp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_ver2_SUPL_POS_INIT_extension,
-      { "ver2-SUPL-POS-INIT-extension", "ulp.ver2_SUPL_POS_INIT_extension",
+      { "ver2-SUPL-POS-INIT-extension", "ulp.ver2_SUPL_POS_INIT_extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_almanacRequested,
@@ -6592,11 +6592,11 @@ void proto_register_ulp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_ulp_navigationModelData,
-      { "navigationModelData", "ulp.navigationModelData",
+      { "navigationModelData", "ulp.navigationModelData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NavigationModel", HFILL }},
     { &hf_ulp_ver2_RequestedAssistData_extension,
-      { "ver2-RequestedAssistData-extension", "ulp.ver2_RequestedAssistData_extension",
+      { "ver2-RequestedAssistData-extension", "ulp.ver2_RequestedAssistData_extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_gpsWeek,
@@ -6620,7 +6620,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SatelliteInfo", HFILL }},
     { &hf_ulp_SatelliteInfo_item,
-      { "SatelliteInfoElement", "ulp.SatelliteInfoElement",
+      { "SatelliteInfoElement", "ulp.SatelliteInfoElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_satId,
@@ -6640,7 +6640,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_Velocity_vals), 0,
         NULL, HFILL }},
     { &hf_ulp_ver2_SUPL_POS_extension,
-      { "ver2-SUPL-POS-extension", "ulp.ver2_SUPL_POS_extension",
+      { "ver2-SUPL-POS-extension", "ulp.ver2_SUPL_POS_extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_tia801payload,
@@ -6656,7 +6656,7 @@ void proto_register_ulp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_ver2_PosPayLoad_extension,
-      { "ver2-PosPayLoad-extension", "ulp.ver2_PosPayLoad_extension",
+      { "ver2-PosPayLoad-extension", "ulp.ver2_PosPayLoad_extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_statusCode,
@@ -6664,7 +6664,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_StatusCode_vals), 0,
         NULL, HFILL }},
     { &hf_ulp_ver2_SUPL_END_extension,
-      { "ver2-SUPL-END-extension", "ulp.ver2_SUPL_END_extension",
+      { "ver2-SUPL-END-extension", "ulp.ver2_SUPL_END_extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_sPCSETKey,
@@ -6672,7 +6672,7 @@ void proto_register_ulp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_sPCTID,
-      { "sPCTID", "ulp.sPCTID",
+      { "sPCTID", "ulp.sPCTID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_sPCSETKeylifetime,
@@ -6688,7 +6688,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_SETId_vals), 0,
         "SETId", HFILL }},
     { &hf_ulp_applicationID,
-      { "applicationID", "ulp.applicationID",
+      { "applicationID", "ulp.applicationID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_multipleLocationIds,
@@ -6708,7 +6708,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_TriggerParams_vals), 0,
         NULL, HFILL }},
     { &hf_ulp_reportingCap,
-      { "reportingCap", "ulp.reportingCap",
+      { "reportingCap", "ulp.reportingCap_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_causeCode,
@@ -6716,11 +6716,11 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_CauseCode_vals), 0,
         NULL, HFILL }},
     { &hf_ulp_periodicParams,
-      { "periodicParams", "ulp.periodicParams",
+      { "periodicParams", "ulp.periodicParams_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_areaEventParams,
-      { "areaEventParams", "ulp.areaEventParams",
+      { "areaEventParams", "ulp.areaEventParams_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_numberOfFixes,
@@ -6744,7 +6744,7 @@ void proto_register_ulp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_ulp_repeatedReportingParams,
-      { "repeatedReportingParams", "ulp.repeatedReportingParams",
+      { "repeatedReportingParams", "ulp.repeatedReportingParams_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_stopTime,
@@ -6760,7 +6760,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxAreaIdList_OF_AreaIdList", HFILL }},
     { &hf_ulp_areaIdLists_item,
-      { "AreaIdList", "ulp.AreaIdList",
+      { "AreaIdList", "ulp.AreaIdList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_minimumIntervalTime,
@@ -6776,15 +6776,15 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_GeographicTargetArea_vals), 0,
         NULL, HFILL }},
     { &hf_ulp_circularArea,
-      { "circularArea", "ulp.circularArea",
+      { "circularArea", "ulp.circularArea_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_ellipticalArea,
-      { "ellipticalArea", "ulp.ellipticalArea",
+      { "ellipticalArea", "ulp.ellipticalArea_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_polygonArea,
-      { "polygonArea", "ulp.polygonArea",
+      { "polygonArea", "ulp.polygonArea_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_areaIdSet,
@@ -6804,35 +6804,35 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_AreaId_vals), 0,
         NULL, HFILL }},
     { &hf_ulp_gSMAreaId,
-      { "gSMAreaId", "ulp.gSMAreaId",
+      { "gSMAreaId", "ulp.gSMAreaId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_wCDMAAreaId,
-      { "wCDMAAreaId", "ulp.wCDMAAreaId",
+      { "wCDMAAreaId", "ulp.wCDMAAreaId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_cDMAAreaId,
-      { "cDMAAreaId", "ulp.cDMAAreaId",
+      { "cDMAAreaId", "ulp.cDMAAreaId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_hRPDAreaId,
-      { "hRPDAreaId", "ulp.hRPDAreaId",
+      { "hRPDAreaId", "ulp.hRPDAreaId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_uMBAreaId,
-      { "uMBAreaId", "ulp.uMBAreaId",
+      { "uMBAreaId", "ulp.uMBAreaId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_lTEAreaId,
-      { "lTEAreaId", "ulp.lTEAreaId",
+      { "lTEAreaId", "ulp.lTEAreaId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_wLANAreaId,
-      { "wLANAreaId", "ulp.wLANAreaId",
+      { "wLANAreaId", "ulp.wLANAreaId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_wiMAXAreaId,
-      { "wiMAXAreaId", "ulp.wiMAXAreaId",
+      { "wiMAXAreaId", "ulp.wiMAXAreaId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_refMCC,
@@ -6892,15 +6892,15 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_supportedNetworkInformation,
-      { "supportedNetworkInformation", "ulp.supportedNetworkInformation",
+      { "supportedNetworkInformation", "ulp.supportedNetworkInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_reportingMode,
-      { "reportingMode", "ulp.reportingMode",
+      { "reportingMode", "ulp.reportingMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_gnssPosTechnology,
-      { "gnssPosTechnology", "ulp.gnssPosTechnology",
+      { "gnssPosTechnology", "ulp.gnssPosTechnology_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_repMode,
@@ -6912,7 +6912,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_BatchRepConditions_vals), 0,
         NULL, HFILL }},
     { &hf_ulp_batchRepType,
-      { "batchRepType", "ulp.batchRepType",
+      { "batchRepType", "ulp.batchRepType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_num_interval,
@@ -6924,7 +6924,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_2048", HFILL }},
     { &hf_ulp_endofsession,
-      { "endofsession", "ulp.endofsession",
+      { "endofsession", "ulp.endofsession_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_reportPosition,
@@ -6952,19 +6952,19 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_moreComponents,
-      { "moreComponents", "ulp.moreComponents",
+      { "moreComponents", "ulp.moreComponents_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_SessionList_item,
-      { "SessionInformation", "ulp.SessionInformation",
+      { "SessionInformation", "ulp.SessionInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_ReportDataList_item,
-      { "ReportData", "ulp.ReportData",
+      { "ReportData", "ulp.ReportData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_positionData,
-      { "positionData", "ulp.positionData",
+      { "positionData", "ulp.positionData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_resultCode,
@@ -6980,7 +6980,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_GANSSsignalsInfo_item,
-      { "GANSSSignalsDescription", "ulp.GANSSSignalsDescription",
+      { "GANSSSignalsDescription", "ulp.GANSSSignalsDescription_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_ganssId,
@@ -7008,11 +7008,11 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_SLPAddress_vals), 0,
         "SLPAddress", HFILL }},
     { &hf_ulp_historicReporting,
-      { "historicReporting", "ulp.historicReporting",
+      { "historicReporting", "ulp.historicReporting_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_protectionLevel,
-      { "protectionLevel", "ulp.protectionLevel",
+      { "protectionLevel", "ulp.protectionLevel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_minimumMajorVersion,
@@ -7024,11 +7024,11 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_AllowedReportingType_vals), 0,
         NULL, HFILL }},
     { &hf_ulp_reportingCriteria,
-      { "reportingCriteria", "ulp.reportingCriteria",
+      { "reportingCriteria", "ulp.reportingCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_timeWindow,
-      { "timeWindow", "ulp.timeWindow",
+      { "timeWindow", "ulp.timeWindow_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_maxNumberofReports,
@@ -7052,7 +7052,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_ProtLevel_vals), 0,
         NULL, HFILL }},
     { &hf_ulp_basicProtectionParams,
-      { "basicProtectionParams", "ulp.basicProtectionParams",
+      { "basicProtectionParams", "ulp.basicProtectionParams_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_keyIdentifier,
@@ -7068,51 +7068,51 @@ void proto_register_ulp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_32", HFILL }},
     { &hf_ulp_initialApproximateposition,
-      { "initialApproximateposition", "ulp.initialApproximateposition",
+      { "initialApproximateposition", "ulp.initialApproximateposition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Position", HFILL }},
     { &hf_ulp_utran_GPSReferenceTimeResult,
-      { "utran-GPSReferenceTimeResult", "ulp.utran_GPSReferenceTimeResult",
+      { "utran-GPSReferenceTimeResult", "ulp.utran_GPSReferenceTimeResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_utran_GANSSReferenceTimeResult,
-      { "utran-GANSSReferenceTimeResult", "ulp.utran_GANSSReferenceTimeResult",
+      { "utran-GANSSReferenceTimeResult", "ulp.utran_GANSSReferenceTimeResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_utran_GPSReferenceTimeAssistance,
-      { "utran-GPSReferenceTimeAssistance", "ulp.utran_GPSReferenceTimeAssistance",
+      { "utran-GPSReferenceTimeAssistance", "ulp.utran_GPSReferenceTimeAssistance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_utran_GANSSReferenceTimeAssistance,
-      { "utran-GANSSReferenceTimeAssistance", "ulp.utran_GANSSReferenceTimeAssistance",
+      { "utran-GANSSReferenceTimeAssistance", "ulp.utran_GANSSReferenceTimeAssistance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_emergencyCallLocation,
-      { "emergencyCallLocation", "ulp.emergencyCallLocation",
+      { "emergencyCallLocation", "ulp.emergencyCallLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_serviceCapabilities,
-      { "serviceCapabilities", "ulp.serviceCapabilities",
+      { "serviceCapabilities", "ulp.serviceCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_supportedBearers,
-      { "supportedBearers", "ulp.supportedBearers",
+      { "supportedBearers", "ulp.supportedBearers_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_servicesSupported,
-      { "servicesSupported", "ulp.servicesSupported",
+      { "servicesSupported", "ulp.servicesSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_reportingCapabilities,
-      { "reportingCapabilities", "ulp.reportingCapabilities",
+      { "reportingCapabilities", "ulp.reportingCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReportingCap", HFILL }},
     { &hf_ulp_eventTriggerCapabilities,
-      { "eventTriggerCapabilities", "ulp.eventTriggerCapabilities",
+      { "eventTriggerCapabilities", "ulp.eventTriggerCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_sessionCapabilities,
-      { "sessionCapabilities", "ulp.sessionCapabilities",
+      { "sessionCapabilities", "ulp.sessionCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_periodicTrigger,
@@ -7124,7 +7124,7 @@ void proto_register_ulp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_ulp_geoAreaShapesSupported,
-      { "geoAreaShapesSupported", "ulp.geoAreaShapesSupported",
+      { "geoAreaShapesSupported", "ulp.geoAreaShapesSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_maxNumGeoAreaSupported,
@@ -7196,11 +7196,11 @@ void proto_register_ulp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_ulp_posProtocolVersionRRLP,
-      { "posProtocolVersionRRLP", "ulp.posProtocolVersionRRLP",
+      { "posProtocolVersionRRLP", "ulp.posProtocolVersionRRLP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PosProtocolVersion3GPP", HFILL }},
     { &hf_ulp_posProtocolVersionRRC,
-      { "posProtocolVersionRRC", "ulp.posProtocolVersionRRC",
+      { "posProtocolVersionRRC", "ulp.posProtocolVersionRRC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PosProtocolVersion3GPP", HFILL }},
     { &hf_ulp_posProtocolVersionTIA801,
@@ -7208,7 +7208,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PosProtocolVersion3GPP2", HFILL }},
     { &hf_ulp_posProtocolVersionLPP,
-      { "posProtocolVersionLPP", "ulp.posProtocolVersionLPP",
+      { "posProtocolVersionLPP", "ulp.posProtocolVersionLPP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PosProtocolVersion3GPP", HFILL }},
     { &hf_ulp_majorVersionField,
@@ -7224,7 +7224,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_255", HFILL }},
     { &hf_ulp_PosProtocolVersion3GPP2_item,
-      { "Supported3GPP2PosProtocolVersion", "ulp.Supported3GPP2PosProtocolVersion",
+      { "Supported3GPP2PosProtocolVersion", "ulp.Supported3GPP2PosProtocolVersion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_revisionNumber,
@@ -7244,7 +7244,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_GANSSPositionMethods_item,
-      { "GANSSPositionMethod", "ulp.GANSSPositionMethod",
+      { "GANSSPositionMethod", "ulp.GANSSPositionMethod_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_ganssSBASid,
@@ -7252,7 +7252,7 @@ void proto_register_ulp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_3", HFILL }},
     { &hf_ulp_gANSSPositioningMethodTypes,
-      { "gANSSPositioningMethodTypes", "ulp.gANSSPositioningMethodTypes",
+      { "gANSSPositioningMethodTypes", "ulp.gANSSPositioningMethodTypes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_setAssisted,
@@ -7268,7 +7268,7 @@ void proto_register_ulp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_ulp_ganssRequestedCommonAssistanceDataList,
-      { "ganssRequestedCommonAssistanceDataList", "ulp.ganssRequestedCommonAssistanceDataList",
+      { "ganssRequestedCommonAssistanceDataList", "ulp.ganssRequestedCommonAssistanceDataList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_ganssRequestedGenericAssistanceDataList,
@@ -7276,11 +7276,11 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_extendedEphemeris,
-      { "extendedEphemeris", "ulp.extendedEphemeris",
+      { "extendedEphemeris", "ulp.extendedEphemeris_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_extendedEphemerisCheck,
-      { "extendedEphemerisCheck", "ulp.extendedEphemerisCheck",
+      { "extendedEphemerisCheck", "ulp.extendedEphemerisCheck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ExtendedEphCheck", HFILL }},
     { &hf_ulp_ganssReferenceTime,
@@ -7304,7 +7304,7 @@ void proto_register_ulp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_ulp_GanssRequestedGenericAssistanceDataList_item,
-      { "GanssReqGenericData", "ulp.GanssReqGenericData",
+      { "GanssReqGenericData", "ulp.GanssReqGenericData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_ganssRealTimeIntegrity,
@@ -7320,7 +7320,7 @@ void proto_register_ulp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_ulp_ganssNavigationModelData,
-      { "ganssNavigationModelData", "ulp.ganssNavigationModelData",
+      { "ganssNavigationModelData", "ulp.ganssNavigationModelData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_ganssTimeModels,
@@ -7332,7 +7332,7 @@ void proto_register_ulp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_ulp_ganssDataBits,
-      { "ganssDataBits", "ulp.ganssDataBits",
+      { "ganssDataBits", "ulp.ganssDataBits_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_ganssUTCModel,
@@ -7340,7 +7340,7 @@ void proto_register_ulp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_ulp_ganssAdditionalDataChoices,
-      { "ganssAdditionalDataChoices", "ulp.ganssAdditionalDataChoices",
+      { "ganssAdditionalDataChoices", "ulp.ganssAdditionalDataChoices_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_ganssAuxiliaryInformation,
@@ -7348,11 +7348,11 @@ void proto_register_ulp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_ulp_ganssExtendedEphemeris,
-      { "ganssExtendedEphemeris", "ulp.ganssExtendedEphemeris",
+      { "ganssExtendedEphemeris", "ulp.ganssExtendedEphemeris_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ExtendedEphemeris", HFILL }},
     { &hf_ulp_ganssExtendedEphemerisCheck,
-      { "ganssExtendedEphemerisCheck", "ulp.ganssExtendedEphemerisCheck",
+      { "ganssExtendedEphemerisCheck", "ulp.ganssExtendedEphemerisCheck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GanssExtendedEphCheck", HFILL }},
     { &hf_ulp_ganssWeek,
@@ -7372,7 +7372,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_SatellitesListRelatedDataList_item,
-      { "SatellitesListRelatedData", "ulp.SatellitesListRelatedData",
+      { "SatellitesListRelatedData", "ulp.SatellitesListRelatedData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_iod,
@@ -7384,7 +7384,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_59", HFILL }},
     { &hf_ulp_reqDataBitAssistanceList,
-      { "reqDataBitAssistanceList", "ulp.reqDataBitAssistanceList",
+      { "reqDataBitAssistanceList", "ulp.reqDataBitAssistanceList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_gnssSignals,
@@ -7424,19 +7424,19 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_256", HFILL }},
     { &hf_ulp_beginTime,
-      { "beginTime", "ulp.beginTime",
+      { "beginTime", "ulp.beginTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GPSTime", HFILL }},
     { &hf_ulp_endTime,
-      { "endTime", "ulp.endTime",
+      { "endTime", "ulp.endTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GPSTime", HFILL }},
     { &hf_ulp_beginTime_01,
-      { "beginTime", "ulp.beginTime",
+      { "beginTime", "ulp.beginTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSSextEphTime", HFILL }},
     { &hf_ulp_endTime_01,
-      { "endTime", "ulp.endTime",
+      { "endTime", "ulp.endTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GANSSextEphTime", HFILL }},
     { &hf_ulp_gPSWeek,
@@ -7484,11 +7484,11 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_255", HFILL }},
     { &hf_ulp_setSessionID,
-      { "setSessionID", "ulp.setSessionID",
+      { "setSessionID", "ulp.setSessionID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_slpSessionID,
-      { "slpSessionID", "ulp.slpSessionID",
+      { "slpSessionID", "ulp.slpSessionID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_sessionId,
@@ -7552,15 +7552,15 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_Status_vals), 0,
         NULL, HFILL }},
     { &hf_ulp_gsmCell,
-      { "gsmCell", "ulp.gsmCell",
+      { "gsmCell", "ulp.gsmCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GsmCellInformation", HFILL }},
     { &hf_ulp_wcdmaCell,
-      { "wcdmaCell", "ulp.wcdmaCell",
+      { "wcdmaCell", "ulp.wcdmaCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "WcdmaCellInformation", HFILL }},
     { &hf_ulp_cdmaCell,
-      { "cdmaCell", "ulp.cdmaCell",
+      { "cdmaCell", "ulp.cdmaCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CdmaCellInformation", HFILL }},
     { &hf_ulp_ver2_CellInfo_extension,
@@ -7572,7 +7572,7 @@ void proto_register_ulp(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "UTCTime", HFILL }},
     { &hf_ulp_positionEstimate,
-      { "positionEstimate", "ulp.positionEstimate",
+      { "positionEstimate", "ulp.positionEstimate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_latitudeSign,
@@ -7588,7 +7588,7 @@ void proto_register_ulp(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M8388608_8388607", HFILL }},
     { &hf_ulp_uncertainty,
-      { "uncertainty", "ulp.uncertainty",
+      { "uncertainty", "ulp.uncertainty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_uncertaintySemiMajor,
@@ -7608,7 +7608,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_100", HFILL }},
     { &hf_ulp_altitudeInfo,
-      { "altitudeInfo", "ulp.altitudeInfo",
+      { "altitudeInfo", "ulp.altitudeInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_altitudeDirection,
@@ -7660,7 +7660,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_255", HFILL }},
     { &hf_ulp_frequencyInfo,
-      { "frequencyInfo", "ulp.frequencyInfo",
+      { "frequencyInfo", "ulp.frequencyInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_primaryScramblingCode,
@@ -7676,7 +7676,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_127", HFILL }},
     { &hf_ulp_timingAdvance,
-      { "timingAdvance", "ulp.timingAdvance",
+      { "timingAdvance", "ulp.timingAdvance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_tA_01,
@@ -7696,11 +7696,11 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_FrequencySpecificInfo_vals), 0,
         "FrequencySpecificInfo", HFILL }},
     { &hf_ulp_fdd_fr,
-      { "fdd", "ulp.fdd",
+      { "fdd", "ulp.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FrequencyInfoFDD", HFILL }},
     { &hf_ulp_tdd_fr,
-      { "tdd", "ulp.tdd",
+      { "tdd", "ulp.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FrequencyInfoTDD", HFILL }},
     { &hf_ulp_uarfcn_UL,
@@ -7716,7 +7716,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "UARFCN", HFILL }},
     { &hf_ulp_NMR_item,
-      { "NMRelement", "ulp.NMRelement",
+      { "NMRelement", "ulp.NMRelement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_aRFCN,
@@ -7732,7 +7732,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_63", HFILL }},
     { &hf_ulp_MeasuredResultsList_item,
-      { "MeasuredResults", "ulp.MeasuredResults",
+      { "MeasuredResults", "ulp.MeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_utra_CarrierRSSI,
@@ -7744,7 +7744,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_CellMeasuredResultsList_item,
-      { "CellMeasuredResults", "ulp.CellMeasuredResults",
+      { "CellMeasuredResults", "ulp.CellMeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_cellIdentity,
@@ -7756,11 +7756,11 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_T_modeSpecificInfo_vals), 0,
         NULL, HFILL }},
     { &hf_ulp_fdd,
-      { "fdd", "ulp.fdd",
+      { "fdd", "ulp.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_primaryCPICH_Info,
-      { "primaryCPICH-Info", "ulp.primaryCPICH_Info",
+      { "primaryCPICH-Info", "ulp.primaryCPICH_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_cpich_Ec_N0,
@@ -7776,7 +7776,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_tdd,
-      { "tdd", "ulp.tdd",
+      { "tdd", "ulp.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_cellParametersID,
@@ -7816,19 +7816,19 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_7", HFILL }},
     { &hf_ulp_horvel,
-      { "horvel", "ulp.horvel",
+      { "horvel", "ulp.horvel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_horandvervel,
-      { "horandvervel", "ulp.horandvervel",
+      { "horandvervel", "ulp.horandvervel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_horveluncert,
-      { "horveluncert", "ulp.horveluncert",
+      { "horveluncert", "ulp.horveluncert_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_horandveruncert,
-      { "horandveruncert", "ulp.horandveruncert",
+      { "horandveruncert", "ulp.horandveruncert_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_bearing,
@@ -7860,7 +7860,7 @@ void proto_register_ulp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_8", HFILL }},
     { &hf_ulp_MultipleLocationIds_item,
-      { "LocationIdData", "ulp.LocationIdData",
+      { "LocationIdData", "ulp.LocationIdData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_relativetimestamp,
@@ -7876,11 +7876,11 @@ void proto_register_ulp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_ulp_supportedWLANInfo,
-      { "supportedWLANInfo", "ulp.supportedWLANInfo",
+      { "supportedWLANInfo", "ulp.supportedWLANInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_supportedWLANApsList,
-      { "supportedWLANApsList", "ulp.supportedWLANApsList",
+      { "supportedWLANApsList", "ulp.supportedWLANApsList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_gSM,
@@ -7892,7 +7892,7 @@ void proto_register_ulp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_ulp_supportedWCDMAInfo,
-      { "supportedWCDMAInfo", "ulp.supportedWCDMAInfo",
+      { "supportedWCDMAInfo", "ulp.supportedWCDMAInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_cDMA,
@@ -7984,15 +7984,15 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxWLANApDataSize_OF_SupportedWLANApData", HFILL }},
     { &hf_ulp_supportedWLANApDataList_item,
-      { "SupportedWLANApData", "ulp.SupportedWLANApData",
+      { "SupportedWLANApData", "ulp.SupportedWLANApData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_supportedWLANapsChannel11a,
-      { "supportedWLANapsChannel11a", "ulp.supportedWLANapsChannel11a",
+      { "supportedWLANapsChannel11a", "ulp.supportedWLANapsChannel11a_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_supportedWLANapsChannel11bg,
-      { "supportedWLANapsChannel11bg", "ulp.supportedWLANapsChannel11bg",
+      { "supportedWLANapsChannel11bg", "ulp.supportedWLANapsChannel11bg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_ch34,
@@ -8124,27 +8124,27 @@ void proto_register_ulp(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_ulp_hrpdCell,
-      { "hrpdCell", "ulp.hrpdCell",
+      { "hrpdCell", "ulp.hrpdCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HrpdCellInformation", HFILL }},
     { &hf_ulp_umbCell,
-      { "umbCell", "ulp.umbCell",
+      { "umbCell", "ulp.umbCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UmbCellInformation", HFILL }},
     { &hf_ulp_lteCell,
-      { "lteCell", "ulp.lteCell",
+      { "lteCell", "ulp.lteCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LteCellInformation", HFILL }},
     { &hf_ulp_wlanAP,
-      { "wlanAP", "ulp.wlanAP",
+      { "wlanAP", "ulp.wlanAP_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "WlanAPInformation", HFILL }},
     { &hf_ulp_wimaxBS,
-      { "wimaxBS", "ulp.wimaxBS",
+      { "wimaxBS", "ulp.wimaxBS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "WimaxBSInformation", HFILL }},
     { &hf_ulp_cellGlobalIdEUTRA,
-      { "cellGlobalIdEUTRA", "ulp.cellGlobalIdEUTRA",
+      { "cellGlobalIdEUTRA", "ulp.cellGlobalIdEUTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_physCellId,
@@ -8172,23 +8172,23 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_MeasResultListEUTRA_item,
-      { "MeasResultEUTRA", "ulp.MeasResultEUTRA",
+      { "MeasResultEUTRA", "ulp.MeasResultEUTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_cgi_Info,
-      { "cgi-Info", "ulp.cgi_Info",
+      { "cgi-Info", "ulp.cgi_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_cellGlobalId,
-      { "cellGlobalId", "ulp.cellGlobalId",
+      { "cellGlobalId", "ulp.cellGlobalId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellGlobalIdEUTRA", HFILL }},
     { &hf_ulp_measResult,
-      { "measResult", "ulp.measResult",
+      { "measResult", "ulp.measResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_plmn_Identity,
-      { "plmn-Identity", "ulp.plmn_Identity",
+      { "plmn-Identity", "ulp.plmn_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_cellIdentity_01,
@@ -8236,7 +8236,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_256", HFILL }},
     { &hf_ulp_apRoundTripDelay,
-      { "apRoundTripDelay", "ulp.apRoundTripDelay",
+      { "apRoundTripDelay", "ulp.apRoundTripDelay_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RTD", HFILL }},
     { &hf_ulp_setTransmitPower,
@@ -8256,7 +8256,7 @@ void proto_register_ulp(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M127_128", HFILL }},
     { &hf_ulp_apReportedLocation,
-      { "apReportedLocation", "ulp.apReportedLocation",
+      { "apReportedLocation", "ulp.apReportedLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReportedLocation", HFILL }},
     { &hf_ulp_rTDValue,
@@ -8276,7 +8276,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_LocationEncodingDescriptor_vals), 0,
         NULL, HFILL }},
     { &hf_ulp_locationData,
-      { "locationData", "ulp.locationData",
+      { "locationData", "ulp.locationData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_locationAccuracy,
@@ -8288,11 +8288,11 @@ void proto_register_ulp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_1_128", HFILL }},
     { &hf_ulp_wimaxBsID,
-      { "wimaxBsID", "ulp.wimaxBsID",
+      { "wimaxBsID", "ulp.wimaxBsID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_wimaxRTD,
-      { "wimaxRTD", "ulp.wimaxRTD",
+      { "wimaxRTD", "ulp.wimaxRTD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_wimaxNMRList,
@@ -8308,7 +8308,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_1023", HFILL }},
     { &hf_ulp_WimaxNMRList_item,
-      { "WimaxNMR", "ulp.WimaxNMR",
+      { "WimaxNMR", "ulp.WimaxNMR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_relDelay,
@@ -8340,11 +8340,11 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_63", HFILL }},
     { &hf_ulp_bSLocation,
-      { "bSLocation", "ulp.bSLocation",
+      { "bSLocation", "ulp.bSLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReportedLocation", HFILL }},
     { &hf_ulp_utran_GPSReferenceTime,
-      { "utran-GPSReferenceTime", "ulp.utran_GPSReferenceTime",
+      { "utran-GPSReferenceTime", "ulp.utran_GPSReferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_gpsReferenceTimeUncertainty,
@@ -8356,7 +8356,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_UTRANGPSDriftRate_vals), 0,
         NULL, HFILL }},
     { &hf_ulp_utran_GPSTimingOfCell,
-      { "utran-GPSTimingOfCell", "ulp.utran_GPSTimingOfCell",
+      { "utran-GPSTimingOfCell", "ulp.utran_GPSTimingOfCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_ms_part,
@@ -8372,15 +8372,15 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_T_modeSpecificInfo_01_vals), 0,
         "T_modeSpecificInfo_01", HFILL }},
     { &hf_ulp_fdd_01,
-      { "fdd", "ulp.fdd",
+      { "fdd", "ulp.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_01", HFILL }},
     { &hf_ulp_referenceIdentity,
-      { "referenceIdentity", "ulp.referenceIdentity",
+      { "referenceIdentity", "ulp.referenceIdentity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrimaryCPICH_Info", HFILL }},
     { &hf_ulp_tdd_01,
-      { "tdd", "ulp.tdd",
+      { "tdd", "ulp.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_01", HFILL }},
     { &hf_ulp_referenceIdentity_01,
@@ -8392,7 +8392,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_4095", HFILL }},
     { &hf_ulp_set_GPSTimingOfCell,
-      { "set-GPSTimingOfCell", "ulp.set_GPSTimingOfCell",
+      { "set-GPSTimingOfCell", "ulp.set_GPSTimingOfCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_set_GPSTimingOfCell", HFILL }},
     { &hf_ulp_ms_part_01,
@@ -8404,11 +8404,11 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_T_modeSpecificInfo_02_vals), 0,
         "T_modeSpecificInfo_02", HFILL }},
     { &hf_ulp_fdd_02,
-      { "fdd", "ulp.fdd",
+      { "fdd", "ulp.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_02", HFILL }},
     { &hf_ulp_tdd_02,
-      { "tdd", "ulp.tdd",
+      { "tdd", "ulp.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_02", HFILL }},
     { &hf_ulp_ganssDay,
@@ -8420,7 +8420,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_15", HFILL }},
     { &hf_ulp_utran_GANSSReferenceTime,
-      { "utran-GANSSReferenceTime", "ulp.utran_GANSSReferenceTime",
+      { "utran-GANSSReferenceTime", "ulp.utran_GANSSReferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_utranGANSSDriftRate,
@@ -8440,11 +8440,11 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_T_modeSpecificInfo_03_vals), 0,
         "T_modeSpecificInfo_03", HFILL }},
     { &hf_ulp_fdd_03,
-      { "fdd", "ulp.fdd",
+      { "fdd", "ulp.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_03", HFILL }},
     { &hf_ulp_tdd_03,
-      { "tdd", "ulp.tdd",
+      { "tdd", "ulp.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_03", HFILL }},
     { &hf_ulp_ganss_TODUncertainty,
@@ -8452,11 +8452,11 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_127", HFILL }},
     { &hf_ulp_set_GANSSReferenceTime,
-      { "set-GANSSReferenceTime", "ulp.set_GANSSReferenceTime",
+      { "set-GANSSReferenceTime", "ulp.set_GANSSReferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_set_GANSSTimingOfCell,
-      { "set-GANSSTimingOfCell", "ulp.set_GANSSTimingOfCell",
+      { "set-GANSSTimingOfCell", "ulp.set_GANSSTimingOfCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_set_GANSSTimingOfCell", HFILL }},
     { &hf_ulp_ms_part_02,
@@ -8468,11 +8468,11 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_T_modeSpecificInfo_04_vals), 0,
         "T_modeSpecificInfo_04", HFILL }},
     { &hf_ulp_fdd_04,
-      { "fdd", "ulp.fdd",
+      { "fdd", "ulp.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_04", HFILL }},
     { &hf_ulp_tdd_04,
-      { "tdd", "ulp.tdd",
+      { "tdd", "ulp.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_04", HFILL }},
     { &hf_ulp_gps,
@@ -8556,11 +8556,11 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_1440", HFILL }},
     { &hf_ulp_repMode_01,
-      { "repMode", "ulp.repMode",
+      { "repMode", "ulp.repMode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RepMode_cap", HFILL }},
     { &hf_ulp_batchRepCap,
-      { "batchRepCap", "ulp.batchRepCap",
+      { "batchRepCap", "ulp.batchRepCap_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_realtime,
@@ -8596,7 +8596,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, VALS(ulp_T_latitudeSign_01_vals), 0,
         "T_latitudeSign_01", HFILL }},
     { &hf_ulp_coordinate,
-      { "coordinate", "ulp.coordinate",
+      { "coordinate", "ulp.coordinate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_radius,
@@ -8648,7 +8648,7 @@ void proto_register_ulp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_100000", HFILL }},
     { &hf_ulp_PolygonDescription_item,
-      { "Coordinate", "ulp.Coordinate",
+      { "Coordinate", "ulp.Coordinate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ulp_GANSSSignals_signal1,
diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c
index 127e33796e..2ce583a5bb 100644
--- a/epan/dissectors/packet-x2ap.c
+++ b/epan/dissectors/packet-x2ap.c
@@ -5492,7 +5492,7 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, VALS(x2ap_ABSInformation_vals), 0,
         NULL, HFILL }},
     { &hf_x2ap_ABS_Status_PDU,
-      { "ABS-Status", "x2ap.ABS_Status",
+      { "ABS-Status", "x2ap.ABS_Status_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_Cause_PDU,
@@ -5500,11 +5500,11 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, VALS(x2ap_Cause_vals), 0,
         NULL, HFILL }},
     { &hf_x2ap_CompositeAvailableCapacityGroup_PDU,
-      { "CompositeAvailableCapacityGroup", "x2ap.CompositeAvailableCapacityGroup",
+      { "CompositeAvailableCapacityGroup", "x2ap.CompositeAvailableCapacityGroup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_CriticalityDiagnostics_PDU,
-      { "CriticalityDiagnostics", "x2ap.CriticalityDiagnostics",
+      { "CriticalityDiagnostics", "x2ap.CriticalityDiagnostics_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_CRNTI_PDU,
@@ -5524,7 +5524,7 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, VALS(x2ap_DeactivationIndication_vals), 0,
         NULL, HFILL }},
     { &hf_x2ap_ECGI_PDU,
-      { "ECGI", "x2ap.ECGI",
+      { "ECGI", "x2ap.ECGI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_E_RAB_List_PDU,
@@ -5532,11 +5532,11 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_E_RAB_Item_PDU,
-      { "E-RAB-Item", "x2ap.E_RAB_Item",
+      { "E-RAB-Item", "x2ap.E_RAB_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_GlobalENB_ID_PDU,
-      { "GlobalENB-ID", "x2ap.GlobalENB_ID",
+      { "GlobalENB-ID", "x2ap.GlobalENB_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_GUGroupIDList_PDU,
@@ -5544,7 +5544,7 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_GUMMEI_PDU,
-      { "GUMMEI", "x2ap.GUMMEI",
+      { "GUMMEI", "x2ap.GUMMEI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_HandoverReportType_PDU,
@@ -5556,7 +5556,7 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, VALS(x2ap_InvokeIndication_vals), 0,
         NULL, HFILL }},
     { &hf_x2ap_MDT_Configuration_PDU,
-      { "MDT-Configuration", "x2ap.MDT_Configuration",
+      { "MDT-Configuration", "x2ap.MDT_Configuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_Measurement_ID_PDU,
@@ -5572,11 +5572,11 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, VALS(x2ap_ManagementBasedMDTallowed_vals), 0,
         NULL, HFILL }},
     { &hf_x2ap_MobilityParametersModificationRange_PDU,
-      { "MobilityParametersModificationRange", "x2ap.MobilityParametersModificationRange",
+      { "MobilityParametersModificationRange", "x2ap.MobilityParametersModificationRange_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_MobilityParametersInformation_PDU,
-      { "MobilityParametersInformation", "x2ap.MobilityParametersInformation",
+      { "MobilityParametersInformation", "x2ap.MobilityParametersInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_Number_of_Antennaports_PDU,
@@ -5588,7 +5588,7 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_PRACH_Configuration_PDU,
-      { "PRACH-Configuration", "x2ap.PRACH_Configuration",
+      { "PRACH-Configuration", "x2ap.PRACH_Configuration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_Registration_Request_PDU,
@@ -5624,7 +5624,7 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, VALS(x2ap_TimeToWait_vals), 0,
         NULL, HFILL }},
     { &hf_x2ap_TraceActivation_PDU,
-      { "TraceActivation", "x2ap.TraceActivation",
+      { "TraceActivation", "x2ap.TraceActivation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_UE_HistoryInformation_PDU,
@@ -5640,19 +5640,19 @@ void proto_register_x2ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_HandoverRequest_PDU,
-      { "HandoverRequest", "x2ap.HandoverRequest",
+      { "HandoverRequest", "x2ap.HandoverRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_UE_ContextInformation_PDU,
-      { "UE-ContextInformation", "x2ap.UE_ContextInformation",
+      { "UE-ContextInformation", "x2ap.UE_ContextInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_E_RABs_ToBeSetup_Item_PDU,
-      { "E-RABs-ToBeSetup-Item", "x2ap.E_RABs_ToBeSetup_Item",
+      { "E-RABs-ToBeSetup-Item", "x2ap.E_RABs_ToBeSetup_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_HandoverRequestAcknowledge_PDU,
-      { "HandoverRequestAcknowledge", "x2ap.HandoverRequestAcknowledge",
+      { "HandoverRequestAcknowledge", "x2ap.HandoverRequestAcknowledge_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_E_RABs_Admitted_List_PDU,
@@ -5660,19 +5660,19 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_E_RABs_Admitted_Item_PDU,
-      { "E-RABs-Admitted-Item", "x2ap.E_RABs_Admitted_Item",
+      { "E-RABs-Admitted-Item", "x2ap.E_RABs_Admitted_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_HandoverPreparationFailure_PDU,
-      { "HandoverPreparationFailure", "x2ap.HandoverPreparationFailure",
+      { "HandoverPreparationFailure", "x2ap.HandoverPreparationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_HandoverReport_PDU,
-      { "HandoverReport", "x2ap.HandoverReport",
+      { "HandoverReport", "x2ap.HandoverReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_SNStatusTransfer_PDU,
-      { "SNStatusTransfer", "x2ap.SNStatusTransfer",
+      { "SNStatusTransfer", "x2ap.SNStatusTransfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_E_RABs_SubjectToStatusTransfer_List_PDU,
@@ -5680,43 +5680,43 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_E_RABs_SubjectToStatusTransfer_Item_PDU,
-      { "E-RABs-SubjectToStatusTransfer-Item", "x2ap.E_RABs_SubjectToStatusTransfer_Item",
+      { "E-RABs-SubjectToStatusTransfer-Item", "x2ap.E_RABs_SubjectToStatusTransfer_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_UEContextRelease_PDU,
-      { "UEContextRelease", "x2ap.UEContextRelease",
+      { "UEContextRelease", "x2ap.UEContextRelease_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_HandoverCancel_PDU,
-      { "HandoverCancel", "x2ap.HandoverCancel",
+      { "HandoverCancel", "x2ap.HandoverCancel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_ErrorIndication_PDU,
-      { "ErrorIndication", "x2ap.ErrorIndication",
+      { "ErrorIndication", "x2ap.ErrorIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_ResetRequest_PDU,
-      { "ResetRequest", "x2ap.ResetRequest",
+      { "ResetRequest", "x2ap.ResetRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_ResetResponse_PDU,
-      { "ResetResponse", "x2ap.ResetResponse",
+      { "ResetResponse", "x2ap.ResetResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_X2SetupRequest_PDU,
-      { "X2SetupRequest", "x2ap.X2SetupRequest",
+      { "X2SetupRequest", "x2ap.X2SetupRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_X2SetupResponse_PDU,
-      { "X2SetupResponse", "x2ap.X2SetupResponse",
+      { "X2SetupResponse", "x2ap.X2SetupResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_X2SetupFailure_PDU,
-      { "X2SetupFailure", "x2ap.X2SetupFailure",
+      { "X2SetupFailure", "x2ap.X2SetupFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_LoadInformation_PDU,
-      { "LoadInformation", "x2ap.LoadInformation",
+      { "LoadInformation", "x2ap.LoadInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_CellInformation_List_PDU,
@@ -5724,11 +5724,11 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_CellInformation_Item_PDU,
-      { "CellInformation-Item", "x2ap.CellInformation_Item",
+      { "CellInformation-Item", "x2ap.CellInformation_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_ENBConfigurationUpdate_PDU,
-      { "ENBConfigurationUpdate", "x2ap.ENBConfigurationUpdate",
+      { "ENBConfigurationUpdate", "x2ap.ENBConfigurationUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_ServedCellsToModify_PDU,
@@ -5740,15 +5740,15 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_ENBConfigurationUpdateAcknowledge_PDU,
-      { "ENBConfigurationUpdateAcknowledge", "x2ap.ENBConfigurationUpdateAcknowledge",
+      { "ENBConfigurationUpdateAcknowledge", "x2ap.ENBConfigurationUpdateAcknowledge_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_ENBConfigurationUpdateFailure_PDU,
-      { "ENBConfigurationUpdateFailure", "x2ap.ENBConfigurationUpdateFailure",
+      { "ENBConfigurationUpdateFailure", "x2ap.ENBConfigurationUpdateFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_ResourceStatusRequest_PDU,
-      { "ResourceStatusRequest", "x2ap.ResourceStatusRequest",
+      { "ResourceStatusRequest", "x2ap.ResourceStatusRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_CellToReport_List_PDU,
@@ -5756,7 +5756,7 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_CellToReport_Item_PDU,
-      { "CellToReport-Item", "x2ap.CellToReport_Item",
+      { "CellToReport-Item", "x2ap.CellToReport_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_ReportingPeriodicity_PDU,
@@ -5768,7 +5768,7 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, VALS(x2ap_PartialSuccessIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_x2ap_ResourceStatusResponse_PDU,
-      { "ResourceStatusResponse", "x2ap.ResourceStatusResponse",
+      { "ResourceStatusResponse", "x2ap.ResourceStatusResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_MeasurementInitiationResult_List_PDU,
@@ -5776,15 +5776,15 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_MeasurementInitiationResult_Item_PDU,
-      { "MeasurementInitiationResult-Item", "x2ap.MeasurementInitiationResult_Item",
+      { "MeasurementInitiationResult-Item", "x2ap.MeasurementInitiationResult_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_MeasurementFailureCause_Item_PDU,
-      { "MeasurementFailureCause-Item", "x2ap.MeasurementFailureCause_Item",
+      { "MeasurementFailureCause-Item", "x2ap.MeasurementFailureCause_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_ResourceStatusFailure_PDU,
-      { "ResourceStatusFailure", "x2ap.ResourceStatusFailure",
+      { "ResourceStatusFailure", "x2ap.ResourceStatusFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_CompleteFailureCauseInformation_List_PDU,
@@ -5792,11 +5792,11 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_CompleteFailureCauseInformation_Item_PDU,
-      { "CompleteFailureCauseInformation-Item", "x2ap.CompleteFailureCauseInformation_Item",
+      { "CompleteFailureCauseInformation-Item", "x2ap.CompleteFailureCauseInformation_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_ResourceStatusUpdate_PDU,
-      { "ResourceStatusUpdate", "x2ap.ResourceStatusUpdate",
+      { "ResourceStatusUpdate", "x2ap.ResourceStatusUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_CellMeasurementResult_List_PDU,
@@ -5804,31 +5804,31 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_CellMeasurementResult_Item_PDU,
-      { "CellMeasurementResult-Item", "x2ap.CellMeasurementResult_Item",
+      { "CellMeasurementResult-Item", "x2ap.CellMeasurementResult_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_PrivateMessage_PDU,
-      { "PrivateMessage", "x2ap.PrivateMessage",
+      { "PrivateMessage", "x2ap.PrivateMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_MobilityChangeRequest_PDU,
-      { "MobilityChangeRequest", "x2ap.MobilityChangeRequest",
+      { "MobilityChangeRequest", "x2ap.MobilityChangeRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_MobilityChangeAcknowledge_PDU,
-      { "MobilityChangeAcknowledge", "x2ap.MobilityChangeAcknowledge",
+      { "MobilityChangeAcknowledge", "x2ap.MobilityChangeAcknowledge_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_MobilityChangeFailure_PDU,
-      { "MobilityChangeFailure", "x2ap.MobilityChangeFailure",
+      { "MobilityChangeFailure", "x2ap.MobilityChangeFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_RLFIndication_PDU,
-      { "RLFIndication", "x2ap.RLFIndication",
+      { "RLFIndication", "x2ap.RLFIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_CellActivationRequest_PDU,
-      { "CellActivationRequest", "x2ap.CellActivationRequest",
+      { "CellActivationRequest", "x2ap.CellActivationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_ServedCellsToActivate_PDU,
@@ -5836,7 +5836,7 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_CellActivationResponse_PDU,
-      { "CellActivationResponse", "x2ap.CellActivationResponse",
+      { "CellActivationResponse", "x2ap.CellActivationResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_ActivatedCellList_PDU,
@@ -5844,7 +5844,7 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_CellActivationFailure_PDU,
-      { "CellActivationFailure", "x2ap.CellActivationFailure",
+      { "CellActivationFailure", "x2ap.CellActivationFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_X2AP_PDU_PDU,
@@ -5860,7 +5860,7 @@ void proto_register_x2ap(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_x2ap_ProtocolIE_Container_item,
-      { "ProtocolIE-Field", "x2ap.ProtocolIE_Field",
+      { "ProtocolIE-Field", "x2ap.ProtocolIE_Field_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_id,
@@ -5872,11 +5872,11 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, VALS(x2ap_Criticality_vals), 0,
         NULL, HFILL }},
     { &hf_x2ap_protocolIE_Field_value,
-      { "value", "x2ap.value",
+      { "value", "x2ap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ProtocolIE_Field_value", HFILL }},
     { &hf_x2ap_ProtocolExtensionContainer_item,
-      { "ProtocolExtensionField", "x2ap.ProtocolExtensionField",
+      { "ProtocolExtensionField", "x2ap.ProtocolExtensionField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_extension_id,
@@ -5884,11 +5884,11 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, VALS(x2ap_ProtocolIE_ID_vals), 0,
         "ProtocolIE_ID", HFILL }},
     { &hf_x2ap_extensionValue,
-      { "extensionValue", "x2ap.extensionValue",
+      { "extensionValue", "x2ap.extensionValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_PrivateIE_Container_item,
-      { "PrivateIE-Field", "x2ap.PrivateIE_Field",
+      { "PrivateIE-Field", "x2ap.PrivateIE_Field_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_private_id,
@@ -5896,19 +5896,19 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, VALS(x2ap_PrivateIE_ID_vals), 0,
         "PrivateIE_ID", HFILL }},
     { &hf_x2ap_privateIE_Field_value,
-      { "value", "x2ap.value",
+      { "value", "x2ap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrivateIE_Field_value", HFILL }},
     { &hf_x2ap_fdd,
-      { "fdd", "x2ap.fdd",
+      { "fdd", "x2ap.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ABSInformationFDD", HFILL }},
     { &hf_x2ap_tdd,
-      { "tdd", "x2ap.tdd",
+      { "tdd", "x2ap.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ABSInformationTDD", HFILL }},
     { &hf_x2ap_abs_inactive,
-      { "abs-inactive", "x2ap.abs_inactive",
+      { "abs-inactive", "x2ap.abs_inactive_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_abs_pattern_info,
@@ -5968,15 +5968,15 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, VALS(x2ap_Pre_emptionVulnerability_vals), 0,
         NULL, HFILL }},
     { &hf_x2ap_cellBased,
-      { "cellBased", "x2ap.cellBased",
+      { "cellBased", "x2ap.cellBased_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellBasedMDT", HFILL }},
     { &hf_x2ap_tABased,
-      { "tABased", "x2ap.tABased",
+      { "tABased", "x2ap.tABased_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TABasedMDT", HFILL }},
     { &hf_x2ap_pLMNWide,
-      { "pLMNWide", "x2ap.pLMNWide",
+      { "pLMNWide", "x2ap.pLMNWide_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_BroadcastPLMNs_Item_item,
@@ -6004,7 +6004,7 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_CellIdListforMDT_item,
-      { "ECGI", "x2ap.ECGI",
+      { "ECGI", "x2ap.ECGI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_cell_Size,
@@ -6012,11 +6012,11 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, VALS(x2ap_Cell_Size_vals), 0,
         NULL, HFILL }},
     { &hf_x2ap_dL_CompositeAvailableCapacity,
-      { "dL-CompositeAvailableCapacity", "x2ap.dL_CompositeAvailableCapacity",
+      { "dL-CompositeAvailableCapacity", "x2ap.dL_CompositeAvailableCapacity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CompositeAvailableCapacity", HFILL }},
     { &hf_x2ap_uL_CompositeAvailableCapacity,
-      { "uL-CompositeAvailableCapacity", "x2ap.uL_CompositeAvailableCapacity",
+      { "uL-CompositeAvailableCapacity", "x2ap.uL_CompositeAvailableCapacity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CompositeAvailableCapacity", HFILL }},
     { &hf_x2ap_cellCapacityClassValue,
@@ -6052,7 +6052,7 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CriticalityDiagnostics_IE_List", HFILL }},
     { &hf_x2ap_CriticalityDiagnostics_IE_List_item,
-      { "CriticalityDiagnostics-IE-List item", "x2ap.CriticalityDiagnostics_IE_List_item",
+      { "CriticalityDiagnostics-IE-List item", "x2ap.CriticalityDiagnostics_IE_List_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_iECriticality,
@@ -6096,15 +6096,15 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, VALS(x2ap_SubframeAssignment_vals), 0,
         NULL, HFILL }},
     { &hf_x2ap_specialSubframe_Info,
-      { "specialSubframe-Info", "x2ap.specialSubframe_Info",
+      { "specialSubframe-Info", "x2ap.specialSubframe_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_fDD,
-      { "fDD", "x2ap.fDD",
+      { "fDD", "x2ap.fDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "FDD_Info", HFILL }},
     { &hf_x2ap_tDD,
-      { "tDD", "x2ap.tDD",
+      { "tDD", "x2ap.tDD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TDD_Info", HFILL }},
     { &hf_x2ap_pLMN_Identity,
@@ -6132,15 +6132,15 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_allocationAndRetentionPriority,
-      { "allocationAndRetentionPriority", "x2ap.allocationAndRetentionPriority",
+      { "allocationAndRetentionPriority", "x2ap.allocationAndRetentionPriority_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_gbrQosInformation,
-      { "gbrQosInformation", "x2ap.gbrQosInformation",
+      { "gbrQosInformation", "x2ap.gbrQosInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GBR_QosInformation", HFILL }},
     { &hf_x2ap_E_RAB_List_item,
-      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_e_RAB_ID,
@@ -6152,7 +6152,7 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, VALS(x2ap_Cause_vals), 0,
         NULL, HFILL }},
     { &hf_x2ap_ForbiddenTAs_item,
-      { "ForbiddenTAs-Item", "x2ap.ForbiddenTAs_Item",
+      { "ForbiddenTAs-Item", "x2ap.ForbiddenTAs_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_forbiddenTACs,
@@ -6164,7 +6164,7 @@ void proto_register_x2ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_ForbiddenLAs_item,
-      { "ForbiddenLAs-Item", "x2ap.ForbiddenLAs_Item",
+      { "ForbiddenLAs-Item", "x2ap.ForbiddenLAs_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_forbiddenLACs,
@@ -6204,7 +6204,7 @@ void proto_register_x2ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "GTP_TEI", HFILL }},
     { &hf_x2ap_GUGroupIDList_item,
-      { "GU-Group-ID", "x2ap.GU_Group_ID",
+      { "GU-Group-ID", "x2ap.GU_Group_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_mME_Group_ID,
@@ -6212,7 +6212,7 @@ void proto_register_x2ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_gU_Group_ID,
-      { "gU-Group-ID", "x2ap.gU_Group_ID",
+      { "gU-Group-ID", "x2ap.gU_Group_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_mME_Code,
@@ -6248,7 +6248,7 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, VALS(x2ap_LoadIndicator_vals), 0,
         "LoadIndicator", HFILL }},
     { &hf_x2ap_e_UTRAN_Cell,
-      { "e-UTRAN-Cell", "x2ap.e_UTRAN_Cell",
+      { "e-UTRAN-Cell", "x2ap.e_UTRAN_Cell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LastVisitedEUTRANCellInformation", HFILL }},
     { &hf_x2ap_uTRAN_Cell,
@@ -6260,11 +6260,11 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, VALS(x2ap_LastVisitedGERANCellInformation_vals), 0,
         "LastVisitedGERANCellInformation", HFILL }},
     { &hf_x2ap_global_Cell_ID,
-      { "global-Cell-ID", "x2ap.global_Cell_ID",
+      { "global-Cell-ID", "x2ap.global_Cell_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ECGI", HFILL }},
     { &hf_x2ap_cellType,
-      { "cellType", "x2ap.cellType",
+      { "cellType", "x2ap.cellType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_time_UE_StayedInCell,
@@ -6272,7 +6272,7 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_undefined,
-      { "undefined", "x2ap.undefined",
+      { "undefined", "x2ap.undefined_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_eventType,
@@ -6300,11 +6300,11 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, VALS(x2ap_ReportingTriggerMDT_vals), 0,
         NULL, HFILL }},
     { &hf_x2ap_thresholdeventA2,
-      { "thresholdeventA2", "x2ap.thresholdeventA2",
+      { "thresholdeventA2", "x2ap.thresholdeventA2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_periodicReportingMDT,
-      { "periodicReportingMDT", "x2ap.periodicReportingMDT",
+      { "periodicReportingMDT", "x2ap.periodicReportingMDT_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_threshold_RSRP,
@@ -6316,7 +6316,7 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_MBSFN_Subframe_Infolist_item,
-      { "MBSFN-Subframe-Info", "x2ap.MBSFN_Subframe_Info",
+      { "MBSFN-Subframe-Info", "x2ap.MBSFN_Subframe_Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_radioframeAllocationPeriod,
@@ -6344,11 +6344,11 @@ void proto_register_x2ap(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M20_20", HFILL }},
     { &hf_x2ap_Neighbour_Information_item,
-      { "Neighbour-Information item", "x2ap.Neighbour_Information_item",
+      { "Neighbour-Information item", "x2ap.Neighbour_Information_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_eCGI,
-      { "eCGI", "x2ap.eCGI",
+      { "eCGI", "x2ap.eCGI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_pCI,
@@ -6436,11 +6436,11 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, VALS(x2ap_LoadIndicator_vals), 0,
         "LoadIndicator", HFILL }},
     { &hf_x2ap_ServedCells_item,
-      { "ServedCells item", "x2ap.ServedCells_item",
+      { "ServedCells item", "x2ap.ServedCells_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_servedCellInfo,
-      { "servedCellInfo", "x2ap.servedCellInfo",
+      { "servedCellInfo", "x2ap.servedCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ServedCell_Information", HFILL }},
     { &hf_x2ap_neighbour_Info,
@@ -6448,7 +6448,7 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Neighbour_Information", HFILL }},
     { &hf_x2ap_cellId,
-      { "cellId", "x2ap.cellId",
+      { "cellId", "x2ap.cellId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ECGI", HFILL }},
     { &hf_x2ap_tAC,
@@ -6536,11 +6536,11 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, VALS(x2ap_UL_InterferenceOverloadIndication_Item_vals), 0,
         NULL, HFILL }},
     { &hf_x2ap_UL_HighInterferenceIndicationInfo_item,
-      { "UL-HighInterferenceIndicationInfo-Item", "x2ap.UL_HighInterferenceIndicationInfo_Item",
+      { "UL-HighInterferenceIndicationInfo-Item", "x2ap.UL_HighInterferenceIndicationInfo_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_target_Cell_ID,
-      { "target-Cell-ID", "x2ap.target_Cell_ID",
+      { "target-Cell-ID", "x2ap.target_Cell_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ECGI", HFILL }},
     { &hf_x2ap_ul_interferenceindication,
@@ -6548,11 +6548,11 @@ void proto_register_x2ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "UL_HighInterferenceIndication", HFILL }},
     { &hf_x2ap_fdd_01,
-      { "fdd", "x2ap.fdd",
+      { "fdd", "x2ap.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UsableABSInformationFDD", HFILL }},
     { &hf_x2ap_tdd_01,
-      { "tdd", "x2ap.tdd",
+      { "tdd", "x2ap.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UsableABSInformationTDD", HFILL }},
     { &hf_x2ap_usable_abs_pattern_info,
@@ -6572,15 +6572,15 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "UE_S1AP_ID", HFILL }},
     { &hf_x2ap_uESecurityCapabilities,
-      { "uESecurityCapabilities", "x2ap.uESecurityCapabilities",
+      { "uESecurityCapabilities", "x2ap.uESecurityCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_aS_SecurityInformation,
-      { "aS-SecurityInformation", "x2ap.aS_SecurityInformation",
+      { "aS-SecurityInformation", "x2ap.aS_SecurityInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_uEaggregateMaximumBitRate,
-      { "uEaggregateMaximumBitRate", "x2ap.uEaggregateMaximumBitRate",
+      { "uEaggregateMaximumBitRate", "x2ap.uEaggregateMaximumBitRate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_subscriberProfileIDforRFP,
@@ -6596,19 +6596,19 @@ void proto_register_x2ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_handoverRestrictionList,
-      { "handoverRestrictionList", "x2ap.handoverRestrictionList",
+      { "handoverRestrictionList", "x2ap.handoverRestrictionList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_locationReportingInformation,
-      { "locationReportingInformation", "x2ap.locationReportingInformation",
+      { "locationReportingInformation", "x2ap.locationReportingInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_E_RABs_ToBeSetup_List_item,
-      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_e_RAB_Level_QoS_Parameters,
-      { "e-RAB-Level-QoS-Parameters", "x2ap.e_RAB_Level_QoS_Parameters",
+      { "e-RAB-Level-QoS-Parameters", "x2ap.e_RAB_Level_QoS_Parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_dL_Forwarding,
@@ -6616,23 +6616,23 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, VALS(x2ap_DL_Forwarding_vals), 0,
         NULL, HFILL }},
     { &hf_x2ap_uL_GTPtunnelEndpoint,
-      { "uL-GTPtunnelEndpoint", "x2ap.uL_GTPtunnelEndpoint",
+      { "uL-GTPtunnelEndpoint", "x2ap.uL_GTPtunnelEndpoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GTPtunnelEndpoint", HFILL }},
     { &hf_x2ap_E_RABs_Admitted_List_item,
-      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_uL_GTP_TunnelEndpoint,
-      { "uL-GTP-TunnelEndpoint", "x2ap.uL_GTP_TunnelEndpoint",
+      { "uL-GTP-TunnelEndpoint", "x2ap.uL_GTP_TunnelEndpoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GTPtunnelEndpoint", HFILL }},
     { &hf_x2ap_dL_GTP_TunnelEndpoint,
-      { "dL-GTP-TunnelEndpoint", "x2ap.dL_GTP_TunnelEndpoint",
+      { "dL-GTP-TunnelEndpoint", "x2ap.dL_GTP_TunnelEndpoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GTPtunnelEndpoint", HFILL }},
     { &hf_x2ap_E_RABs_SubjectToStatusTransfer_List_item,
-      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_receiveStatusofULPDCPSDUs,
@@ -6640,19 +6640,19 @@ void proto_register_x2ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_uL_COUNTvalue,
-      { "uL-COUNTvalue", "x2ap.uL_COUNTvalue",
+      { "uL-COUNTvalue", "x2ap.uL_COUNTvalue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "COUNTvalue", HFILL }},
     { &hf_x2ap_dL_COUNTvalue,
-      { "dL-COUNTvalue", "x2ap.dL_COUNTvalue",
+      { "dL-COUNTvalue", "x2ap.dL_COUNTvalue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "COUNTvalue", HFILL }},
     { &hf_x2ap_CellInformation_List_item,
-      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_cell_ID,
-      { "cell-ID", "x2ap.cell_ID",
+      { "cell-ID", "x2ap.cell_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ECGI", HFILL }},
     { &hf_x2ap_ul_InterferenceOverloadIndication,
@@ -6664,27 +6664,27 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_relativeNarrowbandTxPower,
-      { "relativeNarrowbandTxPower", "x2ap.relativeNarrowbandTxPower",
+      { "relativeNarrowbandTxPower", "x2ap.relativeNarrowbandTxPower_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_ServedCellsToModify_item,
-      { "ServedCellsToModify-Item", "x2ap.ServedCellsToModify_Item",
+      { "ServedCellsToModify-Item", "x2ap.ServedCellsToModify_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_old_ecgi,
-      { "old-ecgi", "x2ap.old_ecgi",
+      { "old-ecgi", "x2ap.old_ecgi_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ECGI", HFILL }},
     { &hf_x2ap_Old_ECGIs_item,
-      { "ECGI", "x2ap.ECGI",
+      { "ECGI", "x2ap.ECGI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_CellToReport_List_item,
-      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_MeasurementInitiationResult_List_item,
-      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_measurementFailureCause_List,
@@ -6692,7 +6692,7 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_MeasurementFailureCause_List_item,
-      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_measurementFailedReportCharacteristics,
@@ -6700,23 +6700,23 @@ void proto_register_x2ap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "ReportCharacteristics", HFILL }},
     { &hf_x2ap_CompleteFailureCauseInformation_List_item,
-      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_CellMeasurementResult_List_item,
-      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container",
+      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_hWLoadIndicator,
-      { "hWLoadIndicator", "x2ap.hWLoadIndicator",
+      { "hWLoadIndicator", "x2ap.hWLoadIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_s1TNLLoadIndicator,
-      { "s1TNLLoadIndicator", "x2ap.s1TNLLoadIndicator",
+      { "s1TNLLoadIndicator", "x2ap.s1TNLLoadIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_radioResourceStatus,
-      { "radioResourceStatus", "x2ap.radioResourceStatus",
+      { "radioResourceStatus", "x2ap.radioResourceStatus_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_privateIEs,
@@ -6724,39 +6724,39 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PrivateIE_Container", HFILL }},
     { &hf_x2ap_ServedCellsToActivate_item,
-      { "ServedCellsToActivate-Item", "x2ap.ServedCellsToActivate_Item",
+      { "ServedCellsToActivate-Item", "x2ap.ServedCellsToActivate_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_ecgi,
-      { "ecgi", "x2ap.ecgi",
+      { "ecgi", "x2ap.ecgi_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_ActivatedCellList_item,
-      { "ActivatedCellList-Item", "x2ap.ActivatedCellList_Item",
+      { "ActivatedCellList-Item", "x2ap.ActivatedCellList_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_initiatingMessage,
-      { "initiatingMessage", "x2ap.initiatingMessage",
+      { "initiatingMessage", "x2ap.initiatingMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_successfulOutcome,
-      { "successfulOutcome", "x2ap.successfulOutcome",
+      { "successfulOutcome", "x2ap.successfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_unsuccessfulOutcome,
-      { "unsuccessfulOutcome", "x2ap.unsuccessfulOutcome",
+      { "unsuccessfulOutcome", "x2ap.unsuccessfulOutcome_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x2ap_initiatingMessage_value,
-      { "value", "x2ap.value",
+      { "value", "x2ap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InitiatingMessage_value", HFILL }},
     { &hf_x2ap_successfulOutcome_value,
-      { "value", "x2ap.value",
+      { "value", "x2ap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SuccessfulOutcome_value", HFILL }},
     { &hf_x2ap_value,
-      { "value", "x2ap.value",
+      { "value", "x2ap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UnsuccessfulOutcome_value", HFILL }},
 
diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c
index a96f50b811..ee50706b89 100644
--- a/epan/dissectors/packet-x509af.c
+++ b/epan/dissectors/packet-x509af.c
@@ -932,27 +932,27 @@ void proto_register_x509af(void) {
 /*--- Included file: packet-x509af-hfarr.c ---*/
 #line 1 "../../asn1/x509af/packet-x509af-hfarr.c"
     { &hf_x509af_x509af_Certificate_PDU,
-      { "Certificate", "x509af.Certificate",
+      { "Certificate", "x509af.Certificate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_CertificatePair_PDU,
-      { "CertificatePair", "x509af.CertificatePair",
+      { "CertificatePair", "x509af.CertificatePair_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_CertificateList_PDU,
-      { "CertificateList", "x509af.CertificateList",
+      { "CertificateList", "x509af.CertificateList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_AttributeCertificate_PDU,
-      { "AttributeCertificate", "x509af.AttributeCertificate",
+      { "AttributeCertificate", "x509af.AttributeCertificate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_DSS_Params_PDU,
-      { "DSS-Params", "x509af.DSS_Params",
+      { "DSS-Params", "x509af.DSS_Params_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_signedCertificate,
-      { "signedCertificate", "x509af.signedCertificate",
+      { "signedCertificate", "x509af.signedCertificate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_version,
@@ -964,7 +964,7 @@ void proto_register_x509af(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "CertificateSerialNumber", HFILL }},
     { &hf_x509af_signature,
-      { "signature", "x509af.signature",
+      { "signature", "x509af.signature_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_x509af_issuer,
@@ -972,7 +972,7 @@ void proto_register_x509af(void) {
         FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
         "Name", HFILL }},
     { &hf_x509af_validity,
-      { "validity", "x509af.validity",
+      { "validity", "x509af.validity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_subject,
@@ -980,7 +980,7 @@ void proto_register_x509af(void) {
         FT_UINT32, BASE_DEC, VALS(x509af_SubjectName_vals), 0,
         "SubjectName", HFILL }},
     { &hf_x509af_subjectPublicKeyInfo,
-      { "subjectPublicKeyInfo", "x509af.subjectPublicKeyInfo",
+      { "subjectPublicKeyInfo", "x509af.subjectPublicKeyInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_issuerUniqueIdentifier,
@@ -996,7 +996,7 @@ void proto_register_x509af(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_algorithmIdentifier,
-      { "algorithmIdentifier", "x509af.algorithmIdentifier",
+      { "algorithmIdentifier", "x509af.algorithmIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_encrypted,
@@ -1012,7 +1012,7 @@ void proto_register_x509af(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_parameters,
-      { "parameters", "x509af.parameters",
+      { "parameters", "x509af.parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_notBefore,
@@ -1024,7 +1024,7 @@ void proto_register_x509af(void) {
         FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
         "Time", HFILL }},
     { &hf_x509af_algorithm,
-      { "algorithm", "x509af.algorithm",
+      { "algorithm", "x509af.algorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_x509af_subjectPublicKey,
@@ -1040,7 +1040,7 @@ void proto_register_x509af(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_Extensions_item,
-      { "Extension", "x509af.Extension",
+      { "Extension", "x509af.Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_extnId,
@@ -1056,7 +1056,7 @@ void proto_register_x509af(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_userCertificate,
-      { "userCertificate", "x509af.userCertificate",
+      { "userCertificate", "x509af.userCertificate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Certificate", HFILL }},
     { &hf_x509af_certificationPath,
@@ -1068,7 +1068,7 @@ void proto_register_x509af(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_CrossCertificates_item,
-      { "Certificate", "x509af.Certificate",
+      { "Certificate", "x509af.Certificate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_theCACertificates,
@@ -1076,19 +1076,19 @@ void proto_register_x509af(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_CertificatePair", HFILL }},
     { &hf_x509af_theCACertificates_item,
-      { "CertificatePair", "x509af.CertificatePair",
+      { "CertificatePair", "x509af.CertificatePair_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_issuedByThisCA,
-      { "issuedByThisCA", "x509af.issuedByThisCA",
+      { "issuedByThisCA", "x509af.issuedByThisCA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Certificate", HFILL }},
     { &hf_x509af_issuedToThisCA,
-      { "issuedToThisCA", "x509af.issuedToThisCA",
+      { "issuedToThisCA", "x509af.issuedToThisCA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Certificate", HFILL }},
     { &hf_x509af_signedCertificateList,
-      { "signedCertificateList", "x509af.signedCertificateList",
+      { "signedCertificateList", "x509af.signedCertificateList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_thisUpdate,
@@ -1104,7 +1104,7 @@ void proto_register_x509af(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_revokedCertificates_item,
-      { "revokedCertificates item", "x509af.revokedCertificates_item",
+      { "revokedCertificates item", "x509af.revokedCertificates_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_revokedUserCertificate,
@@ -1124,7 +1124,7 @@ void proto_register_x509af(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Extensions", HFILL }},
     { &hf_x509af_attributeCertificate,
-      { "attributeCertificate", "x509af.attributeCertificate",
+      { "attributeCertificate", "x509af.attributeCertificate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_acPath,
@@ -1132,15 +1132,15 @@ void proto_register_x509af(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ACPathData", HFILL }},
     { &hf_x509af_acPath_item,
-      { "ACPathData", "x509af.ACPathData",
+      { "ACPathData", "x509af.ACPathData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_certificate,
-      { "certificate", "x509af.certificate",
+      { "certificate", "x509af.certificate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_signedAttributeCertificateInfo,
-      { "signedAttributeCertificateInfo", "x509af.signedAttributeCertificateInfo",
+      { "signedAttributeCertificateInfo", "x509af.signedAttributeCertificateInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeCertificateInfo", HFILL }},
     { &hf_x509af_info_subject,
@@ -1148,7 +1148,7 @@ void proto_register_x509af(void) {
         FT_UINT32, BASE_DEC, VALS(x509af_InfoSubject_vals), 0,
         "InfoSubject", HFILL }},
     { &hf_x509af_baseCertificateID,
-      { "baseCertificateID", "x509af.baseCertificateID",
+      { "baseCertificateID", "x509af.baseCertificateID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IssuerSerial", HFILL }},
     { &hf_x509af_infoSubjectName,
@@ -1160,7 +1160,7 @@ void proto_register_x509af(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GeneralNames", HFILL }},
     { &hf_x509af_attCertValidityPeriod,
-      { "attCertValidityPeriod", "x509af.attCertValidityPeriod",
+      { "attCertValidityPeriod", "x509af.attCertValidityPeriod_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_attributes,
@@ -1168,7 +1168,7 @@ void proto_register_x509af(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Attribute", HFILL }},
     { &hf_x509af_attributes_item,
-      { "Attribute", "x509af.Attribute",
+      { "Attribute", "x509af.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509af_issuerUniqueID,
diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c
index 6574574270..20dc16eb50 100644
--- a/epan/dissectors/packet-x509ce.c
+++ b/epan/dissectors/packet-x509ce.c
@@ -1938,7 +1938,7 @@ void proto_register_x509ce(void) {
 /*--- Included file: packet-x509ce-hfarr.c ---*/
 #line 1 "../../asn1/x509ce/packet-x509ce-hfarr.c"
     { &hf_x509ce_AuthorityKeyIdentifier_PDU,
-      { "AuthorityKeyIdentifier", "x509ce.AuthorityKeyIdentifier",
+      { "AuthorityKeyIdentifier", "x509ce.AuthorityKeyIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_SubjectKeyIdentifier_PDU,
@@ -1954,7 +1954,7 @@ void proto_register_x509ce(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_PrivateKeyUsagePeriod_PDU,
-      { "PrivateKeyUsagePeriod", "x509ce.PrivateKeyUsagePeriod",
+      { "PrivateKeyUsagePeriod", "x509ce.PrivateKeyUsagePeriod_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_CertificatePoliciesSyntax_PDU,
@@ -1974,15 +1974,15 @@ void proto_register_x509ce(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_BasicConstraintsSyntax_PDU,
-      { "BasicConstraintsSyntax", "x509ce.BasicConstraintsSyntax",
+      { "BasicConstraintsSyntax", "x509ce.BasicConstraintsSyntax_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_NameConstraintsSyntax_PDU,
-      { "NameConstraintsSyntax", "x509ce.NameConstraintsSyntax",
+      { "NameConstraintsSyntax", "x509ce.NameConstraintsSyntax_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_PolicyConstraintsSyntax_PDU,
-      { "PolicyConstraintsSyntax", "x509ce.PolicyConstraintsSyntax",
+      { "PolicyConstraintsSyntax", "x509ce.PolicyConstraintsSyntax_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_SkipCerts_PDU,
@@ -2018,7 +2018,7 @@ void proto_register_x509ce(void) {
         FT_UINT32, BASE_DEC, VALS(x509ce_OrderedListSyntax_vals), 0,
         NULL, HFILL }},
     { &hf_x509ce_DeltaInformation_PDU,
-      { "DeltaInformation", "x509ce.DeltaInformation",
+      { "DeltaInformation", "x509ce.DeltaInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_CRLDistPointsSyntax_PDU,
@@ -2026,7 +2026,7 @@ void proto_register_x509ce(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_IssuingDistPointSyntax_PDU,
-      { "IssuingDistPointSyntax", "x509ce.IssuingDistPointSyntax",
+      { "IssuingDistPointSyntax", "x509ce.IssuingDistPointSyntax_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_BaseCRLNumber_PDU,
@@ -2046,47 +2046,47 @@ void proto_register_x509ce(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_AAIssuingDistPointSyntax_PDU,
-      { "AAIssuingDistPointSyntax", "x509ce.AAIssuingDistPointSyntax",
+      { "AAIssuingDistPointSyntax", "x509ce.AAIssuingDistPointSyntax_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_CertificateAssertion_PDU,
-      { "CertificateAssertion", "x509ce.CertificateAssertion",
+      { "CertificateAssertion", "x509ce.CertificateAssertion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_CertificatePairExactAssertion_PDU,
-      { "CertificatePairExactAssertion", "x509ce.CertificatePairExactAssertion",
+      { "CertificatePairExactAssertion", "x509ce.CertificatePairExactAssertion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_CertificatePairAssertion_PDU,
-      { "CertificatePairAssertion", "x509ce.CertificatePairAssertion",
+      { "CertificatePairAssertion", "x509ce.CertificatePairAssertion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_CertificateListExactAssertion_PDU,
-      { "CertificateListExactAssertion", "x509ce.CertificateListExactAssertion",
+      { "CertificateListExactAssertion", "x509ce.CertificateListExactAssertion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_CertificateListAssertion_PDU,
-      { "CertificateListAssertion", "x509ce.CertificateListAssertion",
+      { "CertificateListAssertion", "x509ce.CertificateListAssertion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_PkiPathMatchSyntax_PDU,
-      { "PkiPathMatchSyntax", "x509ce.PkiPathMatchSyntax",
+      { "PkiPathMatchSyntax", "x509ce.PkiPathMatchSyntax_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_EnhancedCertificateAssertion_PDU,
-      { "EnhancedCertificateAssertion", "x509ce.EnhancedCertificateAssertion",
+      { "EnhancedCertificateAssertion", "x509ce.EnhancedCertificateAssertion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_CertificateTemplate_PDU,
-      { "CertificateTemplate", "x509ce.CertificateTemplate",
+      { "CertificateTemplate", "x509ce.CertificateTemplate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_EntrustVersionInfo_PDU,
-      { "EntrustVersionInfo", "x509ce.EntrustVersionInfo",
+      { "EntrustVersionInfo", "x509ce.EntrustVersionInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_ScramblerCapabilities_PDU,
-      { "ScramblerCapabilities", "x509ce.ScramblerCapabilities",
+      { "ScramblerCapabilities", "x509ce.ScramblerCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_CiplusInfo_PDU,
@@ -2122,7 +2122,7 @@ void proto_register_x509ce(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "GeneralizedTime", HFILL }},
     { &hf_x509ce_CertificatePoliciesSyntax_item,
-      { "PolicyInformation", "x509ce.PolicyInformation",
+      { "PolicyInformation", "x509ce.PolicyInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_policyIdentifier,
@@ -2134,7 +2134,7 @@ void proto_register_x509ce(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo", HFILL }},
     { &hf_x509ce_policyQualifiers_item,
-      { "PolicyQualifierInfo", "x509ce.PolicyQualifierInfo",
+      { "PolicyQualifierInfo", "x509ce.PolicyQualifierInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_policyQualifierId,
@@ -2142,11 +2142,11 @@ void proto_register_x509ce(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_qualifier,
-      { "qualifier", "x509ce.qualifier",
+      { "qualifier", "x509ce.qualifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_PolicyMappingsSyntax_item,
-      { "PolicyMappingsSyntax item", "x509ce.PolicyMappingsSyntax_item",
+      { "PolicyMappingsSyntax item", "x509ce.PolicyMappingsSyntax_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_issuerDomainPolicy,
@@ -2162,7 +2162,7 @@ void proto_register_x509ce(void) {
         FT_UINT32, BASE_DEC, VALS(x509ce_GeneralName_vals), 0,
         NULL, HFILL }},
     { &hf_x509ce_otherName,
-      { "otherName", "x509ce.otherName",
+      { "otherName", "x509ce.otherName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_rfc822Name,
@@ -2174,7 +2174,7 @@ void proto_register_x509ce(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "IA5String", HFILL }},
     { &hf_x509ce_x400Address,
-      { "x400Address", "x509ce.x400Address",
+      { "x400Address", "x509ce.x400Address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ORAddress", HFILL }},
     { &hf_x509ce_directoryName,
@@ -2182,7 +2182,7 @@ void proto_register_x509ce(void) {
         FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
         "Name", HFILL }},
     { &hf_x509ce_ediPartyName,
-      { "ediPartyName", "x509ce.ediPartyName",
+      { "ediPartyName", "x509ce.ediPartyName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_uniformResourceIdentifier,
@@ -2202,7 +2202,7 @@ void proto_register_x509ce(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OtherNameType", HFILL }},
     { &hf_x509ce_value,
-      { "value", "x509ce.value",
+      { "value", "x509ce.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OtherNameValue", HFILL }},
     { &hf_x509ce_nameAssigner,
@@ -2214,7 +2214,7 @@ void proto_register_x509ce(void) {
         FT_UINT32, BASE_DEC, VALS(x509sat_DirectoryString_vals), 0,
         "DirectoryString", HFILL }},
     { &hf_x509ce_AttributesSyntax_item,
-      { "Attribute", "x509ce.Attribute",
+      { "Attribute", "x509ce.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_cA,
@@ -2234,7 +2234,7 @@ void proto_register_x509ce(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GeneralSubtrees", HFILL }},
     { &hf_x509ce_GeneralSubtrees_item,
-      { "GeneralSubtree", "x509ce.GeneralSubtree",
+      { "GeneralSubtree", "x509ce.GeneralSubtree_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_base,
@@ -2258,7 +2258,7 @@ void proto_register_x509ce(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SkipCerts", HFILL }},
     { &hf_x509ce_CRLScopeSyntax_item,
-      { "PerAuthorityScope", "x509ce.PerAuthorityScope",
+      { "PerAuthorityScope", "x509ce.PerAuthorityScope_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_authorityName,
@@ -2278,11 +2278,11 @@ void proto_register_x509ce(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "ReasonFlags", HFILL }},
     { &hf_x509ce_serialNumberRange,
-      { "serialNumberRange", "x509ce.serialNumberRange",
+      { "serialNumberRange", "x509ce.serialNumberRange_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NumberRange", HFILL }},
     { &hf_x509ce_subjectKeyIdRange,
-      { "subjectKeyIdRange", "x509ce.subjectKeyIdRange",
+      { "subjectKeyIdRange", "x509ce.subjectKeyIdRange_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NumberRange", HFILL }},
     { &hf_x509ce_nameSubtrees,
@@ -2290,7 +2290,7 @@ void proto_register_x509ce(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GeneralNames", HFILL }},
     { &hf_x509ce_baseRevocationInfo,
-      { "baseRevocationInfo", "x509ce.baseRevocationInfo",
+      { "baseRevocationInfo", "x509ce.baseRevocationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_startingNumber,
@@ -2322,7 +2322,7 @@ void proto_register_x509ce(void) {
         FT_UINT32, BASE_DEC, VALS(x509ce_StatusReferral_vals), 0,
         NULL, HFILL }},
     { &hf_x509ce_cRLReferral,
-      { "cRLReferral", "x509ce.cRLReferral",
+      { "cRLReferral", "x509ce.cRLReferral_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_crlr_issuer,
@@ -2334,7 +2334,7 @@ void proto_register_x509ce(void) {
         FT_UINT32, BASE_DEC, VALS(x509ce_GeneralName_vals), 0,
         "GeneralName", HFILL }},
     { &hf_x509ce_deltaRefInfo,
-      { "deltaRefInfo", "x509ce.deltaRefInfo",
+      { "deltaRefInfo", "x509ce.deltaRefInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_cRLScope,
@@ -2362,7 +2362,7 @@ void proto_register_x509ce(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "GeneralizedTime", HFILL }},
     { &hf_x509ce_CRLDistPointsSyntax_item,
-      { "DistributionPoint", "x509ce.DistributionPoint",
+      { "DistributionPoint", "x509ce.DistributionPoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_reasons,
@@ -2394,7 +2394,7 @@ void proto_register_x509ce(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_x509ce_ToBeRevokedSyntax_item,
-      { "ToBeRevokedGroup", "x509ce.ToBeRevokedGroup",
+      { "ToBeRevokedGroup", "x509ce.ToBeRevokedGroup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_certificateIssuer,
@@ -2402,7 +2402,7 @@ void proto_register_x509ce(void) {
         FT_UINT32, BASE_DEC, VALS(x509ce_GeneralName_vals), 0,
         "GeneralName", HFILL }},
     { &hf_x509ce_reasonInfo,
-      { "reasonInfo", "x509ce.reasonInfo",
+      { "reasonInfo", "x509ce.reasonInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_revocationTime,
@@ -2426,7 +2426,7 @@ void proto_register_x509ce(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CertificateSerialNumbers", HFILL }},
     { &hf_x509ce_certificateGroupNumberRange,
-      { "serialNumberRange", "x509ce.serialNumberRange",
+      { "serialNumberRange", "x509ce.serialNumberRange_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertificateGroupNumberRange", HFILL }},
     { &hf_x509ce_nameSubtree,
@@ -2438,7 +2438,7 @@ void proto_register_x509ce(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_RevokedGroupsSyntax_item,
-      { "RevokedGroup", "x509ce.RevokedGroup",
+      { "RevokedGroup", "x509ce.RevokedGroup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_invalidityDate,
@@ -2474,7 +2474,7 @@ void proto_register_x509ce(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_authorityKeyIdentifier,
-      { "authorityKeyIdentifier", "x509ce.authorityKeyIdentifier",
+      { "authorityKeyIdentifier", "x509ce.authorityKeyIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_certificateValid,
@@ -2510,7 +2510,7 @@ void proto_register_x509ce(void) {
         FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
         "Name", HFILL }},
     { &hf_x509ce_nameConstraints,
-      { "nameConstraints", "x509ce.nameConstraints",
+      { "nameConstraints", "x509ce.nameConstraints_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "NameConstraintsSyntax", HFILL }},
     { &hf_x509ce_builtinNameForm,
@@ -2526,19 +2526,19 @@ void proto_register_x509ce(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509ce_cpea_issuedToThisCAAssertion,
-      { "issuedToThisCAAssertion", "x509ce.issuedToThisCAAssertion",
+      { "issuedToThisCAAssertion", "x509ce.issuedToThisCAAssertion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertificateExactAssertion", HFILL }},
     { &hf_x509ce_cpea_issuedByThisCAAssertion,
-      { "issuedByThisCAAssertion", "x509ce.issuedByThisCAAssertion",
+      { "issuedByThisCAAssertion", "x509ce.issuedByThisCAAssertion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertificateExactAssertion", HFILL }},
     { &hf_x509ce_issuedToThisCAAssertion,
-      { "issuedToThisCAAssertion", "x509ce.issuedToThisCAAssertion",
+      { "issuedToThisCAAssertion", "x509ce.issuedToThisCAAssertion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertificateAssertion", HFILL }},
     { &hf_x509ce_issuedByThisCAAssertion,
-      { "issuedByThisCAAssertion", "x509ce.issuedByThisCAAssertion",
+      { "issuedByThisCAAssertion", "x509ce.issuedByThisCAAssertion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertificateAssertion", HFILL }},
     { &hf_x509ce_thisUpdate,
@@ -2570,7 +2570,7 @@ void proto_register_x509ce(void) {
         FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
         "Name", HFILL }},
     { &hf_x509ce_subjectAltName,
-      { "subjectAltName", "x509ce.subjectAltName",
+      { "subjectAltName", "x509ce.subjectAltName_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AltName", HFILL }},
     { &hf_x509ce_enhancedPathToName,
diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c
index 641b38256b..c238c5ed0c 100644
--- a/epan/dissectors/packet-x509if.c
+++ b/epan/dissectors/packet-x509if.c
@@ -2151,7 +2151,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_SubtreeSpecification_PDU,
-      { "SubtreeSpecification", "x509if.SubtreeSpecification",
+      { "SubtreeSpecification", "x509if.SubtreeSpecification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_HierarchyLevel_PDU,
@@ -2171,7 +2171,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_values_item,
-      { "values item", "x509if.values_item",
+      { "values item", "x509if.values_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_valuesWithContext,
@@ -2179,11 +2179,11 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_valuesWithContext_item,
-      { "valuesWithContext item", "x509if.valuesWithContext_item",
+      { "valuesWithContext item", "x509if.valuesWithContext_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_valuesWithContext_item", HFILL }},
     { &hf_x509if_value,
-      { "value", "x509if.value",
+      { "value", "x509if.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_contextList,
@@ -2191,7 +2191,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_MAX_OF_Context", HFILL }},
     { &hf_x509if_contextList_item,
-      { "Context", "x509if.Context",
+      { "Context", "x509if.Context_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_contextType,
@@ -2203,7 +2203,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_contextValues_item,
-      { "contextValues item", "x509if.contextValues_item",
+      { "contextValues item", "x509if.contextValues_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_fallback,
@@ -2215,7 +2215,7 @@ void proto_register_x509if(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "T_type_01", HFILL }},
     { &hf_x509if_assertion,
-      { "assertion", "x509if.assertion",
+      { "assertion", "x509if.assertion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_assertedContexts,
@@ -2223,7 +2223,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, VALS(x509if_T_assertedContexts_vals), 0,
         NULL, HFILL }},
     { &hf_x509if_allContexts,
-      { "allContexts", "x509if.allContexts",
+      { "allContexts", "x509if.allContexts_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_selectedContexts,
@@ -2231,7 +2231,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_MAX_OF_ContextAssertion", HFILL }},
     { &hf_x509if_selectedContexts_item,
-      { "ContextAssertion", "x509if.ContextAssertion",
+      { "ContextAssertion", "x509if.ContextAssertion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_ca_contextType,
@@ -2243,7 +2243,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_ca_contextValues", HFILL }},
     { &hf_x509if_ca_contextValues_item,
-      { "contextValues item", "x509if.contextValues_item",
+      { "contextValues item", "x509if.contextValues_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ca_contextValues_item", HFILL }},
     { &hf_x509if_type_02,
@@ -2255,7 +2255,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_ContextAssertion", HFILL }},
     { &hf_x509if_ata_assertedContexts_item,
-      { "ContextAssertion", "x509if.ContextAssertion",
+      { "ContextAssertion", "x509if.ContextAssertion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_rdnSequence,
@@ -2267,7 +2267,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_RelativeDistinguishedName_item,
-      { "RelativeDistinguishedName item", "x509if.RelativeDistinguishedName_item",
+      { "RelativeDistinguishedName item", "x509if.RelativeDistinguishedName_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_type_03,
@@ -2275,7 +2275,7 @@ void proto_register_x509if(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "T_type_02", HFILL }},
     { &hf_x509if_atadv_value,
-      { "value", "x509if.value",
+      { "value", "x509if.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_atadv_value", HFILL }},
     { &hf_x509if_primaryDistinguished,
@@ -2287,11 +2287,11 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_valWithContext", HFILL }},
     { &hf_x509if_valueswithContext_item,
-      { "valuesWithContext item", "x509if.valuesWithContext_item",
+      { "valuesWithContext item", "x509if.valuesWithContext_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_valWithContext_item", HFILL }},
     { &hf_x509if_distingAttrValue,
-      { "distingAttrValue", "x509if.distingAttrValue",
+      { "distingAttrValue", "x509if.distingAttrValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_chopSpecificExclusions,
@@ -2435,7 +2435,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_ra_selectedValues", HFILL }},
     { &hf_x509if_ra_selectedValues_item,
-      { "selectedValues item", "x509if.selectedValues_item",
+      { "selectedValues item", "x509if.selectedValues_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ra_selectedValues_item", HFILL }},
     { &hf_x509if_defaultValues,
@@ -2443,7 +2443,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_defaultValues_item,
-      { "defaultValues item", "x509if.defaultValues_item",
+      { "defaultValues item", "x509if.defaultValues_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_entryType,
@@ -2455,7 +2455,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_ra_values", HFILL }},
     { &hf_x509if_ra_values_item,
-      { "values item", "x509if.values_item",
+      { "values item", "x509if.values_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ra_values_item", HFILL }},
     { &hf_x509if_contexts,
@@ -2463,7 +2463,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_0_MAX_OF_ContextProfile", HFILL }},
     { &hf_x509if_contexts_item,
-      { "ContextProfile", "x509if.ContextProfile",
+      { "ContextProfile", "x509if.ContextProfile_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_contextCombination,
@@ -2475,7 +2475,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_MatchingUse", HFILL }},
     { &hf_x509if_matchingUse_item,
-      { "MatchingUse", "x509if.MatchingUse",
+      { "MatchingUse", "x509if.MatchingUse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_contextType_01,
@@ -2487,7 +2487,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_contextValue_item,
-      { "contextValue item", "x509if.contextValue_item",
+      { "contextValue item", "x509if.contextValue_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_context,
@@ -2519,7 +2519,7 @@ void proto_register_x509if(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_restrictionValue,
-      { "restrictionValue", "x509if.restrictionValue",
+      { "restrictionValue", "x509if.restrictionValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_attribute,
@@ -2559,11 +2559,11 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_selectedValues_item,
-      { "selectedValues item", "x509if.selectedValues_item",
+      { "selectedValues item", "x509if.selectedValues_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_matchedValuesOnly,
-      { "matchedValuesOnly", "x509if.matchedValuesOnly",
+      { "matchedValuesOnly", "x509if.matchedValuesOnly_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_contexts_01,
@@ -2571,15 +2571,15 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_ContextProfile", HFILL }},
     { &hf_x509if_serviceControls,
-      { "serviceControls", "x509if.serviceControls",
+      { "serviceControls", "x509if.serviceControls_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ServiceControlOptions", HFILL }},
     { &hf_x509if_searchOptions,
-      { "searchOptions", "x509if.searchOptions",
+      { "searchOptions", "x509if.searchOptions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SearchControlOptions", HFILL }},
     { &hf_x509if_hierarchyOptions,
-      { "hierarchyOptions", "x509if.hierarchyOptions",
+      { "hierarchyOptions", "x509if.hierarchyOptions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "HierarchySelections", HFILL }},
     { &hf_x509if_default,
@@ -2591,7 +2591,7 @@ void proto_register_x509if(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_x509if_basic,
-      { "basic", "x509if.basic",
+      { "basic", "x509if.basic_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MRMapping", HFILL }},
     { &hf_x509if_tightenings,
@@ -2599,7 +2599,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_MRMapping", HFILL }},
     { &hf_x509if_tightenings_item,
-      { "MRMapping", "x509if.MRMapping",
+      { "MRMapping", "x509if.MRMapping_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_relaxations,
@@ -2607,7 +2607,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_MRMapping", HFILL }},
     { &hf_x509if_relaxations_item,
-      { "MRMapping", "x509if.MRMapping",
+      { "MRMapping", "x509if.MRMapping_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_maximum_relaxation,
@@ -2623,7 +2623,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_Mapping", HFILL }},
     { &hf_x509if_mapping_item,
-      { "Mapping", "x509if.Mapping",
+      { "Mapping", "x509if.Mapping_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_substitution,
@@ -2631,7 +2631,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_MRSubstitution", HFILL }},
     { &hf_x509if_substitution_item,
-      { "MRSubstitution", "x509if.MRSubstitution",
+      { "MRSubstitution", "x509if.MRSubstitution_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_mappingFunction,
@@ -2679,7 +2679,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_0_MAX_OF_RequestAttribute", HFILL }},
     { &hf_x509if_inputAttributeTypes_item,
-      { "RequestAttribute", "x509if.RequestAttribute",
+      { "RequestAttribute", "x509if.RequestAttribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_attributeCombination,
@@ -2691,31 +2691,31 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_ResultAttribute", HFILL }},
     { &hf_x509if_outputAttributeTypes_item,
-      { "ResultAttribute", "x509if.ResultAttribute",
+      { "ResultAttribute", "x509if.ResultAttribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_defaultControls,
-      { "defaultControls", "x509if.defaultControls",
+      { "defaultControls", "x509if.defaultControls_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ControlOptions", HFILL }},
     { &hf_x509if_mandatoryControls,
-      { "mandatoryControls", "x509if.mandatoryControls",
+      { "mandatoryControls", "x509if.mandatoryControls_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ControlOptions", HFILL }},
     { &hf_x509if_searchRuleControls,
-      { "searchRuleControls", "x509if.searchRuleControls",
+      { "searchRuleControls", "x509if.searchRuleControls_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ControlOptions", HFILL }},
     { &hf_x509if_familyGrouping,
-      { "familyGrouping", "x509if.familyGrouping",
+      { "familyGrouping", "x509if.familyGrouping_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_familyReturn,
-      { "familyReturn", "x509if.familyReturn",
+      { "familyReturn", "x509if.familyReturn_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_relaxation,
-      { "relaxation", "x509if.relaxation",
+      { "relaxation", "x509if.relaxation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RelaxationPolicy", HFILL }},
     { &hf_x509if_additionalControl,
@@ -2735,7 +2735,7 @@ void proto_register_x509if(void) {
         FT_UINT32, BASE_DEC, VALS(x509if_ImposedSubset_vals), 0,
         NULL, HFILL }},
     { &hf_x509if_entryLimit,
-      { "entryLimit", "x509if.entryLimit",
+      { "entryLimit", "x509if.entryLimit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509if_name,
diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c
index f11ac98e1d..43543154b9 100644
--- a/epan/dissectors/packet-x509sat.c
+++ b/epan/dissectors/packet-x509sat.c
@@ -1867,11 +1867,11 @@ void proto_register_x509sat(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509sat_Guide_PDU,
-      { "Guide", "x509sat.Guide",
+      { "Guide", "x509sat.Guide_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509sat_EnhancedGuide_PDU,
-      { "EnhancedGuide", "x509sat.EnhancedGuide",
+      { "EnhancedGuide", "x509sat.EnhancedGuide_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509sat_PostalAddress_PDU,
@@ -1883,11 +1883,11 @@ void proto_register_x509sat(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509sat_TelexNumber_PDU,
-      { "TelexNumber", "x509sat.TelexNumber",
+      { "TelexNumber", "x509sat.TelexNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509sat_FacsimileTelephoneNumber_PDU,
-      { "FacsimileTelephoneNumber", "x509sat.FacsimileTelephoneNumber",
+      { "FacsimileTelephoneNumber", "x509sat.FacsimileTelephoneNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509sat_X121Address_PDU,
@@ -1907,15 +1907,15 @@ void proto_register_x509sat(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_x509sat_PresentationAddress_PDU,
-      { "PresentationAddress", "x509sat.PresentationAddress",
+      { "PresentationAddress", "x509sat.PresentationAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509sat_ProtocolInformation_PDU,
-      { "ProtocolInformation", "x509sat.ProtocolInformation",
+      { "ProtocolInformation", "x509sat.ProtocolInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509sat_NameAndOptionalUID_PDU,
-      { "NameAndOptionalUID", "x509sat.NameAndOptionalUID",
+      { "NameAndOptionalUID", "x509sat.NameAndOptionalUID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509sat_CaseIgnoreListMatch_PDU,
@@ -2159,7 +2159,7 @@ void proto_register_x509sat(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_AttributeValueAssertion", HFILL }},
     { &hf_x509sat_attributeList_item,
-      { "AttributeValueAssertion", "x509sat.AttributeValueAssertion",
+      { "AttributeValueAssertion", "x509sat.AttributeValueAssertion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509sat_SubstringAssertion_item,
@@ -2179,7 +2179,7 @@ void proto_register_x509sat(void) {
         FT_UINT32, BASE_DEC, VALS(x509sat_DirectoryString_vals), 0,
         "DirectoryString", HFILL }},
     { &hf_x509sat_control,
-      { "control", "x509sat.control",
+      { "control", "x509sat.control_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Attribute", HFILL }},
     { &hf_x509sat_CaseIgnoreListMatch_item,
@@ -2211,7 +2211,7 @@ void proto_register_x509sat(void) {
         FT_UINT32, BASE_DEC, VALS(x509sat_T_time_vals), 0,
         NULL, HFILL }},
     { &hf_x509sat_absolute,
-      { "absolute", "x509sat.absolute",
+      { "absolute", "x509sat.absolute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509sat_startTime,
@@ -2227,7 +2227,7 @@ void proto_register_x509sat(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_Period", HFILL }},
     { &hf_x509sat_periodic_item,
-      { "Period", "x509sat.Period",
+      { "Period", "x509sat.Period_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509sat_notThisTime,
@@ -2243,7 +2243,7 @@ void proto_register_x509sat(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_DayTimeBand", HFILL }},
     { &hf_x509sat_timesOfDay_item,
-      { "DayTimeBand", "x509sat.DayTimeBand",
+      { "DayTimeBand", "x509sat.DayTimeBand_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509sat_days,
@@ -2271,7 +2271,7 @@ void proto_register_x509sat(void) {
         FT_UINT32, BASE_DEC, VALS(x509sat_T_weeks_vals), 0,
         NULL, HFILL }},
     { &hf_x509sat_allWeeks,
-      { "allWeeks", "x509sat.allWeeks",
+      { "allWeeks", "x509sat.allWeeks_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509sat_intWeek,
@@ -2291,7 +2291,7 @@ void proto_register_x509sat(void) {
         FT_UINT32, BASE_DEC, VALS(x509sat_T_months_vals), 0,
         NULL, HFILL }},
     { &hf_x509sat_allMonths,
-      { "allMonths", "x509sat.allMonths",
+      { "allMonths", "x509sat.allMonths_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509sat_intMonth,
@@ -2343,11 +2343,11 @@ void proto_register_x509sat(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509sat_startDayTime,
-      { "startDayTime", "x509sat.startDayTime",
+      { "startDayTime", "x509sat.startDayTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DayTime", HFILL }},
     { &hf_x509sat_endDayTime,
-      { "endDayTime", "x509sat.endDayTime",
+      { "endDayTime", "x509sat.endDayTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DayTime", HFILL }},
     { &hf_x509sat_hour,
@@ -2363,7 +2363,7 @@ void proto_register_x509sat(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_x509sat_now,
-      { "now", "x509sat.now",
+      { "now", "x509sat.now_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509sat_at,
@@ -2371,7 +2371,7 @@ void proto_register_x509sat(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "GeneralizedTime", HFILL }},
     { &hf_x509sat_between,
-      { "between", "x509sat.between",
+      { "between", "x509sat.between_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_x509sat_entirely,