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

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

svn path=/trunk/; revision=49599

1 files changed, 202 insertions, 202 deletions

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,