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

diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c
index 7c77267eb3..e38a8af430 100644
--- a/epan/dissectors/packet-camel.c
+++ b/epan/dissectors/packet-camel.c
@@ -7594,7 +7594,7 @@ void proto_register_camel(void) {
 /*--- Included file: packet-camel-hfarr.c ---*/
 #line 1 "../../asn1/camel/packet-camel-hfarr.c"
     { &hf_camel_PAR_cancelFailed_PDU,
-      { "PAR-cancelFailed", "camel.PAR_cancelFailed",
+      { "PAR-cancelFailed", "camel.PAR_cancelFailed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_PAR_requestedInfoError_PDU,
@@ -7610,15 +7610,15 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_PAR_taskRefused_vals), 0,
         NULL, HFILL }},
     { &hf_camel_CAP_GPRS_ReferenceNumber_PDU,
-      { "CAP-GPRS-ReferenceNumber", "camel.CAP_GPRS_ReferenceNumber",
+      { "CAP-GPRS-ReferenceNumber", "camel.CAP_GPRS_ReferenceNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_PlayAnnouncementArg_PDU,
-      { "PlayAnnouncementArg", "camel.PlayAnnouncementArg",
+      { "PlayAnnouncementArg", "camel.PlayAnnouncementArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_PromptAndCollectUserInformationArg_PDU,
-      { "PromptAndCollectUserInformationArg", "camel.PromptAndCollectUserInformationArg",
+      { "PromptAndCollectUserInformationArg", "camel.PromptAndCollectUserInformationArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ReceivedInformationArg_PDU,
@@ -7630,7 +7630,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_SpecializedResourceReportArg_vals), 0,
         NULL, HFILL }},
     { &hf_camel_ApplyChargingArg_PDU,
-      { "ApplyChargingArg", "camel.ApplyChargingArg",
+      { "ApplyChargingArg", "camel.ApplyChargingArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ApplyChargingReportArg_PDU,
@@ -7638,19 +7638,19 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_AssistRequestInstructionsArg_PDU,
-      { "AssistRequestInstructionsArg", "camel.AssistRequestInstructionsArg",
+      { "AssistRequestInstructionsArg", "camel.AssistRequestInstructionsArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_CallGapArg_PDU,
-      { "CallGapArg", "camel.CallGapArg",
+      { "CallGapArg", "camel.CallGapArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_CallInformationReportArg_PDU,
-      { "CallInformationReportArg", "camel.CallInformationReportArg",
+      { "CallInformationReportArg", "camel.CallInformationReportArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_CallInformationRequestArg_PDU,
-      { "CallInformationRequestArg", "camel.CallInformationRequestArg",
+      { "CallInformationRequestArg", "camel.CallInformationRequestArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_CancelArg_PDU,
@@ -7658,27 +7658,27 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_CancelArg_vals), 0,
         NULL, HFILL }},
     { &hf_camel_CollectInformationArg_PDU,
-      { "CollectInformationArg", "camel.CollectInformationArg",
+      { "CollectInformationArg", "camel.CollectInformationArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ConnectArg_PDU,
-      { "ConnectArg", "camel.ConnectArg",
+      { "ConnectArg", "camel.ConnectArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ConnectToResourceArg_PDU,
-      { "ConnectToResourceArg", "camel.ConnectToResourceArg",
+      { "ConnectToResourceArg", "camel.ConnectToResourceArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ContinueWithArgumentArg_PDU,
-      { "ContinueWithArgumentArg", "camel.ContinueWithArgumentArg",
+      { "ContinueWithArgumentArg", "camel.ContinueWithArgumentArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_DisconnectForwardConnectionWithArgumentArg_PDU,
-      { "DisconnectForwardConnectionWithArgumentArg", "camel.DisconnectForwardConnectionWithArgumentArg",
+      { "DisconnectForwardConnectionWithArgumentArg", "camel.DisconnectForwardConnectionWithArgumentArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_DisconnectLegArg_PDU,
-      { "DisconnectLegArg", "camel.DisconnectLegArg",
+      { "DisconnectLegArg", "camel.DisconnectLegArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_EntityReleasedArg_PDU,
@@ -7686,11 +7686,11 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_EntityReleasedArg_vals), 0,
         NULL, HFILL }},
     { &hf_camel_EstablishTemporaryConnectionArg_PDU,
-      { "EstablishTemporaryConnectionArg", "camel.EstablishTemporaryConnectionArg",
+      { "EstablishTemporaryConnectionArg", "camel.EstablishTemporaryConnectionArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_EventReportBCSMArg_PDU,
-      { "EventReportBCSMArg", "camel.EventReportBCSMArg",
+      { "EventReportBCSMArg", "camel.EventReportBCSMArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_FurnishChargingInformationArg_PDU,
@@ -7698,23 +7698,23 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_InitialDPArg_PDU,
-      { "InitialDPArg", "camel.InitialDPArg",
+      { "InitialDPArg", "camel.InitialDPArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_InitiateCallAttemptArg_PDU,
-      { "InitiateCallAttemptArg", "camel.InitiateCallAttemptArg",
+      { "InitiateCallAttemptArg", "camel.InitiateCallAttemptArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_InitiateCallAttemptRes_PDU,
-      { "InitiateCallAttemptRes", "camel.InitiateCallAttemptRes",
+      { "InitiateCallAttemptRes", "camel.InitiateCallAttemptRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_MoveLegArg_PDU,
-      { "MoveLegArg", "camel.MoveLegArg",
+      { "MoveLegArg", "camel.MoveLegArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_PlayToneArg_PDU,
-      { "PlayToneArg", "camel.PlayToneArg",
+      { "PlayToneArg", "camel.PlayToneArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ReleaseCallArg_PDU,
@@ -7722,47 +7722,47 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_ReleaseCallArg_vals), 0,
         NULL, HFILL }},
     { &hf_camel_RequestReportBCSMEventArg_PDU,
-      { "RequestReportBCSMEventArg", "camel.RequestReportBCSMEventArg",
+      { "RequestReportBCSMEventArg", "camel.RequestReportBCSMEventArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ResetTimerArg_PDU,
-      { "ResetTimerArg", "camel.ResetTimerArg",
+      { "ResetTimerArg", "camel.ResetTimerArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_SendChargingInformationArg_PDU,
-      { "SendChargingInformationArg", "camel.SendChargingInformationArg",
+      { "SendChargingInformationArg", "camel.SendChargingInformationArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_SplitLegArg_PDU,
-      { "SplitLegArg", "camel.SplitLegArg",
+      { "SplitLegArg", "camel.SplitLegArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ApplyChargingGPRSArg_PDU,
-      { "ApplyChargingGPRSArg", "camel.ApplyChargingGPRSArg",
+      { "ApplyChargingGPRSArg", "camel.ApplyChargingGPRSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ApplyChargingReportGPRSArg_PDU,
-      { "ApplyChargingReportGPRSArg", "camel.ApplyChargingReportGPRSArg",
+      { "ApplyChargingReportGPRSArg", "camel.ApplyChargingReportGPRSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_CancelGPRSArg_PDU,
-      { "CancelGPRSArg", "camel.CancelGPRSArg",
+      { "CancelGPRSArg", "camel.CancelGPRSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ConnectGPRSArg_PDU,
-      { "ConnectGPRSArg", "camel.ConnectGPRSArg",
+      { "ConnectGPRSArg", "camel.ConnectGPRSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ContinueGPRSArg_PDU,
-      { "ContinueGPRSArg", "camel.ContinueGPRSArg",
+      { "ContinueGPRSArg", "camel.ContinueGPRSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_EntityReleasedGPRSArg_PDU,
-      { "EntityReleasedGPRSArg", "camel.EntityReleasedGPRSArg",
+      { "EntityReleasedGPRSArg", "camel.EntityReleasedGPRSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_EventReportGPRSArg_PDU,
-      { "EventReportGPRSArg", "camel.EventReportGPRSArg",
+      { "EventReportGPRSArg", "camel.EventReportGPRSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_FurnishChargingInformationGPRSArg_PDU,
@@ -7770,31 +7770,31 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_InitialDPGPRSArg_PDU,
-      { "InitialDPGPRSArg", "camel.InitialDPGPRSArg",
+      { "InitialDPGPRSArg", "camel.InitialDPGPRSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ReleaseGPRSArg_PDU,
-      { "ReleaseGPRSArg", "camel.ReleaseGPRSArg",
+      { "ReleaseGPRSArg", "camel.ReleaseGPRSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_RequestReportGPRSEventArg_PDU,
-      { "RequestReportGPRSEventArg", "camel.RequestReportGPRSEventArg",
+      { "RequestReportGPRSEventArg", "camel.RequestReportGPRSEventArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ResetTimerGPRSArg_PDU,
-      { "ResetTimerGPRSArg", "camel.ResetTimerGPRSArg",
+      { "ResetTimerGPRSArg", "camel.ResetTimerGPRSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_SendChargingInformationGPRSArg_PDU,
-      { "SendChargingInformationGPRSArg", "camel.SendChargingInformationGPRSArg",
+      { "SendChargingInformationGPRSArg", "camel.SendChargingInformationGPRSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ConnectSMSArg_PDU,
-      { "ConnectSMSArg", "camel.ConnectSMSArg",
+      { "ConnectSMSArg", "camel.ConnectSMSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_EventReportSMSArg_PDU,
-      { "EventReportSMSArg", "camel.EventReportSMSArg",
+      { "EventReportSMSArg", "camel.EventReportSMSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_FurnishChargingInformationSMSArg_PDU,
@@ -7802,7 +7802,7 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_InitialDPSMSArg_PDU,
-      { "InitialDPSMSArg", "camel.InitialDPSMSArg",
+      { "InitialDPSMSArg", "camel.InitialDPSMSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ReleaseSMSArg_PDU,
@@ -7810,11 +7810,11 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_RequestReportSMSEventArg_PDU,
-      { "RequestReportSMSEventArg", "camel.RequestReportSMSEventArg",
+      { "RequestReportSMSEventArg", "camel.RequestReportSMSEventArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ResetTimerSMSArg_PDU,
-      { "ResetTimerSMSArg", "camel.ResetTimerSMSArg",
+      { "ResetTimerSMSArg", "camel.ResetTimerSMSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_CAP_U_ABORT_REASON_PDU,
@@ -7830,15 +7830,15 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CallSegmentID", HFILL }},
     { &hf_camel_aOCInitial,
-      { "aOCInitial", "camel.aOCInitial",
+      { "aOCInitial", "camel.aOCInitial_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CAI_GSM0224", HFILL }},
     { &hf_camel_aOCSubsequent,
-      { "aOCSubsequent", "camel.aOCSubsequent",
+      { "aOCSubsequent", "camel.aOCSubsequent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_cAI_GSM0224,
-      { "cAI-GSM0224", "camel.cAI_GSM0224",
+      { "cAI-GSM0224", "camel.cAI_GSM0224_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_aocSubsequent_tariffSwitchInterval,
@@ -7850,7 +7850,7 @@ void proto_register_camel(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_camel_burstList,
-      { "burstList", "camel.burstList",
+      { "burstList", "camel.burstList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_conferenceTreatmentIndicator,
@@ -7866,11 +7866,11 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Digits", HFILL }},
     { &hf_camel_gapOnService,
-      { "gapOnService", "camel.gapOnService",
+      { "gapOnService", "camel.gapOnService_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_calledAddressAndService,
-      { "calledAddressAndService", "camel.calledAddressAndService",
+      { "calledAddressAndService", "camel.calledAddressAndService_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_serviceKey,
@@ -7878,7 +7878,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_callingAddressAndService,
-      { "callingAddressAndService", "camel.callingAddressAndService",
+      { "callingAddressAndService", "camel.callingAddressAndService_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_callingAddressValue,
@@ -7898,7 +7898,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_DpSpecificCriteria_vals), 0,
         NULL, HFILL }},
     { &hf_camel_automaticRearm,
-      { "automaticRearm", "camel.automaticRearm",
+      { "automaticRearm", "camel.automaticRearm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_cause,
@@ -7934,7 +7934,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_1200", HFILL }},
     { &hf_camel_bursts,
-      { "bursts", "camel.bursts",
+      { "bursts", "camel.bursts_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Burst", HFILL }},
     { &hf_camel_e1,
@@ -7974,7 +7974,7 @@ void proto_register_camel(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_timeDurationCharging,
-      { "timeDurationCharging", "camel.timeDurationCharging",
+      { "timeDurationCharging", "camel.timeDurationCharging_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_maxCallPeriodDuration,
@@ -7998,7 +7998,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_timeDurationChargingResult,
-      { "timeDurationChargingResult", "camel.timeDurationChargingResult",
+      { "timeDurationChargingResult", "camel.timeDurationChargingResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_timeDurationChargingResultpartyToCharge,
@@ -8014,7 +8014,7 @@ void proto_register_camel(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_camel_callLegReleasedAtTcpExpiry,
-      { "callLegReleasedAtTcpExpiry", "camel.callLegReleasedAtTcpExpiry",
+      { "callLegReleasedAtTcpExpiry", "camel.callLegReleasedAtTcpExpiry_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_aChChargingAddress,
@@ -8022,7 +8022,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_AChChargingAddress_vals), 0,
         NULL, HFILL }},
     { &hf_camel_fci_fCIBCCCAMELsequence1,
-      { "fCIBCCCAMELsequence1", "camel.fCIBCCCAMELsequence1",
+      { "fCIBCCCAMELsequence1", "camel.fCIBCCCAMELsequence1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fci_fCIBCCCAMELsequence1", HFILL }},
     { &hf_camel_freeFormatData,
@@ -8038,7 +8038,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_AppendFreeFormatData_vals), 0,
         NULL, HFILL }},
     { &hf_camel_fciGPRS_fCIBCCCAMELsequence1,
-      { "fCIBCCCAMELsequence1", "camel.fCIBCCCAMELsequence1",
+      { "fCIBCCCAMELsequence1", "camel.fCIBCCCAMELsequence1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fciGPRS_fCIBCCCAMELsequence1", HFILL }},
     { &hf_camel_pDPID,
@@ -8046,23 +8046,23 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_fciSMS_fCIBCCCAMELsequence1,
-      { "fCIBCCCAMELsequence1", "camel.fCIBCCCAMELsequence1",
+      { "fCIBCCCAMELsequence1", "camel.fCIBCCCAMELsequence1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fciSMS_fCIBCCCAMELsequence1", HFILL }},
     { &hf_camel_aOCBeforeAnswer,
-      { "aOCBeforeAnswer", "camel.aOCBeforeAnswer",
+      { "aOCBeforeAnswer", "camel.aOCBeforeAnswer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_aOCAfterAnswer,
-      { "aOCAfterAnswer", "camel.aOCAfterAnswer",
+      { "aOCAfterAnswer", "camel.aOCAfterAnswer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AOCSubsequent", HFILL }},
     { &hf_camel_aOC_extension,
-      { "aOC-extension", "camel.aOC_extension",
+      { "aOC-extension", "camel.aOC_extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CAMEL_SCIBillingChargingCharacteristicsAlt", HFILL }},
     { &hf_camel_aOCGPRS,
-      { "aOCGPRS", "camel.aOCGPRS",
+      { "aOCGPRS", "camel.aOCGPRS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ChangeOfPositionControlInfo_item,
@@ -8082,19 +8082,19 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "LAIFixedLength", HFILL }},
     { &hf_camel_inter_SystemHandOver,
-      { "inter-SystemHandOver", "camel.inter_SystemHandOver",
+      { "inter-SystemHandOver", "camel.inter_SystemHandOver_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_inter_PLMNHandOver,
-      { "inter-PLMNHandOver", "camel.inter_PLMNHandOver",
+      { "inter-PLMNHandOver", "camel.inter_PLMNHandOver_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_inter_MSCHandOver,
-      { "inter-MSCHandOver", "camel.inter_MSCHandOver",
+      { "inter-MSCHandOver", "camel.inter_MSCHandOver_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_changeOfLocationAlt,
-      { "changeOfLocationAlt", "camel.changeOfLocationAlt",
+      { "changeOfLocationAlt", "camel.changeOfLocationAlt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_maxTransferredVolume,
@@ -8166,7 +8166,7 @@ void proto_register_camel(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_camel_collectedDigits,
-      { "collectedDigits", "camel.collectedDigits",
+      { "collectedDigits", "camel.collectedDigits_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_basicGapCriteria,
@@ -8186,11 +8186,11 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_midCallControlInfo,
-      { "midCallControlInfo", "camel.midCallControlInfo",
+      { "midCallControlInfo", "camel.midCallControlInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_dpSpecificCriteriaAlt,
-      { "dpSpecificCriteriaAlt", "camel.dpSpecificCriteriaAlt",
+      { "dpSpecificCriteriaAlt", "camel.dpSpecificCriteriaAlt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_changeOfPositionControlInfo,
@@ -8206,7 +8206,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_127", HFILL }},
     { &hf_camel_oServiceChangeSpecificInfo,
-      { "oServiceChangeSpecificInfo", "camel.oServiceChangeSpecificInfo",
+      { "oServiceChangeSpecificInfo", "camel.oServiceChangeSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ext_basicServiceCode,
@@ -8222,11 +8222,11 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_NatureOfServiceChange_vals), 0,
         NULL, HFILL }},
     { &hf_camel_tServiceChangeSpecificInfo,
-      { "tServiceChangeSpecificInfo", "camel.tServiceChangeSpecificInfo",
+      { "tServiceChangeSpecificInfo", "camel.tServiceChangeSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_collectedInfoSpecificInfo,
-      { "collectedInfoSpecificInfo", "camel.collectedInfoSpecificInfo",
+      { "collectedInfoSpecificInfo", "camel.collectedInfoSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_calledPartyNumber,
@@ -8238,7 +8238,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_86400", HFILL }},
     { &hf_camel_timeGPRSIfTariffSwitch,
-      { "timeGPRSIfTariffSwitch", "camel.timeGPRSIfTariffSwitch",
+      { "timeGPRSIfTariffSwitch", "camel.timeGPRSIfTariffSwitch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_timeGPRSSinceLastTariffSwitch,
@@ -8254,7 +8254,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_255", HFILL }},
     { &hf_camel_rO_TimeGPRSIfTariffSwitch,
-      { "rO-TimeGPRSIfTariffSwitch", "camel.rO_TimeGPRSIfTariffSwitch",
+      { "rO-TimeGPRSIfTariffSwitch", "camel.rO_TimeGPRSIfTariffSwitch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_rO_TimeGPRSSinceLastTariffSwitch,
@@ -8278,7 +8278,7 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_routeSelectFailureSpecificInfo,
-      { "routeSelectFailureSpecificInfo", "camel.routeSelectFailureSpecificInfo",
+      { "routeSelectFailureSpecificInfo", "camel.routeSelectFailureSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_routeSelectfailureCause,
@@ -8286,7 +8286,7 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Cause", HFILL }},
     { &hf_camel_oCalledPartyBusySpecificInfo,
-      { "oCalledPartyBusySpecificInfo", "camel.oCalledPartyBusySpecificInfo",
+      { "oCalledPartyBusySpecificInfo", "camel.oCalledPartyBusySpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_busyCause,
@@ -8294,11 +8294,11 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Cause", HFILL }},
     { &hf_camel_oNoAnswerSpecificInfo,
-      { "oNoAnswerSpecificInfo", "camel.oNoAnswerSpecificInfo",
+      { "oNoAnswerSpecificInfo", "camel.oNoAnswerSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_oAnswerSpecificInfo,
-      { "oAnswerSpecificInfo", "camel.oAnswerSpecificInfo",
+      { "oAnswerSpecificInfo", "camel.oAnswerSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_destinationAddress,
@@ -8306,11 +8306,11 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "CalledPartyNumber", HFILL }},
     { &hf_camel_or_Call,
-      { "or-Call", "camel.or_Call",
+      { "or-Call", "camel.or_Call_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_forwardedCall,
-      { "forwardedCall", "camel.forwardedCall",
+      { "forwardedCall", "camel.forwardedCall_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_chargeIndicator,
@@ -8322,7 +8322,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_Ext_BasicServiceCode_vals), 0,
         "Ext_BasicServiceCode", HFILL }},
     { &hf_camel_oMidCallSpecificInfo,
-      { "oMidCallSpecificInfo", "camel.oMidCallSpecificInfo",
+      { "oMidCallSpecificInfo", "camel.oMidCallSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_omidCallEvents,
@@ -8338,7 +8338,7 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Digits", HFILL }},
     { &hf_camel_oDisconnectSpecificInfo,
-      { "oDisconnectSpecificInfo", "camel.oDisconnectSpecificInfo",
+      { "oDisconnectSpecificInfo", "camel.oDisconnectSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_releaseCause,
@@ -8346,15 +8346,15 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Cause", HFILL }},
     { &hf_camel_tBusySpecificInfo,
-      { "tBusySpecificInfo", "camel.tBusySpecificInfo",
+      { "tBusySpecificInfo", "camel.tBusySpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_callForwarded,
-      { "callForwarded", "camel.callForwarded",
+      { "callForwarded", "camel.callForwarded_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_routeNotPermitted,
-      { "routeNotPermitted", "camel.routeNotPermitted",
+      { "routeNotPermitted", "camel.routeNotPermitted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_forwardingDestinationNumber,
@@ -8362,15 +8362,15 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "CalledPartyNumber", HFILL }},
     { &hf_camel_tNoAnswerSpecificInfo,
-      { "tNoAnswerSpecificInfo", "camel.tNoAnswerSpecificInfo",
+      { "tNoAnswerSpecificInfo", "camel.tNoAnswerSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_tAnswerSpecificInfo,
-      { "tAnswerSpecificInfo", "camel.tAnswerSpecificInfo",
+      { "tAnswerSpecificInfo", "camel.tAnswerSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_tMidCallSpecificInfo,
-      { "tMidCallSpecificInfo", "camel.tMidCallSpecificInfo",
+      { "tMidCallSpecificInfo", "camel.tMidCallSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_tmidCallEvents,
@@ -8378,27 +8378,27 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_T_tmidCallEvents_vals), 0,
         "T_tmidCallEvents", HFILL }},
     { &hf_camel_tDisconnectSpecificInfo,
-      { "tDisconnectSpecificInfo", "camel.tDisconnectSpecificInfo",
+      { "tDisconnectSpecificInfo", "camel.tDisconnectSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_oTermSeizedSpecificInfo,
-      { "oTermSeizedSpecificInfo", "camel.oTermSeizedSpecificInfo",
+      { "oTermSeizedSpecificInfo", "camel.oTermSeizedSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_locationInformation,
-      { "locationInformation", "camel.locationInformation",
+      { "locationInformation", "camel.locationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_callAcceptedSpecificInfo,
-      { "callAcceptedSpecificInfo", "camel.callAcceptedSpecificInfo",
+      { "callAcceptedSpecificInfo", "camel.callAcceptedSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_oAbandonSpecificInfo,
-      { "oAbandonSpecificInfo", "camel.oAbandonSpecificInfo",
+      { "oAbandonSpecificInfo", "camel.oAbandonSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_oChangeOfPositionSpecificInfo,
-      { "oChangeOfPositionSpecificInfo", "camel.oChangeOfPositionSpecificInfo",
+      { "oChangeOfPositionSpecificInfo", "camel.oChangeOfPositionSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_metDPCriteriaList,
@@ -8406,15 +8406,15 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_tChangeOfPositionSpecificInfo,
-      { "tChangeOfPositionSpecificInfo", "camel.tChangeOfPositionSpecificInfo",
+      { "tChangeOfPositionSpecificInfo", "camel.tChangeOfPositionSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_dpSpecificInfoAlt,
-      { "dpSpecificInfoAlt", "camel.dpSpecificInfoAlt",
+      { "dpSpecificInfoAlt", "camel.dpSpecificInfoAlt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_o_smsFailureSpecificInfo,
-      { "o-smsFailureSpecificInfo", "camel.o_smsFailureSpecificInfo",
+      { "o-smsFailureSpecificInfo", "camel.o_smsFailureSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_smsfailureCause,
@@ -8422,11 +8422,11 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_MO_SMSCause_vals), 0,
         "MO_SMSCause", HFILL }},
     { &hf_camel_o_smsSubmissionSpecificInfo,
-      { "o-smsSubmissionSpecificInfo", "camel.o_smsSubmissionSpecificInfo",
+      { "o-smsSubmissionSpecificInfo", "camel.o_smsSubmissionSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_t_smsFailureSpecificInfo,
-      { "t-smsFailureSpecificInfo", "camel.t_smsFailureSpecificInfo",
+      { "t-smsFailureSpecificInfo", "camel.t_smsFailureSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_t_smsFailureSpecificInfo", HFILL }},
     { &hf_camel_t_smsfailureCause,
@@ -8434,11 +8434,11 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "MT_SMSCause", HFILL }},
     { &hf_camel_t_smsDeliverySpecificInfo,
-      { "t-smsDeliverySpecificInfo", "camel.t_smsDeliverySpecificInfo",
+      { "t-smsDeliverySpecificInfo", "camel.t_smsDeliverySpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_t_smsDeliverySpecificInfo", HFILL }},
     { &hf_camel_Extensions_item,
-      { "ExtensionField", "camel.ExtensionField",
+      { "ExtensionField", "camel.ExtensionField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_type,
@@ -8450,7 +8450,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(inap_CriticalityType_vals), 0,
         "CriticalityType", HFILL }},
     { &hf_camel_value,
-      { "value", "camel.value",
+      { "value", "camel.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_callDiversionTreatmentIndicator,
@@ -8462,7 +8462,7 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_1", HFILL }},
     { &hf_camel_compoundGapCriteria,
-      { "compoundGapCriteria", "camel.compoundGapCriteria",
+      { "compoundGapCriteria", "camel.compoundGapCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CompoundCriteria", HFILL }},
     { &hf_camel_gapIndicatorsDuration,
@@ -8502,15 +8502,15 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_GPRSEventType_vals), 0,
         NULL, HFILL }},
     { &hf_camel_attachChangeOfPositionSpecificInformation,
-      { "attachChangeOfPositionSpecificInformation", "camel.attachChangeOfPositionSpecificInformation",
+      { "attachChangeOfPositionSpecificInformation", "camel.attachChangeOfPositionSpecificInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_locationInformationGPRS,
-      { "locationInformationGPRS", "camel.locationInformationGPRS",
+      { "locationInformationGPRS", "camel.locationInformationGPRS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_pdp_ContextchangeOfPositionSpecificInformation,
-      { "pdp-ContextchangeOfPositionSpecificInformation", "camel.pdp_ContextchangeOfPositionSpecificInformation",
+      { "pdp-ContextchangeOfPositionSpecificInformation", "camel.pdp_ContextchangeOfPositionSpecificInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_accessPointName,
@@ -8522,11 +8522,11 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "GPRSChargingID", HFILL }},
     { &hf_camel_endUserAddress,
-      { "endUserAddress", "camel.endUserAddress",
+      { "endUserAddress", "camel.endUserAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_qualityOfService,
-      { "qualityOfService", "camel.qualityOfService",
+      { "qualityOfService", "camel.qualityOfService_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_timeAndTimeZone,
@@ -8538,7 +8538,7 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "GSN_Address", HFILL }},
     { &hf_camel_detachSpecificInformation,
-      { "detachSpecificInformation", "camel.detachSpecificInformation",
+      { "detachSpecificInformation", "camel.detachSpecificInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_initiatingEntity,
@@ -8546,15 +8546,15 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_InitiatingEntity_vals), 0,
         NULL, HFILL }},
     { &hf_camel_routeingAreaUpdate,
-      { "routeingAreaUpdate", "camel.routeingAreaUpdate",
+      { "routeingAreaUpdate", "camel.routeingAreaUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_disconnectSpecificInformation,
-      { "disconnectSpecificInformation", "camel.disconnectSpecificInformation",
+      { "disconnectSpecificInformation", "camel.disconnectSpecificInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_pDPContextEstablishmentSpecificInformation,
-      { "pDPContextEstablishmentSpecificInformation", "camel.pDPContextEstablishmentSpecificInformation",
+      { "pDPContextEstablishmentSpecificInformation", "camel.pDPContextEstablishmentSpecificInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_pDPInitiationType,
@@ -8562,11 +8562,11 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_PDPInitiationType_vals), 0,
         NULL, HFILL }},
     { &hf_camel_secondaryPDP_context,
-      { "secondaryPDP-context", "camel.secondaryPDP_context",
+      { "secondaryPDP-context", "camel.secondaryPDP_context_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_pDPContextEstablishmentAcknowledgementSpecificInformation,
-      { "pDPContextEstablishmentAcknowledgementSpecificInformation", "camel.pDPContextEstablishmentAcknowledgementSpecificInformation",
+      { "pDPContextEstablishmentAcknowledgementSpecificInformation", "camel.pDPContextEstablishmentAcknowledgementSpecificInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_messageID,
@@ -8586,11 +8586,11 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_32767", HFILL }},
     { &hf_camel_inbandInfo,
-      { "inbandInfo", "camel.inbandInfo",
+      { "inbandInfo", "camel.inbandInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_tone,
-      { "tone", "camel.tone",
+      { "tone", "camel.tone_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_cellGlobalIdOrServiceAreaIdOrLAI,
@@ -8614,11 +8614,11 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "LSAIdentity", HFILL }},
     { &hf_camel_extensionContainer,
-      { "extensionContainer", "camel.extensionContainer",
+      { "extensionContainer", "camel.extensionContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_sai_Present,
-      { "sai-Present", "camel.sai_Present",
+      { "sai-Present", "camel.sai_Present_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_userCSGInformation,
@@ -8630,7 +8630,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Integer4", HFILL }},
     { &hf_camel_text,
-      { "text", "camel.text",
+      { "text", "camel.text_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_messageContent,
@@ -8650,7 +8650,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_variableMessage,
-      { "variableMessage", "camel.variableMessage",
+      { "variableMessage", "camel.variableMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_variableParts,
@@ -8690,15 +8690,15 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "LAIFixedLength", HFILL }},
     { &hf_camel_inter_SystemHandOverToUMTS,
-      { "inter-SystemHandOverToUMTS", "camel.inter_SystemHandOverToUMTS",
+      { "inter-SystemHandOverToUMTS", "camel.inter_SystemHandOverToUMTS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_inter_SystemHandOverToGSM,
-      { "inter-SystemHandOverToGSM", "camel.inter_SystemHandOverToGSM",
+      { "inter-SystemHandOverToGSM", "camel.inter_SystemHandOverToGSM_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_metDPCriterionAlt,
-      { "metDPCriterionAlt", "camel.metDPCriterionAlt",
+      { "metDPCriterionAlt", "camel.metDPCriterionAlt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_minimumNumberOfDigits,
@@ -8722,15 +8722,15 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_GPRS_QoS_vals), 0,
         "GPRS_QoS", HFILL }},
     { &hf_camel_requested_QoS_Extension,
-      { "requested-QoS-Extension", "camel.requested_QoS_Extension",
+      { "requested-QoS-Extension", "camel.requested_QoS_Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GPRS_QoS_Extension", HFILL }},
     { &hf_camel_subscribed_QoS_Extension,
-      { "subscribed-QoS-Extension", "camel.subscribed_QoS_Extension",
+      { "subscribed-QoS-Extension", "camel.subscribed_QoS_Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GPRS_QoS_Extension", HFILL }},
     { &hf_camel_negotiated_QoS_Extension,
-      { "negotiated-QoS-Extension", "camel.negotiated_QoS_Extension",
+      { "negotiated-QoS-Extension", "camel.negotiated_QoS_Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GPRS_QoS_Extension", HFILL }},
     { &hf_camel_receivingSideID,
@@ -8738,7 +8738,7 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "LegType", HFILL }},
     { &hf_camel_RequestedInformationList_item,
-      { "RequestedInformation", "camel.RequestedInformation",
+      { "RequestedInformation", "camel.RequestedInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_RequestedInformationTypeList_item,
@@ -8774,11 +8774,11 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "LegType", HFILL }},
     { &hf_camel_forwardServiceInteractionInd,
-      { "forwardServiceInteractionInd", "camel.forwardServiceInteractionInd",
+      { "forwardServiceInteractionInd", "camel.forwardServiceInteractionInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_backwardServiceInteractionInd,
-      { "backwardServiceInteractionInd", "camel.backwardServiceInteractionInd",
+      { "backwardServiceInteractionInd", "camel.backwardServiceInteractionInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_bothwayThroughConnectionInd,
@@ -8790,7 +8790,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_ConnectedNumberTreatmentInd_vals), 0,
         NULL, HFILL }},
     { &hf_camel_nonCUGCall,
-      { "nonCUGCall", "camel.nonCUGCall",
+      { "nonCUGCall", "camel.nonCUGCall_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_holdTreatmentIndicator,
@@ -8822,7 +8822,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_timeIfTariffSwitch,
-      { "timeIfTariffSwitch", "camel.timeIfTariffSwitch",
+      { "timeIfTariffSwitch", "camel.timeIfTariffSwitch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_toneID,
@@ -8838,7 +8838,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_4294967295", HFILL }},
     { &hf_camel_volumeIfTariffSwitch,
-      { "volumeIfTariffSwitch", "camel.volumeIfTariffSwitch",
+      { "volumeIfTariffSwitch", "camel.volumeIfTariffSwitch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_volumeSinceLastTariffSwitch,
@@ -8854,7 +8854,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_255", HFILL }},
     { &hf_camel_rO_VolumeIfTariffSwitch,
-      { "rO-VolumeIfTariffSwitch", "camel.rO_VolumeIfTariffSwitch",
+      { "rO-VolumeIfTariffSwitch", "camel.rO_VolumeIfTariffSwitch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_rO_VolumeSinceLastTariffSwitch,
@@ -8922,11 +8922,11 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Digits", HFILL }},
     { &hf_camel_allAnnouncementsComplete,
-      { "allAnnouncementsComplete", "camel.allAnnouncementsComplete",
+      { "allAnnouncementsComplete", "camel.allAnnouncementsComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_firstAnnouncementStarted,
-      { "firstAnnouncementStarted", "camel.firstAnnouncementStarted",
+      { "firstAnnouncementStarted", "camel.firstAnnouncementStarted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_aChBillingChargingCharacteristics,
@@ -8954,7 +8954,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_GapCriteria_vals), 0,
         NULL, HFILL }},
     { &hf_camel_gapIndicators,
-      { "gapIndicators", "camel.gapIndicators",
+      { "gapIndicators", "camel.gapIndicators_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_controlType,
@@ -8982,11 +8982,11 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_SendingSideID_vals), 0,
         "SendingSideID", HFILL }},
     { &hf_camel_allRequests,
-      { "allRequests", "camel.allRequests",
+      { "allRequests", "camel.allRequests_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_callSegmentToCancel,
-      { "callSegmentToCancel", "camel.callSegmentToCancel",
+      { "callSegmentToCancel", "camel.callSegmentToCancel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_destinationRoutingAddress,
@@ -9022,7 +9022,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_serviceInteractionIndicatorsTwo,
-      { "serviceInteractionIndicatorsTwo", "camel.serviceInteractionIndicatorsTwo",
+      { "serviceInteractionIndicatorsTwo", "camel.serviceInteractionIndicatorsTwo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_chargeNumber,
@@ -9038,15 +9038,15 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_cug_OutgoingAccess,
-      { "cug-OutgoingAccess", "camel.cug_OutgoingAccess",
+      { "cug-OutgoingAccess", "camel.cug_OutgoingAccess_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_suppressionOfAnnouncement,
-      { "suppressionOfAnnouncement", "camel.suppressionOfAnnouncement",
+      { "suppressionOfAnnouncement", "camel.suppressionOfAnnouncement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_oCSIApplicable,
-      { "oCSIApplicable", "camel.oCSIApplicable",
+      { "oCSIApplicable", "camel.oCSIApplicable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_naOliInfo,
@@ -9054,11 +9054,11 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_bor_InterrogationRequested,
-      { "bor-InterrogationRequested", "camel.bor_InterrogationRequested",
+      { "bor-InterrogationRequested", "camel.bor_InterrogationRequested_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_suppress_N_CSI,
-      { "suppress-N-CSI", "camel.suppress_N_CSI",
+      { "suppress-N-CSI", "camel.suppress_N_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_resourceAddress,
@@ -9070,23 +9070,23 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_none,
-      { "none", "camel.none",
+      { "none", "camel.none_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_suppress_O_CSI,
-      { "suppress-O-CSI", "camel.suppress_O_CSI",
+      { "suppress-O-CSI", "camel.suppress_O_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_continueWithArgumentArgExtension,
-      { "continueWithArgumentArgExtension", "camel.continueWithArgumentArgExtension",
+      { "continueWithArgumentArgExtension", "camel.continueWithArgumentArgExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_suppress_D_CSI,
-      { "suppress-D-CSI", "camel.suppress_D_CSI",
+      { "suppress-D-CSI", "camel.suppress_D_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_suppressOutgoingCallBarring,
-      { "suppressOutgoingCallBarring", "camel.suppressOutgoingCallBarring",
+      { "suppressOutgoingCallBarring", "camel.suppressOutgoingCallBarring_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_legOrCallSegment,
@@ -9098,11 +9098,11 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(inap_LegID_vals), 0,
         "LegID", HFILL }},
     { &hf_camel_callSegmentFailure,
-      { "callSegmentFailure", "camel.callSegmentFailure",
+      { "callSegmentFailure", "camel.callSegmentFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_bCSM_Failure,
-      { "bCSM-Failure", "camel.bCSM_Failure",
+      { "bCSM-Failure", "camel.bCSM_Failure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_assistingSSPIPRoutingAddress,
@@ -9118,7 +9118,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_EventSpecificInformationBCSM_vals), 0,
         NULL, HFILL }},
     { &hf_camel_miscCallInfo,
-      { "miscCallInfo", "camel.miscCallInfo",
+      { "miscCallInfo", "camel.miscCallInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_cGEncountered,
@@ -9170,11 +9170,11 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_callForwardingSS_Pending,
-      { "callForwardingSS-Pending", "camel.callForwardingSS_Pending",
+      { "callForwardingSS-Pending", "camel.callForwardingSS_Pending_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_initialDPArgExtension,
-      { "initialDPArgExtension", "camel.initialDPArgExtension",
+      { "initialDPArgExtension", "camel.initialDPArgExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_gmscAddress,
@@ -9214,19 +9214,19 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "LowLayerCompatibility", HFILL }},
     { &hf_camel_enhancedDialledServicesAllowed,
-      { "enhancedDialledServicesAllowed", "camel.enhancedDialledServicesAllowed",
+      { "enhancedDialledServicesAllowed", "camel.enhancedDialledServicesAllowed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_uu_Data,
-      { "uu-Data", "camel.uu_Data",
+      { "uu-Data", "camel.uu_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_collectInformationAllowed,
-      { "collectInformationAllowed", "camel.collectInformationAllowed",
+      { "collectInformationAllowed", "camel.collectInformationAllowed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_releaseCallArgExtensionAllowed,
-      { "releaseCallArgExtensionAllowed", "camel.releaseCallArgExtensionAllowed",
+      { "releaseCallArgExtensionAllowed", "camel.releaseCallArgExtensionAllowed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_legToBeCreated,
@@ -9242,7 +9242,7 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "ISDN_AddressString", HFILL }},
     { &hf_camel_suppress_T_CSI,
-      { "suppress-T-CSI", "camel.suppress_T_CSI",
+      { "suppress-T-CSI", "camel.suppress_T_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_legIDToMove,
@@ -9254,7 +9254,7 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_allCallSegmentsWithExtension,
-      { "allCallSegmentsWithExtension", "camel.allCallSegmentsWithExtension",
+      { "allCallSegmentsWithExtension", "camel.allCallSegmentsWithExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_bcsmEvents,
@@ -9262,7 +9262,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_bound__numOfBCSMEvents_OF_BCSMEvent", HFILL }},
     { &hf_camel_bcsmEvents_item,
-      { "BCSMEvent", "camel.BCSMEvent",
+      { "BCSMEvent", "camel.BCSMEvent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_timerID,
@@ -9310,7 +9310,7 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_miscGPRSInfo,
-      { "miscGPRSInfo", "camel.miscGPRSInfo",
+      { "miscGPRSInfo", "camel.miscGPRSInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MiscCallInfo", HFILL }},
     { &hf_camel_gPRSEventSpecificInformation,
@@ -9322,7 +9322,7 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "ISDN_AddressString", HFILL }},
     { &hf_camel_gPRSMSClass,
-      { "gPRSMSClass", "camel.gPRSMSClass",
+      { "gPRSMSClass", "camel.gPRSMSClass_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_sGSNCapabilities,
@@ -9338,7 +9338,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_bound__numOfGPRSEvents_OF_GPRSEvent", HFILL }},
     { &hf_camel_gPRSEvent_item,
-      { "GPRSEvent", "camel.GPRSEvent",
+      { "GPRSEvent", "camel.GPRSEvent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_sCIGPRSBillingChargingCharacteristics,
@@ -9366,7 +9366,7 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "SMS_AddressString", HFILL }},
     { &hf_camel_locationInformationMSC,
-      { "locationInformationMSC", "camel.locationInformationMSC",
+      { "locationInformationMSC", "camel.locationInformationMSC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LocationInformation", HFILL }},
     { &hf_camel_tPShortMessageSpecificInfo,
@@ -9398,11 +9398,11 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_bound__numOfSMSEvents_OF_SMSEvent", HFILL }},
     { &hf_camel_sMSEvents_item,
-      { "SMSEvent", "camel.SMSEvent",
+      { "SMSEvent", "camel.SMSEvent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_naCarrierInformation,
-      { "naCarrierInformation", "camel.naCarrierInformation",
+      { "naCarrierInformation", "camel.naCarrierInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_naCarrierId,
@@ -9414,11 +9414,11 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "NACarrierSelectionInfo", HFILL }},
     { &hf_camel_timeDurationCharging_01,
-      { "timeDurationCharging", "camel.timeDurationCharging",
+      { "timeDurationCharging", "camel.timeDurationCharging_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_timeDurationCharging_01", HFILL }},
     { &hf_camel_releaseIfdurationExceeded_01,
-      { "releaseIfdurationExceeded", "camel.releaseIfdurationExceeded",
+      { "releaseIfdurationExceeded", "camel.releaseIfdurationExceeded_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_tariffSwitchInterval,
@@ -9434,7 +9434,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField", HFILL }},
     { &hf_camel_extensions_item,
-      { "ExtensionField", "camel.ExtensionField",
+      { "ExtensionField", "camel.ExtensionField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_local,
@@ -9446,19 +9446,19 @@ void proto_register_camel(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_invoke,
-      { "invoke", "camel.invoke",
+      { "invoke", "camel.invoke_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_returnResult,
-      { "returnResult", "camel.returnResult",
+      { "returnResult", "camel.returnResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_returnError,
-      { "returnError", "camel.returnError",
+      { "returnError", "camel.returnError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_reject,
-      { "reject", "camel.reject",
+      { "reject", "camel.reject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_invokeId,
@@ -9474,7 +9474,7 @@ void proto_register_camel(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "T_linkedIdPresent", HFILL }},
     { &hf_camel_absent,
-      { "absent", "camel.absent",
+      { "absent", "camel.absent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_opcode,
@@ -9482,15 +9482,15 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_Code_vals), 0,
         "Code", HFILL }},
     { &hf_camel_argument,
-      { "argument", "camel.argument",
+      { "argument", "camel.argument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_result,
-      { "result", "camel.result",
+      { "result", "camel.result_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_resultArgument,
-      { "result", "camel.result",
+      { "result", "camel.result_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ResultArgument", HFILL }},
     { &hf_camel_errcode,
@@ -9498,7 +9498,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_Code_vals), 0,
         "Code", HFILL }},
     { &hf_camel_parameter,
-      { "parameter", "camel.parameter",
+      { "parameter", "camel.parameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_problem,