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, 130 insertions, 130 deletions

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 }},