Regenerate all asn2wrs generated dissectors.

svn path=/trunk/; revision=28379

1 files changed, 59 insertions, 59 deletions

diff --git a/epan/dissectors/packet-pcap.c b/epan/dissectors/packet-pcap.c
index 578631e7eb..37bfeb94fd 100644
--- a/epan/dissectors/packet-pcap.c
+++ b/epan/dissectors/packet-pcap.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-pcap.c                                                              */
-/* ../../tools/asn2wrs.py -p pcap -c pcap.cnf -s packet-pcap-template PCAP-CommonDataTypes.asn PCAP-Constants.asn PCAP-Containers.asn PCAP-IEs.asn PCAP-PDU-Contents.asn PCAP-PDU-Descriptions.asn */
+/* ../../tools/asn2wrs.py -p pcap -c ./pcap.cnf -s ./packet-pcap-template -D . PCAP-CommonDataTypes.asn PCAP-Constants.asn PCAP-Containers.asn PCAP-IEs.asn PCAP-PDU-Contents.asn PCAP-PDU-Descriptions.asn */
 
 /* Input file: packet-pcap-template.c */
 
@@ -11602,7 +11602,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.INTEGER_0_32767", HFILL }},
     { &hf_pcap_ProtocolIE_Container_item,
-      { "ProtocolIE-Container", "pcap.ProtocolIE_Container_item",
+      { "ProtocolIE-Field", "pcap.ProtocolIE_Field",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.ProtocolIE_Field", HFILL }},
     { &hf_pcap_id,
@@ -11618,7 +11618,7 @@ void proto_register_pcap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.T_ie_field_value", HFILL }},
     { &hf_pcap_ProtocolExtensionContainer_item,
-      { "ProtocolExtensionContainer", "pcap.ProtocolExtensionContainer_item",
+      { "ProtocolExtensionField", "pcap.ProtocolExtensionField",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.ProtocolExtensionField", HFILL }},
     { &hf_pcap_ext_id,
@@ -11630,7 +11630,7 @@ void proto_register_pcap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.T_extensionValue", HFILL }},
     { &hf_pcap_PrivateIE_Container_item,
-      { "PrivateIE-Container", "pcap.PrivateIE_Container_item",
+      { "PrivateIE-Field", "pcap.PrivateIE_Field",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.PrivateIE_Field", HFILL }},
     { &hf_pcap_private_id,
@@ -11674,11 +11674,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_CauseMisc_vals), 0,
         "pcap.CauseMisc", HFILL }},
     { &hf_pcap_CellId_MeasuredResultsSets_item,
-      { "CellId-MeasuredResultsSets", "pcap.CellId_MeasuredResultsSets_item",
+      { "CellId-MeasuredResultsInfoList", "pcap.CellId_MeasuredResultsInfoList",
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.CellId_MeasuredResultsInfoList", HFILL }},
     { &hf_pcap_CellId_MeasuredResultsInfoList_item,
-      { "CellId-MeasuredResultsInfoList", "pcap.CellId_MeasuredResultsInfoList_item",
+      { "CellId-MeasuredResultsInfo", "pcap.CellId_MeasuredResultsInfo",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.CellId_MeasuredResultsInfo", HFILL }},
     { &hf_pcap_uC_ID,
@@ -11874,7 +11874,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.CriticalityDiagnostics_IE_List", HFILL }},
     { &hf_pcap_CriticalityDiagnostics_IE_List_item,
-      { "CriticalityDiagnostics-IE-List", "pcap.CriticalityDiagnostics_IE_List_item",
+      { "CriticalityDiagnostics-IE-List item", "pcap.CriticalityDiagnostics_IE_List_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.CriticalityDiagnostics_IE_List_item", HFILL }},
     { &hf_pcap_iECriticality,
@@ -11910,7 +11910,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.DGPS_CorrectionSatInfoList", HFILL }},
     { &hf_pcap_DGPS_CorrectionSatInfoList_item,
-      { "DGPS-CorrectionSatInfoList", "pcap.DGPS_CorrectionSatInfoList_item",
+      { "DGPS-CorrectionSatInfo", "pcap.DGPS_CorrectionSatInfo",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.DGPS_CorrectionSatInfo", HFILL }},
     { &hf_pcap_satID,
@@ -12018,7 +12018,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.INTEGER_0_127", HFILL }},
     { &hf_pcap_GA_Polygon_item,
-      { "GA-Polygon", "pcap.GA_Polygon_item",
+      { "GA-Polygon item", "pcap.GA_Polygon_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.GA_Polygon_item", HFILL }},
     { &hf_pcap_uncertaintySemi_major,
@@ -12066,11 +12066,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.PositioningDataSet", HFILL }},
     { &hf_pcap_GANSS_PositioningDataSet_item,
-      { "GANSS-PositioningDataSet", "pcap.GANSS_PositioningDataSet_item",
+      { "GANSS-PositioningMethodAndUsage", "pcap.GANSS_PositioningMethodAndUsage",
         FT_BYTES, BASE_HEX, NULL, 0,
         "pcap.GANSS_PositioningMethodAndUsage", HFILL }},
     { &hf_pcap_PositioningDataSet_item,
-      { "PositioningDataSet", "pcap.PositioningDataSet_item",
+      { "PositioningMethodAndUsage", "pcap.PositioningMethodAndUsage",
         FT_BYTES, BASE_HEX, NULL, 0,
         "pcap.PositioningMethodAndUsage", HFILL }},
     { &hf_pcap_gps_TOW_1msec,
@@ -12082,7 +12082,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.AcquisitionSatInfoList", HFILL }},
     { &hf_pcap_AcquisitionSatInfoList_item,
-      { "AcquisitionSatInfoList", "pcap.AcquisitionSatInfoList_item",
+      { "AcquisitionSatInfo", "pcap.AcquisitionSatInfo",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.AcquisitionSatInfo", HFILL }},
     { &hf_pcap_doppler0thOrder,
@@ -12142,7 +12142,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.ProtocolExtensionContainer", HFILL }},
     { &hf_pcap_DGANSS_Information_item,
-      { "DGANSS-Information", "pcap.DGANSS_Information_item",
+      { "DGANSS-InformationItem", "pcap.DGANSS_InformationItem",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.DGANSS_InformationItem", HFILL }},
     { &hf_pcap_gANSS_SignalId,
@@ -12158,7 +12158,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.DGANSS_SignalInformation", HFILL }},
     { &hf_pcap_DGANSS_SignalInformation_item,
-      { "DGANSS-SignalInformation", "pcap.DGANSS_SignalInformation_item",
+      { "DGANSS-SignalInformationItem", "pcap.DGANSS_SignalInformationItem",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.DGANSS_SignalInformationItem", HFILL }},
     { &hf_pcap_satId,
@@ -12198,7 +12198,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.INTEGER_0_75", HFILL }},
     { &hf_pcap_GANSS_Clock_Model_item,
-      { "GANSS-Clock-Model", "pcap.GANSS_Clock_Model_item",
+      { "GANSS-SatelliteClockModelItem", "pcap.GANSS_SatelliteClockModelItem",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.GANSS_SatelliteClockModelItem", HFILL }},
     { &hf_pcap_ganss_Reference_Time,
@@ -12222,7 +12222,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.GANSS_DataBitAssistanceList", HFILL }},
     { &hf_pcap_GANSS_DataBitAssistanceList_item,
-      { "GANSS-DataBitAssistanceList", "pcap.GANSS_DataBitAssistanceList_item",
+      { "GANSS-DataBitAssistanceItem", "pcap.GANSS_DataBitAssistanceItem",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.GANSS_DataBitAssistanceItem", HFILL }},
     { &hf_pcap_ganssDataTypeID,
@@ -12246,7 +12246,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_T_dopplerUncertainty_vals), 0,
         "pcap.T_dopplerUncertainty", HFILL }},
     { &hf_pcap_GANSS_GenericAssistanceDataList_item,
-      { "GANSS-GenericAssistanceDataList", "pcap.GANSS_GenericAssistanceDataList_item",
+      { "GANSSGenericAssistanceData", "pcap.GANSSGenericAssistanceData",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.GANSSGenericAssistanceData", HFILL }},
     { &hf_pcap_ganssId,
@@ -12286,7 +12286,7 @@ void proto_register_pcap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.GANSS_Navigation_Model", HFILL }},
     { &hf_pcap_GANSS_GenericMeasurementInfo_item,
-      { "GANSS-GenericMeasurementInfo", "pcap.GANSS_GenericMeasurementInfo_item",
+      { "GANSS-GenericMeasurementInfo item", "pcap.GANSS_GenericMeasurementInfo_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.GANSS_GenericMeasurementInfo_item", HFILL }},
     { &hf_pcap_ganssSignalId,
@@ -12414,7 +12414,7 @@ void proto_register_pcap(void) {
         FT_BYTES, BASE_HEX, NULL, 0,
         "pcap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_GANSS_MeasurementParameters_item,
-      { "GANSS-MeasurementParameters", "pcap.GANSS_MeasurementParameters_item",
+      { "GANSS-MeasurementParametersItem", "pcap.GANSS_MeasurementParametersItem",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.GANSS_MeasurementParametersItem", HFILL }},
     { &hf_pcap_cToNzero,
@@ -12450,7 +12450,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.INTEGER_0_33554431", HFILL }},
     { &hf_pcap_GANSS_MeasuredResultsList_item,
-      { "GANSS-MeasuredResultsList", "pcap.GANSS_MeasuredResultsList_item",
+      { "GANSS-MeasuredResults", "pcap.GANSS_MeasuredResults",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.GANSS_MeasuredResults", HFILL }},
     { &hf_pcap_referenceTime,
@@ -12494,7 +12494,7 @@ void proto_register_pcap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.GANSS_KeplerianParametersOrb", HFILL }},
     { &hf_pcap_GANSS_Real_Time_Integrity_item,
-      { "GANSS-Real-Time-Integrity", "pcap.GANSS_Real_Time_Integrity_item",
+      { "GANSS-RealTimeInformationItem", "pcap.GANSS_RealTimeInformationItem",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.GANSS_RealTimeInformationItem", HFILL }},
     { &hf_pcap_bad_ganss_satId,
@@ -12570,7 +12570,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.INTEGER_0_3", HFILL }},
     { &hf_pcap_GANSS_SatelliteInformation_item,
-      { "GANSS-SatelliteInformation", "pcap.GANSS_SatelliteInformation_item",
+      { "GANSS-SatelliteInformationItem", "pcap.GANSS_SatelliteInformationItem",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.GANSS_SatelliteInformationItem", HFILL }},
     { &hf_pcap_ganssSatId,
@@ -12602,7 +12602,7 @@ void proto_register_pcap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.GANSS_AzimuthAndElevation", HFILL }},
     { &hf_pcap_GANSS_SatelliteInformationKP_item,
-      { "GANSS-SatelliteInformationKP", "pcap.GANSS_SatelliteInformationKP_item",
+      { "GANSS-SatelliteInformationKPItem", "pcap.GANSS_SatelliteInformationKPItem",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.GANSS_SatelliteInformationKPItem", HFILL }},
     { &hf_pcap_ganss_e_alm,
@@ -12646,7 +12646,7 @@ void proto_register_pcap(void) {
         FT_BYTES, BASE_HEX, NULL, 0,
         "pcap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_pcap_GANSS_Sat_Info_Nav_item,
-      { "GANSS-Sat-Info-Nav", "pcap.GANSS_Sat_Info_Nav_item",
+      { "GANSS-Sat-Info-Nav item", "pcap.GANSS_Sat_Info_Nav_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.GANSS_Sat_Info_Nav_item", HFILL }},
     { &hf_pcap_svHealth,
@@ -12758,7 +12758,7 @@ void proto_register_pcap(void) {
         FT_BYTES, BASE_HEX, NULL, 0,
         "pcap.BIT_STRING_SIZE_364", HFILL }},
     { &hf_pcap_AlmanacSatInfoList_item,
-      { "AlmanacSatInfoList", "pcap.AlmanacSatInfoList_item",
+      { "AlmanacSatInfo", "pcap.AlmanacSatInfo",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.AlmanacSatInfo", HFILL }},
     { &hf_pcap_dataID,
@@ -12974,7 +12974,7 @@ void proto_register_pcap(void) {
         FT_BYTES, BASE_HEX, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_MeasuredResultsList_item,
-      { "MeasuredResultsList", "pcap.MeasuredResultsList_item",
+      { "GPS-MeasuredResults", "pcap.GPS_MeasuredResults",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.GPS_MeasuredResults", HFILL }},
     { &hf_pcap_gps_MeasurementParamList,
@@ -12982,7 +12982,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.GPS_MeasurementParamList", HFILL }},
     { &hf_pcap_GPS_MeasurementParamList_item,
-      { "GPS-MeasurementParamList", "pcap.GPS_MeasurementParamList_item",
+      { "GPS-MeasurementParam", "pcap.GPS_MeasurementParam",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.GPS_MeasurementParam", HFILL }},
     { &hf_pcap_satelliteID,
@@ -13014,7 +13014,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.INTEGER_0_63", HFILL }},
     { &hf_pcap_GPS_NavigationModel_item,
-      { "GPS-NavigationModel", "pcap.GPS_NavigationModel_item",
+      { "NavigationModelSatInfo", "pcap.NavigationModelSatInfo",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.NavigationModelSatInfo", HFILL }},
     { &hf_pcap_satelliteStatus,
@@ -13034,7 +13034,7 @@ void proto_register_pcap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.NoBadSatellites", HFILL }},
     { &hf_pcap_BadSatList_item,
-      { "BadSatList", "pcap.BadSatList_item",
+      { "BadSatList item", "pcap.BadSatList_item",
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.INTEGER_0_63", HFILL }},
     { &hf_pcap_gps_Week,
@@ -13046,7 +13046,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.GPS_TOW_AssistList", HFILL }},
     { &hf_pcap_GPS_TOW_AssistList_item,
-      { "GPS-TOW-AssistList", "pcap.GPS_TOW_AssistList_item",
+      { "GPS-TOW-Assist", "pcap.GPS_TOW_Assist",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.GPS_TOW_Assist", HFILL }},
     { &hf_pcap_tlm_Message,
@@ -13158,7 +13158,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.GanssRequestedGenericAssistanceDataList", HFILL }},
     { &hf_pcap_GanssRequestedGenericAssistanceDataList_item,
-      { "GanssRequestedGenericAssistanceDataList", "pcap.GanssRequestedGenericAssistanceDataList_item",
+      { "GanssReqGenericData", "pcap.GanssReqGenericData",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.GanssReqGenericData", HFILL }},
     { &hf_pcap_ganssRealTimeIntegrity,
@@ -13202,7 +13202,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.ReqDataBitAssistanceList", HFILL }},
     { &hf_pcap_ReqDataBitAssistanceList_item,
-      { "ReqDataBitAssistanceList", "pcap.ReqDataBitAssistanceList_item",
+      { "ReqDataBitAssistanceList item", "pcap.ReqDataBitAssistanceList_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.ReqDataBitAssistanceList_item", HFILL }},
     { &hf_pcap_ganssDataBitAssistance,
@@ -13234,7 +13234,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.ExplicitInformationList", HFILL }},
     { &hf_pcap_ExplicitInformationList_item,
-      { "ExplicitInformationList", "pcap.ExplicitInformationList_item",
+      { "ExplicitInformation", "pcap.ExplicitInformation",
         FT_UINT32, BASE_DEC, VALS(pcap_ExplicitInformation_vals), 0,
         "pcap.ExplicitInformation", HFILL }},
     { &hf_pcap_almanacAndSatelliteHealth,
@@ -13302,7 +13302,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_T_ganss_ReferenceLocation_vals), 0,
         "pcap.T_ganss_ReferenceLocation", HFILL }},
     { &hf_pcap_GANSSGenericDataList_item,
-      { "GANSSGenericDataList", "pcap.GANSSGenericDataList_item",
+      { "GANSSGenericDataReq", "pcap.GANSSGenericDataReq",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.GANSSGenericDataReq", HFILL }},
     { &hf_pcap_ganssID,
@@ -13366,7 +13366,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.SatelliteRelatedDataList", HFILL }},
     { &hf_pcap_SatelliteRelatedDataList_item,
-      { "SatelliteRelatedDataList", "pcap.SatelliteRelatedDataList_item",
+      { "SatelliteRelatedData", "pcap.SatelliteRelatedData",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.SatelliteRelatedData", HFILL }},
     { &hf_pcap_ganssWeek,
@@ -13386,11 +13386,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.SatelliteRelatedDataListGANSS", HFILL }},
     { &hf_pcap_SatelliteRelatedDataListGANSS_item,
-      { "SatelliteRelatedDataListGANSS", "pcap.SatelliteRelatedDataListGANSS_item",
+      { "SatelliteRelatedDataGANSS", "pcap.SatelliteRelatedDataGANSS",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.SatelliteRelatedDataGANSS", HFILL }},
     { &hf_pcap_MessageStructure_item,
-      { "MessageStructure", "pcap.MessageStructure_item",
+      { "MessageStructure item", "pcap.MessageStructure_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.MessageStructure_item", HFILL }},
     { &hf_pcap_repetitionNumber_01,
@@ -13422,7 +13422,7 @@ void proto_register_pcap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.TUTRANGPSMeasurementValueInfo", HFILL }},
     { &hf_pcap_OTDOA_NeighbourCellInfoList_item,
-      { "OTDOA-NeighbourCellInfoList", "pcap.OTDOA_NeighbourCellInfoList_item",
+      { "OTDOA-NeighbourCellInfo", "pcap.OTDOA_NeighbourCellInfo",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.OTDOA_NeighbourCellInfo", HFILL }},
     { &hf_pcap_relativeTimingDifferenceInfo,
@@ -13430,11 +13430,11 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_RelativeTimingDifferenceInfo_vals), 0,
         "pcap.RelativeTimingDifferenceInfo", HFILL }},
     { &hf_pcap_OTDOA_MeasuredResultsSets_item,
-      { "OTDOA-MeasuredResultsSets", "pcap.OTDOA_MeasuredResultsSets_item",
+      { "OTDOA-MeasuredResultsInfoList", "pcap.OTDOA_MeasuredResultsInfoList",
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.OTDOA_MeasuredResultsInfoList", HFILL }},
     { &hf_pcap_OTDOA_MeasuredResultsInfoList_item,
-      { "OTDOA-MeasuredResultsInfoList", "pcap.OTDOA_MeasuredResultsInfoList_item",
+      { "OTDOA-MeasuredResultsInfo", "pcap.OTDOA_MeasuredResultsInfo",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.OTDOA_MeasuredResultsInfo", HFILL }},
     { &hf_pcap_ue_SFNSFNTimeDifferenceType2Info,
@@ -13658,7 +13658,7 @@ void proto_register_pcap(void) {
         FT_BOOLEAN, 8, NULL, 0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_NetworkAssistedGANSSSupport_item,
-      { "NetworkAssistedGANSSSupport", "pcap.NetworkAssistedGANSSSupport_item",
+      { "NetworkAssistedGANSSSupport item", "pcap.NetworkAssistedGANSSSupport_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.NetworkAssistedGANSSSupport_item", HFILL }},
     { &hf_pcap_ganssMode,
@@ -13830,7 +13830,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.INTEGER_1_16", HFILL }},
     { &hf_pcap_UE_Positioning_OTDOA_NeighbourCellList_item,
-      { "UE-Positioning-OTDOA-NeighbourCellList", "pcap.UE_Positioning_OTDOA_NeighbourCellList_item",
+      { "UE-Positioning-OTDOA-NeighbourCellInfo", "pcap.UE_Positioning_OTDOA_NeighbourCellInfo",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.UE_Positioning_OTDOA_NeighbourCellInfo", HFILL }},
     { &hf_pcap_modeSpecificInfo_02,
@@ -14034,7 +14034,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.CFN", HFILL }},
     { &hf_pcap_Transmission_Gap_Pattern_Sequence_Information_item,
-      { "Transmission-Gap-Pattern-Sequence-Information", "pcap.Transmission_Gap_Pattern_Sequence_Information_item",
+      { "Transmission-Gap-Pattern-Sequence-Information item", "pcap.Transmission_Gap_Pattern_Sequence_Information_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.Transmission_Gap_Pattern_Sequence_Information_item", HFILL }},
     { &hf_pcap_tGPSID,
@@ -14074,7 +14074,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.Transmission_Gap_Pattern_Sequence_Status_List", HFILL }},
     { &hf_pcap_Transmission_Gap_Pattern_Sequence_Status_List_item,
-      { "Transmission-Gap-Pattern-Sequence-Status-List", "pcap.Transmission_Gap_Pattern_Sequence_Status_List_item",
+      { "Transmission-Gap-Pattern-Sequence-Status-List item", "pcap.Transmission_Gap_Pattern_Sequence_Status_List_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.Transmission_Gap_Pattern_Sequence_Status_List_item", HFILL }},
     { &hf_pcap_tGPRC,
@@ -14094,7 +14094,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.TrChInfoList", HFILL }},
     { &hf_pcap_TrChInfoList_item,
-      { "TrChInfoList", "pcap.TrChInfoList_item",
+      { "UL-TrCHInfo", "pcap.UL_TrCHInfo",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.UL_TrCHInfo", HFILL }},
     { &hf_pcap_uL_TrCHtype,
@@ -14134,7 +14134,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.Reference_E_TFCI_Information", HFILL }},
     { &hf_pcap_Reference_E_TFCI_Information_item,
-      { "Reference-E-TFCI-Information", "pcap.Reference_E_TFCI_Information_item",
+      { "Reference-E-TFCI-Information-Item", "pcap.Reference_E_TFCI_Information_Item",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.Reference_E_TFCI_Information_Item", HFILL }},
     { &hf_pcap_reference_E_TFCI,
@@ -14154,7 +14154,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.INTEGER_0_63", HFILL }},
     { &hf_pcap_UL_Timeslot_Information_item,
-      { "UL-Timeslot-Information", "pcap.UL_Timeslot_Information_item",
+      { "UL-Timeslot-InformationItem", "pcap.UL_Timeslot_InformationItem",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.UL_Timeslot_InformationItem", HFILL }},
     { &hf_pcap_timeSlot,
@@ -14222,7 +14222,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_T_midambleAllocationMode_02_vals), 0,
         "pcap.T_midambleAllocationMode_02", HFILL }},
     { &hf_pcap_TDD_UL_Code_Information_item,
-      { "TDD-UL-Code-Information", "pcap.TDD_UL_Code_Information_item",
+      { "TDD-UL-Code-InformationItem", "pcap.TDD_UL_Code_InformationItem",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.TDD_UL_Code_InformationItem", HFILL }},
     { &hf_pcap_tdd_ChannelisationCode,
@@ -14242,7 +14242,7 @@ void proto_register_pcap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.UschParameters", HFILL }},
     { &hf_pcap_PRACHparameters_item,
-      { "PRACHparameters", "pcap.PRACHparameters_item",
+      { "PRACH-ChannelInfo", "pcap.PRACH_ChannelInfo",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.PRACH_ChannelInfo", HFILL }},
     { &hf_pcap_pRACH_Info,
@@ -14298,7 +14298,7 @@ void proto_register_pcap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.TransportFormatSet_Semi_staticPart", HFILL }},
     { &hf_pcap_TransportFormatSet_DynamicPartList_item,
-      { "TransportFormatSet-DynamicPartList", "pcap.TransportFormatSet_DynamicPartList_item",
+      { "TransportFormatSet-DynamicPartList item", "pcap.TransportFormatSet_DynamicPartList_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.TransportFormatSet_DynamicPartList_item", HFILL }},
     { &hf_pcap_rlc_Size,
@@ -14310,7 +14310,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.SEQUENCE_SIZE_1_maxNrOfTFs_OF_TbsTTIInfo", HFILL }},
     { &hf_pcap_numberOfTbsTTIList_item,
-      { "numberOfTbsTTIList", "pcap.numberOfTbsTTIList_item",
+      { "TbsTTIInfo", "pcap.TbsTTIInfo",
         FT_NONE, BASE_NONE, NULL, 0,
         "pcap.TbsTTIInfo", HFILL }},
     { &hf_pcap_tTIInfo,
@@ -14342,7 +14342,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, VALS(pcap_TransportFormatSet_CRC_Size_vals), 0,
         "pcap.TransportFormatSet_CRC_Size", HFILL }},
     { &hf_pcap_TFCS_item,
-      { "TFCS", "pcap.TFCS_item",
+      { "CTFC", "pcap.CTFC",
         FT_UINT32, BASE_DEC, VALS(pcap_CTFC_vals), 0,
         "pcap.CTFC", HFILL }},
     { &hf_pcap_ctfc2Bit,
@@ -14350,7 +14350,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.T_ctfc2Bit", HFILL }},
     { &hf_pcap_ctfc2Bit_item,
-      { "ctfc2Bit", "pcap.ctfc2Bit_item",
+      { "ctfc2Bit item", "pcap.ctfc2Bit_item",
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.INTEGER_0_3", HFILL }},
     { &hf_pcap_ctfc4Bit,
@@ -14358,7 +14358,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.T_ctfc4Bit", HFILL }},
     { &hf_pcap_ctfc4Bit_item,
-      { "ctfc4Bit", "pcap.ctfc4Bit_item",
+      { "ctfc4Bit item", "pcap.ctfc4Bit_item",
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.INTEGER_0_15", HFILL }},
     { &hf_pcap_ctfc6Bit,
@@ -14366,7 +14366,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.T_ctfc6Bit", HFILL }},
     { &hf_pcap_ctfc6Bit_item,
-      { "ctfc6Bit", "pcap.ctfc6Bit_item",
+      { "ctfc6Bit item", "pcap.ctfc6Bit_item",
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.INTEGER_0_63", HFILL }},
     { &hf_pcap_ctfc8Bit,
@@ -14374,7 +14374,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.T_ctfc8Bit", HFILL }},
     { &hf_pcap_ctfc8Bit_item,
-      { "ctfc8Bit", "pcap.ctfc8Bit_item",
+      { "ctfc8Bit item", "pcap.ctfc8Bit_item",
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.INTEGER_0_255", HFILL }},
     { &hf_pcap_ctfc12Bit,
@@ -14382,7 +14382,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.T_ctfc12Bit", HFILL }},
     { &hf_pcap_ctfc12Bit_item,
-      { "ctfc12Bit", "pcap.ctfc12Bit_item",
+      { "ctfc12Bit item", "pcap.ctfc12Bit_item",
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.INTEGER_0_4095", HFILL }},
     { &hf_pcap_ctfc16Bit,
@@ -14390,7 +14390,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.T_ctfc16Bit", HFILL }},
     { &hf_pcap_ctfc16Bit_item,
-      { "ctfc16Bit", "pcap.ctfc16Bit_item",
+      { "ctfc16Bit item", "pcap.ctfc16Bit_item",
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.INTEGER_0_65535", HFILL }},
     { &hf_pcap_ctfc24Bit,
@@ -14398,7 +14398,7 @@ void proto_register_pcap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.T_ctfc24Bit", HFILL }},
     { &hf_pcap_ctfc24Bit_item,
-      { "ctfc24Bit", "pcap.ctfc24Bit_item",
+      { "ctfc24Bit item", "pcap.ctfc24Bit_item",
         FT_UINT32, BASE_DEC, NULL, 0,
         "pcap.INTEGER_0_16777215", HFILL }},
     { &hf_pcap_uSCH_SchedulingOffset,