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

diff --git a/epan/dissectors/packet-lppe.c b/epan/dissectors/packet-lppe.c
index 24c8674347..839cd44cea 100644
--- a/epan/dissectors/packet-lppe.c
+++ b/epan/dissectors/packet-lppe.c
@@ -14971,7 +14971,7 @@ void proto_register_lppe(void) {
 /*--- Included file: packet-lppe-hfarr.c ---*/
 #line 1 "../../asn1/lppe/packet-lppe-hfarr.c"
     { &hf_lppe_OMA_LPPe_MessageExtension_PDU,
-      { "OMA-LPPe-MessageExtension", "lppe.OMA_LPPe_MessageExtension",
+      { "OMA-LPPe-MessageExtension", "lppe.OMA_LPPe_MessageExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_lppeCompatibilityLevel,
@@ -14979,7 +14979,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_LPPeCompatibilityLevel", HFILL }},
     { &hf_lppe_lppeVersion,
-      { "lppeVersion", "lppe.lppeVersion",
+      { "lppeVersion", "lppe.lppeVersion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_LPPeVersion", HFILL }},
     { &hf_lppe_lppeMode,
@@ -14999,327 +14999,327 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_255", HFILL }},
     { &hf_lppe_requestCapabilities,
-      { "requestCapabilities", "lppe.requestCapabilities",
+      { "requestCapabilities", "lppe.requestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RequestCapabilities", HFILL }},
     { &hf_lppe_provideCapabilities,
-      { "provideCapabilities", "lppe.provideCapabilities",
+      { "provideCapabilities", "lppe.provideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ProvideCapabilities", HFILL }},
     { &hf_lppe_requestAssistanceData,
-      { "requestAssistanceData", "lppe.requestAssistanceData",
+      { "requestAssistanceData", "lppe.requestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RequestAssistanceData", HFILL }},
     { &hf_lppe_provideAssistanceData,
-      { "provideAssistanceData", "lppe.provideAssistanceData",
+      { "provideAssistanceData", "lppe.provideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ProvideAssistanceData", HFILL }},
     { &hf_lppe_requestLocationInformation,
-      { "requestLocationInformation", "lppe.requestLocationInformation",
+      { "requestLocationInformation", "lppe.requestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RequestLocationInformation", HFILL }},
     { &hf_lppe_provideLocationInformation,
-      { "provideLocationInformation", "lppe.provideLocationInformation",
+      { "provideLocationInformation", "lppe.provideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ProvideLocationInformation", HFILL }},
     { &hf_lppe_error,
-      { "error", "lppe.error",
+      { "error", "lppe.error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_Error", HFILL }},
     { &hf_lppe_abort,
-      { "abort", "lppe.abort",
+      { "abort", "lppe.abort_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_Abort", HFILL }},
     { &hf_lppe_commonIEsRequestCapabilities,
-      { "commonIEsRequestCapabilities", "lppe.commonIEsRequestCapabilities",
+      { "commonIEsRequestCapabilities", "lppe.commonIEsRequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CommonIEsRequestCapabilities", HFILL }},
     { &hf_lppe_agnss_RequestCapabilities,
-      { "agnss-RequestCapabilities", "lppe.agnss_RequestCapabilities",
+      { "agnss-RequestCapabilities", "lppe.agnss_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_RequestCapabilities", HFILL }},
     { &hf_lppe_otdoa_RequestCapabilities,
-      { "otdoa-RequestCapabilities", "lppe.otdoa_RequestCapabilities",
+      { "otdoa-RequestCapabilities", "lppe.otdoa_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_RequestCapabilities", HFILL }},
     { &hf_lppe_eotd_RequestCapabilities,
-      { "eotd-RequestCapabilities", "lppe.eotd_RequestCapabilities",
+      { "eotd-RequestCapabilities", "lppe.eotd_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_RequestCapabilities", HFILL }},
     { &hf_lppe_otdoa_utra_RequestCapabilities,
-      { "otdoa-utra-RequestCapabilities", "lppe.otdoa_utra_RequestCapabilities",
+      { "otdoa-utra-RequestCapabilities", "lppe.otdoa_utra_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_RequestCapabilities", HFILL }},
     { &hf_lppe_ecid_lte_RequestCapabilities,
-      { "ecid-lte-RequestCapabilities", "lppe.ecid_lte_RequestCapabilities",
+      { "ecid-lte-RequestCapabilities", "lppe.ecid_lte_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_LTE_RequestCapabilities", HFILL }},
     { &hf_lppe_ecid_gsm_RequestCapabilities,
-      { "ecid-gsm-RequestCapabilities", "lppe.ecid_gsm_RequestCapabilities",
+      { "ecid-gsm-RequestCapabilities", "lppe.ecid_gsm_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_GSM_RequestCapabilities", HFILL }},
     { &hf_lppe_ecid_utra_RequestCapabilities,
-      { "ecid-utra-RequestCapabilities", "lppe.ecid_utra_RequestCapabilities",
+      { "ecid-utra-RequestCapabilities", "lppe.ecid_utra_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_UTRA_RequestCapabilities", HFILL }},
     { &hf_lppe_wlan_ap_RequestCapabilities,
-      { "wlan-ap-RequestCapabilities", "lppe.wlan_ap_RequestCapabilities",
+      { "wlan-ap-RequestCapabilities", "lppe.wlan_ap_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_RequestCapabilities", HFILL }},
     { &hf_lppe_ecid_wimax_RequestCapabilities,
-      { "ecid-wimax-RequestCapabilities", "lppe.ecid_wimax_RequestCapabilities",
+      { "ecid-wimax-RequestCapabilities", "lppe.ecid_wimax_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_WiMax_RequestCapabilities", HFILL }},
     { &hf_lppe_sensor_RequestCapabilities,
-      { "sensor-RequestCapabilities", "lppe.sensor_RequestCapabilities",
+      { "sensor-RequestCapabilities", "lppe.sensor_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_Sensor_RequestCapabilities", HFILL }},
     { &hf_lppe_srn_RequestCapabilities,
-      { "srn-RequestCapabilities", "lppe.srn_RequestCapabilities",
+      { "srn-RequestCapabilities", "lppe.srn_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_RequestCapabilities", HFILL }},
     { &hf_lppe_commonIEsProvideCapabilities,
-      { "commonIEsProvideCapabilities", "lppe.commonIEsProvideCapabilities",
+      { "commonIEsProvideCapabilities", "lppe.commonIEsProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CommonIEsProvideCapabilities", HFILL }},
     { &hf_lppe_agnss_ProvideCapabilities,
-      { "agnss-ProvideCapabilities", "lppe.agnss_ProvideCapabilities",
+      { "agnss-ProvideCapabilities", "lppe.agnss_ProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_ProvideCapabilities", HFILL }},
     { &hf_lppe_otdoa_ProvideCapabilities,
-      { "otdoa-ProvideCapabilities", "lppe.otdoa_ProvideCapabilities",
+      { "otdoa-ProvideCapabilities", "lppe.otdoa_ProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_ProvideCapabilities", HFILL }},
     { &hf_lppe_eotd_ProvideCapabilities,
-      { "eotd-ProvideCapabilities", "lppe.eotd_ProvideCapabilities",
+      { "eotd-ProvideCapabilities", "lppe.eotd_ProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_ProvideCapabilities", HFILL }},
     { &hf_lppe_otdoa_utra_ProvideCapabilities,
-      { "otdoa-utra-ProvideCapabilities", "lppe.otdoa_utra_ProvideCapabilities",
+      { "otdoa-utra-ProvideCapabilities", "lppe.otdoa_utra_ProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_ProvideCapabilities", HFILL }},
     { &hf_lppe_ecid_lte_ProvideCapabilities,
-      { "ecid-lte-ProvideCapabilities", "lppe.ecid_lte_ProvideCapabilities",
+      { "ecid-lte-ProvideCapabilities", "lppe.ecid_lte_ProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_LTE_ProvideCapabilities", HFILL }},
     { &hf_lppe_ecid_gsm_ProvideCapabilities,
-      { "ecid-gsm-ProvideCapabilities", "lppe.ecid_gsm_ProvideCapabilities",
+      { "ecid-gsm-ProvideCapabilities", "lppe.ecid_gsm_ProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_GSM_ProvideCapabilities", HFILL }},
     { &hf_lppe_ecid_utra_ProvideCapabilities,
-      { "ecid-utra-ProvideCapabilities", "lppe.ecid_utra_ProvideCapabilities",
+      { "ecid-utra-ProvideCapabilities", "lppe.ecid_utra_ProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_UTRA_ProvideCapabilities", HFILL }},
     { &hf_lppe_wlan_ap_ProvideCapabilities,
-      { "wlan-ap-ProvideCapabilities", "lppe.wlan_ap_ProvideCapabilities",
+      { "wlan-ap-ProvideCapabilities", "lppe.wlan_ap_ProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_ProvideCapabilities", HFILL }},
     { &hf_lppe_ecid_wimax_ProvideCapabilities,
-      { "ecid-wimax-ProvideCapabilities", "lppe.ecid_wimax_ProvideCapabilities",
+      { "ecid-wimax-ProvideCapabilities", "lppe.ecid_wimax_ProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_WiMax_ProvideCapabilities", HFILL }},
     { &hf_lppe_sensor_ProvideCapabilities,
-      { "sensor-ProvideCapabilities", "lppe.sensor_ProvideCapabilities",
+      { "sensor-ProvideCapabilities", "lppe.sensor_ProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_Sensor_ProvideCapabilities", HFILL }},
     { &hf_lppe_srn_ProvideCapabilities,
-      { "srn-ProvideCapabilities", "lppe.srn_ProvideCapabilities",
+      { "srn-ProvideCapabilities", "lppe.srn_ProvideCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_ProvideCapabilities", HFILL }},
     { &hf_lppe_commonIEsRequestAssistanceData,
-      { "commonIEsRequestAssistanceData", "lppe.commonIEsRequestAssistanceData",
+      { "commonIEsRequestAssistanceData", "lppe.commonIEsRequestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CommonIEsRequestAssistanceData", HFILL }},
     { &hf_lppe_agnss_RequestAssistanceData,
-      { "agnss-RequestAssistanceData", "lppe.agnss_RequestAssistanceData",
+      { "agnss-RequestAssistanceData", "lppe.agnss_RequestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_RequestAssistanceData", HFILL }},
     { &hf_lppe_otdoa_RequestAssistanceData,
-      { "otdoa-RequestAssistanceData", "lppe.otdoa_RequestAssistanceData",
+      { "otdoa-RequestAssistanceData", "lppe.otdoa_RequestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_RequestAssistanceData", HFILL }},
     { &hf_lppe_eotd_RequestAssistanceData,
-      { "eotd-RequestAssistanceData", "lppe.eotd_RequestAssistanceData",
+      { "eotd-RequestAssistanceData", "lppe.eotd_RequestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_RequestAssistanceData", HFILL }},
     { &hf_lppe_otdoa_utra_RequestAssistanceData,
-      { "otdoa-utra-RequestAssistanceData", "lppe.otdoa_utra_RequestAssistanceData",
+      { "otdoa-utra-RequestAssistanceData", "lppe.otdoa_utra_RequestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_RequestAssistanceData", HFILL }},
     { &hf_lppe_ecid_lte_RequestAssistanceData,
-      { "ecid-lte-RequestAssistanceData", "lppe.ecid_lte_RequestAssistanceData",
+      { "ecid-lte-RequestAssistanceData", "lppe.ecid_lte_RequestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_LTE_RequestAssistanceData", HFILL }},
     { &hf_lppe_ecid_gsm_RequestAssistanceData,
-      { "ecid-gsm-RequestAssistanceData", "lppe.ecid_gsm_RequestAssistanceData",
+      { "ecid-gsm-RequestAssistanceData", "lppe.ecid_gsm_RequestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_GSM_RequestAssistanceData", HFILL }},
     { &hf_lppe_ecid_utra_RequestAssistanceData,
-      { "ecid-utra-RequestAssistanceData", "lppe.ecid_utra_RequestAssistanceData",
+      { "ecid-utra-RequestAssistanceData", "lppe.ecid_utra_RequestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_UTRA_RequestAssistanceData", HFILL }},
     { &hf_lppe_wlan_ap_RequestAssistanceData,
-      { "wlan-ap-RequestAssistanceData", "lppe.wlan_ap_RequestAssistanceData",
+      { "wlan-ap-RequestAssistanceData", "lppe.wlan_ap_RequestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_RequestAssistanceData", HFILL }},
     { &hf_lppe_sensor_RequestAssistanceData,
-      { "sensor-RequestAssistanceData", "lppe.sensor_RequestAssistanceData",
+      { "sensor-RequestAssistanceData", "lppe.sensor_RequestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_Sensor_RequestAssistanceData", HFILL }},
     { &hf_lppe_srn_RequestAssistanceData,
-      { "srn-RequestAssistanceData", "lppe.srn_RequestAssistanceData",
+      { "srn-RequestAssistanceData", "lppe.srn_RequestAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_RequestAssistanceData", HFILL }},
     { &hf_lppe_commonIEsProvideAssistanceData,
-      { "commonIEsProvideAssistanceData", "lppe.commonIEsProvideAssistanceData",
+      { "commonIEsProvideAssistanceData", "lppe.commonIEsProvideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CommonIEsProvideAssistanceData", HFILL }},
     { &hf_lppe_agnss_ProvideAssistanceData,
-      { "agnss-ProvideAssistanceData", "lppe.agnss_ProvideAssistanceData",
+      { "agnss-ProvideAssistanceData", "lppe.agnss_ProvideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_ProvideAssistanceData", HFILL }},
     { &hf_lppe_otdoa_ProvideAssistanceData,
-      { "otdoa-ProvideAssistanceData", "lppe.otdoa_ProvideAssistanceData",
+      { "otdoa-ProvideAssistanceData", "lppe.otdoa_ProvideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_ProvideAssistanceData", HFILL }},
     { &hf_lppe_eotd_ProvideAssistanceData,
-      { "eotd-ProvideAssistanceData", "lppe.eotd_ProvideAssistanceData",
+      { "eotd-ProvideAssistanceData", "lppe.eotd_ProvideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_ProvideAssistanceData", HFILL }},
     { &hf_lppe_otdoa_utra_ProvideAssistanceData,
-      { "otdoa-utra-ProvideAssistanceData", "lppe.otdoa_utra_ProvideAssistanceData",
+      { "otdoa-utra-ProvideAssistanceData", "lppe.otdoa_utra_ProvideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_ProvideAssistanceData", HFILL }},
     { &hf_lppe_ecid_lte_ProvideAssistanceData,
-      { "ecid-lte-ProvideAssistanceData", "lppe.ecid_lte_ProvideAssistanceData",
+      { "ecid-lte-ProvideAssistanceData", "lppe.ecid_lte_ProvideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_LTE_ProvideAssistanceData", HFILL }},
     { &hf_lppe_ecid_gsm_ProvideAssistanceData,
-      { "ecid-gsm-ProvideAssistanceData", "lppe.ecid_gsm_ProvideAssistanceData",
+      { "ecid-gsm-ProvideAssistanceData", "lppe.ecid_gsm_ProvideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_GSM_ProvideAssistanceData", HFILL }},
     { &hf_lppe_ecid_utra_ProvideAssistanceData,
-      { "ecid-utra-ProvideAssistanceData", "lppe.ecid_utra_ProvideAssistanceData",
+      { "ecid-utra-ProvideAssistanceData", "lppe.ecid_utra_ProvideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_UTRA_ProvideAssistanceData", HFILL }},
     { &hf_lppe_wlan_ap_ProvideAssistanceData,
-      { "wlan-ap-ProvideAssistanceData", "lppe.wlan_ap_ProvideAssistanceData",
+      { "wlan-ap-ProvideAssistanceData", "lppe.wlan_ap_ProvideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_ProvideAssistanceData", HFILL }},
     { &hf_lppe_sensor_ProvideAssistanceData,
-      { "sensor-ProvideAssistanceData", "lppe.sensor_ProvideAssistanceData",
+      { "sensor-ProvideAssistanceData", "lppe.sensor_ProvideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_Sensor_ProvideAssistanceData", HFILL }},
     { &hf_lppe_srn_ProvideAssistanceData,
-      { "srn-ProvideAssistanceData", "lppe.srn_ProvideAssistanceData",
+      { "srn-ProvideAssistanceData", "lppe.srn_ProvideAssistanceData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_ProvideAssistanceData", HFILL }},
     { &hf_lppe_commonIEsRequestLocationInformation,
-      { "commonIEsRequestLocationInformation", "lppe.commonIEsRequestLocationInformation",
+      { "commonIEsRequestLocationInformation", "lppe.commonIEsRequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CommonIEsRequestLocationInformation", HFILL }},
     { &hf_lppe_agnss_RequestLocationInformation,
-      { "agnss-RequestLocationInformation", "lppe.agnss_RequestLocationInformation",
+      { "agnss-RequestLocationInformation", "lppe.agnss_RequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_RequestLocationInformation", HFILL }},
     { &hf_lppe_otdoa_RequestLocationInformation,
-      { "otdoa-RequestLocationInformation", "lppe.otdoa_RequestLocationInformation",
+      { "otdoa-RequestLocationInformation", "lppe.otdoa_RequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_RequestLocationInformation", HFILL }},
     { &hf_lppe_eotd_RequestLocationInformation,
-      { "eotd-RequestLocationInformation", "lppe.eotd_RequestLocationInformation",
+      { "eotd-RequestLocationInformation", "lppe.eotd_RequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_RequestLocationInformation", HFILL }},
     { &hf_lppe_otdoa_utra_RequestLocationInformation,
-      { "otdoa-utra-RequestLocationInformation", "lppe.otdoa_utra_RequestLocationInformation",
+      { "otdoa-utra-RequestLocationInformation", "lppe.otdoa_utra_RequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_RequestLocationInformation", HFILL }},
     { &hf_lppe_ecid_lte_RequestLocationInformation,
-      { "ecid-lte-RequestLocationInformation", "lppe.ecid_lte_RequestLocationInformation",
+      { "ecid-lte-RequestLocationInformation", "lppe.ecid_lte_RequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_LTE_RequestLocationInformation", HFILL }},
     { &hf_lppe_ecid_gsm_RequestLocationInformation,
-      { "ecid-gsm-RequestLocationInformation", "lppe.ecid_gsm_RequestLocationInformation",
+      { "ecid-gsm-RequestLocationInformation", "lppe.ecid_gsm_RequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_GSM_RequestLocationInformation", HFILL }},
     { &hf_lppe_ecid_utra_RequestLocationInformation,
-      { "ecid-utra-RequestLocationInformation", "lppe.ecid_utra_RequestLocationInformation",
+      { "ecid-utra-RequestLocationInformation", "lppe.ecid_utra_RequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_UTRA_RequestLocationInformation", HFILL }},
     { &hf_lppe_wlan_ap_RequestLocationInformation,
-      { "wlan-ap-RequestLocationInformation", "lppe.wlan_ap_RequestLocationInformation",
+      { "wlan-ap-RequestLocationInformation", "lppe.wlan_ap_RequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_RequestLocationInformation", HFILL }},
     { &hf_lppe_ecid_wimax_RequestLocationInformation,
-      { "ecid-wimax-RequestLocationInformation", "lppe.ecid_wimax_RequestLocationInformation",
+      { "ecid-wimax-RequestLocationInformation", "lppe.ecid_wimax_RequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_WiMax_RequestLocationInformation", HFILL }},
     { &hf_lppe_sensor_RequestLocationInformation,
-      { "sensor-RequestLocationInformation", "lppe.sensor_RequestLocationInformation",
+      { "sensor-RequestLocationInformation", "lppe.sensor_RequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_Sensor_RequestLocationInformation", HFILL }},
     { &hf_lppe_srn_RequestLocationInformation,
-      { "srn-RequestLocationInformation", "lppe.srn_RequestLocationInformation",
+      { "srn-RequestLocationInformation", "lppe.srn_RequestLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_RequestLocationInformation", HFILL }},
     { &hf_lppe_commonIEsProvideLocationInformation,
-      { "commonIEsProvideLocationInformation", "lppe.commonIEsProvideLocationInformation",
+      { "commonIEsProvideLocationInformation", "lppe.commonIEsProvideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CommonIEsProvideLocationInformation", HFILL }},
     { &hf_lppe_agnss_ProvideLocationInformation,
-      { "agnss-ProvideLocationInformation", "lppe.agnss_ProvideLocationInformation",
+      { "agnss-ProvideLocationInformation", "lppe.agnss_ProvideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_ProvideLocationInformation", HFILL }},
     { &hf_lppe_otdoa_ProvideLocationInformation,
-      { "otdoa-ProvideLocationInformation", "lppe.otdoa_ProvideLocationInformation",
+      { "otdoa-ProvideLocationInformation", "lppe.otdoa_ProvideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_ProvideLocationInformation", HFILL }},
     { &hf_lppe_eotd_ProvideLocationInformation,
-      { "eotd-ProvideLocationInformation", "lppe.eotd_ProvideLocationInformation",
+      { "eotd-ProvideLocationInformation", "lppe.eotd_ProvideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_ProvideLocationInformation", HFILL }},
     { &hf_lppe_otdoa_utra_ProvideLocationInformation,
-      { "otdoa-utra-ProvideLocationInformation", "lppe.otdoa_utra_ProvideLocationInformation",
+      { "otdoa-utra-ProvideLocationInformation", "lppe.otdoa_utra_ProvideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_ProvideLocationInformation", HFILL }},
     { &hf_lppe_ecid_lte_ProvideLocationInformation,
-      { "ecid-lte-ProvideLocationInformation", "lppe.ecid_lte_ProvideLocationInformation",
+      { "ecid-lte-ProvideLocationInformation", "lppe.ecid_lte_ProvideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_LTE_ProvideLocationInformation", HFILL }},
     { &hf_lppe_ecid_gsm_ProvideLocationInformation,
-      { "ecid-gsm-ProvideLocationInformation", "lppe.ecid_gsm_ProvideLocationInformation",
+      { "ecid-gsm-ProvideLocationInformation", "lppe.ecid_gsm_ProvideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_GSM_ProvideLocationInformation", HFILL }},
     { &hf_lppe_ecid_utra_ProvideLocationInformation,
-      { "ecid-utra-ProvideLocationInformation", "lppe.ecid_utra_ProvideLocationInformation",
+      { "ecid-utra-ProvideLocationInformation", "lppe.ecid_utra_ProvideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_UTRA_ProvideLocationInformation", HFILL }},
     { &hf_lppe_wlan_ap_ProvideLocationInformastion,
-      { "wlan-ap-ProvideLocationInformastion", "lppe.wlan_ap_ProvideLocationInformastion",
+      { "wlan-ap-ProvideLocationInformastion", "lppe.wlan_ap_ProvideLocationInformastion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_ProvideLocationInformation", HFILL }},
     { &hf_lppe_ecid_wimax_ProvideLocationInformastion,
-      { "ecid-wimax-ProvideLocationInformastion", "lppe.ecid_wimax_ProvideLocationInformastion",
+      { "ecid-wimax-ProvideLocationInformastion", "lppe.ecid_wimax_ProvideLocationInformastion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_WiMax_ProvideLocationInformation", HFILL }},
     { &hf_lppe_sensor_ProvideLocationInformation,
-      { "sensor-ProvideLocationInformation", "lppe.sensor_ProvideLocationInformation",
+      { "sensor-ProvideLocationInformation", "lppe.sensor_ProvideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_Sensor_ProvideLocationInformation", HFILL }},
     { &hf_lppe_srn_ProvideLocationInformation,
-      { "srn-ProvideLocationInformation", "lppe.srn_ProvideLocationInformation",
+      { "srn-ProvideLocationInformation", "lppe.srn_ProvideLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_ProvideLocationInformation", HFILL }},
     { &hf_lppe_commonIEsAbort,
-      { "commonIEsAbort", "lppe.commonIEsAbort",
+      { "commonIEsAbort", "lppe.commonIEsAbort_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CommonIEsAbort", HFILL }},
     { &hf_lppe_agnssAbort,
-      { "agnssAbort", "lppe.agnssAbort",
+      { "agnssAbort", "lppe.agnssAbort_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_Abort", HFILL }},
     { &hf_lppe_commonIEsError,
-      { "commonIEsError", "lppe.commonIEsError",
+      { "commonIEsError", "lppe.commonIEsError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CommonIEsError", HFILL }},
     { &hf_lppe_dataSerialNumber,
@@ -15331,11 +15331,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_65535", HFILL }},
     { &hf_lppe_OMA_LPPe_AssistanceContainerProvideList_item,
-      { "OMA-LPPe-AssistanceContainerProvide", "lppe.OMA_LPPe_AssistanceContainerProvide",
+      { "OMA-LPPe-AssistanceContainerProvide", "lppe.OMA_LPPe_AssistanceContainerProvide_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_dataIdentifier,
-      { "dataIdentifier", "lppe.dataIdentifier",
+      { "dataIdentifier", "lppe.dataIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_VendorOrOperatorAssistanceDataIdentifier", HFILL }},
     { &hf_lppe_checkOrUpdateOrError,
@@ -15351,15 +15351,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_5000", HFILL }},
     { &hf_lppe_data,
-      { "data", "lppe.data",
+      { "data", "lppe.data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AssistanceContainerData", HFILL }},
     { &hf_lppe_errorCode,
-      { "errorCode", "lppe.errorCode",
+      { "errorCode", "lppe.errorCode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AssistanceContainerProvideError", HFILL }},
     { &hf_lppe_dataSerialNumber_01,
-      { "dataSerialNumber", "lppe.dataSerialNumber",
+      { "dataSerialNumber", "lppe.dataSerialNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AssistanceContainer_DataSerialNumber", HFILL }},
     { &hf_lppe_data_01,
@@ -15367,11 +15367,11 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_lppe_validityPeriod,
-      { "validityPeriod", "lppe.validityPeriod",
+      { "validityPeriod", "lppe.validityPeriod_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ValidityPeriod", HFILL }},
     { &hf_lppe_validityArea,
-      { "validityArea", "lppe.validityArea",
+      { "validityArea", "lppe.validityArea_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ValidityArea", HFILL }},
     { &hf_lppe_serverError,
@@ -15379,7 +15379,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_serverError_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_AssistanceContainerRequestList_item,
-      { "OMA-LPPe-AssistanceContainerRequest", "lppe.OMA_LPPe_AssistanceContainerRequest",
+      { "OMA-LPPe-AssistanceContainerRequest", "lppe.OMA_LPPe_AssistanceContainerRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_simulatedReq,
@@ -15387,11 +15387,11 @@ void proto_register_lppe(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lppe_checkOrUpdateReq,
-      { "checkOrUpdateReq", "lppe.checkOrUpdateReq",
+      { "checkOrUpdateReq", "lppe.checkOrUpdateReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AssistanceContainerCheckOrUpdateReq", HFILL }},
     { &hf_lppe_validityTimeRequest,
-      { "validityTimeRequest", "lppe.validityTimeRequest",
+      { "validityTimeRequest", "lppe.validityTimeRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ValidityPeriod", HFILL }},
     { &hf_lppe_proprietaryRequestParameters,
@@ -15427,7 +15427,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_CivicAddressElementList", HFILL }},
     { &hf_lppe_OMA_LPPe_CivicAddressElementList_item,
-      { "OMA-LPPe-CivicAddressElement", "lppe.OMA_LPPe_CivicAddressElement",
+      { "OMA-LPPe-CivicAddressElement", "lppe.OMA_LPPe_CivicAddressElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_caType,
@@ -15487,7 +15487,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_99", HFILL }},
     { &hf_lppe_enu_origin,
-      { "enu-origin", "lppe.enu_origin",
+      { "enu-origin", "lppe.enu_origin_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_HighAccuracy3Dposition", HFILL }},
     { &hf_lppe_east_component,
@@ -15495,7 +15495,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_511", HFILL }},
     { &hf_lppe_negative_sign_east,
-      { "negative-sign-east", "lppe.negative_sign_east",
+      { "negative-sign-east", "lppe.negative_sign_east_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_north_component,
@@ -15503,7 +15503,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_511", HFILL }},
     { &hf_lppe_negative_sign_north,
-      { "negative-sign-north", "lppe.negative_sign_north",
+      { "negative-sign-north", "lppe.negative_sign_north_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_up_component,
@@ -15511,7 +15511,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_511", HFILL }},
     { &hf_lppe_negative_sign_up,
-      { "negative-sign-up", "lppe.negative_sign_up",
+      { "negative-sign-up", "lppe.negative_sign_up_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_uncertainty_up_component,
@@ -15531,11 +15531,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_LocationInformationContainerDataList", HFILL }},
     { &hf_lppe_OMA_LPPe_LocationInformationContainerDataList_item,
-      { "OMA-LPPe-LocationInformationContainerData", "lppe.OMA_LPPe_LocationInformationContainerData",
+      { "OMA-LPPe-LocationInformationContainerData", "lppe.OMA_LPPe_LocationInformationContainerData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_containerID_01,
-      { "containerID", "lppe.containerID",
+      { "containerID", "lppe.containerID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_LocationInformationContainerID", HFILL }},
     { &hf_lppe_containerData,
@@ -15547,7 +15547,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_LocationInformationContainerRequestList", HFILL }},
     { &hf_lppe_OMA_LPPe_LocationInformationContainerRequestList_item,
-      { "OMA-LPPe-LocationInformationContainerRequestItem", "lppe.OMA_LPPe_LocationInformationContainerRequestItem",
+      { "OMA-LPPe-LocationInformationContainerRequestItem", "lppe.OMA_LPPe_LocationInformationContainerRequestItem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_additionalInformation,
@@ -15555,7 +15555,7 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_lppe_dataID,
-      { "dataID", "lppe.dataID",
+      { "dataID", "lppe.dataID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AssistanceContainerID", HFILL }},
     { &hf_lppe_mapReference,
@@ -15567,7 +15567,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_5000", HFILL }},
     { &hf_lppe_eulerAngles,
-      { "eulerAngles", "lppe.eulerAngles",
+      { "eulerAngles", "lppe.eulerAngles_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_alpha,
@@ -15583,7 +15583,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_359", HFILL }},
     { &hf_lppe_referencePointUniqueID,
-      { "referencePointUniqueID", "lppe.referencePointUniqueID",
+      { "referencePointUniqueID", "lppe.referencePointUniqueID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ReferencePointUniqueID", HFILL }},
     { &hf_lppe_referencePointGeographicLocation,
@@ -15591,19 +15591,19 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_referencePointGeographicLocation_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_location3D,
-      { "location3D", "lppe.location3D",
+      { "location3D", "lppe.location3D_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EllipsoidPointWithAltitude", HFILL }},
     { &hf_lppe_location3DwithUncertainty,
-      { "location3DwithUncertainty", "lppe.location3DwithUncertainty",
+      { "location3DwithUncertainty", "lppe.location3DwithUncertainty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EllipsoidPointWithAltitudeAndUncertaintyEllipsoid", HFILL }},
     { &hf_lppe_locationwithhighaccuracy,
-      { "locationwithhighaccuracy", "lppe.locationwithhighaccuracy",
+      { "locationwithhighaccuracy", "lppe.locationwithhighaccuracy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_HighAccuracy3Dposition", HFILL }},
     { &hf_lppe_referencePointCivicLocation,
-      { "referencePointCivicLocation", "lppe.referencePointCivicLocation",
+      { "referencePointCivicLocation", "lppe.referencePointCivicLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CivicLocation", HFILL }},
     { &hf_lppe_referencePointFloorLevel,
@@ -15615,7 +15615,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_8_OF_OMA_LPPe_ReferencePointRelationship", HFILL }},
     { &hf_lppe_relatedReferencePoints_item,
-      { "OMA-LPPe-ReferencePointRelationship", "lppe.OMA_LPPe_ReferencePointRelationship",
+      { "OMA-LPPe-ReferencePointRelationship", "lppe.OMA_LPPe_ReferencePointRelationship_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mapDataInformation,
@@ -15623,7 +15623,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_MapDataInformation", HFILL }},
     { &hf_lppe_OMA_LPPe_MapDataInformation_item,
-      { "OMA-LPPe-MapDataReferenceElement", "lppe.OMA_LPPe_MapDataReferenceElement",
+      { "OMA-LPPe-MapDataReferenceElement", "lppe.OMA_LPPe_MapDataReferenceElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mapDataUrl,
@@ -15635,7 +15635,7 @@ void proto_register_lppe(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "OMA_LPPe_Uri", HFILL }},
     { &hf_lppe_mapDataRef,
-      { "mapDataRef", "lppe.mapDataRef",
+      { "mapDataRef", "lppe.mapDataRef_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_MapDataReference", HFILL }},
     { &hf_lppe_mapProvider,
@@ -15643,7 +15643,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_mapProvider_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_sameAsRefPointProvider,
-      { "sameAsRefPointProvider", "lppe.sameAsRefPointProvider",
+      { "sameAsRefPointProvider", "lppe.sameAsRefPointProvider_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_notSameAsRefPointProvider,
@@ -15655,7 +15655,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_mapAssociation_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_referencePointUniqueID_01,
-      { "referencePointUniqueID", "lppe.referencePointUniqueID",
+      { "referencePointUniqueID", "lppe.referencePointUniqueID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_otherID,
@@ -15663,11 +15663,11 @@ void proto_register_lppe(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "VisibleString_SIZE_1_64", HFILL }},
     { &hf_lppe_mapOffset,
-      { "mapOffset", "lppe.mapOffset",
+      { "mapOffset", "lppe.mapOffset_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RelativeLocation", HFILL }},
     { &hf_lppe_origin,
-      { "origin", "lppe.origin",
+      { "origin", "lppe.origin_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mapHorizontalOrientation,
@@ -15675,7 +15675,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_359", HFILL }},
     { &hf_lppe_relativeLocation,
-      { "relativeLocation", "lppe.relativeLocation",
+      { "relativeLocation", "lppe.relativeLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RelativeLocation", HFILL }},
     { &hf_lppe_providerID,
@@ -15707,11 +15707,11 @@ void proto_register_lppe(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M524288_524287", HFILL }},
     { &hf_lppe_relativeAltitude,
-      { "relativeAltitude", "lppe.relativeAltitude",
+      { "relativeAltitude", "lppe.relativeAltitude_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RelativeAltitude", HFILL }},
     { &hf_lppe_horizontalUncertainty,
-      { "horizontalUncertainty", "lppe.horizontalUncertainty",
+      { "horizontalUncertainty", "lppe.horizontalUncertainty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_HorizontalUncertaintyAndConfidence", HFILL }},
     { &hf_lppe_uncShape,
@@ -15723,7 +15723,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_127", HFILL }},
     { &hf_lppe_ellipse,
-      { "ellipse", "lppe.ellipse",
+      { "ellipse", "lppe.ellipse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_semimajor,
@@ -15743,11 +15743,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_99", HFILL }},
     { &hf_lppe_geodeticRelativeAltitude,
-      { "geodeticRelativeAltitude", "lppe.geodeticRelativeAltitude",
+      { "geodeticRelativeAltitude", "lppe.geodeticRelativeAltitude_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_GeodeticRelativeAltitude", HFILL }},
     { &hf_lppe_civicRelativeAltitude,
-      { "civicRelativeAltitude", "lppe.civicRelativeAltitude",
+      { "civicRelativeAltitude", "lppe.civicRelativeAltitude_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CivicRelativeAltitude", HFILL }},
     { &hf_lppe_geodetic_height_depth,
@@ -15755,7 +15755,7 @@ void proto_register_lppe(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M32768_32767", HFILL }},
     { &hf_lppe_geodetic_uncertainty_and_confidence,
-      { "geodetic-uncertainty-and-confidence", "lppe.geodetic_uncertainty_and_confidence",
+      { "geodetic-uncertainty-and-confidence", "lppe.geodetic_uncertainty_and_confidence_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_GeodeticUncertaintyAndConfidence", HFILL }},
     { &hf_lppe_uncertainty,
@@ -15767,7 +15767,7 @@ void proto_register_lppe(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M255_256", HFILL }},
     { &hf_lppe_civic_uncertainty_and_confidence,
-      { "civic-uncertainty-and-confidence", "lppe.civic_uncertainty_and_confidence",
+      { "civic-uncertainty-and-confidence", "lppe.civic_uncertainty_and_confidence_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CivicUncertaintyAndConfidence", HFILL }},
     { &hf_lppe_provider_ID,
@@ -15807,7 +15807,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_255", HFILL }},
     { &hf_lppe_beginTime,
-      { "beginTime", "lppe.beginTime",
+      { "beginTime", "lppe.beginTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SystemTime", HFILL }},
     { &hf_lppe_beginTimeAlt,
@@ -15819,7 +15819,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_2881", HFILL }},
     { &hf_lppe_assistanceDataID,
-      { "assistanceDataID", "lppe.assistanceDataID",
+      { "assistanceDataID", "lppe.assistanceDataID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AssistanceContainerID", HFILL }},
     { &hf_lppe_standard_VendorOrOperatorID,
@@ -15827,7 +15827,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_1024", HFILL }},
     { &hf_lppe_nonStandard_VendorOrOperatorID,
-      { "nonStandard-VendorOrOperatorID", "lppe.nonStandard_VendorOrOperatorID",
+      { "nonStandard-VendorOrOperatorID", "lppe.nonStandard_VendorOrOperatorID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_NonStandard_VendorOrOperatorID", HFILL }},
     { &hf_lppe_encodedID,
@@ -15855,11 +15855,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_16_OF_OMA_LPPe_WLANFemtoCoverageAreaElement", HFILL }},
     { &hf_lppe_componentList_item,
-      { "OMA-LPPe-WLANFemtoCoverageAreaElement", "lppe.OMA_LPPe_WLANFemtoCoverageAreaElement",
+      { "OMA-LPPe-WLANFemtoCoverageAreaElement", "lppe.OMA_LPPe_WLANFemtoCoverageAreaElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_refPointAndArea,
-      { "refPointAndArea", "lppe.refPointAndArea",
+      { "refPointAndArea", "lppe.refPointAndArea_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_referenceLocation,
@@ -15867,11 +15867,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_referenceLocation_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_referencePoint,
-      { "referencePoint", "lppe.referencePoint",
+      { "referencePoint", "lppe.referencePoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ReferencePointUniqueID", HFILL }},
     { &hf_lppe_locationAndArea,
-      { "locationAndArea", "lppe.locationAndArea",
+      { "locationAndArea", "lppe.locationAndArea_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RelativeLocation", HFILL }},
     { &hf_lppe_type,
@@ -15883,43 +15883,43 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_100", HFILL }},
     { &hf_lppe_iP_Address_RequestCapabilities,
-      { "iP-Address-RequestCapabilities", "lppe.iP_Address_RequestCapabilities",
+      { "iP-Address-RequestCapabilities", "lppe.iP_Address_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_IP_Address_RequestCapabilities", HFILL }},
     { &hf_lppe_assistanceContainerSupportReq,
-      { "assistanceContainerSupportReq", "lppe.assistanceContainerSupportReq",
+      { "assistanceContainerSupportReq", "lppe.assistanceContainerSupportReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AssistanceContainerSupportReq", HFILL }},
     { &hf_lppe_locationInformationContainerSupportReq,
-      { "locationInformationContainerSupportReq", "lppe.locationInformationContainerSupportReq",
+      { "locationInformationContainerSupportReq", "lppe.locationInformationContainerSupportReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_LocationInformationContainerSupportReq", HFILL }},
     { &hf_lppe_relativeLocationChange_RequestCapabilities,
-      { "relativeLocationChange-RequestCapabilities", "lppe.relativeLocationChange_RequestCapabilities",
+      { "relativeLocationChange-RequestCapabilities", "lppe.relativeLocationChange_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RelativeLocationChange_RequestCapabilities", HFILL }},
     { &hf_lppe_highAccuracyFormatCapabilitiesReq,
-      { "highAccuracyFormatCapabilitiesReq", "lppe.highAccuracyFormatCapabilitiesReq",
+      { "highAccuracyFormatCapabilitiesReq", "lppe.highAccuracyFormatCapabilitiesReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_HighAccuracyFormatCapabilitiesReq", HFILL }},
     { &hf_lppe_segmentedAssistanceData_ReqCapabilities,
-      { "segmentedAssistanceData-ReqCapabilities", "lppe.segmentedAssistanceData_ReqCapabilities",
+      { "segmentedAssistanceData-ReqCapabilities", "lppe.segmentedAssistanceData_ReqCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SegmentedAssistanceData_ReqCapabilities", HFILL }},
     { &hf_lppe_referencePointCapabilitiesReq,
-      { "referencePointCapabilitiesReq", "lppe.referencePointCapabilitiesReq",
+      { "referencePointCapabilitiesReq", "lppe.referencePointCapabilitiesReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ReferencePointCapabilitiesReq", HFILL }},
     { &hf_lppe_scheduledLocation_RequestCapabilities,
-      { "scheduledLocation-RequestCapabilities", "lppe.scheduledLocation_RequestCapabilities",
+      { "scheduledLocation-RequestCapabilities", "lppe.scheduledLocation_RequestCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ScheduledLocation_RequestCapabilities", HFILL }},
     { &hf_lppe_accessCapabilitiesReq,
-      { "accessCapabilitiesReq", "lppe.accessCapabilitiesReq",
+      { "accessCapabilitiesReq", "lppe.accessCapabilitiesReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AccessCapabilitiesReq", HFILL }},
     { &hf_lppe_segmentedLocationInformation_ReqCapabilities,
-      { "segmentedLocationInformation-ReqCapabilities", "lppe.segmentedLocationInformation_ReqCapabilities",
+      { "segmentedLocationInformation-ReqCapabilities", "lppe.segmentedLocationInformation_ReqCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SegmentedLocationInformation_ReqCapabilities", HFILL }},
     { &hf_lppe_vendorOrOperatorIDList,
@@ -15939,7 +15939,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_VendorOrOperatorID_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_iP_Address_Capabilities,
-      { "iP-Address-Capabilities", "lppe.iP_Address_Capabilities",
+      { "iP-Address-Capabilities", "lppe.iP_Address_Capabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_IP_Address_Capabilities", HFILL }},
     { &hf_lppe_assistanceContainerSupport,
@@ -15951,7 +15951,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_LocationInformationContainerSupport", HFILL }},
     { &hf_lppe_relativeLocationChange_Capabilities,
-      { "relativeLocationChange-Capabilities", "lppe.relativeLocationChange_Capabilities",
+      { "relativeLocationChange-Capabilities", "lppe.relativeLocationChange_Capabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RelativeLocationChange_Capabilities", HFILL }},
     { &hf_lppe_highAccuracyFormatCapabilities,
@@ -15959,23 +15959,23 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OMA_LPPe_HighAccuracyFormatCapabilities", HFILL }},
     { &hf_lppe_segmentedAssistanceData_ProvideCapabs,
-      { "segmentedAssistanceData-ProvideCapabs", "lppe.segmentedAssistanceData_ProvideCapabs",
+      { "segmentedAssistanceData-ProvideCapabs", "lppe.segmentedAssistanceData_ProvideCapabs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SegmentedAssistanceData_ProvideCapabs", HFILL }},
     { &hf_lppe_referencePointCapabilities,
-      { "referencePointCapabilities", "lppe.referencePointCapabilities",
+      { "referencePointCapabilities", "lppe.referencePointCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ReferencePointCapabilities", HFILL }},
     { &hf_lppe_scheduledLocation_Capabilities,
-      { "scheduledLocation-Capabilities", "lppe.scheduledLocation_Capabilities",
+      { "scheduledLocation-Capabilities", "lppe.scheduledLocation_Capabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ScheduledLocation_Capabilities", HFILL }},
     { &hf_lppe_accessCapabilities,
-      { "accessCapabilities", "lppe.accessCapabilities",
+      { "accessCapabilities", "lppe.accessCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AccessCapabilities", HFILL }},
     { &hf_lppe_segmentedLocationInformation_ProvideCapabs,
-      { "segmentedLocationInformation-ProvideCapabs", "lppe.segmentedLocationInformation_ProvideCapabs",
+      { "segmentedLocationInformation-ProvideCapabs", "lppe.segmentedLocationInformation_ProvideCapabs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SegmentedLocationInformation_ProvideCapabs", HFILL }},
     { &hf_lppe_iP_Address_support,
@@ -15983,7 +15983,7 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_AssistanceContainerSupport_item,
-      { "OMA-LPPe-VendorOrOperatorAssistanceContainerList", "lppe.OMA_LPPe_VendorOrOperatorAssistanceContainerList",
+      { "OMA-LPPe-VendorOrOperatorAssistanceContainerList", "lppe.OMA_LPPe_VendorOrOperatorAssistanceContainerList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_assistanceContainerList,
@@ -15991,11 +15991,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AssistanceContainerList", HFILL }},
     { &hf_lppe_OMA_LPPe_AssistanceContainerList_item,
-      { "OMA-LPPe-AssistanceContainerID", "lppe.OMA_LPPe_AssistanceContainerID",
+      { "OMA-LPPe-AssistanceContainerID", "lppe.OMA_LPPe_AssistanceContainerID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_LocationInformationContainerSupport_item,
-      { "OMA-LPPe-VendorOrOperatorLocationInformationContainerList", "lppe.OMA_LPPe_VendorOrOperatorLocationInformationContainerList",
+      { "OMA-LPPe-VendorOrOperatorLocationInformationContainerList", "lppe.OMA_LPPe_VendorOrOperatorLocationInformationContainerList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_locationInformationContainerList,
@@ -16003,7 +16003,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_LocationInformationContainerList", HFILL }},
     { &hf_lppe_OMA_LPPe_LocationInformationContainerList_item,
-      { "OMA-LPPe-LocationInformationContainerID", "lppe.OMA_LPPe_LocationInformationContainerID",
+      { "OMA-LPPe-LocationInformationContainerID", "lppe.OMA_LPPe_LocationInformationContainerID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_numberOfChanges,
@@ -16023,7 +16023,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_5000", HFILL }},
     { &hf_lppe_resume,
-      { "resume", "lppe.resume",
+      { "resume", "lppe.resume_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_relativeLocationReportingSupport,
@@ -16035,7 +16035,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_128_OF_OMA_LPPe_ReferencePointProviderSupportElement", HFILL }},
     { &hf_lppe_referencePointProviderSupportList_item,
-      { "OMA-LPPe-ReferencePointProviderSupportElement", "lppe.OMA_LPPe_ReferencePointProviderSupportElement",
+      { "OMA-LPPe-ReferencePointProviderSupportElement", "lppe.OMA_LPPe_ReferencePointProviderSupportElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_referencePointProvider,
@@ -16043,7 +16043,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_VendorOrOperatorID_vals), 0,
         "OMA_LPPe_VendorOrOperatorID", HFILL }},
     { &hf_lppe_mapDataSupport,
-      { "mapDataSupport", "lppe.mapDataSupport",
+      { "mapDataSupport", "lppe.mapDataSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mapDataFormat,
@@ -16055,7 +16055,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_1024", HFILL }},
     { &hf_lppe_gnssTimeReference,
-      { "gnssTimeReference", "lppe.gnssTimeReference",
+      { "gnssTimeReference", "lppe.gnssTimeReference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_ID_Bitmap", HFILL }},
     { &hf_lppe_networkTimeReference,
@@ -16063,7 +16063,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_networkTimeReference_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_accessTypeUnknown,
-      { "accessTypeUnknown", "lppe.accessTypeUnknown",
+      { "accessTypeUnknown", "lppe.accessTypeUnknown_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_fixedAccessTypes,
@@ -16075,7 +16075,7 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OMA_LPPe_WirelessAccessTypes", HFILL }},
     { &hf_lppe_approximate_location,
-      { "approximate-location", "lppe.approximate_location",
+      { "approximate-location", "lppe.approximate_location_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EllipsoidPointWithAltitudeAndUncertaintyEllipsoid", HFILL }},
     { &hf_lppe_assistanceContainerRequestList,
@@ -16083,7 +16083,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AssistanceContainerRequestList", HFILL }},
     { &hf_lppe_requestPeriodicADwithUpdate,
-      { "requestPeriodicADwithUpdate", "lppe.requestPeriodicADwithUpdate",
+      { "requestPeriodicADwithUpdate", "lppe.requestPeriodicADwithUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RequestPeriodicADwithUpdate", HFILL }},
     { &hf_lppe_segmentedADpreference,
@@ -16091,11 +16091,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_segmentedADpreference_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_segmentedADResume,
-      { "segmentedADResume", "lppe.segmentedADResume",
+      { "segmentedADResume", "lppe.segmentedADResume_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SegmentedADResume", HFILL }},
     { &hf_lppe_referencePointAssistanceReq,
-      { "referencePointAssistanceReq", "lppe.referencePointAssistanceReq",
+      { "referencePointAssistanceReq", "lppe.referencePointAssistanceReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ReferencePointAssistanceReq", HFILL }},
     { &hf_lppe_periodicAD_session_ID,
@@ -16107,7 +16107,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_TypeOfADRequest_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_segmentedAD_session_ID,
-      { "segmentedAD-session-ID", "lppe.segmentedAD_session_ID",
+      { "segmentedAD-session-ID", "lppe.segmentedAD_session_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_Session_ID", HFILL }},
     { &hf_lppe_next_segment_number,
@@ -16119,7 +16119,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_16_OF_OMA_LPPe_ReferencePointAssistanceReqElement", HFILL }},
     { &hf_lppe_referencePointReq_item,
-      { "OMA-LPPe-ReferencePointAssistanceReqElement", "lppe.OMA_LPPe_ReferencePointAssistanceReqElement",
+      { "OMA-LPPe-ReferencePointAssistanceReqElement", "lppe.OMA_LPPe_ReferencePointAssistanceReqElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mapDataReq,
@@ -16131,15 +16131,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AssistanceContainerProvideList", HFILL }},
     { &hf_lppe_providePeriodicADwithUpdate,
-      { "providePeriodicADwithUpdate", "lppe.providePeriodicADwithUpdate",
+      { "providePeriodicADwithUpdate", "lppe.providePeriodicADwithUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ProvidePeriodicADwithUpdate", HFILL }},
     { &hf_lppe_segmentedADTransfer,
-      { "segmentedADTransfer", "lppe.segmentedADTransfer",
+      { "segmentedADTransfer", "lppe.segmentedADTransfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SegmentedADTransfer", HFILL }},
     { &hf_lppe_default_reference_point,
-      { "default-reference-point", "lppe.default_reference_point",
+      { "default-reference-point", "lppe.default_reference_point_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ReferencePoint", HFILL }},
     { &hf_lppe_typeOfADProvide,
@@ -16151,31 +16151,31 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_4096", HFILL }},
     { &hf_lppe_iP_Address_Request,
-      { "iP-Address-Request", "lppe.iP_Address_Request",
+      { "iP-Address-Request", "lppe.iP_Address_Request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_IP_Address_Request", HFILL }},
     { &hf_lppe_locationInformationContainerRequest,
-      { "locationInformationContainerRequest", "lppe.locationInformationContainerRequest",
+      { "locationInformationContainerRequest", "lppe.locationInformationContainerRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_LocationInformationContainerRequest", HFILL }},
     { &hf_lppe_requestPeriodicLocInfoWithUpdate,
-      { "requestPeriodicLocInfoWithUpdate", "lppe.requestPeriodicLocInfoWithUpdate",
+      { "requestPeriodicLocInfoWithUpdate", "lppe.requestPeriodicLocInfoWithUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RequestPeriodicLocInfoWithUpdate", HFILL }},
     { &hf_lppe_relativeLocationChange_Request,
-      { "relativeLocationChange-Request", "lppe.relativeLocationChange_Request",
+      { "relativeLocationChange-Request", "lppe.relativeLocationChange_Request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RelativeLocationChange_Request", HFILL }},
     { &hf_lppe_localPositionRequest,
-      { "localPositionRequest", "lppe.localPositionRequest",
+      { "localPositionRequest", "lppe.localPositionRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_LocalPositionRequest", HFILL }},
     { &hf_lppe_scheduledLocation_Request,
-      { "scheduledLocation-Request", "lppe.scheduledLocation_Request",
+      { "scheduledLocation-Request", "lppe.scheduledLocation_Request_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ScheduledLocation_Request", HFILL }},
     { &hf_lppe_accessTypeRequest,
-      { "accessTypeRequest", "lppe.accessTypeRequest",
+      { "accessTypeRequest", "lppe.accessTypeRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AccessTypeRequest", HFILL }},
     { &hf_lppe_segmentedLIpreference,
@@ -16183,7 +16183,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_segmentedLIpreference_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_segmentedLIResume,
-      { "segmentedLIResume", "lppe.segmentedLIResume",
+      { "segmentedLIResume", "lppe.segmentedLIResume_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SegmentedLIResume", HFILL }},
     { &hf_lppe_session_ID_01,
@@ -16203,15 +16203,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_8_OF_OMA_LPPe_ReferencePointUniqueID", HFILL }},
     { &hf_lppe_referencePointReq_item_01,
-      { "OMA-LPPe-ReferencePointUniqueID", "lppe.OMA_LPPe_ReferencePointUniqueID",
+      { "OMA-LPPe-ReferencePointUniqueID", "lppe.OMA_LPPe_ReferencePointUniqueID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_gnssTime,
-      { "gnssTime", "lppe.gnssTime",
+      { "gnssTime", "lppe.gnssTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SystemTime", HFILL }},
     { &hf_lppe_networkTime,
-      { "networkTime", "lppe.networkTime",
+      { "networkTime", "lppe.networkTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_relativeTime,
@@ -16227,15 +16227,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_256", HFILL }},
     { &hf_lppe_highAccuracy3Dposition,
-      { "highAccuracy3Dposition", "lppe.highAccuracy3Dposition",
+      { "highAccuracy3Dposition", "lppe.highAccuracy3Dposition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_HighAccuracy3Dposition", HFILL }},
     { &hf_lppe_localPosition,
-      { "localPosition", "lppe.localPosition",
+      { "localPosition", "lppe.localPosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_LocalPosition", HFILL }},
     { &hf_lppe_highAccuracy3Dvelocity,
-      { "highAccuracy3Dvelocity", "lppe.highAccuracy3Dvelocity",
+      { "highAccuracy3Dvelocity", "lppe.highAccuracy3Dvelocity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_HighAccuracy3Dvelocity", HFILL }},
     { &hf_lppe_iP_Address_List,
@@ -16243,11 +16243,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_IP_Address_List", HFILL }},
     { &hf_lppe_locationInformationContainer,
-      { "locationInformationContainer", "lppe.locationInformationContainer",
+      { "locationInformationContainer", "lppe.locationInformationContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_LocationInformationContainer", HFILL }},
     { &hf_lppe_providePeriodicLocInfoWithUpdate,
-      { "providePeriodicLocInfoWithUpdate", "lppe.providePeriodicLocInfoWithUpdate",
+      { "providePeriodicLocInfoWithUpdate", "lppe.providePeriodicLocInfoWithUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ProvidePeriodicLocInfowithUpdate", HFILL }},
     { &hf_lppe_relativeLocationChangeList,
@@ -16255,15 +16255,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_RelativeLocationChangeList", HFILL }},
     { &hf_lppe_scheduledLocation,
-      { "scheduledLocation", "lppe.scheduledLocation",
+      { "scheduledLocation", "lppe.scheduledLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ScheduledLocation", HFILL }},
     { &hf_lppe_accessTypes,
-      { "accessTypes", "lppe.accessTypes",
+      { "accessTypes", "lppe.accessTypes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AccessTypes", HFILL }},
     { &hf_lppe_segmentedLITransfer,
-      { "segmentedLITransfer", "lppe.segmentedLITransfer",
+      { "segmentedLITransfer", "lppe.segmentedLITransfer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SegmentedLITransfer", HFILL }},
     { &hf_lppe_locationInformationTimeStamp,
@@ -16271,11 +16271,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_TimeStamp_vals), 0,
         "OMA_LPPe_TimeStamp", HFILL }},
     { &hf_lppe_subjectLocation,
-      { "subjectLocation", "lppe.subjectLocation",
+      { "subjectLocation", "lppe.subjectLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RelativeLocation", HFILL }},
     { &hf_lppe_OMA_LPPe_IP_Address_List_item,
-      { "OMA-LPPe-IP-Address", "lppe.OMA_LPPe_IP_Address",
+      { "OMA-LPPe-IP-Address", "lppe.OMA_LPPe_IP_Address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_local_IP_Address,
@@ -16303,7 +16303,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_TypeOfLocInfoProvide_vals), 0,
         "OMA_LPPe_TypeOfLocInfoProvide", HFILL }},
     { &hf_lppe_OMA_LPPe_RelativeLocationChangeList_item,
-      { "OMA-LPPe-RelativeLocationChange", "lppe.OMA_LPPe_RelativeLocationChange",
+      { "OMA-LPPe-RelativeLocationChange", "lppe.OMA_LPPe_RelativeLocationChange_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_relativeTime_01,
@@ -16319,7 +16319,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_disposition_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_actualWindow,
-      { "actualWindow", "lppe.actualWindow",
+      { "actualWindow", "lppe.actualWindow_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_start,
@@ -16343,7 +16343,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_256", HFILL }},
     { &hf_lppe_commonAssistData,
-      { "commonAssistData", "lppe.commonAssistData",
+      { "commonAssistData", "lppe.commonAssistData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_CommonAssistData", HFILL }},
     { &hf_lppe_genericAssistData,
@@ -16359,7 +16359,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_AGNSS_IonosphericModel_vals), 0,
         "OMA_LPPe_AGNSS_IonosphericModel", HFILL }},
     { &hf_lppe_troposphereModel,
-      { "troposphereModel", "lppe.troposphereModel",
+      { "troposphereModel", "lppe.troposphereModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_TroposphereModel", HFILL }},
     { &hf_lppe_altitudeAssistance,
@@ -16367,7 +16367,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AGNSS_AltitudeAssistanceList", HFILL }},
     { &hf_lppe_solarRadiation,
-      { "solarRadiation", "lppe.solarRadiation",
+      { "solarRadiation", "lppe.solarRadiation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_SolarRadiation", HFILL }},
     { &hf_lppe_ccpAssistCommonProvide,
@@ -16375,11 +16375,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_AGNSS_CCPassistCommonProvide_vals), 0,
         "OMA_LPPe_AGNSS_CCPassistCommonProvide", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_GenericAssistData_item,
-      { "OMA-LPPe-AGNSS-GenericAssistDataElement", "lppe.OMA_LPPe_AGNSS_GenericAssistDataElement",
+      { "OMA-LPPe-AGNSS-GenericAssistDataElement", "lppe.OMA_LPPe_AGNSS_GenericAssistDataElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_gnss_ID,
-      { "gnss-ID", "lppe.gnss_ID",
+      { "gnss-ID", "lppe.gnss_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_wideAreaIonoSurfacePerSVlist,
@@ -16403,11 +16403,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AGNSS_CCPassistGenericProvide", HFILL }},
     { &hf_lppe_navModelList,
-      { "navModelList", "lppe.navModelList",
+      { "navModelList", "lppe.navModelList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModelList", HFILL }},
     { &hf_lppe_staticModels,
-      { "staticModels", "lppe.staticModels",
+      { "staticModels", "lppe.staticModels_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_localKlobucharModelList,
@@ -16415,7 +16415,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AGNSS_LocalKlobucharModelList", HFILL }},
     { &hf_lppe_ionoStormIndication,
-      { "ionoStormIndication", "lppe.ionoStormIndication",
+      { "ionoStormIndication", "lppe.ionoStormIndication_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_IonoStormIndication", HFILL }},
     { &hf_lppe_waIono,
@@ -16423,15 +16423,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_waIono_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_controlParameters,
-      { "controlParameters", "lppe.controlParameters",
+      { "controlParameters", "lppe.controlParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_WideAreaIonoSurfaceControlParametersProvide", HFILL }},
     { &hf_lppe_commonProvide,
-      { "commonProvide", "lppe.commonProvide",
+      { "commonProvide", "lppe.commonProvide_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_WideAreaIonoSurfaceCommon", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_LocalKlobucharModelList_item,
-      { "OMA-LPPe-AGNSS-LocalKlobucharModelElement", "lppe.OMA_LPPe_AGNSS_LocalKlobucharModelElement",
+      { "OMA-LPPe-AGNSS-LocalKlobucharModelElement", "lppe.OMA_LPPe_AGNSS_LocalKlobucharModelElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_klobucharModel,
@@ -16439,7 +16439,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_8_OF_OMA_LPPe_AGNSS_LocalKlobucharModel", HFILL }},
     { &hf_lppe_klobucharModel_item,
-      { "OMA-LPPe-AGNSS-LocalKlobucharModel", "lppe.OMA_LPPe_AGNSS_LocalKlobucharModel",
+      { "OMA-LPPe-AGNSS-LocalKlobucharModel", "lppe.OMA_LPPe_AGNSS_LocalKlobucharModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_alfa0,
@@ -16475,7 +16475,7 @@ void proto_register_lppe(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M128_127", HFILL }},
     { &hf_lppe_area,
-      { "area", "lppe.area",
+      { "area", "lppe.area_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ValidityArea", HFILL }},
     { &hf_lppe_stormList,
@@ -16483,7 +16483,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AGNSS_StormList", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_StormList_item,
-      { "OMA-LPPe-AGNSS-StormElement", "lppe.OMA_LPPe_AGNSS_StormElement",
+      { "OMA-LPPe-AGNSS-StormElement", "lppe.OMA_LPPe_AGNSS_StormElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_rleListIono,
@@ -16491,7 +16491,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AGNSS_RleListIono", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_RleListIono_item,
-      { "OMA-LPPe-AGNSS-RleIonoElement", "lppe.OMA_LPPe_AGNSS_RleIonoElement",
+      { "OMA-LPPe-AGNSS-RleIonoElement", "lppe.OMA_LPPe_AGNSS_RleIonoElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_regionCount,
@@ -16507,7 +16507,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_AGNSS_NoaaScales_vals), 0,
         "OMA_LPPe_AGNSS_NoaaScales", HFILL }},
     { &hf_lppe_duration_03,
-      { "duration", "lppe.duration",
+      { "duration", "lppe.duration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_Duration", HFILL }},
     { &hf_lppe_rate,
@@ -16515,15 +16515,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_64", HFILL }},
     { &hf_lppe_referencePosition,
-      { "referencePosition", "lppe.referencePosition",
+      { "referencePosition", "lppe.referencePosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ellipsoid_Point", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_WideAreaIonoSurfacePerSVlist_item,
-      { "OMA-LPPe-AGNSS-WideAreaIonoSurfacePerSVelement", "lppe.OMA_LPPe_AGNSS_WideAreaIonoSurfacePerSVelement",
+      { "OMA-LPPe-AGNSS-WideAreaIonoSurfacePerSVelement", "lppe.OMA_LPPe_AGNSS_WideAreaIonoSurfacePerSVelement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_svID,
-      { "svID", "lppe.svID",
+      { "svID", "lppe.svID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SV_ID", HFILL }},
     { &hf_lppe_a0,
@@ -16559,7 +16559,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AGNSS_LocalSurfaceParametersList", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_LocalTroposphereDelayList_item,
-      { "OMA-LPPe-AGNSS-LocalTroposphereDelayAreaElement", "lppe.OMA_LPPe_AGNSS_LocalTroposphereDelayAreaElement",
+      { "OMA-LPPe-AGNSS-LocalTroposphereDelayAreaElement", "lppe.OMA_LPPe_AGNSS_LocalTroposphereDelayAreaElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_refAltitude,
@@ -16567,7 +16567,7 @@ void proto_register_lppe(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M1000_8192", HFILL }},
     { &hf_lppe_gradientReferencePosition,
-      { "gradientReferencePosition", "lppe.gradientReferencePosition",
+      { "gradientReferencePosition", "lppe.gradientReferencePosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ellipsoid_Point", HFILL }},
     { &hf_lppe_delayList,
@@ -16575,7 +16575,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_8_OF_OMA_LPPe_AGNSS_LocalTroposphereDelayTimeElement", HFILL }},
     { &hf_lppe_delayList_item,
-      { "OMA-LPPe-AGNSS-LocalTroposphereDelayTimeElement", "lppe.OMA_LPPe_AGNSS_LocalTroposphereDelayTimeElement",
+      { "OMA-LPPe-AGNSS-LocalTroposphereDelayTimeElement", "lppe.OMA_LPPe_AGNSS_LocalTroposphereDelayTimeElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_zh0,
@@ -16603,11 +16603,11 @@ void proto_register_lppe(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M8192_8191", HFILL }},
     { &hf_lppe_mappingFunctionParameters,
-      { "mappingFunctionParameters", "lppe.mappingFunctionParameters",
+      { "mappingFunctionParameters", "lppe.mappingFunctionParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_MappingFunctionParameters", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_LocalSurfaceParametersList_item,
-      { "OMA-LPPe-AGNSS-LocalSurfaceParametersAreaElement", "lppe.OMA_LPPe_AGNSS_LocalSurfaceParametersAreaElement",
+      { "OMA-LPPe-AGNSS-LocalSurfaceParametersAreaElement", "lppe.OMA_LPPe_AGNSS_LocalSurfaceParametersAreaElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_parameterList,
@@ -16615,7 +16615,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_8_OF_OMA_LPPe_AGNSS_LocalSurfaceParametersTimeElement", HFILL }},
     { &hf_lppe_parameterList_item,
-      { "OMA-LPPe-AGNSS-LocalSurfaceParametersTimeElement", "lppe.OMA_LPPe_AGNSS_LocalSurfaceParametersTimeElement",
+      { "OMA-LPPe-AGNSS-LocalSurfaceParametersTimeElement", "lppe.OMA_LPPe_AGNSS_LocalSurfaceParametersTimeElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_pressure,
@@ -16675,11 +16675,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_16383", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_AltitudeAssistanceList_item,
-      { "OMA-LPPe-AGNSS-AltitudeAssistanceAreaElement", "lppe.OMA_LPPe_AGNSS_AltitudeAssistanceAreaElement",
+      { "OMA-LPPe-AGNSS-AltitudeAssistanceAreaElement", "lppe.OMA_LPPe_AGNSS_AltitudeAssistanceAreaElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_gradientReferencePosition_01,
-      { "gradientReferencePosition", "lppe.gradientReferencePosition",
+      { "gradientReferencePosition", "lppe.gradientReferencePosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EllipsoidPointWithAltitudeAndUncertaintyEllipsoid", HFILL }},
     { &hf_lppe_pressureAssistanceList,
@@ -16687,7 +16687,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_16_OF_OMA_LPPe_AGNSS_PressureAssistanceElement", HFILL }},
     { &hf_lppe_pressureAssistanceList_item,
-      { "OMA-LPPe-AGNSS-PressureAssistanceElement", "lppe.OMA_LPPe_AGNSS_PressureAssistanceElement",
+      { "OMA-LPPe-AGNSS-PressureAssistanceElement", "lppe.OMA_LPPe_AGNSS_PressureAssistanceElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_gN_01,
@@ -16703,11 +16703,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1000_2000", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_MechanicsForAllSVs_item,
-      { "OMA-LPPe-AGNSS-MechanicsElement", "lppe.OMA_LPPe_AGNSS_MechanicsElement",
+      { "OMA-LPPe-AGNSS-MechanicsElement", "lppe.OMA_LPPe_AGNSS_MechanicsElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_svid,
-      { "svid", "lppe.svid",
+      { "svid", "lppe.svid_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SV_ID", HFILL }},
     { &hf_lppe_mass,
@@ -16719,11 +16719,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_511", HFILL }},
     { &hf_lppe_pco,
-      { "pco", "lppe.pco",
+      { "pco", "lppe.pco_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_PCOelement", HFILL }},
     { &hf_lppe_svInfo,
-      { "svInfo", "lppe.svInfo",
+      { "svInfo", "lppe.svInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_svType,
@@ -16747,15 +16747,15 @@ void proto_register_lppe(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M30000_30000", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_DCBsForAllSVs_item,
-      { "OMA-LPPe-AGNSS-DCBlistElement", "lppe.OMA_LPPe_AGNSS_DCBlistElement",
+      { "OMA-LPPe-AGNSS-DCBlistElement", "lppe.OMA_LPPe_AGNSS_DCBlistElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_reference,
-      { "reference", "lppe.reference",
+      { "reference", "lppe.reference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_signal,
-      { "signal", "lppe.signal",
+      { "signal", "lppe.signal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SignalID", HFILL }},
     { &hf_lppe_pd,
@@ -16767,7 +16767,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AGNSS_DCBlist", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_DCBlist_item,
-      { "OMA-LPPe-AGNSS-DCBelement", "lppe.OMA_LPPe_AGNSS_DCBelement",
+      { "OMA-LPPe-AGNSS-DCBelement", "lppe.OMA_LPPe_AGNSS_DCBelement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_pd_01,
@@ -16779,15 +16779,15 @@ void proto_register_lppe(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M4096_4095", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_NavModelDegradationModelList_item,
-      { "OMA-LPPe-AGNSS-NavModelDegradationModelElement", "lppe.OMA_LPPe_AGNSS_NavModelDegradationModelElement",
+      { "OMA-LPPe-AGNSS-NavModelDegradationModelElement", "lppe.OMA_LPPe_AGNSS_NavModelDegradationModelElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_clockDegradationModel,
-      { "clockDegradationModel", "lppe.clockDegradationModel",
+      { "clockDegradationModel", "lppe.clockDegradationModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_ClockModelDegradationModel", HFILL }},
     { &hf_lppe_orbitDegradationModel,
-      { "orbitDegradationModel", "lppe.orbitDegradationModel",
+      { "orbitDegradationModel", "lppe.orbitDegradationModel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_OrbitModelDegradationModel", HFILL }},
     { &hf_lppe_clockRMS0,
@@ -16807,19 +16807,19 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_7", HFILL }},
     { &hf_lppe_ccpProvideCommonParameters,
-      { "ccpProvideCommonParameters", "lppe.ccpProvideCommonParameters",
+      { "ccpProvideCommonParameters", "lppe.ccpProvideCommonParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_CCPprovideCommonParameters", HFILL }},
     { &hf_lppe_ccpProvideControlParameters,
-      { "ccpProvideControlParameters", "lppe.ccpProvideControlParameters",
+      { "ccpProvideControlParameters", "lppe.ccpProvideControlParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_CCPprovideControlParameters", HFILL }},
     { &hf_lppe_ccpReferenceTime,
-      { "ccpReferenceTime", "lppe.ccpReferenceTime",
+      { "ccpReferenceTime", "lppe.ccpReferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SystemTime", HFILL }},
     { &hf_lppe_ccpSupportArea,
-      { "ccpSupportArea", "lppe.ccpSupportArea",
+      { "ccpSupportArea", "lppe.ccpSupportArea_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_CCPsupportArea", HFILL }},
     { &hf_lppe_ccpNeighborList,
@@ -16831,7 +16831,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AGNSS_CCPreferenceStationList", HFILL }},
     { &hf_lppe_areaDescription,
-      { "areaDescription", "lppe.areaDescription",
+      { "areaDescription", "lppe.areaDescription_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ValidityArea", HFILL }},
     { &hf_lppe_signalSupport,
@@ -16839,35 +16839,35 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_8_OF_OMA_LPPe_AGNSS_CCPsignalSupport", HFILL }},
     { &hf_lppe_signalSupport_item,
-      { "OMA-LPPe-AGNSS-CCPsignalSupport", "lppe.OMA_LPPe_AGNSS_CCPsignalSupport",
+      { "OMA-LPPe-AGNSS-CCPsignalSupport", "lppe.OMA_LPPe_AGNSS_CCPsignalSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_gnss,
-      { "gnss", "lppe.gnss",
+      { "gnss", "lppe.gnss_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_ID", HFILL }},
     { &hf_lppe_signals,
-      { "signals", "lppe.signals",
+      { "signals", "lppe.signals_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SignalIDs", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_CCPreferenceStationList_item,
-      { "OMA-LPPe-AGNSS-CCPreferenceStationElement", "lppe.OMA_LPPe_AGNSS_CCPreferenceStationElement",
+      { "OMA-LPPe-AGNSS-CCPreferenceStationElement", "lppe.OMA_LPPe_AGNSS_CCPreferenceStationElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_referenceStationID,
-      { "referenceStationID", "lppe.referenceStationID",
+      { "referenceStationID", "lppe.referenceStationID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_CCPreferenceStationID", HFILL }},
     { &hf_lppe_referenceStationLocation,
-      { "referenceStationLocation", "lppe.referenceStationLocation",
+      { "referenceStationLocation", "lppe.referenceStationLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_HighAccuracy3Dposition", HFILL }},
     { &hf_lppe_antennaDescription,
-      { "antennaDescription", "lppe.antennaDescription",
+      { "antennaDescription", "lppe.antennaDescription_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_AntennaDescription", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_CCPassistGenericProvide_item,
-      { "OMA-LPPe-AGNSS-CCPassistGenericProvideElement", "lppe.OMA_LPPe_AGNSS_CCPassistGenericProvideElement",
+      { "OMA-LPPe-AGNSS-CCPassistGenericProvideElement", "lppe.OMA_LPPe_AGNSS_CCPassistGenericProvideElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ccpPerSignalList,
@@ -16875,11 +16875,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_8_OF_OMA_LPPe_AGNSS_CCPperSignalElement", HFILL }},
     { &hf_lppe_ccpPerSignalList_item,
-      { "OMA-LPPe-AGNSS-CCPperSignalElement", "lppe.OMA_LPPe_AGNSS_CCPperSignalElement",
+      { "OMA-LPPe-AGNSS-CCPperSignalElement", "lppe.OMA_LPPe_AGNSS_CCPperSignalElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_signal_ID,
-      { "signal-ID", "lppe.signal_ID",
+      { "signal-ID", "lppe.signal_ID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SignalID", HFILL }},
     { &hf_lppe_ccpPerSVlist,
@@ -16887,7 +16887,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_64_OF_OMA_LPPe_AGNSS_CCPperSVelement", HFILL }},
     { &hf_lppe_ccpPerSVlist_item,
-      { "OMA-LPPe-AGNSS-CCPperSVelement", "lppe.OMA_LPPe_AGNSS_CCPperSVelement",
+      { "OMA-LPPe-AGNSS-CCPperSVelement", "lppe.OMA_LPPe_AGNSS_CCPperSVelement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_integerCodePhase,
@@ -16923,11 +16923,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_255", HFILL }},
     { &hf_lppe_coordinateBased,
-      { "coordinateBased", "lppe.coordinateBased",
+      { "coordinateBased", "lppe.coordinateBased_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModel_CoordinateBased", HFILL }},
     { &hf_lppe_fixedInterval,
-      { "fixedInterval", "lppe.fixedInterval",
+      { "fixedInterval", "lppe.fixedInterval_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_interval,
@@ -16935,7 +16935,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_30", HFILL }},
     { &hf_lppe_bases,
-      { "bases", "lppe.bases",
+      { "bases", "lppe.bases_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_baseForPosVel,
@@ -16943,7 +16943,7 @@ void proto_register_lppe(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M100000000_100000000", HFILL }},
     { &hf_lppe_baseForCcRate,
-      { "baseForCcRate", "lppe.baseForCcRate",
+      { "baseForCcRate", "lppe.baseForCcRate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModel_BigNumber", HFILL }},
     { &hf_lppe_referencedTo,
@@ -16955,11 +16955,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_97_OF_OMA_LPPe_AGNSS_NavModel_CoordinateBasedElement", HFILL }},
     { &hf_lppe_pointList_item,
-      { "OMA-LPPe-AGNSS-NavModel-CoordinateBasedElement", "lppe.OMA_LPPe_AGNSS_NavModel_CoordinateBasedElement",
+      { "OMA-LPPe-AGNSS-NavModel-CoordinateBasedElement", "lppe.OMA_LPPe_AGNSS_NavModel_CoordinateBasedElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_time_of_record,
-      { "time-of-record", "lppe.time_of_record",
+      { "time-of-record", "lppe.time_of_record_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SystemTime", HFILL }},
     { &hf_lppe_svIdList,
@@ -16967,51 +16967,51 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_64_OF_OMA_LPPe_AGNSS_NavModel_PVTelement", HFILL }},
     { &hf_lppe_svIdList_item,
-      { "OMA-LPPe-AGNSS-NavModel-PVTelement", "lppe.OMA_LPPe_AGNSS_NavModel_PVTelement",
+      { "OMA-LPPe-AGNSS-NavModel-PVTelement", "lppe.OMA_LPPe_AGNSS_NavModel_PVTelement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_svClockOffset,
-      { "svClockOffset", "lppe.svClockOffset",
+      { "svClockOffset", "lppe.svClockOffset_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModel_BigNumber", HFILL }},
     { &hf_lppe_ecefPositionX,
-      { "ecefPositionX", "lppe.ecefPositionX",
+      { "ecefPositionX", "lppe.ecefPositionX_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModel_BigNumber", HFILL }},
     { &hf_lppe_ecefPositionY,
-      { "ecefPositionY", "lppe.ecefPositionY",
+      { "ecefPositionY", "lppe.ecefPositionY_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModel_BigNumber", HFILL }},
     { &hf_lppe_ecefPositionZ,
-      { "ecefPositionZ", "lppe.ecefPositionZ",
+      { "ecefPositionZ", "lppe.ecefPositionZ_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModel_BigNumber", HFILL }},
     { &hf_lppe_clockPosSTD,
-      { "clockPosSTD", "lppe.clockPosSTD",
+      { "clockPosSTD", "lppe.clockPosSTD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModel_STDmatrix", HFILL }},
     { &hf_lppe_rateRecord,
-      { "rateRecord", "lppe.rateRecord",
+      { "rateRecord", "lppe.rateRecord_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_svClockRate,
-      { "svClockRate", "lppe.svClockRate",
+      { "svClockRate", "lppe.svClockRate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModel_BigNumber", HFILL }},
     { &hf_lppe_ecefVelocityX,
-      { "ecefVelocityX", "lppe.ecefVelocityX",
+      { "ecefVelocityX", "lppe.ecefVelocityX_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModel_BigNumber", HFILL }},
     { &hf_lppe_ecefVelocityY,
-      { "ecefVelocityY", "lppe.ecefVelocityY",
+      { "ecefVelocityY", "lppe.ecefVelocityY_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModel_BigNumber", HFILL }},
     { &hf_lppe_ecefVelocityZ,
-      { "ecefVelocityZ", "lppe.ecefVelocityZ",
+      { "ecefVelocityZ", "lppe.ecefVelocityZ_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModel_BigNumber", HFILL }},
     { &hf_lppe_clockRateVelSTD,
-      { "clockRateVelSTD", "lppe.clockRateVelSTD",
+      { "clockRateVelSTD", "lppe.clockRateVelSTD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModel_STDmatrix", HFILL }},
     { &hf_lppe_msb,
@@ -17063,7 +17063,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_10000000", HFILL }},
     { &hf_lppe_commonAssistDataReq,
-      { "commonAssistDataReq", "lppe.commonAssistDataReq",
+      { "commonAssistDataReq", "lppe.commonAssistDataReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_CommonAssistanceDataReq", HFILL }},
     { &hf_lppe_genericAssistDataReq,
@@ -17075,51 +17075,51 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_AGNSS_IonosphericModelReq_vals), 0,
         "OMA_LPPe_AGNSS_IonosphericModelReq", HFILL }},
     { &hf_lppe_troposphereModelReq,
-      { "troposphereModelReq", "lppe.troposphereModelReq",
+      { "troposphereModelReq", "lppe.troposphereModelReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_TroposphereModelReq", HFILL }},
     { &hf_lppe_altitudeAssistanceReq,
-      { "altitudeAssistanceReq", "lppe.altitudeAssistanceReq",
+      { "altitudeAssistanceReq", "lppe.altitudeAssistanceReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_AltitudeAssistanceReq", HFILL }},
     { &hf_lppe_solarRadiationRequest,
-      { "solarRadiationRequest", "lppe.solarRadiationRequest",
+      { "solarRadiationRequest", "lppe.solarRadiationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_SolarRadiationReq", HFILL }},
     { &hf_lppe_ccpRequestControlParameters,
-      { "ccpRequestControlParameters", "lppe.ccpRequestControlParameters",
+      { "ccpRequestControlParameters", "lppe.ccpRequestControlParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_CCPrequestControlParameters", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_GenericAssistanceDataReq_item,
-      { "OMA-LPPe-AGNSS-GenericAssistDataReqElement", "lppe.OMA_LPPe_AGNSS_GenericAssistDataReqElement",
+      { "OMA-LPPe-AGNSS-GenericAssistDataReqElement", "lppe.OMA_LPPe_AGNSS_GenericAssistDataReqElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_waIonoSurfaceReq,
-      { "waIonoSurfaceReq", "lppe.waIonoSurfaceReq",
+      { "waIonoSurfaceReq", "lppe.waIonoSurfaceReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_WaIonoSurfaceRequest", HFILL }},
     { &hf_lppe_mechanicsReq,
-      { "mechanicsReq", "lppe.mechanicsReq",
+      { "mechanicsReq", "lppe.mechanicsReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_MechanicsReq", HFILL }},
     { &hf_lppe_dcbReq,
-      { "dcbReq", "lppe.dcbReq",
+      { "dcbReq", "lppe.dcbReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_DCBreq", HFILL }},
     { &hf_lppe_navModelDegradationModelReq,
-      { "navModelDegradationModelReq", "lppe.navModelDegradationModelReq",
+      { "navModelDegradationModelReq", "lppe.navModelDegradationModelReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModelDegradationModelReq", HFILL }},
     { &hf_lppe_ccpAssistGenericReq,
-      { "ccpAssistGenericReq", "lppe.ccpAssistGenericReq",
+      { "ccpAssistGenericReq", "lppe.ccpAssistGenericReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_CCPassistGenericReq", HFILL }},
     { &hf_lppe_navigationModelReq,
-      { "navigationModelReq", "lppe.navigationModelReq",
+      { "navigationModelReq", "lppe.navigationModelReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavigationModelReq", HFILL }},
     { &hf_lppe_staticModels_01,
-      { "staticModels", "lppe.staticModels",
+      { "staticModels", "lppe.staticModels_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_staticModels_01", HFILL }},
     { &hf_lppe_ionoreq,
@@ -17127,15 +17127,15 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_requestBeginTime,
-      { "requestBeginTime", "lppe.requestBeginTime",
+      { "requestBeginTime", "lppe.requestBeginTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SystemTime", HFILL }},
     { &hf_lppe_periodicModels,
-      { "periodicModels", "lppe.periodicModels",
+      { "periodicModels", "lppe.periodicModels_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_waIonoSurface,
-      { "waIonoSurface", "lppe.waIonoSurface",
+      { "waIonoSurface", "lppe.waIonoSurface_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_WideAreaIonoSurfaceControlParametersRequest", HFILL }},
     { &hf_lppe_troposphereModelReq_01,
@@ -17147,7 +17147,7 @@ void proto_register_lppe(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lppe_reference_01,
-      { "reference", "lppe.reference",
+      { "reference", "lppe.reference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_reference_01", HFILL }},
     { &hf_lppe_pd_02,
@@ -17171,15 +17171,15 @@ void proto_register_lppe(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lppe_ccpSupportAreaRequest,
-      { "ccpSupportAreaRequest", "lppe.ccpSupportAreaRequest",
+      { "ccpSupportAreaRequest", "lppe.ccpSupportAreaRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ccpNeighborListRequest,
-      { "ccpNeighborListRequest", "lppe.ccpNeighborListRequest",
+      { "ccpNeighborListRequest", "lppe.ccpNeighborListRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ccpCommonRequest,
-      { "ccpCommonRequest", "lppe.ccpCommonRequest",
+      { "ccpCommonRequest", "lppe.ccpCommonRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_refStation,
@@ -17187,11 +17187,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_refStation_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_posBasedReferenceStationRequest,
-      { "posBasedReferenceStationRequest", "lppe.posBasedReferenceStationRequest",
+      { "posBasedReferenceStationRequest", "lppe.posBasedReferenceStationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_requestedReferenceStationLocation,
-      { "requestedReferenceStationLocation", "lppe.requestedReferenceStationLocation",
+      { "requestedReferenceStationLocation", "lppe.requestedReferenceStationLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_HighAccuracy3Dposition", HFILL }},
     { &hf_lppe_qor,
@@ -17207,11 +17207,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AGNSS_ReferenceStationIDlist", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_ReferenceStationIDlist_item,
-      { "OMA-LPPe-AGNSS-CCPreferenceStationID", "lppe.OMA_LPPe_AGNSS_CCPreferenceStationID",
+      { "OMA-LPPe-AGNSS-CCPreferenceStationID", "lppe.OMA_LPPe_AGNSS_CCPreferenceStationID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ccpAssist_SignalsReq,
-      { "ccpAssist-SignalsReq", "lppe.ccpAssist_SignalsReq",
+      { "ccpAssist-SignalsReq", "lppe.ccpAssist_SignalsReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SignalIDs", HFILL }},
     { &hf_lppe_navModelID_PrefList,
@@ -17223,7 +17223,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_8", HFILL }},
     { &hf_lppe_highAccuracyReferenceTime,
-      { "highAccuracyReferenceTime", "lppe.highAccuracyReferenceTime",
+      { "highAccuracyReferenceTime", "lppe.highAccuracyReferenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SystemTime", HFILL }},
     { &hf_lppe_highAccuracyMeasurements,
@@ -17231,31 +17231,31 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_AGNSS_HAgnssProvide_vals), 0,
         "OMA_LPPe_AGNSS_HAgnssProvide", HFILL }},
     { &hf_lppe_ionosphereMeasurements,
-      { "ionosphereMeasurements", "lppe.ionosphereMeasurements",
+      { "ionosphereMeasurements", "lppe.ionosphereMeasurements_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_IonosphereMeasurements", HFILL }},
     { &hf_lppe_localSurfaceMeasurements,
-      { "localSurfaceMeasurements", "lppe.localSurfaceMeasurements",
+      { "localSurfaceMeasurements", "lppe.localSurfaceMeasurements_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_LocalSurfaceMeasurements", HFILL }},
     { &hf_lppe_controlParameters_01,
-      { "controlParameters", "lppe.controlParameters",
+      { "controlParameters", "lppe.controlParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_measurements,
-      { "measurements", "lppe.measurements",
+      { "measurements", "lppe.measurements_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_position,
-      { "position", "lppe.position",
+      { "position", "lppe.position_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EllipsoidPointWithAltitudeAndUncertaintyEllipsoid", HFILL }},
     { &hf_lppe_referenceTime,
-      { "referenceTime", "lppe.referenceTime",
+      { "referenceTime", "lppe.referenceTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SystemTime", HFILL }},
     { &hf_lppe_localPressure,
-      { "localPressure", "lppe.localPressure",
+      { "localPressure", "lppe.localPressure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_pressureUncertainty,
@@ -17271,7 +17271,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_16_OF_OMA_LPPe_AGNSS_HAgnssMeasurementElement", HFILL }},
     { &hf_lppe_signalMeasurements_item,
-      { "OMA-LPPe-AGNSS-HAgnssMeasurementElement", "lppe.OMA_LPPe_AGNSS_HAgnssMeasurementElement",
+      { "OMA-LPPe-AGNSS-HAgnssMeasurementElement", "lppe.OMA_LPPe_AGNSS_HAgnssMeasurementElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_haGNSSperSignalList,
@@ -17279,7 +17279,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_8_OF_OMA_LPPe_HAgnssPerSignalElement", HFILL }},
     { &hf_lppe_haGNSSperSignalList_item,
-      { "OMA-LPPe-HAgnssPerSignalElement", "lppe.OMA_LPPe_HAgnssPerSignalElement",
+      { "OMA-LPPe-HAgnssPerSignalElement", "lppe.OMA_LPPe_HAgnssPerSignalElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_haGNSSperSVlist,
@@ -17287,7 +17287,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_64_OF_OMA_LPPe_HAgnssPerSVelement", HFILL }},
     { &hf_lppe_haGNSSperSVlist_item,
-      { "OMA-LPPe-HAgnssPerSVelement", "lppe.OMA_LPPe_HAgnssPerSVelement",
+      { "OMA-LPPe-HAgnssPerSVelement", "lppe.OMA_LPPe_HAgnssPerSVelement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_multipathDetection,
@@ -17307,11 +17307,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_AGNSS_TECPerSV", HFILL }},
     { &hf_lppe_tecAtZenith,
-      { "tecAtZenith", "lppe.tecAtZenith",
+      { "tecAtZenith", "lppe.tecAtZenith_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_TECAtZenith", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_TECPerSV_item,
-      { "OMA-LPPe-AGNSS-TECPerSVElement", "lppe.OMA_LPPe_AGNSS_TECPerSVElement",
+      { "OMA-LPPe-AGNSS-TECPerSVElement", "lppe.OMA_LPPe_AGNSS_TECPerSVElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_azimuth,
@@ -17339,7 +17339,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_63", HFILL }},
     { &hf_lppe_temperatureMeasurement,
-      { "temperatureMeasurement", "lppe.temperatureMeasurement",
+      { "temperatureMeasurement", "lppe.temperatureMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_temperatureUncertainty,
@@ -17347,7 +17347,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_7", HFILL }},
     { &hf_lppe_positioningInstructions,
-      { "positioningInstructions", "lppe.positioningInstructions",
+      { "positioningInstructions", "lppe.positioningInstructions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_PositioningInstructions", HFILL }},
     { &hf_lppe_ionosphereMeasurementsReq,
@@ -17355,7 +17355,7 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_localSurfaceMeasurementReq,
-      { "localSurfaceMeasurementReq", "lppe.localSurfaceMeasurementReq",
+      { "localSurfaceMeasurementReq", "lppe.localSurfaceMeasurementReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_LocalSurfaceMeasurementReq", HFILL }},
     { &hf_lppe_highAccuracyMethodRequested,
@@ -17363,7 +17363,7 @@ void proto_register_lppe(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lppe_haGNSSreq,
-      { "haGNSSreq", "lppe.haGNSSreq",
+      { "haGNSSreq", "lppe.haGNSSreq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_HAgnssRequestControlParameters", HFILL }},
     { &hf_lppe_rate_01,
@@ -17383,27 +17383,27 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_16_OF_OMA_LPPe_AGNSS_HAgnssSignalReqElement", HFILL }},
     { &hf_lppe_signalReqList_item,
-      { "OMA-LPPe-AGNSS-HAgnssSignalReqElement", "lppe.OMA_LPPe_AGNSS_HAgnssSignalReqElement",
+      { "OMA-LPPe-AGNSS-HAgnssSignalReqElement", "lppe.OMA_LPPe_AGNSS_HAgnssSignalReqElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_gnssID,
-      { "gnssID", "lppe.gnssID",
+      { "gnssID", "lppe.gnssID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_ID", HFILL }},
     { &hf_lppe_assistanceDataSupportList,
-      { "assistanceDataSupportList", "lppe.assistanceDataSupportList",
+      { "assistanceDataSupportList", "lppe.assistanceDataSupportList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_AssistanceDataSupportList", HFILL }},
     { &hf_lppe_environmentObservationSupportList,
-      { "environmentObservationSupportList", "lppe.environmentObservationSupportList",
+      { "environmentObservationSupportList", "lppe.environmentObservationSupportList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_EnvironmentObservationSupportList", HFILL }},
     { &hf_lppe_haGNSSsupport,
-      { "haGNSSsupport", "lppe.haGNSSsupport",
+      { "haGNSSsupport", "lppe.haGNSSsupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_HAgnssSupport", HFILL }},
     { &hf_lppe_commonAssistanceDataSupport,
-      { "commonAssistanceDataSupport", "lppe.commonAssistanceDataSupport",
+      { "commonAssistanceDataSupport", "lppe.commonAssistanceDataSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_CommonAssistanceDataSupport", HFILL }},
     { &hf_lppe_genericAssistanceDataSupport,
@@ -17423,23 +17423,23 @@ void proto_register_lppe(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lppe_ionosphericModelSupport,
-      { "ionosphericModelSupport", "lppe.ionosphericModelSupport",
+      { "ionosphericModelSupport", "lppe.ionosphericModelSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_IonosphericModelSupport", HFILL }},
     { &hf_lppe_troposphereModelSupport,
-      { "troposphereModelSupport", "lppe.troposphereModelSupport",
+      { "troposphereModelSupport", "lppe.troposphereModelSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_TroposphereModelSupport", HFILL }},
     { &hf_lppe_altitudeAssistanceSupport,
-      { "altitudeAssistanceSupport", "lppe.altitudeAssistanceSupport",
+      { "altitudeAssistanceSupport", "lppe.altitudeAssistanceSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_AltitudeAssistanceSupport", HFILL }},
     { &hf_lppe_solarRadiationSupport,
-      { "solarRadiationSupport", "lppe.solarRadiationSupport",
+      { "solarRadiationSupport", "lppe.solarRadiationSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_SolarRadiationSupport", HFILL }},
     { &hf_lppe_ccpSupport,
-      { "ccpSupport", "lppe.ccpSupport",
+      { "ccpSupport", "lppe.ccpSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_CCPsupport", HFILL }},
     { &hf_lppe_ionoModel,
@@ -17459,27 +17459,27 @@ void proto_register_lppe(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lppe_OMA_LPPe_AGNSS_GenericAssistanceDataSupport_item,
-      { "OMA-LPPe-AGNSS-GenericAssistDataSupportElement", "lppe.OMA_LPPe_AGNSS_GenericAssistDataSupportElement",
+      { "OMA-LPPe-AGNSS-GenericAssistDataSupportElement", "lppe.OMA_LPPe_AGNSS_GenericAssistDataSupportElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mechnanicsSupport,
-      { "mechnanicsSupport", "lppe.mechnanicsSupport",
+      { "mechnanicsSupport", "lppe.mechnanicsSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_MechanicsSupport", HFILL }},
     { &hf_lppe_dcbSupport,
-      { "dcbSupport", "lppe.dcbSupport",
+      { "dcbSupport", "lppe.dcbSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_DCBsupport", HFILL }},
     { &hf_lppe_navModelAccuracyModelDegradationSupport,
-      { "navModelAccuracyModelDegradationSupport", "lppe.navModelAccuracyModelDegradationSupport",
+      { "navModelAccuracyModelDegradationSupport", "lppe.navModelAccuracyModelDegradationSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModelAccuracyModelDegradationSupport", HFILL }},
     { &hf_lppe_ccpAssistanceSuppport,
-      { "ccpAssistanceSuppport", "lppe.ccpAssistanceSuppport",
+      { "ccpAssistanceSuppport", "lppe.ccpAssistanceSuppport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SignalIDs", HFILL }},
     { &hf_lppe_navModelSupport,
-      { "navModelSupport", "lppe.navModelSupport",
+      { "navModelSupport", "lppe.navModelSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_NavModelSupport", HFILL }},
     { &hf_lppe_navModelSupport_01,
@@ -17507,31 +17507,31 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_8_OF_OMA_LPPe_AGNSS_HAgnssPerGNSSsupport", HFILL }},
     { &hf_lppe_haGNSSperGNSSsupport_item,
-      { "OMA-LPPe-AGNSS-HAgnssPerGNSSsupport", "lppe.OMA_LPPe_AGNSS_HAgnssPerGNSSsupport",
+      { "OMA-LPPe-AGNSS-HAgnssPerGNSSsupport", "lppe.OMA_LPPe_AGNSS_HAgnssPerGNSSsupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_haGNSSsignalSupport,
-      { "haGNSSsignalSupport", "lppe.haGNSSsignalSupport",
+      { "haGNSSsignalSupport", "lppe.haGNSSsignalSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GNSS_SignalIDs", HFILL }},
     { &hf_lppe_assistanceDataSupportListReq,
-      { "assistanceDataSupportListReq", "lppe.assistanceDataSupportListReq",
+      { "assistanceDataSupportListReq", "lppe.assistanceDataSupportListReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_environmentObservationSupportListReq,
-      { "environmentObservationSupportListReq", "lppe.environmentObservationSupportListReq",
+      { "environmentObservationSupportListReq", "lppe.environmentObservationSupportListReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_haGNSSsupportReq,
-      { "haGNSSsupportReq", "lppe.haGNSSsupportReq",
+      { "haGNSSsupportReq", "lppe.haGNSSsupportReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_agnss_locationServerErrorCauses,
-      { "agnss-locationServerErrorCauses", "lppe.agnss_locationServerErrorCauses",
+      { "agnss-locationServerErrorCauses", "lppe.agnss_locationServerErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_LocationServerErrorCauses", HFILL }},
     { &hf_lppe_agnss_targetDeviceErrorCauses,
-      { "agnss-targetDeviceErrorCauses", "lppe.agnss_targetDeviceErrorCauses",
+      { "agnss-targetDeviceErrorCauses", "lppe.agnss_targetDeviceErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_AGNSS_TargetDeviceErrorCauses", HFILL }},
     { &hf_lppe_waIonoErrorCauses,
@@ -17583,7 +17583,7 @@ void proto_register_lppe(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "OMA_LPPe_CharArray", HFILL }},
     { &hf_lppe_targetDeviceAbortCauses,
-      { "targetDeviceAbortCauses", "lppe.targetDeviceAbortCauses",
+      { "targetDeviceAbortCauses", "lppe.targetDeviceAbortCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ccpAbort,
@@ -17595,7 +17595,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_waIonoAbort_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_otdoa_ReferenceCellInfo,
-      { "otdoa-ReferenceCellInfo", "lppe.otdoa_ReferenceCellInfo",
+      { "otdoa-ReferenceCellInfo", "lppe.otdoa_ReferenceCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_ReferenceCellInfo", HFILL }},
     { &hf_lppe_otdoa_NeighbourCellInfo,
@@ -17607,11 +17607,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_OTDOA_Error_vals), 0,
         "OMA_LPPe_OTDOA_Error", HFILL }},
     { &hf_lppe_referenceCellInfo,
-      { "referenceCellInfo", "lppe.referenceCellInfo",
+      { "referenceCellInfo", "lppe.referenceCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OTDOA_ReferenceCellInfo", HFILL }},
     { &hf_lppe_positionCalculationInfoRef,
-      { "positionCalculationInfoRef", "lppe.positionCalculationInfoRef",
+      { "positionCalculationInfoRef", "lppe.positionCalculationInfoRef_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_PositionCalculationInfoRef", HFILL }},
     { &hf_lppe_systemFrameNumber,
@@ -17619,23 +17619,23 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_10", HFILL }},
     { &hf_lppe_rtdReferenceStd,
-      { "rtdReferenceStd", "lppe.rtdReferenceStd",
+      { "rtdReferenceStd", "lppe.rtdReferenceStd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_RTDquality", HFILL }},
     { &hf_lppe_cellLocation,
-      { "cellLocation", "lppe.cellLocation",
+      { "cellLocation", "lppe.cellLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_reference_point,
-      { "reference-point", "lppe.reference_point",
+      { "reference-point", "lppe.reference_point_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ReferencePoint", HFILL }},
     { &hf_lppe_relative_location,
-      { "relative-location", "lppe.relative_location",
+      { "relative-location", "lppe.relative_location_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RelativeLocation", HFILL }},
     { &hf_lppe_femtoCellInfo,
-      { "femtoCellInfo", "lppe.femtoCellInfo",
+      { "femtoCellInfo", "lppe.femtoCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_location_reliability,
@@ -17643,7 +17643,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_100", HFILL }},
     { &hf_lppe_OMA_LPPe_OTDOA_NeighbourCellInfoList_item,
-      { "OMA-LPPe-OTDOA-NeighbourFreqCellInfoList", "lppe.OMA_LPPe_OTDOA_NeighbourFreqCellInfoList",
+      { "OMA-LPPe-OTDOA-NeighbourFreqCellInfoList", "lppe.OMA_LPPe_OTDOA_NeighbourFreqCellInfoList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_neighbourCellInfoList_eNB,
@@ -17651,7 +17651,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxLTEeNBs_OF_OMA_LPPe_OTDOA_NeighbourCellInfoElement_eNB", HFILL }},
     { &hf_lppe_neighbourCellInfoList_eNB_item,
-      { "OMA-LPPe-OTDOA-NeighbourCellInfoElement-eNB", "lppe.OMA_LPPe_OTDOA_NeighbourCellInfoElement_eNB",
+      { "OMA-LPPe-OTDOA-NeighbourCellInfoElement-eNB", "lppe.OMA_LPPe_OTDOA_NeighbourCellInfoElement_eNB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_neighbourCellInfoList_HeNB,
@@ -17659,11 +17659,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxLTEHeNBs_OF_OMA_LPPe_OTDOA_NeighbourCellInfoElement_HeNB", HFILL }},
     { &hf_lppe_neighbourCellInfoList_HeNB_item,
-      { "OMA-LPPe-OTDOA-NeighbourCellInfoElement-HeNB", "lppe.OMA_LPPe_OTDOA_NeighbourCellInfoElement_HeNB",
+      { "OMA-LPPe-OTDOA-NeighbourCellInfoElement-HeNB", "lppe.OMA_LPPe_OTDOA_NeighbourCellInfoElement_HeNB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_relative_Location,
-      { "relative-Location", "lppe.relative_Location",
+      { "relative-Location", "lppe.relative_Location_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RelativeLocation", HFILL }},
     { &hf_lppe_otdoa_eNB_CellDataList,
@@ -17671,19 +17671,19 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxLTEMacroCells_OF_OMA_LPPe_OTDOA_CellData", HFILL }},
     { &hf_lppe_otdoa_eNB_CellDataList_item,
-      { "OMA-LPPe-OTDOA-CellData", "lppe.OMA_LPPe_OTDOA_CellData",
+      { "OMA-LPPe-OTDOA-CellData", "lppe.OMA_LPPe_OTDOA_CellData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_otdoa_HeNB_CellDataList,
-      { "otdoa-HeNB-CellDataList", "lppe.otdoa_HeNB_CellDataList",
+      { "otdoa-HeNB-CellDataList", "lppe.otdoa_HeNB_CellDataList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_CellData", HFILL }},
     { &hf_lppe_otdoa_NeighbourCellInfoElement,
-      { "otdoa-NeighbourCellInfoElement", "lppe.otdoa_NeighbourCellInfoElement",
+      { "otdoa-NeighbourCellInfoElement", "lppe.otdoa_NeighbourCellInfoElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_rtdInfo,
-      { "rtdInfo", "lppe.rtdInfo",
+      { "rtdInfo", "lppe.rtdInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_subframeOffset,
@@ -17695,7 +17695,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_99999", HFILL }},
     { &hf_lppe_fineRTDstd,
-      { "fineRTDstd", "lppe.fineRTDstd",
+      { "fineRTDstd", "lppe.fineRTDstd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_RTDquality", HFILL }},
     { &hf_lppe_fineRTDdriftRate,
@@ -17711,7 +17711,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_127", HFILL }},
     { &hf_lppe_lteCell,
-      { "lteCell", "lppe.lteCell",
+      { "lteCell", "lppe.lteCell_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_physCellId,
@@ -17723,7 +17723,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ARFCN_ValueEUTRA", HFILL }},
     { &hf_lppe_ecgi,
-      { "ecgi", "lppe.ecgi",
+      { "ecgi", "lppe.ecgi_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellGlobalIdEUTRA_AndUTRA", HFILL }},
     { &hf_lppe_requestedCells,
@@ -17731,7 +17731,7 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_otdoaLocationInformation,
-      { "otdoaLocationInformation", "lppe.otdoaLocationInformation",
+      { "otdoaLocationInformation", "lppe.otdoaLocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_LocationInformation", HFILL }},
     { &hf_lppe_otdoaError,
@@ -17739,7 +17739,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_OTDOA_Error_vals), 0,
         "OMA_LPPe_OTDOA_Error", HFILL }},
     { &hf_lppe_cellGlobalId,
-      { "cellGlobalId", "lppe.cellGlobalId",
+      { "cellGlobalId", "lppe.cellGlobalId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellGlobalIdEUTRA_AndUTRA", HFILL }},
     { &hf_lppe_assistanceAvailability,
@@ -17747,19 +17747,19 @@ void proto_register_lppe(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lppe_eNodeB_AD_sup,
-      { "eNodeB-AD-sup", "lppe.eNodeB_AD_sup",
+      { "eNodeB-AD-sup", "lppe.eNodeB_AD_sup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_home_eNodeB_AD_sup,
-      { "home-eNodeB-AD-sup", "lppe.home_eNodeB_AD_sup",
+      { "home-eNodeB-AD-sup", "lppe.home_eNodeB_AD_sup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_locationServerErrorCauses,
-      { "locationServerErrorCauses", "lppe.locationServerErrorCauses",
+      { "locationServerErrorCauses", "lppe.locationServerErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_LocationServerErrorCauses", HFILL }},
     { &hf_lppe_targetDeviceErrorCauses,
-      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses",
+      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_TargetDeviceErrorCauses", HFILL }},
     { &hf_lppe_cause,
@@ -17771,7 +17771,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_cause_01_vals), 0,
         "T_cause_01", HFILL }},
     { &hf_lppe_referenceBTS,
-      { "referenceBTS", "lppe.referenceBTS",
+      { "referenceBTS", "lppe.referenceBTS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_ReferenceBTSForAssistance", HFILL }},
     { &hf_lppe_msrAssistDataList,
@@ -17787,7 +17787,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_EOTD_Error_vals), 0,
         "OMA_LPPe_EOTD_Error", HFILL }},
     { &hf_lppe_bsicAndCarrier,
-      { "bsicAndCarrier", "lppe.bsicAndCarrier",
+      { "bsicAndCarrier", "lppe.bsicAndCarrier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CellNonUniqueIDGERAN", HFILL }},
     { &hf_lppe_timeSlotScheme,
@@ -17799,15 +17799,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_btsPosition_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_ellipsoidPoint,
-      { "ellipsoidPoint", "lppe.ellipsoidPoint",
+      { "ellipsoidPoint", "lppe.ellipsoidPoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Ellipsoid_Point", HFILL }},
     { &hf_lppe_ellipsoidPointWithAltitudeAndUncertaintyEllipsoid,
-      { "ellipsoidPointWithAltitudeAndUncertaintyEllipsoid", "lppe.ellipsoidPointWithAltitudeAndUncertaintyEllipsoid",
+      { "ellipsoidPointWithAltitudeAndUncertaintyEllipsoid", "lppe.ellipsoidPointWithAltitudeAndUncertaintyEllipsoid_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_EOTD_MsrAssistDataList_item,
-      { "OMA-LPPe-EOTD-MsrAssistBTS", "lppe.OMA_LPPe_EOTD_MsrAssistBTS",
+      { "OMA-LPPe-EOTD-MsrAssistBTS", "lppe.OMA_LPPe_EOTD_MsrAssistBTS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_multiFrameOffset,
@@ -17819,11 +17819,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_EOTD_RoughRTD", HFILL }},
     { &hf_lppe_expectedOTD,
-      { "expectedOTD", "lppe.expectedOTD",
+      { "expectedOTD", "lppe.expectedOTD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_ExpectedOTD", HFILL }},
     { &hf_lppe_calcAssistanceBTS,
-      { "calcAssistanceBTS", "lppe.calcAssistanceBTS",
+      { "calcAssistanceBTS", "lppe.calcAssistanceBTS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_CalcAssistanceBTS", HFILL }},
     { &hf_lppe_OMA_LPPe_EOTD_SystemInfoAssistDataList_item,
@@ -17831,11 +17831,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_EOTD_SystemInfoAssistBTS_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_notPresent,
-      { "notPresent", "lppe.notPresent",
+      { "notPresent", "lppe.notPresent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_present,
-      { "present", "lppe.present",
+      { "present", "lppe.present_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_AssistBTSData", HFILL }},
     { &hf_lppe_fineRTD_01,
@@ -17843,7 +17843,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_EOTD_FineRTD", HFILL }},
     { &hf_lppe_relativePos,
-      { "relativePos", "lppe.relativePos",
+      { "relativePos", "lppe.relativePos_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_relativePos", HFILL }},
     { &hf_lppe_relativeNorth_01,
@@ -17863,7 +17863,7 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_eotdMsrElement,
-      { "eotdMsrElement", "lppe.eotdMsrElement",
+      { "eotdMsrElement", "lppe.eotdMsrElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_MsrElement", HFILL }},
     { &hf_lppe_refFrameNumber,
@@ -17875,7 +17875,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_EOTD_ModuloTimeSlot", HFILL }},
     { &hf_lppe_toaMeasurementsOfRef,
-      { "toaMeasurementsOfRef", "lppe.toaMeasurementsOfRef",
+      { "toaMeasurementsOfRef", "lppe.toaMeasurementsOfRef_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_TOA_MeasurementsOfRef", HFILL }},
     { &hf_lppe_stdResolution,
@@ -17891,7 +17891,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_15_OF_OMA_LPPe_EOTD_MeasurementWithID", HFILL }},
     { &hf_lppe_otd_FirstSetMsrs_item,
-      { "OMA-LPPe-EOTD-MeasurementWithID", "lppe.OMA_LPPe_EOTD_MeasurementWithID",
+      { "OMA-LPPe-EOTD-MeasurementWithID", "lppe.OMA_LPPe_EOTD_MeasurementWithID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_refQuality,
@@ -17911,7 +17911,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_EOTD_ModuloTimeSlot", HFILL }},
     { &hf_lppe_eotdQuality,
-      { "eotdQuality", "lppe.eotdQuality",
+      { "eotdQuality", "lppe.eotdQuality_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_EOTDQuality", HFILL }},
     { &hf_lppe_otdValue,
@@ -17923,7 +17923,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_EOTD_CellID", HFILL }},
     { &hf_lppe_multiFrameCarrier,
-      { "multiFrameCarrier", "lppe.multiFrameCarrier",
+      { "multiFrameCarrier", "lppe.multiFrameCarrier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_MultiFrameCarrier", HFILL }},
     { &hf_lppe_requestIndex,
@@ -17935,7 +17935,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_EOTD_SystemInfoIndex", HFILL }},
     { &hf_lppe_ciAndLac,
-      { "ciAndLac", "lppe.ciAndLac",
+      { "ciAndLac", "lppe.ciAndLac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CellLocalIdGERAN", HFILL }},
     { &hf_lppe_nbrOfMeasurements,
@@ -17955,11 +17955,11 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_locationServerErrorCauses_01,
-      { "locationServerErrorCauses", "lppe.locationServerErrorCauses",
+      { "locationServerErrorCauses", "lppe.locationServerErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_LocationServerErrorCauses", HFILL }},
     { &hf_lppe_targetDeviceErrorCauses_01,
-      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses",
+      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_EOTD_TargetDeviceErrorCauses", HFILL }},
     { &hf_lppe_cause_02,
@@ -17979,7 +17979,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_7", HFILL }},
     { &hf_lppe_referenceCellInfo_01,
-      { "referenceCellInfo", "lppe.referenceCellInfo",
+      { "referenceCellInfo", "lppe.referenceCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_ReferenceCellInfo", HFILL }},
     { &hf_lppe_neigborCellList,
@@ -17999,31 +17999,31 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_modeSpecificInfo_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_fdd,
-      { "fdd", "lppe.fdd",
+      { "fdd", "lppe.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_primaryCPICH_info,
-      { "primaryCPICH-info", "lppe.primaryCPICH_info",
+      { "primaryCPICH-info", "lppe.primaryCPICH_info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_PrimaryCPICH_Info", HFILL }},
     { &hf_lppe_tdd,
-      { "tdd", "lppe.tdd",
+      { "tdd", "lppe.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_cellAndChannelIdentity,
-      { "cellAndChannelIdentity", "lppe.cellAndChannelIdentity",
+      { "cellAndChannelIdentity", "lppe.cellAndChannelIdentity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_CellAndChannelIdentity", HFILL }},
     { &hf_lppe_frequencyInfo,
-      { "frequencyInfo", "lppe.frequencyInfo",
+      { "frequencyInfo", "lppe.frequencyInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_UTRA_FrequencyInfo", HFILL }},
     { &hf_lppe_refPosAssist,
-      { "refPosAssist", "lppe.refPosAssist",
+      { "refPosAssist", "lppe.refPosAssist_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_RefPosAssist", HFILL }},
     { &hf_lppe_ipdl_parameters,
-      { "ipdl-parameters", "lppe.ipdl_parameters",
+      { "ipdl-parameters", "lppe.ipdl_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_IPDL_Parameters", HFILL }},
     { &hf_lppe_cellPosition,
@@ -18031,7 +18031,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_cellPosition_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_ellipsoidPointWithAltitude,
-      { "ellipsoidPointWithAltitude", "lppe.ellipsoidPointWithAltitude",
+      { "ellipsoidPointWithAltitude", "lppe.ellipsoidPointWithAltitude_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_roundTripTime,
@@ -18043,7 +18043,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_70274", HFILL }},
     { &hf_lppe_OMA_LPPe_OTDOA_UTRA_NeighborCellList_item,
-      { "OMA-LPPe-OTDOA-UTRA-NeighborCellInfo", "lppe.OMA_LPPe_OTDOA_UTRA_NeighborCellInfo",
+      { "OMA-LPPe-OTDOA-UTRA-NeighborCellInfo", "lppe.OMA_LPPe_OTDOA_UTRA_NeighborCellInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_modeSpecificInfo_01,
@@ -18051,15 +18051,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_modeSpecificInfo_01_vals), 0,
         "T_modeSpecificInfo_01", HFILL }},
     { &hf_lppe_fdd_01,
-      { "fdd", "lppe.fdd",
+      { "fdd", "lppe.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_01", HFILL }},
     { &hf_lppe_tdd_01,
-      { "tdd", "lppe.tdd",
+      { "tdd", "lppe.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_01", HFILL }},
     { &hf_lppe_sfn_SFN_relTimeDifference,
-      { "sfn-SFN-relTimeDifference", "lppe.sfn_SFN_relTimeDifference",
+      { "sfn-SFN-relTimeDifference", "lppe.sfn_SFN_relTimeDifference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_SFN_SFN_RelTimeDifference1", HFILL }},
     { &hf_lppe_sfn_offsetValidity,
@@ -18075,7 +18075,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_OTDOA_UTRA_SearchWindowSize_vals), 0,
         "OMA_LPPe_OTDOA_UTRA_SearchWindowSize", HFILL }},
     { &hf_lppe_positioningAssistance,
-      { "positioningAssistance", "lppe.positioningAssistance",
+      { "positioningAssistance", "lppe.positioningAssistance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_PositioningAssistance", HFILL }},
     { &hf_lppe_sfn_offset,
@@ -18107,7 +18107,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_modeSpecificInfo_02_vals), 0,
         "T_modeSpecificInfo_02", HFILL }},
     { &hf_lppe_fdd_02,
-      { "fdd", "lppe.fdd",
+      { "fdd", "lppe.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_02", HFILL }},
     { &hf_lppe_ip_spacing,
@@ -18127,11 +18127,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_63", HFILL }},
     { &hf_lppe_burstModeParameters,
-      { "burstModeParameters", "lppe.burstModeParameters",
+      { "burstModeParameters", "lppe.burstModeParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_BurstModeParameters", HFILL }},
     { &hf_lppe_tdd_02,
-      { "tdd", "lppe.tdd",
+      { "tdd", "lppe.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_02", HFILL }},
     { &hf_lppe_ip_spacing_tdd,
@@ -18167,11 +18167,11 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_otdoaUtraMeasurement,
-      { "otdoaUtraMeasurement", "lppe.otdoaUtraMeasurement",
+      { "otdoaUtraMeasurement", "lppe.otdoaUtraMeasurement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_Measurement", HFILL }},
     { &hf_lppe_timeStampData,
-      { "timeStampData", "lppe.timeStampData",
+      { "timeStampData", "lppe.timeStampData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_TimeStampData", HFILL }},
     { &hf_lppe_modeSpecificInfoMeas,
@@ -18179,19 +18179,19 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_modeSpecificInfoMeas_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_fdd_03,
-      { "fdd", "lppe.fdd",
+      { "fdd", "lppe.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_03", HFILL }},
     { &hf_lppe_referenceCellIdentity,
-      { "referenceCellIdentity", "lppe.referenceCellIdentity",
+      { "referenceCellIdentity", "lppe.referenceCellIdentity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_PrimaryCPICH_Info", HFILL }},
     { &hf_lppe_ue_RX_TX_TimeDifferenceType2Info,
-      { "ue-RX-TX-TimeDifferenceType2Info", "lppe.ue_RX_TX_TimeDifferenceType2Info",
+      { "ue-RX-TX-TimeDifferenceType2Info", "lppe.ue_RX_TX_TimeDifferenceType2Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_UE_RX_TX_TimeDifferenceType2Info", HFILL }},
     { &hf_lppe_tdd_03,
-      { "tdd", "lppe.tdd",
+      { "tdd", "lppe.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_03", HFILL }},
     { &hf_lppe_neighborList,
@@ -18203,11 +18203,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_TimeDifferenceType2", HFILL }},
     { &hf_lppe_neighborQuality,
-      { "neighborQuality", "lppe.neighborQuality",
+      { "neighborQuality", "lppe.neighborQuality_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_NeighborQuality", HFILL }},
     { &hf_lppe_OMA_LPPe_OTDOA_UTRA_NeighborList_item,
-      { "OMA-LPPe-OTDOA-UTRA-Neighbor", "lppe.OMA_LPPe_OTDOA_UTRA_Neighbor",
+      { "OMA-LPPe-OTDOA-UTRA-Neighbor", "lppe.OMA_LPPe_OTDOA_UTRA_Neighbor_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_modeSpecificInfo_03,
@@ -18215,19 +18215,19 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_modeSpecificInfo_03_vals), 0,
         "T_modeSpecificInfo_03", HFILL }},
     { &hf_lppe_fdd_04,
-      { "fdd", "lppe.fdd",
+      { "fdd", "lppe.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_04", HFILL }},
     { &hf_lppe_neighborIdentity_01,
-      { "neighborIdentity", "lppe.neighborIdentity",
+      { "neighborIdentity", "lppe.neighborIdentity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_PrimaryCPICH_Info", HFILL }},
     { &hf_lppe_ue_RX_TX_timeDifferenceType2Info,
-      { "ue-RX-TX-timeDifferenceType2Info", "lppe.ue_RX_TX_timeDifferenceType2Info",
+      { "ue-RX-TX-timeDifferenceType2Info", "lppe.ue_RX_TX_timeDifferenceType2Info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_UE_RX_TX_TimeDifferenceType2Info", HFILL }},
     { &hf_lppe_tdd_04,
-      { "tdd", "lppe.tdd",
+      { "tdd", "lppe.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_04", HFILL }},
     { &hf_lppe_uarfcn,
@@ -18239,7 +18239,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_SFN_SFN_ObsTimeDifference2", HFILL }},
     { &hf_lppe_quality_01,
-      { "quality", "lppe.quality",
+      { "quality", "lppe.quality_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_Quality", HFILL }},
     { &hf_lppe_numberOfOTDOA_Measurements,
@@ -18251,7 +18251,7 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_5", HFILL }},
     { &hf_lppe_utraCellGlobalID,
-      { "utraCellGlobalID", "lppe.utraCellGlobalID",
+      { "utraCellGlobalID", "lppe.utraCellGlobalID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellGlobalIdEUTRA_AndUTRA", HFILL }},
     { &hf_lppe_nonUniqueCellID,
@@ -18279,11 +18279,11 @@ void proto_register_lppe(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lppe_locationServerErrorCauses_02,
-      { "locationServerErrorCauses", "lppe.locationServerErrorCauses",
+      { "locationServerErrorCauses", "lppe.locationServerErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_LocationServerErrorCauses", HFILL }},
     { &hf_lppe_targetDeviceErrorCauses_02,
-      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses",
+      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_OTDOA_UTRA_TargetDeviceErrorCauses", HFILL }},
     { &hf_lppe_cause_04,
@@ -18315,7 +18315,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxLTENetworks_OF_OMA_LPPe_ECID_LTE_NetworkData", HFILL }},
     { &hf_lppe_ecid_LTE_NetworkData_item,
-      { "OMA-LPPe-ECID-LTE-NetworkData", "lppe.OMA_LPPe_ECID_LTE_NetworkData",
+      { "OMA-LPPe-ECID-LTE-NetworkData", "lppe.OMA_LPPe_ECID_LTE_NetworkData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_LTE_Error,
@@ -18323,7 +18323,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_ECID_LTE_Error_vals), 0,
         "OMA_LPPe_ECID_LTE_Error", HFILL }},
     { &hf_lppe_plmn_Identity,
-      { "plmn-Identity", "lppe.plmn_Identity",
+      { "plmn-Identity", "lppe.plmn_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mcc,
@@ -18347,7 +18347,7 @@ void proto_register_lppe(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lppe_reference_location,
-      { "reference-location", "lppe.reference_location",
+      { "reference-location", "lppe.reference_location_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ReferencePoint", HFILL }},
     { &hf_lppe_ecid_lte_eNodeB_list,
@@ -18355,7 +18355,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxLTEeNBs_OF_OMA_LPPe_ECID_LTE_eNodeBData", HFILL }},
     { &hf_lppe_ecid_lte_eNodeB_list_item,
-      { "OMA-LPPe-ECID-LTE-eNodeBData", "lppe.OMA_LPPe_ECID_LTE_eNodeBData",
+      { "OMA-LPPe-ECID-LTE-eNodeBData", "lppe.OMA_LPPe_ECID_LTE_eNodeBData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_lte_HeNB_list,
@@ -18363,7 +18363,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxLTEHeNBs_OF_OMA_LPPe_ECID_LTE_HeNBData", HFILL }},
     { &hf_lppe_ecid_lte_HeNB_list_item,
-      { "OMA-LPPe-ECID-LTE-HeNBData", "lppe.OMA_LPPe_ECID_LTE_HeNBData",
+      { "OMA-LPPe-ECID-LTE-HeNBData", "lppe.OMA_LPPe_ECID_LTE_HeNBData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_lte_eNodeB_CellData,
@@ -18371,15 +18371,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxLTEMacroCells_OF_OMA_LPPe_ECID_LTE_CellData", HFILL }},
     { &hf_lppe_ecid_lte_eNodeB_CellData_item,
-      { "OMA-LPPe-ECID-LTE-CellData", "lppe.OMA_LPPe_ECID_LTE_CellData",
+      { "OMA-LPPe-ECID-LTE-CellData", "lppe.OMA_LPPe_ECID_LTE_CellData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_coverageArea,
-      { "coverageArea", "lppe.coverageArea",
+      { "coverageArea", "lppe.coverageArea_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLANFemtoCoverageArea", HFILL }},
     { &hf_lppe_ecid_lte_HeNB_CellData,
-      { "ecid-lte-HeNB-CellData", "lppe.ecid_lte_HeNB_CellData",
+      { "ecid-lte-HeNB-CellData", "lppe.ecid_lte_HeNB_CellData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_LTE_CellData", HFILL }},
     { &hf_lppe_cellIdentity_01,
@@ -18427,11 +18427,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxLTEECIDSize_OF_OMA_LPPe_ECID_LTE_LocationInformationList", HFILL }},
     { &hf_lppe_ecid_LTE_CombinedLocationInformation_item,
-      { "OMA-LPPe-ECID-LTE-LocationInformationList", "lppe.OMA_LPPe_ECID_LTE_LocationInformationList",
+      { "OMA-LPPe-ECID-LTE-LocationInformationList", "lppe.OMA_LPPe_ECID_LTE_LocationInformationList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_LTE_LocationInformation,
-      { "ecid-LTE-LocationInformation", "lppe.ecid_LTE_LocationInformation",
+      { "ecid-LTE-LocationInformation", "lppe.ecid_LTE_LocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_LTE_LocationInformation", HFILL }},
     { &hf_lppe_relativeTimeStamp,
@@ -18443,7 +18443,7 @@ void proto_register_lppe(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lppe_lpp_ECID_SignalMeasurementInformation,
-      { "lpp-ECID-SignalMeasurementInformation", "lppe.lpp_ECID_SignalMeasurementInformation",
+      { "lpp-ECID-SignalMeasurementInformation", "lppe.lpp_ECID_SignalMeasurementInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ECID_SignalMeasurementInformation", HFILL }},
     { &hf_lppe_requestedMeasurements,
@@ -18463,11 +18463,11 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_locationServerErrorCauses_03,
-      { "locationServerErrorCauses", "lppe.locationServerErrorCauses",
+      { "locationServerErrorCauses", "lppe.locationServerErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_LTE_LocationServerErrorCauses", HFILL }},
     { &hf_lppe_targetDeviceErrorCauses_03,
-      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses",
+      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_LTE_TargetDeviceErrorCauses", HFILL }},
     { &hf_lppe_cause_06,
@@ -18475,71 +18475,71 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_cause_06_vals), 0,
         "T_cause_06", HFILL }},
     { &hf_lppe_eNodeBMandatoryDataUnavailable,
-      { "eNodeBMandatoryDataUnavailable", "lppe.eNodeBMandatoryDataUnavailable",
+      { "eNodeBMandatoryDataUnavailable", "lppe.eNodeBMandatoryDataUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_eNodeBLocationsUnavailable,
-      { "eNodeBLocationsUnavailable", "lppe.eNodeBLocationsUnavailable",
+      { "eNodeBLocationsUnavailable", "lppe.eNodeBLocationsUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_eNodeBcellTransmitPowerUnavailable,
-      { "eNodeBcellTransmitPowerUnavailable", "lppe.eNodeBcellTransmitPowerUnavailable",
+      { "eNodeBcellTransmitPowerUnavailable", "lppe.eNodeBcellTransmitPowerUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_eNodeBcellAntennaPortConfigUnavailable,
-      { "eNodeBcellAntennaPortConfigUnavailable", "lppe.eNodeBcellAntennaPortConfigUnavailable",
+      { "eNodeBcellAntennaPortConfigUnavailable", "lppe.eNodeBcellAntennaPortConfigUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_eNodeBcallAntennaGainUnavailable,
-      { "eNodeBcallAntennaGainUnavailable", "lppe.eNodeBcallAntennaGainUnavailable",
+      { "eNodeBcallAntennaGainUnavailable", "lppe.eNodeBcallAntennaGainUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_eNodeBcellBeamWidthUnavailable,
-      { "eNodeBcellBeamWidthUnavailable", "lppe.eNodeBcellBeamWidthUnavailable",
+      { "eNodeBcellBeamWidthUnavailable", "lppe.eNodeBcellBeamWidthUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_eNodeBcellTransmitDirectionUnavailable,
-      { "eNodeBcellTransmitDirectionUnavailable", "lppe.eNodeBcellTransmitDirectionUnavailable",
+      { "eNodeBcellTransmitDirectionUnavailable", "lppe.eNodeBcellTransmitDirectionUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_eNodeBcellFrequencyAccuracyUnavailable,
-      { "eNodeBcellFrequencyAccuracyUnavailable", "lppe.eNodeBcellFrequencyAccuracyUnavailable",
+      { "eNodeBcellFrequencyAccuracyUnavailable", "lppe.eNodeBcellFrequencyAccuracyUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_eNodeBnonservingADUnavailable,
-      { "eNodeBnonservingADUnavailable", "lppe.eNodeBnonservingADUnavailable",
+      { "eNodeBnonservingADUnavailable", "lppe.eNodeBnonservingADUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_heNBMandatoryDataUnavailable,
-      { "heNBMandatoryDataUnavailable", "lppe.heNBMandatoryDataUnavailable",
+      { "heNBMandatoryDataUnavailable", "lppe.heNBMandatoryDataUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_heNBLocationUnavailable,
-      { "heNBLocationUnavailable", "lppe.heNBLocationUnavailable",
+      { "heNBLocationUnavailable", "lppe.heNBLocationUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_heNBLocationReliabilityUnavailable,
-      { "heNBLocationReliabilityUnavailable", "lppe.heNBLocationReliabilityUnavailable",
+      { "heNBLocationReliabilityUnavailable", "lppe.heNBLocationReliabilityUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_heNBcellTransmitPowerUnavailable,
-      { "heNBcellTransmitPowerUnavailable", "lppe.heNBcellTransmitPowerUnavailable",
+      { "heNBcellTransmitPowerUnavailable", "lppe.heNBcellTransmitPowerUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_heNBcellAntennaPortConfigUnavailable,
-      { "heNBcellAntennaPortConfigUnavailable", "lppe.heNBcellAntennaPortConfigUnavailable",
+      { "heNBcellAntennaPortConfigUnavailable", "lppe.heNBcellAntennaPortConfigUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_heNBcellFrequencyAccuracyUnavailable,
-      { "heNBcellFrequencyAccuracyUnavailable", "lppe.heNBcellFrequencyAccuracyUnavailable",
+      { "heNBcellFrequencyAccuracyUnavailable", "lppe.heNBcellFrequencyAccuracyUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_heNBCoverageAreaUnavailable,
-      { "heNBCoverageAreaUnavailable", "lppe.heNBCoverageAreaUnavailable",
+      { "heNBCoverageAreaUnavailable", "lppe.heNBCoverageAreaUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_heNBnonservingADUnavailable,
-      { "heNBnonservingADUnavailable", "lppe.heNBnonservingADUnavailable",
+      { "heNBnonservingADUnavailable", "lppe.heNBnonservingADUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_cause_07,
@@ -18547,23 +18547,23 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_cause_07_vals), 0,
         "T_cause_07", HFILL }},
     { &hf_lppe_rsrpMeasurementNotPossible,
-      { "rsrpMeasurementNotPossible", "lppe.rsrpMeasurementNotPossible",
+      { "rsrpMeasurementNotPossible", "lppe.rsrpMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_rsrqMeasurementNotPossible,
-      { "rsrqMeasurementNotPossible", "lppe.rsrqMeasurementNotPossible",
+      { "rsrqMeasurementNotPossible", "lppe.rsrqMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ueRxTxMeasurementNotPossible,
-      { "ueRxTxMeasurementNotPossible", "lppe.ueRxTxMeasurementNotPossible",
+      { "ueRxTxMeasurementNotPossible", "lppe.ueRxTxMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_non_servingMeasurementsNotAvailable,
-      { "non-servingMeasurementsNotAvailable", "lppe.non_servingMeasurementsNotAvailable",
+      { "non-servingMeasurementsNotAvailable", "lppe.non_servingMeasurementsNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_historicMeasurementsNotAvailable,
-      { "historicMeasurementsNotAvailable", "lppe.historicMeasurementsNotAvailable",
+      { "historicMeasurementsNotAvailable", "lppe.historicMeasurementsNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_gsm_NetworkData,
@@ -18571,7 +18571,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxGSMNetworks_OF_OMA_LPPe_ECID_GSM_NetworkData", HFILL }},
     { &hf_lppe_ecid_gsm_NetworkData_item,
-      { "OMA-LPPe-ECID-GSM-NetworkData", "lppe.OMA_LPPe_ECID_GSM_NetworkData",
+      { "OMA-LPPe-ECID-GSM-NetworkData", "lppe.OMA_LPPe_ECID_GSM_NetworkData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_gsm_Error,
@@ -18579,7 +18579,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_ECID_GSM_Error_vals), 0,
         "OMA_LPPe_ECID_GSM_Error", HFILL }},
     { &hf_lppe_plmn_Identity_01,
-      { "plmn-Identity", "lppe.plmn_Identity",
+      { "plmn-Identity", "lppe.plmn_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_plmn_Identity_01", HFILL }},
     { &hf_lppe_mcc_01,
@@ -18595,7 +18595,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxGSMBaseStations_OF_OMA_LPPe_ECID_GSM_BaseStationData", HFILL }},
     { &hf_lppe_base_station_list_item,
-      { "OMA-LPPe-ECID-GSM-BaseStationData", "lppe.OMA_LPPe_ECID_GSM_BaseStationData",
+      { "OMA-LPPe-ECID-GSM-BaseStationData", "lppe.OMA_LPPe_ECID_GSM_BaseStationData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_gsm_CellData,
@@ -18603,15 +18603,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxGSMCells_OF_OMA_LPPe_ECID_GSM_CellData", HFILL }},
     { &hf_lppe_ecid_gsm_CellData_item,
-      { "OMA-LPPe-ECID-GSM-CellData", "lppe.OMA_LPPe_ECID_GSM_CellData",
+      { "OMA-LPPe-ECID-GSM-CellData", "lppe.OMA_LPPe_ECID_GSM_CellData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_cellNonUniqueIDGERAN,
-      { "cellNonUniqueIDGERAN", "lppe.cellNonUniqueIDGERAN",
+      { "cellNonUniqueIDGERAN", "lppe.cellNonUniqueIDGERAN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CellNonUniqueIDGERAN", HFILL }},
     { &hf_lppe_cellLocalIDGERAN,
-      { "cellLocalIDGERAN", "lppe.cellLocalIDGERAN",
+      { "cellLocalIDGERAN", "lppe.cellLocalIDGERAN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_CellLocalIdGERAN", HFILL }},
     { &hf_lppe_transmit_power,
@@ -18627,7 +18627,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxGSMECIDSize_OF_OMA_LPPe_ECID_GSM_LocationInformationList", HFILL }},
     { &hf_lppe_ecid_GSM_CombinedLocationInformation_item,
-      { "OMA-LPPe-ECID-GSM-LocationInformationList", "lppe.OMA_LPPe_ECID_GSM_LocationInformationList",
+      { "OMA-LPPe-ECID-GSM-LocationInformationList", "lppe.OMA_LPPe_ECID_GSM_LocationInformationList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_GSM_Error,
@@ -18635,11 +18635,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_ECID_GSM_Error_vals), 0,
         "OMA_LPPe_ECID_GSM_Error", HFILL }},
     { &hf_lppe_ecid_GSM_LocationInformation,
-      { "ecid-GSM-LocationInformation", "lppe.ecid_GSM_LocationInformation",
+      { "ecid-GSM-LocationInformation", "lppe.ecid_GSM_LocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_GSM_LocationInformation", HFILL }},
     { &hf_lppe_cellGlobalIdGERAN,
-      { "cellGlobalIdGERAN", "lppe.cellGlobalIdGERAN",
+      { "cellGlobalIdGERAN", "lppe.cellGlobalIdGERAN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_rxLevel,
@@ -18655,7 +18655,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_NMR_GERAN", HFILL }},
     { &hf_lppe_OMA_LPPe_NMR_GERAN_item,
-      { "OMA-LPPe-NMR-GERAN item", "lppe.OMA_LPPe_NMR_GERAN_item",
+      { "OMA-LPPe-NMR-GERAN item", "lppe.OMA_LPPe_NMR_GERAN_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_requestedMeasurements_01,
@@ -18671,11 +18671,11 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_locationServerErrorCauses_04,
-      { "locationServerErrorCauses", "lppe.locationServerErrorCauses",
+      { "locationServerErrorCauses", "lppe.locationServerErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_GSM_LocationServerErrorCauses", HFILL }},
     { &hf_lppe_targetDeviceErrorCauses_04,
-      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses",
+      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_GSM_TargetDeviceErrorCauses", HFILL }},
     { &hf_lppe_cause_08,
@@ -18683,35 +18683,35 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_cause_08_vals), 0,
         "T_cause_08", HFILL }},
     { &hf_lppe_mandatoryDataUnavailable,
-      { "mandatoryDataUnavailable", "lppe.mandatoryDataUnavailable",
+      { "mandatoryDataUnavailable", "lppe.mandatoryDataUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_bsLocationsUnavailable,
-      { "bsLocationsUnavailable", "lppe.bsLocationsUnavailable",
+      { "bsLocationsUnavailable", "lppe.bsLocationsUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_cellTransmitPowerUnavailable,
-      { "cellTransmitPowerUnavailable", "lppe.cellTransmitPowerUnavailable",
+      { "cellTransmitPowerUnavailable", "lppe.cellTransmitPowerUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_callAntennaGainUnavailable,
-      { "callAntennaGainUnavailable", "lppe.callAntennaGainUnavailable",
+      { "callAntennaGainUnavailable", "lppe.callAntennaGainUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_cellBeamWidthUnavailable,
-      { "cellBeamWidthUnavailable", "lppe.cellBeamWidthUnavailable",
+      { "cellBeamWidthUnavailable", "lppe.cellBeamWidthUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_cellTransmitDirectionUnavailable,
-      { "cellTransmitDirectionUnavailable", "lppe.cellTransmitDirectionUnavailable",
+      { "cellTransmitDirectionUnavailable", "lppe.cellTransmitDirectionUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_cellFrequencyAccuracyUnavailable,
-      { "cellFrequencyAccuracyUnavailable", "lppe.cellFrequencyAccuracyUnavailable",
+      { "cellFrequencyAccuracyUnavailable", "lppe.cellFrequencyAccuracyUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nonservingADUnavailable,
-      { "nonservingADUnavailable", "lppe.nonservingADUnavailable",
+      { "nonservingADUnavailable", "lppe.nonservingADUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_cause_09,
@@ -18719,15 +18719,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_cause_09_vals), 0,
         "T_cause_09", HFILL }},
     { &hf_lppe_rxLevelMeasurementNotPossible,
-      { "rxLevelMeasurementNotPossible", "lppe.rxLevelMeasurementNotPossible",
+      { "rxLevelMeasurementNotPossible", "lppe.rxLevelMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_taMeasurementNotPossible,
-      { "taMeasurementNotPossible", "lppe.taMeasurementNotPossible",
+      { "taMeasurementNotPossible", "lppe.taMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nMRMeasurementNotPossible,
-      { "nMRMeasurementNotPossible", "lppe.nMRMeasurementNotPossible",
+      { "nMRMeasurementNotPossible", "lppe.nMRMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_UTRA_NetworkData,
@@ -18735,7 +18735,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxUTRANetworks_OF_OMA_LPPe_ECID_UTRA_NetworkData", HFILL }},
     { &hf_lppe_ecid_UTRA_NetworkData_item,
-      { "OMA-LPPe-ECID-UTRA-NetworkData", "lppe.OMA_LPPe_ECID_UTRA_NetworkData",
+      { "OMA-LPPe-ECID-UTRA-NetworkData", "lppe.OMA_LPPe_ECID_UTRA_NetworkData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_UTRA_Error,
@@ -18743,7 +18743,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_ECID_UTRA_Error_vals), 0,
         "OMA_LPPe_ECID_UTRA_Error", HFILL }},
     { &hf_lppe_plmn_Identity_02,
-      { "plmn-Identity", "lppe.plmn_Identity",
+      { "plmn-Identity", "lppe.plmn_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_plmn_Identity_02", HFILL }},
     { &hf_lppe_mcc_02,
@@ -18759,7 +18759,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxUTRAnodeBs_OF_OMA_LPPe_ECID_UTRA_NodeBData", HFILL }},
     { &hf_lppe_ecid_utra_nodeB_list_item,
-      { "OMA-LPPe-ECID-UTRA-NodeBData", "lppe.OMA_LPPe_ECID_UTRA_NodeBData",
+      { "OMA-LPPe-ECID-UTRA-NodeBData", "lppe.OMA_LPPe_ECID_UTRA_NodeBData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_utra_HNB_list,
@@ -18767,7 +18767,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxUTRAHNBs_OF_OMA_LPPe_ECID_UTRA_HNBData", HFILL }},
     { &hf_lppe_ecid_utra_HNB_list_item,
-      { "OMA-LPPe-ECID-UTRA-HNBData", "lppe.OMA_LPPe_ECID_UTRA_HNBData",
+      { "OMA-LPPe-ECID-UTRA-HNBData", "lppe.OMA_LPPe_ECID_UTRA_HNBData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_utra_nodeB_CellData,
@@ -18775,11 +18775,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxUTRAMacroCells_OF_OMA_LPPe_ECID_UTRA_CellData", HFILL }},
     { &hf_lppe_ecid_utra_nodeB_CellData_item,
-      { "OMA-LPPe-ECID-UTRA-CellData", "lppe.OMA_LPPe_ECID_UTRA_CellData",
+      { "OMA-LPPe-ECID-UTRA-CellData", "lppe.OMA_LPPe_ECID_UTRA_CellData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_utra_HNB_CellData,
-      { "ecid-utra-HNB-CellData", "lppe.ecid_utra_HNB_CellData",
+      { "ecid-utra-HNB-CellData", "lppe.ecid_utra_HNB_CellData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_UTRA_CellData", HFILL }},
     { &hf_lppe_cellIdentity_02,
@@ -18791,7 +18791,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_modeSpecificInfo_04_vals), 0,
         "T_modeSpecificInfo_04", HFILL }},
     { &hf_lppe_fdd_05,
-      { "fdd", "lppe.fdd",
+      { "fdd", "lppe.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_05", HFILL }},
     { &hf_lppe_primaryCPICH_Scrambling_Code,
@@ -18807,7 +18807,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ARFCN_ValueUTRA", HFILL }},
     { &hf_lppe_tdd_05,
-      { "tdd", "lppe.tdd",
+      { "tdd", "lppe.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_05", HFILL }},
     { &hf_lppe_primaryCCPCH_Tx_Power,
@@ -18831,7 +18831,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxECIDUTRASize_OF_OMA_LPPe_ECID_UTRA_LocationInformationList", HFILL }},
     { &hf_lppe_ecid_UTRA_CombinedLocationInformation_item,
-      { "OMA-LPPe-ECID-UTRA-LocationInformationList", "lppe.OMA_LPPe_ECID_UTRA_LocationInformationList",
+      { "OMA-LPPe-ECID-UTRA-LocationInformationList", "lppe.OMA_LPPe_ECID_UTRA_LocationInformationList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_Error,
@@ -18839,11 +18839,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_ECID_UTRA_Error_vals), 0,
         "OMA_LPPe_ECID_UTRA_Error", HFILL }},
     { &hf_lppe_ecid_utra_LocationInformation,
-      { "ecid-utra-LocationInformation", "lppe.ecid_utra_LocationInformation",
+      { "ecid-utra-LocationInformation", "lppe.ecid_utra_LocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_UTRA_LocationInformation", HFILL }},
     { &hf_lppe_cellGlobalIdUTRA,
-      { "cellGlobalIdUTRA", "lppe.cellGlobalIdUTRA",
+      { "cellGlobalIdUTRA", "lppe.cellGlobalIdUTRA_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CellGlobalIdEUTRA_AndUTRA", HFILL }},
     { &hf_lppe_measuredResultsList,
@@ -18851,7 +18851,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_ECID_UTRA_MeasuredResultsList", HFILL }},
     { &hf_lppe_utratimingAdvance,
-      { "utratimingAdvance", "lppe.utratimingAdvance",
+      { "utratimingAdvance", "lppe.utratimingAdvance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_UTRA_UTRATimingAdvance", HFILL }},
     { &hf_lppe_tA_01,
@@ -18871,11 +18871,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_UTRA_ModeSpecificInfo_vals), 0,
         "OMA_LPPe_UTRA_ModeSpecificInfo", HFILL }},
     { &hf_lppe_fdd_06,
-      { "fdd", "lppe.fdd",
+      { "fdd", "lppe.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_UTRA_FrequencyInfoFDD", HFILL }},
     { &hf_lppe_tdd_06,
-      { "tdd", "lppe.tdd",
+      { "tdd", "lppe.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_UTRA_FrequencyInfoTDD", HFILL }},
     { &hf_lppe_uarfcn_UL,
@@ -18891,7 +18891,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ARFCN_ValueUTRA", HFILL }},
     { &hf_lppe_OMA_LPPe_ECID_UTRA_MeasuredResultsList_item,
-      { "OMA-LPPe-ECID-UTRA-MeasuredResults", "lppe.OMA_LPPe_ECID_UTRA_MeasuredResults",
+      { "OMA-LPPe-ECID-UTRA-MeasuredResults", "lppe.OMA_LPPe_ECID_UTRA_MeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_utra_CarrierRSSI,
@@ -18903,7 +18903,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_ECID_UTRA_CellMeasuredResultsList", HFILL }},
     { &hf_lppe_OMA_LPPe_ECID_UTRA_CellMeasuredResultsList_item,
-      { "OMA-LPPe-ECID-UTRA-CellMeasuredResults", "lppe.OMA_LPPe_ECID_UTRA_CellMeasuredResults",
+      { "OMA-LPPe-ECID-UTRA-CellMeasuredResults", "lppe.OMA_LPPe_ECID_UTRA_CellMeasuredResults_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_modeSpecificInfo_06,
@@ -18911,7 +18911,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_modeSpecificInfo_05_vals), 0,
         "T_modeSpecificInfo_05", HFILL }},
     { &hf_lppe_fdd_07,
-      { "fdd", "lppe.fdd",
+      { "fdd", "lppe.fdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fdd_06", HFILL }},
     { &hf_lppe_primaryCPICH_Info,
@@ -18931,7 +18931,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_ECID_UTRA_Pathloss", HFILL }},
     { &hf_lppe_tdd_07,
-      { "tdd", "lppe.tdd",
+      { "tdd", "lppe.tdd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_tdd_06", HFILL }},
     { &hf_lppe_primaryCCPCH_RSCP,
@@ -18955,11 +18955,11 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_locationServerErrorCauses_05,
-      { "locationServerErrorCauses", "lppe.locationServerErrorCauses",
+      { "locationServerErrorCauses", "lppe.locationServerErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_UTRA_LocationServerErrorCauses", HFILL }},
     { &hf_lppe_targetDeviceErrorCauses_05,
-      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses",
+      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_UTRA_TargetDeviceErrorCauses", HFILL }},
     { &hf_lppe_cause_10,
@@ -18967,63 +18967,63 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_cause_10_vals), 0,
         "T_cause_10", HFILL }},
     { &hf_lppe_nodeBMandatoryDataUnavailable,
-      { "nodeBMandatoryDataUnavailable", "lppe.nodeBMandatoryDataUnavailable",
+      { "nodeBMandatoryDataUnavailable", "lppe.nodeBMandatoryDataUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nodeBLocationUnavailable,
-      { "nodeBLocationUnavailable", "lppe.nodeBLocationUnavailable",
+      { "nodeBLocationUnavailable", "lppe.nodeBLocationUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nodeBcellTransmitPowerUnavailable,
-      { "nodeBcellTransmitPowerUnavailable", "lppe.nodeBcellTransmitPowerUnavailable",
+      { "nodeBcellTransmitPowerUnavailable", "lppe.nodeBcellTransmitPowerUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nodeBcallAntennaGainUnavailable,
-      { "nodeBcallAntennaGainUnavailable", "lppe.nodeBcallAntennaGainUnavailable",
+      { "nodeBcallAntennaGainUnavailable", "lppe.nodeBcallAntennaGainUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nodeBcellBeamWidthUnavailable,
-      { "nodeBcellBeamWidthUnavailable", "lppe.nodeBcellBeamWidthUnavailable",
+      { "nodeBcellBeamWidthUnavailable", "lppe.nodeBcellBeamWidthUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nodeBcellTransmitDirectionUnavailable,
-      { "nodeBcellTransmitDirectionUnavailable", "lppe.nodeBcellTransmitDirectionUnavailable",
+      { "nodeBcellTransmitDirectionUnavailable", "lppe.nodeBcellTransmitDirectionUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nodeBcellFrequencyAccuracyUnavailable,
-      { "nodeBcellFrequencyAccuracyUnavailable", "lppe.nodeBcellFrequencyAccuracyUnavailable",
+      { "nodeBcellFrequencyAccuracyUnavailable", "lppe.nodeBcellFrequencyAccuracyUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nodeBnonservingADUnavailable,
-      { "nodeBnonservingADUnavailable", "lppe.nodeBnonservingADUnavailable",
+      { "nodeBnonservingADUnavailable", "lppe.nodeBnonservingADUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_hNBMandatoryDataUnavailable,
-      { "hNBMandatoryDataUnavailable", "lppe.hNBMandatoryDataUnavailable",
+      { "hNBMandatoryDataUnavailable", "lppe.hNBMandatoryDataUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_hNBLocationUnavailable,
-      { "hNBLocationUnavailable", "lppe.hNBLocationUnavailable",
+      { "hNBLocationUnavailable", "lppe.hNBLocationUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_hNBLocationReliabilityUnavailable,
-      { "hNBLocationReliabilityUnavailable", "lppe.hNBLocationReliabilityUnavailable",
+      { "hNBLocationReliabilityUnavailable", "lppe.hNBLocationReliabilityUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_hNBcellTransmitPowerUnavailable,
-      { "hNBcellTransmitPowerUnavailable", "lppe.hNBcellTransmitPowerUnavailable",
+      { "hNBcellTransmitPowerUnavailable", "lppe.hNBcellTransmitPowerUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_hNBcellFrequencyAccuracyUnavailable,
-      { "hNBcellFrequencyAccuracyUnavailable", "lppe.hNBcellFrequencyAccuracyUnavailable",
+      { "hNBcellFrequencyAccuracyUnavailable", "lppe.hNBcellFrequencyAccuracyUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_hNBCoverageAreaUnavailable,
-      { "hNBCoverageAreaUnavailable", "lppe.hNBCoverageAreaUnavailable",
+      { "hNBCoverageAreaUnavailable", "lppe.hNBCoverageAreaUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_hNBnonservingADUnavailable,
-      { "hNBnonservingADUnavailable", "lppe.hNBnonservingADUnavailable",
+      { "hNBnonservingADUnavailable", "lppe.hNBnonservingADUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_cause_11,
@@ -19031,35 +19031,35 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_cause_11_vals), 0,
         "T_cause_11", HFILL }},
     { &hf_lppe_mRLMeasurementsNotPossible,
-      { "mRLMeasurementsNotPossible", "lppe.mRLMeasurementsNotPossible",
+      { "mRLMeasurementsNotPossible", "lppe.mRLMeasurementsNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_tdd_timingAdvanceMeasurementNotPossible,
-      { "tdd-timingAdvanceMeasurementNotPossible", "lppe.tdd_timingAdvanceMeasurementNotPossible",
+      { "tdd-timingAdvanceMeasurementNotPossible", "lppe.tdd_timingAdvanceMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mRL_utra_CarrierRSSIMeasurementNotPossible,
-      { "mRL-utra-CarrierRSSIMeasurementNotPossible", "lppe.mRL_utra_CarrierRSSIMeasurementNotPossible",
+      { "mRL-utra-CarrierRSSIMeasurementNotPossible", "lppe.mRL_utra_CarrierRSSIMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mRL_FDD_cpich_Ec_N0MeasurementNotPossible,
-      { "mRL-FDD-cpich-Ec-N0MeasurementNotPossible", "lppe.mRL_FDD_cpich_Ec_N0MeasurementNotPossible",
+      { "mRL-FDD-cpich-Ec-N0MeasurementNotPossible", "lppe.mRL_FDD_cpich_Ec_N0MeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mRL_FDD_cpich_RSCPMeasurementNotPossible,
-      { "mRL-FDD-cpich-RSCPMeasurementNotPossible", "lppe.mRL_FDD_cpich_RSCPMeasurementNotPossible",
+      { "mRL-FDD-cpich-RSCPMeasurementNotPossible", "lppe.mRL_FDD_cpich_RSCPMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mRL_FDD_pathlossMeasurementNotPossible,
-      { "mRL-FDD-pathlossMeasurementNotPossible", "lppe.mRL_FDD_pathlossMeasurementNotPossible",
+      { "mRL-FDD-pathlossMeasurementNotPossible", "lppe.mRL_FDD_pathlossMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mRL_TDD_primaryCCPCH_RSCPMeasurementNotPossible,
-      { "mRL-TDD-primaryCCPCH-RSCPMeasurementNotPossible", "lppe.mRL_TDD_primaryCCPCH_RSCPMeasurementNotPossible",
+      { "mRL-TDD-primaryCCPCH-RSCPMeasurementNotPossible", "lppe.mRL_TDD_primaryCCPCH_RSCPMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_mRL_TDD_pathlossMeasurementNotPossible,
-      { "mRL-TDD-pathlossMeasurementNotPossible", "lppe.mRL_TDD_pathlossMeasurementNotPossible",
+      { "mRL-TDD-pathlossMeasurementNotPossible", "lppe.mRL_TDD_pathlossMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_wlan_DataSet,
@@ -19067,7 +19067,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxWLANDataSets_OF_OMA_LPPe_WLAN_DataSet", HFILL }},
     { &hf_lppe_wlan_DataSet_item,
-      { "OMA-LPPe-WLAN-DataSet", "lppe.OMA_LPPe_WLAN_DataSet",
+      { "OMA-LPPe-WLAN-DataSet", "lppe.OMA_LPPe_WLAN_DataSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_wlan_AP_Error,
@@ -19075,7 +19075,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_WLAN_AP_Error_vals), 0,
         "OMA_LPPe_WLAN_AP_Error", HFILL }},
     { &hf_lppe_plmn_Identity_03,
-      { "plmn-Identity", "lppe.plmn_Identity",
+      { "plmn-Identity", "lppe.plmn_Identity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_plmn_Identity_03", HFILL }},
     { &hf_lppe_mcc_03,
@@ -19087,11 +19087,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "T_mnc_03", HFILL }},
     { &hf_lppe_supported_channels_11a,
-      { "supported-channels-11a", "lppe.supported_channels_11a",
+      { "supported-channels-11a", "lppe.supported_channels_11a_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_supported_channels_11bg,
-      { "supported-channels-11bg", "lppe.supported_channels_11bg",
+      { "supported-channels-11bg", "lppe.supported_channels_11bg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_wlan_ap_list,
@@ -19099,7 +19099,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxWLANAPs_OF_OMA_LPPe_WLAN_AP_Data", HFILL }},
     { &hf_lppe_wlan_ap_list_item,
-      { "OMA-LPPe-WLAN-AP-Data", "lppe.OMA_LPPe_WLAN_AP_Data",
+      { "OMA-LPPe-WLAN-AP-Data", "lppe.OMA_LPPe_WLAN_AP_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ch34,
@@ -19223,7 +19223,7 @@ void proto_register_lppe(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lppe_wlan_ap_id,
-      { "wlan-ap-id", "lppe.wlan_ap_id",
+      { "wlan-ap-id", "lppe.wlan_ap_id_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_ID", HFILL }},
     { &hf_lppe_wlan_ap_Type_Data,
@@ -19231,7 +19231,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxWLANTypes_OF_OMA_LPPe_WLAN_AP_Type_Data", HFILL }},
     { &hf_lppe_wlan_ap_Type_Data_item,
-      { "OMA-LPPe-WLAN-AP-Type-Data", "lppe.OMA_LPPe_WLAN_AP_Type_Data",
+      { "OMA-LPPe-WLAN-AP-Type-Data", "lppe.OMA_LPPe_WLAN_AP_Type_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_wlan_AP_Type,
@@ -19251,15 +19251,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxWLANAPSize_OF_OMA_LPPe_WLAN_AP_LocationInformationList", HFILL }},
     { &hf_lppe_wlan_AP_CombinedLocationInformation_item,
-      { "OMA-LPPe-WLAN-AP-LocationInformationList", "lppe.OMA_LPPe_WLAN_AP_LocationInformationList",
+      { "OMA-LPPe-WLAN-AP-LocationInformationList", "lppe.OMA_LPPe_WLAN_AP_LocationInformationList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_wlan_AP_LocationInformation,
-      { "wlan-AP-LocationInformation", "lppe.wlan_AP_LocationInformation",
+      { "wlan-AP-LocationInformation", "lppe.wlan_AP_LocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_LocationInformation", HFILL }},
     { &hf_lppe_apMACAddress,
-      { "apMACAddress", "lppe.apMACAddress",
+      { "apMACAddress", "lppe.apMACAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_ID", HFILL }},
     { &hf_lppe_apSSID,
@@ -19287,7 +19287,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_256", HFILL }},
     { &hf_lppe_apRoundTripDelay,
-      { "apRoundTripDelay", "lppe.apRoundTripDelay",
+      { "apRoundTripDelay", "lppe.apRoundTripDelay_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_RTD", HFILL }},
     { &hf_lppe_ueTransmitPower,
@@ -19299,7 +19299,7 @@ void proto_register_lppe(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M127_128", HFILL }},
     { &hf_lppe_apReportedLocation,
-      { "apReportedLocation", "lppe.apReportedLocation",
+      { "apReportedLocation", "lppe.apReportedLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_ReportedLocation", HFILL }},
     { &hf_lppe_rTDValue,
@@ -19315,7 +19315,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_255", HFILL }},
     { &hf_lppe_locationDataLCI,
-      { "locationDataLCI", "lppe.locationDataLCI",
+      { "locationDataLCI", "lppe.locationDataLCI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_LocationDataLCI", HFILL }},
     { &hf_lppe_latitudeResolution,
@@ -19363,7 +19363,7 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_Type_List", HFILL }},
     { &hf_lppe_ap_Capability,
-      { "ap-Capability", "lppe.ap_Capability",
+      { "ap-Capability", "lppe.ap_Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_Capability", HFILL }},
     { &hf_lppe_wlan_ap_ADSupported,
@@ -19375,11 +19375,11 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_Type_List", HFILL }},
     { &hf_lppe_locationServerErrorCauses_06,
-      { "locationServerErrorCauses", "lppe.locationServerErrorCauses",
+      { "locationServerErrorCauses", "lppe.locationServerErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_LocationServerErrorCauses", HFILL }},
     { &hf_lppe_targetDeviceErrorCauses_06,
-      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses",
+      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_AP_TargetDeviceErrorCauses", HFILL }},
     { &hf_lppe_cause_12,
@@ -19387,27 +19387,27 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_cause_12_vals), 0,
         "T_cause_12", HFILL }},
     { &hf_lppe_apMandatoryDataUnavailable,
-      { "apMandatoryDataUnavailable", "lppe.apMandatoryDataUnavailable",
+      { "apMandatoryDataUnavailable", "lppe.apMandatoryDataUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_apLocationsUnavailable,
-      { "apLocationsUnavailable", "lppe.apLocationsUnavailable",
+      { "apLocationsUnavailable", "lppe.apLocationsUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_apLocationReliabilityUnavailable,
-      { "apLocationReliabilityUnavailable", "lppe.apLocationReliabilityUnavailable",
+      { "apLocationReliabilityUnavailable", "lppe.apLocationReliabilityUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_apTransmitPowerUnavailable,
-      { "apTransmitPowerUnavailable", "lppe.apTransmitPowerUnavailable",
+      { "apTransmitPowerUnavailable", "lppe.apTransmitPowerUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_apAntennaGainUnavailable,
-      { "apAntennaGainUnavailable", "lppe.apAntennaGainUnavailable",
+      { "apAntennaGainUnavailable", "lppe.apAntennaGainUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_apCoverageAreaUnavailable,
-      { "apCoverageAreaUnavailable", "lppe.apCoverageAreaUnavailable",
+      { "apCoverageAreaUnavailable", "lppe.apCoverageAreaUnavailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_cause_13,
@@ -19415,43 +19415,43 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_cause_13_vals), 0,
         "T_cause_13", HFILL }},
     { &hf_lppe_apSSIDnotAvailable,
-      { "apSSIDnotAvailable", "lppe.apSSIDnotAvailable",
+      { "apSSIDnotAvailable", "lppe.apSSIDnotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_apSNMeasurementNotPossible,
-      { "apSNMeasurementNotPossible", "lppe.apSNMeasurementNotPossible",
+      { "apSNMeasurementNotPossible", "lppe.apSNMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_apDevTypeNotAvailable,
-      { "apDevTypeNotAvailable", "lppe.apDevTypeNotAvailable",
+      { "apDevTypeNotAvailable", "lppe.apDevTypeNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_apPhyTypeNotAvailable,
-      { "apPhyTypeNotAvailable", "lppe.apPhyTypeNotAvailable",
+      { "apPhyTypeNotAvailable", "lppe.apPhyTypeNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_apRSSIMeasurementNotPossible,
-      { "apRSSIMeasurementNotPossible", "lppe.apRSSIMeasurementNotPossible",
+      { "apRSSIMeasurementNotPossible", "lppe.apRSSIMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_apChanFreqNotAvailable,
-      { "apChanFreqNotAvailable", "lppe.apChanFreqNotAvailable",
+      { "apChanFreqNotAvailable", "lppe.apChanFreqNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_apRTDMeasurementNotPossible,
-      { "apRTDMeasurementNotPossible", "lppe.apRTDMeasurementNotPossible",
+      { "apRTDMeasurementNotPossible", "lppe.apRTDMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ueTPNotAvailable,
-      { "ueTPNotAvailable", "lppe.ueTPNotAvailable",
+      { "ueTPNotAvailable", "lppe.ueTPNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ueAGNotAvailable,
-      { "ueAGNotAvailable", "lppe.ueAGNotAvailable",
+      { "ueAGNotAvailable", "lppe.ueAGNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_apRecLocNotAvailable,
-      { "apRecLocNotAvailable", "lppe.apRecLocNotAvailable",
+      { "apRecLocNotAvailable", "lppe.apRecLocNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_wimax_CombinedLocationInformation,
@@ -19459,7 +19459,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxWiMaxECIDSize_OF_OMA_LPPe_ECID_WiMax_LocationInformationList", HFILL }},
     { &hf_lppe_ecid_wimax_CombinedLocationInformation_item,
-      { "OMA-LPPe-ECID-WiMax-LocationInformationList", "lppe.OMA_LPPe_ECID_WiMax_LocationInformationList",
+      { "OMA-LPPe-ECID-WiMax-LocationInformationList", "lppe.OMA_LPPe_ECID_WiMax_LocationInformationList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_ecid_wimax_Error,
@@ -19467,15 +19467,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_ECID_WiMax_Error_vals), 0,
         "OMA_LPPe_ECID_WiMax_Error", HFILL }},
     { &hf_lppe_ecid_wimax_LocationInformation,
-      { "ecid-wimax-LocationInformation", "lppe.ecid_wimax_LocationInformation",
+      { "ecid-wimax-LocationInformation", "lppe.ecid_wimax_LocationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_WiMax_LocationInformation", HFILL }},
     { &hf_lppe_wimaxBsID,
-      { "wimaxBsID", "lppe.wimaxBsID",
+      { "wimaxBsID", "lppe.wimaxBsID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_WiMax_WimaxBsID", HFILL }},
     { &hf_lppe_wimaxRTD,
-      { "wimaxRTD", "lppe.wimaxRTD",
+      { "wimaxRTD", "lppe.wimaxRTD_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_WiMax_WimaxRTD", HFILL }},
     { &hf_lppe_wimaxNMRList,
@@ -19499,7 +19499,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_1023", HFILL }},
     { &hf_lppe_OMA_LPPe_ECID_WiMax_WimaxNMRList_item,
-      { "OMA-LPPe-ECID-WiMax-WimaxNMR", "lppe.OMA_LPPe_ECID_WiMax_WimaxNMR",
+      { "OMA-LPPe-ECID-WiMax-WimaxNMR", "lppe.OMA_LPPe_ECID_WiMax_WimaxNMR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_relDelay,
@@ -19531,7 +19531,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_63", HFILL }},
     { &hf_lppe_bSLocation,
-      { "bSLocation", "lppe.bSLocation",
+      { "bSLocation", "lppe.bSLocation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_ReportedLocation", HFILL }},
     { &hf_lppe_requestedMeasurements_04,
@@ -19543,11 +19543,11 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_locationServerErrorCauses_07,
-      { "locationServerErrorCauses", "lppe.locationServerErrorCauses",
+      { "locationServerErrorCauses", "lppe.locationServerErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_WiMax_LocationServerErrorCauses", HFILL }},
     { &hf_lppe_targetDeviceErrorCauses_07,
-      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses",
+      { "targetDeviceErrorCauses", "lppe.targetDeviceErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ECID_WiMax_TargetDeviceErrorCauses", HFILL }},
     { &hf_lppe_cause_14,
@@ -19559,43 +19559,43 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_cause_15_vals), 0,
         "T_cause_15", HFILL }},
     { &hf_lppe_rTDMeasurementNotPossible,
-      { "rTDMeasurementNotPossible", "lppe.rTDMeasurementNotPossible",
+      { "rTDMeasurementNotPossible", "lppe.rTDMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_rTDstdMeasurementNotPossible,
-      { "rTDstdMeasurementNotPossible", "lppe.rTDstdMeasurementNotPossible",
+      { "rTDstdMeasurementNotPossible", "lppe.rTDstdMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nMRrelDelayMeasurementNotPossible,
-      { "nMRrelDelayMeasurementNotPossible", "lppe.nMRrelDelayMeasurementNotPossible",
+      { "nMRrelDelayMeasurementNotPossible", "lppe.nMRrelDelayMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nMRrelDelaystdMeasurementNotPossible,
-      { "nMRrelDelaystdMeasurementNotPossible", "lppe.nMRrelDelaystdMeasurementNotPossible",
+      { "nMRrelDelaystdMeasurementNotPossible", "lppe.nMRrelDelaystdMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nMRrSSIMeasurementNotPossible,
-      { "nMRrSSIMeasurementNotPossible", "lppe.nMRrSSIMeasurementNotPossible",
+      { "nMRrSSIMeasurementNotPossible", "lppe.nMRrSSIMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nMRrSSIstdMeasurementNotPossible,
-      { "nMRrSSIstdMeasurementNotPossible", "lppe.nMRrSSIstdMeasurementNotPossible",
+      { "nMRrSSIstdMeasurementNotPossible", "lppe.nMRrSSIstdMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nMRbSTxPowerMeasurementNotPossible,
-      { "nMRbSTxPowerMeasurementNotPossible", "lppe.nMRbSTxPowerMeasurementNotPossible",
+      { "nMRbSTxPowerMeasurementNotPossible", "lppe.nMRbSTxPowerMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nMRcINRMeasurementNotPossible,
-      { "nMRcINRMeasurementNotPossible", "lppe.nMRcINRMeasurementNotPossible",
+      { "nMRcINRMeasurementNotPossible", "lppe.nMRcINRMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nMRcINRstdMeasurementNotPossible,
-      { "nMRcINRstdMeasurementNotPossible", "lppe.nMRcINRstdMeasurementNotPossible",
+      { "nMRcINRstdMeasurementNotPossible", "lppe.nMRcINRstdMeasurementNotPossible_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_nMRbSLocationNotAvailable,
-      { "nMRbSLocationNotAvailable", "lppe.nMRbSLocationNotAvailable",
+      { "nMRbSLocationNotAvailable", "lppe.nMRbSLocationNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_motionStateList,
@@ -19607,7 +19607,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_Sensor_Error_vals), 0,
         "OMA_LPPe_Sensor_Error", HFILL }},
     { &hf_lppe_OMA_LPPe_Sensor_MotionStateList_item,
-      { "OMA-LPPe-Sensor-MotionStateElement", "lppe.OMA_LPPe_Sensor_MotionStateElement",
+      { "OMA-LPPe-Sensor-MotionStateElement", "lppe.OMA_LPPe_Sensor_MotionStateElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_primaryMotionState,
@@ -19619,23 +19619,23 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_motionStateReq,
-      { "motionStateReq", "lppe.motionStateReq",
+      { "motionStateReq", "lppe.motionStateReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_Sensor_MotionStateRequest", HFILL }},
     { &hf_lppe_secondaryMotionStateRequest,
-      { "secondaryMotionStateRequest", "lppe.secondaryMotionStateRequest",
+      { "secondaryMotionStateRequest", "lppe.secondaryMotionStateRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_motionStateSupport,
-      { "motionStateSupport", "lppe.motionStateSupport",
+      { "motionStateSupport", "lppe.motionStateSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_secondarySupport,
-      { "secondarySupport", "lppe.secondarySupport",
+      { "secondarySupport", "lppe.secondarySupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_targetError,
-      { "targetError", "lppe.targetError",
+      { "targetError", "lppe.targetError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_Sensor_TargetError", HFILL }},
     { &hf_lppe_motionStateError,
@@ -19651,7 +19651,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_srnGroup_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_srnGroupList,
-      { "srnGroupList", "lppe.srnGroupList",
+      { "srnGroupList", "lppe.srnGroupList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_SRNgroupList", HFILL }},
     { &hf_lppe_srnGroupUpdateResponse,
@@ -19671,7 +19671,7 @@ void proto_register_lppe(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_lppe_defaultReferencePoint,
-      { "defaultReferencePoint", "lppe.defaultReferencePoint",
+      { "defaultReferencePoint", "lppe.defaultReferencePoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ReferencePoint", HFILL }},
     { &hf_lppe_groupList,
@@ -19679,23 +19679,23 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_64_OF_OMA_LPPe_SRN_SRNgroup", HFILL }},
     { &hf_lppe_groupList_item,
-      { "OMA-LPPe-SRN-SRNgroup", "lppe.OMA_LPPe_SRN_SRNgroup",
+      { "OMA-LPPe-SRN-SRNgroup", "lppe.OMA_LPPe_SRN_SRNgroup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_srnGroupID,
-      { "srnGroupID", "lppe.srnGroupID",
+      { "srnGroupID", "lppe.srnGroupID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_SRNgroupUniqueID", HFILL }},
     { &hf_lppe_defaultSRNtype,
-      { "defaultSRNtype", "lppe.defaultSRNtype",
+      { "defaultSRNtype", "lppe.defaultSRNtype_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_SRNtype", HFILL }},
     { &hf_lppe_referencePoint_01,
-      { "referencePoint", "lppe.referencePoint",
+      { "referencePoint", "lppe.referencePoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ReferencePoint", HFILL }},
     { &hf_lppe_globalOrientation,
-      { "globalOrientation", "lppe.globalOrientation",
+      { "globalOrientation", "lppe.globalOrientation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_srnsInGroupList,
@@ -19703,19 +19703,19 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_1024_OF_OMA_LPPe_SRN_SRNinfo", HFILL }},
     { &hf_lppe_srnsInGroupList_item,
-      { "OMA-LPPe-SRN-SRNinfo", "lppe.OMA_LPPe_SRN_SRNinfo",
+      { "OMA-LPPe-SRN-SRNinfo", "lppe.OMA_LPPe_SRN_SRNinfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_srnID,
-      { "srnID", "lppe.srnID",
+      { "srnID", "lppe.srnID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_SRNid", HFILL }},
     { &hf_lppe_srnType,
-      { "srnType", "lppe.srnType",
+      { "srnType", "lppe.srnType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_SRNtype", HFILL }},
     { &hf_lppe_relativePosition,
-      { "relativePosition", "lppe.relativePosition",
+      { "relativePosition", "lppe.relativePosition_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_RelativeLocation", HFILL }},
     { &hf_lppe_orientation,
@@ -19723,7 +19723,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_OMA_LPPe_Orientation_vals), 0,
         "OMA_LPPe_Orientation", HFILL }},
     { &hf_lppe_OMA_LPPe_SRN_SRNgroupUpdateResponse_item,
-      { "OMA-LPPe-SRN-SRNgroupUpdateResponseElement", "lppe.OMA_LPPe_SRN_SRNgroupUpdateResponseElement",
+      { "OMA-LPPe-SRN-SRNgroupUpdateResponseElement", "lppe.OMA_LPPe_SRN_SRNgroupUpdateResponseElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_targetDataValidity,
@@ -19731,15 +19731,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_targetDataValidity_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_updatedSRNgroup,
-      { "updatedSRNgroup", "lppe.updatedSRNgroup",
+      { "updatedSRNgroup", "lppe.updatedSRNgroup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_SRNgroup", HFILL }},
     { &hf_lppe_OMA_LPPe_SRN_AntennaPattern_item,
-      { "OMA-LPPe-SRN-AntennaPatternElement", "lppe.OMA_LPPe_SRN_AntennaPatternElement",
+      { "OMA-LPPe-SRN-AntennaPatternElement", "lppe.OMA_LPPe_SRN_AntennaPatternElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_identification,
-      { "identification", "lppe.identification",
+      { "identification", "lppe.identification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_vendorOrOperator,
@@ -19755,7 +19755,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_antennaData_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_antennaPattern_01,
-      { "antennaPattern", "lppe.antennaPattern",
+      { "antennaPattern", "lppe.antennaPattern_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_AntennaPatternForChannels", HFILL }},
     { &hf_lppe_antennaContainer,
@@ -19763,7 +19763,7 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_lppe_evenGrid,
-      { "evenGrid", "lppe.evenGrid",
+      { "evenGrid", "lppe.evenGrid_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_inAzimuth,
@@ -19779,7 +19779,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxChannels_OF_OMA_LPPe_SRN_ChannelResponse", HFILL }},
     { &hf_lppe_patternList_item,
-      { "OMA-LPPe-SRN-ChannelResponse", "lppe.OMA_LPPe_SRN_ChannelResponse",
+      { "OMA-LPPe-SRN-ChannelResponse", "lppe.OMA_LPPe_SRN_ChannelResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_channelNumber,
@@ -19791,7 +19791,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_7_901_OF_OMA_LPPe_SRN_ResponseInElevation", HFILL }},
     { &hf_lppe_responseInElevation_item,
-      { "OMA-LPPe-SRN-ResponseInElevation", "lppe.OMA_LPPe_SRN_ResponseInElevation",
+      { "OMA-LPPe-SRN-ResponseInElevation", "lppe.OMA_LPPe_SRN_ResponseInElevation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_elevation_01,
@@ -19803,7 +19803,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_18_3601_OF_OMA_LPPe_SRN_ResponseInAzimuth", HFILL }},
     { &hf_lppe_responseInAzimuth_item,
-      { "OMA-LPPe-SRN-ResponseInAzimuth", "lppe.OMA_LPPe_SRN_ResponseInAzimuth",
+      { "OMA-LPPe-SRN-ResponseInAzimuth", "lppe.OMA_LPPe_SRN_ResponseInAzimuth_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_azimuth_01,
@@ -19811,7 +19811,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_3599", HFILL }},
     { &hf_lppe_response,
-      { "response", "lppe.response",
+      { "response", "lppe.response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_ComplexNumber", HFILL }},
     { &hf_lppe_amplitude,
@@ -19827,7 +19827,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_srnGroup_01_vals), 0,
         "T_srnGroup_01", HFILL }},
     { &hf_lppe_srnGroupRequest,
-      { "srnGroupRequest", "lppe.srnGroupRequest",
+      { "srnGroupRequest", "lppe.srnGroupRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_SRNgroupRequest", HFILL }},
     { &hf_lppe_srnGroupUpdateRequest,
@@ -19839,11 +19839,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "OMA_LPPe_SRN_AntennaPatternRequest", HFILL }},
     { &hf_lppe_doNotProvideList,
-      { "doNotProvideList", "lppe.doNotProvideList",
+      { "doNotProvideList", "lppe.doNotProvideList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_SRNProvideList", HFILL }},
     { &hf_lppe_doProvideList,
-      { "doProvideList", "lppe.doProvideList",
+      { "doProvideList", "lppe.doProvideList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_SRNProvideList", HFILL }},
     { &hf_lppe_groupList_01,
@@ -19851,7 +19851,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_256_OF_OMA_LPPe_SRN_SRNgroupUniqueID", HFILL }},
     { &hf_lppe_groupList_item_01,
-      { "OMA-LPPe-SRN-SRNgroupUniqueID", "lppe.OMA_LPPe_SRN_SRNgroupUniqueID",
+      { "OMA-LPPe-SRN-SRNgroupUniqueID", "lppe.OMA_LPPe_SRN_SRNgroupUniqueID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_categoryList,
@@ -19859,15 +19859,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_16_OF_OMA_LPPe_SRN_Category", HFILL }},
     { &hf_lppe_categoryList_item,
-      { "OMA-LPPe-SRN-Category", "lppe.OMA_LPPe_SRN_Category",
+      { "OMA-LPPe-SRN-Category", "lppe.OMA_LPPe_SRN_Category_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_SRN_SRNgroupUpdateRequest_item,
-      { "OMA-LPPe-SRN-SRNgroupUpdateRequestElement", "lppe.OMA_LPPe_SRN_SRNgroupUpdateRequestElement",
+      { "OMA-LPPe-SRN-SRNgroupUpdateRequestElement", "lppe.OMA_LPPe_SRN_SRNgroupUpdateRequestElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_provideIndicationOnly,
-      { "provideIndicationOnly", "lppe.provideIndicationOnly",
+      { "provideIndicationOnly", "lppe.provideIndicationOnly_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_inTheGroup,
@@ -19875,15 +19875,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_1024_OF_OMA_LPPe_SRN_SRNid", HFILL }},
     { &hf_lppe_inTheGroup_item,
-      { "OMA-LPPe-SRN-SRNid", "lppe.OMA_LPPe_SRN_SRNid",
+      { "OMA-LPPe-SRN-SRNid", "lppe.OMA_LPPe_SRN_SRNid_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_OMA_LPPe_SRN_AntennaPatternRequest_item,
-      { "OMA-LPPe-SRN-AntennaPatternRequestElement", "lppe.OMA_LPPe_SRN_AntennaPatternRequestElement",
+      { "OMA-LPPe-SRN-AntennaPatternRequestElement", "lppe.OMA_LPPe_SRN_AntennaPatternRequestElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_antennaPatternID_01,
-      { "antennaPatternID", "lppe.antennaPatternID",
+      { "antennaPatternID", "lppe.antennaPatternID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_srnMeasurementList,
@@ -19891,11 +19891,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_64_OF_OMA_LPPe_SRN_MeasurementElement", HFILL }},
     { &hf_lppe_srnMeasurementList_item,
-      { "OMA-LPPe-SRN-MeasurementElement", "lppe.OMA_LPPe_SRN_MeasurementElement",
+      { "OMA-LPPe-SRN-MeasurementElement", "lppe.OMA_LPPe_SRN_MeasurementElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_srnCategory,
-      { "srnCategory", "lppe.srnCategory",
+      { "srnCategory", "lppe.srnCategory_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_Category", HFILL }},
     { &hf_lppe_measurementList,
@@ -19903,7 +19903,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_64_OF_OMA_LPPe_SRN_srnMeasurementElement", HFILL }},
     { &hf_lppe_measurementList_item,
-      { "OMA-LPPe-SRN-srnMeasurementElement", "lppe.OMA_LPPe_SRN_srnMeasurementElement",
+      { "OMA-LPPe-SRN-srnMeasurementElement", "lppe.OMA_LPPe_SRN_srnMeasurementElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_relativeTimeStamp_01,
@@ -19915,7 +19915,7 @@ void proto_register_lppe(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M128_127", HFILL }},
     { &hf_lppe_rtd,
-      { "rtd", "lppe.rtd",
+      { "rtd", "lppe.rtd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_WLAN_RTD", HFILL }},
     { &hf_lppe_requestInfo,
@@ -19923,11 +19923,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_16_OF_OMA_LPPe_SRN_ReqLocInfo_Category", HFILL }},
     { &hf_lppe_requestInfo_item,
-      { "OMA-LPPe-SRN-ReqLocInfo-Category", "lppe.OMA_LPPe_SRN_ReqLocInfo_Category",
+      { "OMA-LPPe-SRN-ReqLocInfo-Category", "lppe.OMA_LPPe_SRN_ReqLocInfo_Category_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_category,
-      { "category", "lppe.category",
+      { "category", "lppe.category_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_Category", HFILL }},
     { &hf_lppe_multipleMeasurements,
@@ -19935,11 +19935,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_multipleMeasurements_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_allowedMeasurements,
-      { "allowedMeasurements", "lppe.allowedMeasurements",
+      { "allowedMeasurements", "lppe.allowedMeasurements_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_MeasurementMask", HFILL }},
     { &hf_lppe_historicMeasurementsRequested,
-      { "historicMeasurementsRequested", "lppe.historicMeasurementsRequested",
+      { "historicMeasurementsRequested", "lppe.historicMeasurementsRequested_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_capabilitiesPerSRNCategory,
@@ -19947,11 +19947,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_16_OF_OMA_LPPe_SRN_ProvideCapabilitiesElement", HFILL }},
     { &hf_lppe_capabilitiesPerSRNCategory_item,
-      { "OMA-LPPe-SRN-ProvideCapabilitiesElement", "lppe.OMA_LPPe_SRN_ProvideCapabilitiesElement",
+      { "OMA-LPPe-SRN-ProvideCapabilitiesElement", "lppe.OMA_LPPe_SRN_ProvideCapabilitiesElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_supportedMeasurements,
-      { "supportedMeasurements", "lppe.supportedMeasurements",
+      { "supportedMeasurements", "lppe.supportedMeasurements_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_MeasurementMask", HFILL }},
     { &hf_lppe_supportedAssistanceData,
@@ -19959,7 +19959,7 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_historicMeasurementsSupported,
-      { "historicMeasurementsSupported", "lppe.historicMeasurementsSupported",
+      { "historicMeasurementsSupported", "lppe.historicMeasurementsSupported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_capabilitiesRequestedFor,
@@ -19967,15 +19967,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_16_OF_OMA_LPPe_SRN_Category", HFILL }},
     { &hf_lppe_capabilitiesRequestedFor_item,
-      { "OMA-LPPe-SRN-Category", "lppe.OMA_LPPe_SRN_Category",
+      { "OMA-LPPe-SRN-Category", "lppe.OMA_LPPe_SRN_Category_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_srnLocationServerErrorCauses,
-      { "srnLocationServerErrorCauses", "lppe.srnLocationServerErrorCauses",
+      { "srnLocationServerErrorCauses", "lppe.srnLocationServerErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_LocationServerErrorCauses", HFILL }},
     { &hf_lppe_srnTargetDeviceErrorCauses,
-      { "srnTargetDeviceErrorCauses", "lppe.srnTargetDeviceErrorCauses",
+      { "srnTargetDeviceErrorCauses", "lppe.srnTargetDeviceErrorCauses_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_TargetDeviceErrorCauses", HFILL }},
     { &hf_lppe_groupErrors,
@@ -19995,7 +19995,7 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_16_OF_OMA_LPPe_SRN_TargetDeviceError", HFILL }},
     { &hf_lppe_srnErrorsPerCategory_item,
-      { "OMA-LPPe-SRN-TargetDeviceError", "lppe.OMA_LPPe_SRN_TargetDeviceError",
+      { "OMA-LPPe-SRN-TargetDeviceError", "lppe.OMA_LPPe_SRN_TargetDeviceError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_srnErrors,
@@ -20003,15 +20003,15 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, VALS(lppe_T_srnErrors_vals), 0,
         NULL, HFILL }},
     { &hf_lppe_rssiNotAvailable,
-      { "rssiNotAvailable", "lppe.rssiNotAvailable",
+      { "rssiNotAvailable", "lppe.rssiNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_rtdNotAvailable,
-      { "rtdNotAvailable", "lppe.rtdNotAvailable",
+      { "rtdNotAvailable", "lppe.rtdNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_multipleSetsNotAvailable,
-      { "multipleSetsNotAvailable", "lppe.multipleSetsNotAvailable",
+      { "multipleSetsNotAvailable", "lppe.multipleSetsNotAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_srnDataVersion,
@@ -20023,7 +20023,7 @@ void proto_register_lppe(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M300_500", HFILL }},
     { &hf_lppe_srnAntennaInfo,
-      { "srnAntennaInfo", "lppe.srnAntennaInfo",
+      { "srnAntennaInfo", "lppe.srnAntennaInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_switchingPatternID,
@@ -20031,11 +20031,11 @@ void proto_register_lppe(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_65535", HFILL }},
     { &hf_lppe_srnTechnologyType,
-      { "srnTechnologyType", "lppe.srnTechnologyType",
+      { "srnTechnologyType", "lppe.srnTechnologyType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OMA_LPPe_SRN_Technologies", HFILL }},
     { &hf_lppe_srnVendorInformation,
-      { "srnVendorInformation", "lppe.srnVendorInformation",
+      { "srnVendorInformation", "lppe.srnVendorInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_vendor,
@@ -20055,7 +20055,7 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_48", HFILL }},
     { &hf_lppe_nfc,
-      { "nfc", "lppe.nfc",
+      { "nfc", "lppe.nfc_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_manufacturer,
@@ -20067,7 +20067,7 @@ void proto_register_lppe(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_48", HFILL }},
     { &hf_lppe_mobileCode,
-      { "mobileCode", "lppe.mobileCode",
+      { "mobileCode", "lppe.mobileCode_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_lppe_registryID,