Regenerate all asn2wrs generated dissectors.

svn path=/trunk/; revision=28379

1 files changed, 66 insertions, 66 deletions

diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index 6fd960bb2b..e3e5ab44c6 100644
--- a/epan/dissectors/packet-gsm_map.c
+++ b/epan/dissectors/packet-gsm_map.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-gsm_map.c                                                           */
-/* ../../tools/asn2wrs.py -b -e -c gsmmap.cnf -s packet-gsmmap-template ../ros/Remote-Operations-Information-Objects.asn MobileDomainDefinitions.asn MAP-ApplicationContexts.asn MAP-SS-Code.asn MAP-BS-Code.asn MAP-TS-Code.asn MAP-ExtensionDataTypes.asn MAP-CommonDataTypes.asn MAP-SS-DataTypes.asn MAP-ER-DataTypes.asn MAP-SM-DataTypes.asn MAP-OM-DataTypes.asn MAP-MS-DataTypes.asn MAP-CH-DataTypes.asn MAP-LCS-DataTypes.asn MAP-GR-DataTypes.asn MAP-DialogueInformation.asn MAP-LocationServiceOperations.asn MAP-Group-Call-Operations.asn MAP-ShortMessageServiceOperations.asn MAP-SupplementaryServiceOperations.asn MAP-CallHandlingOperations.asn MAP-OperationAndMaintenanceOperations.asn MAP-MobileServiceOperations.asn MAP-Errors.asn MAP-Protocol.asn GSMMAP.asn SS-DataTypes.asn SS-Operations.asn */
+/* ../../tools/asn2wrs.py -b -e -c ./gsmmap.cnf -s ./packet-gsmmap-template -D . ../ros/Remote-Operations-Information-Objects.asn MobileDomainDefinitions.asn MAP-ApplicationContexts.asn MAP-SS-Code.asn MAP-BS-Code.asn MAP-TS-Code.asn MAP-ExtensionDataTypes.asn MAP-CommonDataTypes.asn MAP-SS-DataTypes.asn MAP-ER-DataTypes.asn MAP-SM-DataTypes.asn MAP-OM-DataTypes.asn MAP-MS-DataTypes.asn MAP-CH-DataTypes.asn MAP-LCS-DataTypes.asn MAP-GR-DataTypes.asn MAP-DialogueInformation.asn MAP-LocationServiceOperations.asn MAP-Group-Call-Operations.asn MAP-ShortMessageServiceOperations.asn MAP-SupplementaryServiceOperations.asn MAP-CallHandlingOperations.asn MAP-OperationAndMaintenanceOperations.asn MAP-MobileServiceOperations.asn MAP-Errors.asn MAP-Protocol.asn GSMMAP.asn SS-DataTypes.asn SS-Operations.asn */
 
 /* Input file: packet-gsmmap-template.c */
 
@@ -18279,7 +18279,7 @@ void proto_register_gsm_map(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map.SLR_Arg_PCS_Extensions", HFILL }},
     { &hf_gsm_map_PrivateExtensionList_item,
-      { "PrivateExtensionList", "gsm_map.PrivateExtensionList_item",
+      { "PrivateExtension", "gsm_map.PrivateExtension",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map.PrivateExtension", HFILL }},
     { &hf_gsm_map_extId,
@@ -18334,7 +18334,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_HEX, NULL, 0,
         "gsm_map.LMSI", HFILL }},
     { &hf_gsm_map_HLR_List_item,
-      { "HLR-List", "gsm_map.HLR_List_item",
+      { "HLR-Id", "gsm_map.HLR_Id",
         FT_BYTES, BASE_HEX, NULL, 0,
         "gsm_map.HLR_Id", HFILL }},
     { &hf_gsm_map_naea_PreferredCIC,
@@ -18449,7 +18449,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map_ss.ForwardingFeatureList", HFILL }},
     { &hf_gsm_map_ss_ForwardingFeatureList_item,
-      { "ForwardingFeatureList", "gsm_map.ss.ForwardingFeatureList_item",
+      { "ForwardingFeature", "gsm_map.ss.ForwardingFeature",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ss.ForwardingFeature", HFILL }},
     { &hf_gsm_map_ss_ss_Status,
@@ -18473,7 +18473,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map_ss.CallBarringFeatureList", HFILL }},
     { &hf_gsm_map_ss_CallBarringFeatureList_item,
-      { "CallBarringFeatureList", "gsm_map.ss.CallBarringFeatureList_item",
+      { "CallBarringFeature", "gsm_map.ss.CallBarringFeature",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ss.CallBarringFeature", HFILL }},
     { &hf_gsm_map_ss_ss_SubscriptionOption,
@@ -18509,7 +18509,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map.MC_Bearers", HFILL }},
     { &hf_gsm_map_ss_CCBS_FeatureList_item,
-      { "CCBS-FeatureList", "gsm_map.ss.CCBS_FeatureList_item",
+      { "CCBS-Feature", "gsm_map.ss.CCBS_Feature",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ss.CCBS_Feature", HFILL }},
     { &hf_gsm_map_ss_ccbs_Index,
@@ -18549,11 +18549,11 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_HEX, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ss_SS_List_item,
-      { "SS-List", "gsm_map.ss.SS_List_item",
+      { "SS-Code", "gsm_map.ss.SS_Code",
         FT_UINT8, BASE_DEC, VALS(ssCode_vals), 0,
         "gsm_map.SS_Code", HFILL }},
     { &hf_gsm_map_ss_BasicServiceGroupList_item,
-      { "BasicServiceGroupList", "gsm_map.ss.BasicServiceGroupList_item",
+      { "BasicServiceCode", "gsm_map.ss.BasicServiceCode",
         FT_UINT32, BASE_DEC, VALS(gsm_map_BasicServiceCode_vals), 0,
         "gsm_map.BasicServiceCode", HFILL }},
     { &hf_gsm_map_ss_imsi,
@@ -18577,7 +18577,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ss_CCBS_RequestState_vals), 0,
         "gsm_map_ss.CCBS_RequestState", HFILL }},
     { &hf_gsm_map_ss_SS_EventSpecification_item,
-      { "SS-EventSpecification", "gsm_map.ss.SS_EventSpecification_item",
+      { "AddressString", "gsm_map.ss.AddressString",
         FT_BYTES, BASE_HEX, NULL, 0,
         "gsm_map.AddressString", HFILL }},
     { &hf_gsm_map_ss_ccbs_Data,
@@ -18891,7 +18891,7 @@ void proto_register_gsm_map(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_sm.NULL", HFILL }},
     { &hf_gsm_map_sm_DispatcherList_item,
-      { "DispatcherList", "gsm_map.sm.DispatcherList_item",
+      { "ISDN-AddressString", "gsm_map.sm.ISDN_AddressString",
         FT_BYTES, BASE_HEX, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_sm_MW_Status_sc_AddressNotIncluded,
@@ -19353,7 +19353,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_HEX, NULL, 0,
         "gsm_map.IMEI", HFILL }},
     { &hf_gsm_map_ms_PagingArea_item,
-      { "PagingArea", "gsm_map.ms.PagingArea_item",
+      { "LocationArea", "gsm_map.ms.LocationArea",
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_LocationArea_vals), 0,
         "gsm_map_ms.LocationArea", HFILL }},
     { &hf_gsm_map_ms_laiFixedLength,
@@ -19429,11 +19429,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map_ms.QuintupletList", HFILL }},
     { &hf_gsm_map_ms_TripletList_item,
-      { "TripletList", "gsm_map.ms.TripletList_item",
+      { "AuthenticationTriplet", "gsm_map.ms.AuthenticationTriplet",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.AuthenticationTriplet", HFILL }},
     { &hf_gsm_map_ms_QuintupletList_item,
-      { "QuintupletList", "gsm_map.ms.QuintupletList_item",
+      { "AuthenticationQuintuplet", "gsm_map.ms.AuthenticationQuintuplet",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.AuthenticationQuintuplet", HFILL }},
     { &hf_gsm_map_ms_rand,
@@ -19665,11 +19665,11 @@ void proto_register_gsm_map(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.UESBI_Iu", HFILL }},
     { &hf_gsm_map_ms_BSSMAP_ServiceHandoverList_item,
-      { "BSSMAP-ServiceHandoverList", "gsm_map.ms.BSSMAP_ServiceHandoverList_item",
+      { "BSSMAP-ServiceHandoverInfo", "gsm_map.ms.BSSMAP_ServiceHandoverInfo",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.BSSMAP_ServiceHandoverInfo", HFILL }},
     { &hf_gsm_map_ms_RadioResourceList_item,
-      { "RadioResourceList", "gsm_map.ms.RadioResourceList_item",
+      { "RadioResource", "gsm_map.ms.RadioResource",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.RadioResource", HFILL }},
     { &hf_gsm_map_ms_handoverNumber,
@@ -19773,7 +19773,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_HEX, NULL, 0,
         "gsm_map_ms.Codec", HFILL }},
     { &hf_gsm_map_ms_RelocationNumberList_item,
-      { "RelocationNumberList", "gsm_map.ms.RelocationNumberList_item",
+      { "RelocationNumber", "gsm_map.ms.RelocationNumber",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.RelocationNumber", HFILL }},
     { &hf_gsm_map_ms_immediateResponsePreferred,
@@ -19809,7 +19809,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map_ms.EPS_AuthenticationSetList", HFILL }},
     { &hf_gsm_map_ms_EPS_AuthenticationSetList_item,
-      { "EPS-AuthenticationSetList", "gsm_map.ms.EPS_AuthenticationSetList_item",
+      { "EPC-AV", "gsm_map.ms.EPC_AV",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.EPC_AV", HFILL }},
     { &hf_gsm_map_ms_kasme,
@@ -19841,7 +19841,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_HEX, NULL, 0,
         "gsm_map_ms.UESBI_IuB", HFILL }},
     { &hf_gsm_map_ms_CSG_SubscriptionDataList_item,
-      { "CSG-SubscriptionDataList", "gsm_map.ms.CSG_SubscriptionDataList_item",
+      { "CSG-SubscriptionData", "gsm_map.ms.CSG_SubscriptionData",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.CSG_SubscriptionData", HFILL }},
     { &hf_gsm_map_ms_csg_Id,
@@ -19885,7 +19885,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map_ms.EPS_DataList", HFILL }},
     { &hf_gsm_map_ms_EPS_DataList_item,
-      { "EPS-DataList", "gsm_map.ms.EPS_DataList_item",
+      { "APN-Configuration", "gsm_map.ms.APN_Configuration",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.APN_Configuration", HFILL }},
     { &hf_gsm_map_ms_servedPartyIP_Address,
@@ -19929,7 +19929,7 @@ void proto_register_gsm_map(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "gsm_map_ms.Bandwidth", HFILL }},
     { &hf_gsm_map_ms_SpecificAPNInfoList_item,
-      { "SpecificAPNInfoList", "gsm_map.ms.SpecificAPNInfoList_item",
+      { "SpecificAPNInfo", "gsm_map.ms.SpecificAPNInfo",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.SpecificAPNInfo", HFILL }},
     { &hf_gsm_map_ms_priority_level,
@@ -19973,11 +19973,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map_ms.LCS_PrivacyExceptionList", HFILL }},
     { &hf_gsm_map_ms_GMLC_List_item,
-      { "GMLC-List", "gsm_map.ms.GMLC_List_item",
+      { "ISDN-AddressString", "gsm_map.ms.ISDN_AddressString",
         FT_BYTES, BASE_HEX, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ms_GPRSDataList_item,
-      { "GPRSDataList", "gsm_map.ms.GPRSDataList_item",
+      { "PDP-Context", "gsm_map.ms.PDP_Context",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.PDP_Context", HFILL }},
     { &hf_gsm_map_ms_pdp_ContextId,
@@ -20053,7 +20053,7 @@ void proto_register_gsm_map(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.NULL", HFILL }},
     { &hf_gsm_map_ms_GPRS_CamelTDPDataList_item,
-      { "GPRS-CamelTDPDataList", "gsm_map.ms.GPRS_CamelTDPDataList_item",
+      { "GPRS-CamelTDPData", "gsm_map.ms.GPRS_CamelTDPData",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.GPRS_CamelTDPData", HFILL }},
     { &hf_gsm_map_ms_gprs_TriggerDetectionPoint,
@@ -20073,7 +20073,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_DefaultGPRS_Handling_vals), 0,
         "gsm_map_ms.DefaultGPRS_Handling", HFILL }},
     { &hf_gsm_map_ms_LSADataList_item,
-      { "LSADataList", "gsm_map.ms.LSADataList_item",
+      { "LSAData", "gsm_map.ms.LSAData",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.LSAData", HFILL }},
     { &hf_gsm_map_ms_lsaIdentity,
@@ -20145,11 +20145,11 @@ void proto_register_gsm_map(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.VlrCamelSubscriptionInfo", HFILL }},
     { &hf_gsm_map_ms_BearerServiceList_item,
-      { "BearerServiceList", "gsm_map.ms.BearerServiceList_item",
+      { "Ext-BearerServiceCode", "gsm_map.ms.Ext_BearerServiceCode",
         FT_UINT8, BASE_DEC, VALS(Bearerservice_vals), 0,
         "gsm_map.Ext_BearerServiceCode", HFILL }},
     { &hf_gsm_map_ms_TeleserviceList_item,
-      { "TeleserviceList", "gsm_map.ms.TeleserviceList_item",
+      { "Ext-TeleserviceCode", "gsm_map.ms.Ext_TeleserviceCode",
         FT_UINT8, BASE_DEC, VALS(Teleservice_vals), 0,
         "gsm_map.Ext_TeleserviceCode", HFILL }},
     { &hf_gsm_map_ms_odb_GeneralData,
@@ -20161,7 +20161,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_HEX, NULL, 0,
         "gsm_map_ms.ODB_HPLMN_Data", HFILL }},
     { &hf_gsm_map_ms_Ext_SS_InfoList_item,
-      { "Ext-SS-InfoList", "gsm_map.ms.Ext_SS_InfoList_item",
+      { "Ext-SS-Info", "gsm_map.ms.Ext_SS_Info",
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_Ext_SS_Info_vals), 0,
         "gsm_map_ms.Ext_SS_Info", HFILL }},
     { &hf_gsm_map_ms_forwardingInfo,
@@ -20193,7 +20193,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map_ms.Ext_ForwFeatureList", HFILL }},
     { &hf_gsm_map_ms_Ext_ForwFeatureList_item,
-      { "Ext-ForwFeatureList", "gsm_map.ms.Ext_ForwFeatureList_item",
+      { "Ext-ForwFeature", "gsm_map.ms.Ext_ForwFeature",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.Ext_ForwFeature", HFILL }},
     { &hf_gsm_map_ms_basicService,
@@ -20229,7 +20229,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map_ms.Ext_CallBarFeatureList", HFILL }},
     { &hf_gsm_map_ms_Ext_CallBarFeatureList_item,
-      { "Ext-CallBarFeatureList", "gsm_map.ms.Ext_CallBarFeatureList_item",
+      { "Ext-CallBarringFeature", "gsm_map.ms.Ext_CallBarringFeature",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.Ext_CallBarringFeature", HFILL }},
     { &hf_gsm_map_ms_cug_SubscriptionList,
@@ -20241,7 +20241,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map_ms.CUG_FeatureList", HFILL }},
     { &hf_gsm_map_ms_CUG_SubscriptionList_item,
-      { "CUG-SubscriptionList", "gsm_map.ms.CUG_SubscriptionList_item",
+      { "CUG-Subscription", "gsm_map.ms.CUG_Subscription",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.CUG_Subscription", HFILL }},
     { &hf_gsm_map_ms_cug_Index,
@@ -20261,11 +20261,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map_ms.Ext_BasicServiceGroupList", HFILL }},
     { &hf_gsm_map_ms_CUG_FeatureList_item,
-      { "CUG-FeatureList", "gsm_map.ms.CUG_FeatureList_item",
+      { "CUG-Feature", "gsm_map.ms.CUG_Feature",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.CUG_Feature", HFILL }},
     { &hf_gsm_map_ms_Ext_BasicServiceGroupList_item,
-      { "Ext-BasicServiceGroupList", "gsm_map.ms.Ext_BasicServiceGroupList_item",
+      { "Ext-BasicServiceCode", "gsm_map.ms.Ext_BasicServiceCode",
         FT_UINT32, BASE_DEC, VALS(gsm_map_Ext_BasicServiceCode_vals), 0,
         "gsm_map.Ext_BasicServiceCode", HFILL }},
     { &hf_gsm_map_ms_preferentialCUG_Indicator,
@@ -20281,7 +20281,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ss_SS_SubscriptionOption_vals), 0,
         "gsm_map_ss.SS_SubscriptionOption", HFILL }},
     { &hf_gsm_map_ms_LCS_PrivacyExceptionList_item,
-      { "LCS-PrivacyExceptionList", "gsm_map.ms.LCS_PrivacyExceptionList_item",
+      { "LCS-PrivacyClass", "gsm_map.ms.LCS_PrivacyClass",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.LCS_PrivacyClass", HFILL }},
     { &hf_gsm_map_ms_notificationToMSUser,
@@ -20305,15 +20305,15 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map_ms.ServiceTypeList", HFILL }},
     { &hf_gsm_map_ms_ExternalClientList_item,
-      { "ExternalClientList", "gsm_map.ms.ExternalClientList_item",
+      { "ExternalClient", "gsm_map.ms.ExternalClient",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.ExternalClient", HFILL }},
     { &hf_gsm_map_ms_PLMNClientList_item,
-      { "PLMNClientList", "gsm_map.ms.PLMNClientList_item",
+      { "LCSClientInternalID", "gsm_map.ms.LCSClientInternalID",
         FT_UINT32, BASE_DEC, VALS(gsm_map_LCSClientInternalID_vals), 0,
         "gsm_map.LCSClientInternalID", HFILL }},
     { &hf_gsm_map_ms_Ext_ExternalClientList_item,
-      { "Ext-ExternalClientList", "gsm_map.ms.Ext_ExternalClientList_item",
+      { "ExternalClient", "gsm_map.ms.ExternalClient",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.ExternalClient", HFILL }},
     { &hf_gsm_map_ms_clientIdentity,
@@ -20325,7 +20325,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_GMLC_Restriction_vals), 0,
         "gsm_map_ms.GMLC_Restriction", HFILL }},
     { &hf_gsm_map_ms_ServiceTypeList_item,
-      { "ServiceTypeList", "gsm_map.ms.ServiceTypeList_item",
+      { "ServiceType", "gsm_map.ms.ServiceType",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.ServiceType", HFILL }},
     { &hf_gsm_map_ms_serviceTypeIdentity,
@@ -20333,11 +20333,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_LCSServiceTypeID_vals), 0,
         "gsm_map.LCSServiceTypeID", HFILL }},
     { &hf_gsm_map_ms_MOLR_List_item,
-      { "MOLR-List", "gsm_map.ms.MOLR_List_item",
+      { "MOLR-Class", "gsm_map.ms.MOLR_Class",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.MOLR_Class", HFILL }},
     { &hf_gsm_map_ms_ZoneCodeList_item,
-      { "ZoneCodeList", "gsm_map.ms.ZoneCodeList_item",
+      { "ZoneCode", "gsm_map.ms.ZoneCode",
         FT_BYTES, BASE_HEX, NULL, 0,
         "gsm_map_ms.ZoneCode", HFILL }},
     { &hf_gsm_map_ms_ss_List,
@@ -20425,7 +20425,7 @@ void proto_register_gsm_map(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.NULL", HFILL }},
     { &hf_gsm_map_ms_ContextIdList_item,
-      { "ContextIdList", "gsm_map.ms.ContextIdList_item",
+      { "ContextId", "gsm_map.ms.ContextId",
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map_ms.ContextId", HFILL }},
     { &hf_gsm_map_ms_allLSAData,
@@ -20437,11 +20437,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map_ms.LSAIdentityList", HFILL }},
     { &hf_gsm_map_ms_LSAIdentityList_item,
-      { "LSAIdentityList", "gsm_map.ms.LSAIdentityList_item",
+      { "LSAIdentity", "gsm_map.ms.LSAIdentity",
         FT_BYTES, BASE_HEX, NULL, 0,
         "gsm_map_ms.LSAIdentity", HFILL }},
     { &hf_gsm_map_ms_BasicServiceList_item,
-      { "BasicServiceList", "gsm_map.ms.BasicServiceList_item",
+      { "Ext-BasicServiceCode", "gsm_map.ms.Ext_BasicServiceCode",
         FT_UINT32, BASE_DEC, VALS(gsm_map_Ext_BasicServiceCode_vals), 0,
         "gsm_map.Ext_BasicServiceCode", HFILL }},
     { &hf_gsm_map_ms_o_CSI,
@@ -20477,7 +20477,7 @@ void proto_register_gsm_map(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.D_CSI", HFILL }},
     { &hf_gsm_map_ms_MT_smsCAMELTDP_CriteriaList_item,
-      { "MT-smsCAMELTDP-CriteriaList", "gsm_map.ms.MT_smsCAMELTDP_CriteriaList_item",
+      { "MT-smsCAMELTDP-Criteria", "gsm_map.ms.MT_smsCAMELTDP_Criteria",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.MT_smsCAMELTDP_Criteria", HFILL }},
     { &hf_gsm_map_ms_sms_TriggerDetectionPoint,
@@ -20489,7 +20489,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map_ms.TPDU_TypeCriterion", HFILL }},
     { &hf_gsm_map_ms_TPDU_TypeCriterion_item,
-      { "TPDU-TypeCriterion", "gsm_map.ms.TPDU_TypeCriterion_item",
+      { "MT-SMS-TPDU-Type", "gsm_map.ms.MT_SMS_TPDU_Type",
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_MT_SMS_TPDU_Type_vals), 0,
         "gsm_map_ms.MT_SMS_TPDU_Type", HFILL }},
     { &hf_gsm_map_ms_dp_AnalysedInfoCriteriaList,
@@ -20497,7 +20497,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map_ms.DP_AnalysedInfoCriteriaList", HFILL }},
     { &hf_gsm_map_ms_DP_AnalysedInfoCriteriaList_item,
-      { "DP-AnalysedInfoCriteriaList", "gsm_map.ms.DP_AnalysedInfoCriteriaList_item",
+      { "DP-AnalysedInfoCriterium", "gsm_map.ms.DP_AnalysedInfoCriterium",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.DP_AnalysedInfoCriterium", HFILL }},
     { &hf_gsm_map_ms_dialledNumber,
@@ -20517,7 +20517,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map_ms.SS_EventList", HFILL }},
     { &hf_gsm_map_ms_SS_EventList_item,
-      { "SS-EventList", "gsm_map.ms.SS_EventList_item",
+      { "SS-Code", "gsm_map.ms.SS_Code",
         FT_UINT8, BASE_DEC, VALS(ssCode_vals), 0,
         "gsm_map.SS_Code", HFILL }},
     { &hf_gsm_map_ms_o_BcsmCamelTDPDataList,
@@ -20529,7 +20529,7 @@ void proto_register_gsm_map(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.NULL", HFILL }},
     { &hf_gsm_map_ms_O_BcsmCamelTDPDataList_item,
-      { "O-BcsmCamelTDPDataList", "gsm_map.ms.O_BcsmCamelTDPDataList_item",
+      { "O-BcsmCamelTDPData", "gsm_map.ms.O_BcsmCamelTDPData",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.O_BcsmCamelTDPData", HFILL }},
     { &hf_gsm_map_ms_o_BcsmTriggerDetectionPoint,
@@ -20537,11 +20537,11 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_O_BcsmTriggerDetectionPoint_vals), 0,
         "gsm_map_ms.O_BcsmTriggerDetectionPoint", HFILL }},
     { &hf_gsm_map_ms_O_BcsmCamelTDPCriteriaList_item,
-      { "O-BcsmCamelTDPCriteriaList", "gsm_map.ms.O_BcsmCamelTDPCriteriaList_item",
+      { "O-BcsmCamelTDP-Criteria", "gsm_map.ms.O_BcsmCamelTDP_Criteria",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.O_BcsmCamelTDP_Criteria", HFILL }},
     { &hf_gsm_map_ms_T_BCSM_CAMEL_TDP_CriteriaList_item,
-      { "T-BCSM-CAMEL-TDP-CriteriaList", "gsm_map.ms.T_BCSM_CAMEL_TDP_CriteriaList_item",
+      { "T-BCSM-CAMEL-TDP-Criteria", "gsm_map.ms.T_BCSM_CAMEL_TDP_Criteria",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.T_BCSM_CAMEL_TDP_Criteria", HFILL }},
     { &hf_gsm_map_ms_destinationNumberCriteria,
@@ -20581,23 +20581,23 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map_ms.DestinationNumberLengthList", HFILL }},
     { &hf_gsm_map_ms_DestinationNumberList_item,
-      { "DestinationNumberList", "gsm_map.ms.DestinationNumberList_item",
+      { "ISDN-AddressString", "gsm_map.ms.ISDN_AddressString",
         FT_BYTES, BASE_HEX, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ms_DestinationNumberLengthList_item,
-      { "DestinationNumberLengthList", "gsm_map.ms.DestinationNumberLengthList_item",
+      { "DestinationNumberLengthList item", "gsm_map.ms.DestinationNumberLengthList_item",
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map_ms.INTEGER_1_maxNumOfISDN_AddressDigits", HFILL }},
     { &hf_gsm_map_ms_BasicServiceCriteria_item,
-      { "BasicServiceCriteria", "gsm_map.ms.BasicServiceCriteria_item",
+      { "Ext-BasicServiceCode", "gsm_map.ms.Ext_BasicServiceCode",
         FT_UINT32, BASE_DEC, VALS(gsm_map_Ext_BasicServiceCode_vals), 0,
         "gsm_map.Ext_BasicServiceCode", HFILL }},
     { &hf_gsm_map_ms_O_CauseValueCriteria_item,
-      { "O-CauseValueCriteria", "gsm_map.ms.O_CauseValueCriteria_item",
+      { "CauseValue", "gsm_map.ms.CauseValue",
         FT_BYTES, BASE_HEX, NULL, 0,
         "gsm_map_ms.CauseValue", HFILL }},
     { &hf_gsm_map_ms_T_CauseValueCriteria_item,
-      { "T-CauseValueCriteria", "gsm_map.ms.T_CauseValueCriteria_item",
+      { "CauseValue", "gsm_map.ms.CauseValue",
         FT_BYTES, BASE_HEX, NULL, 0,
         "gsm_map_ms.CauseValue", HFILL }},
     { &hf_gsm_map_ms_sms_CAMEL_TDP_DataList,
@@ -20605,7 +20605,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map_ms.SMS_CAMEL_TDP_DataList", HFILL }},
     { &hf_gsm_map_ms_SMS_CAMEL_TDP_DataList_item,
-      { "SMS-CAMEL-TDP-DataList", "gsm_map.ms.SMS_CAMEL_TDP_DataList_item",
+      { "SMS-CAMEL-TDP-Data", "gsm_map.ms.SMS_CAMEL_TDP_Data",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.SMS_CAMEL_TDP_Data", HFILL }},
     { &hf_gsm_map_ms_defaultSMS_Handling,
@@ -20617,7 +20617,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map_ms.MobilityTriggers", HFILL }},
     { &hf_gsm_map_ms_MobilityTriggers_item,
-      { "MobilityTriggers", "gsm_map.ms.MobilityTriggers_item",
+      { "MM-Code", "gsm_map.ms.MM_Code",
         FT_BYTES, BASE_HEX, NULL, 0,
         "gsm_map_ms.MM_Code", HFILL }},
     { &hf_gsm_map_ms_t_BcsmCamelTDPDataList,
@@ -20625,7 +20625,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map_ms.T_BcsmCamelTDPDataList", HFILL }},
     { &hf_gsm_map_ms_T_BcsmCamelTDPDataList_item,
-      { "T-BcsmCamelTDPDataList", "gsm_map.ms.T_BcsmCamelTDPDataList_item",
+      { "T-BcsmCamelTDPData", "gsm_map.ms.T_BcsmCamelTDPData",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.T_BcsmCamelTDPData", HFILL }},
     { &hf_gsm_map_ms_t_BcsmTriggerDetectionPoint,
@@ -20653,11 +20653,11 @@ void proto_register_gsm_map(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.NULL", HFILL }},
     { &hf_gsm_map_ms_VBSDataList_item,
-      { "VBSDataList", "gsm_map.ms.VBSDataList_item",
+      { "VoiceBroadcastData", "gsm_map.ms.VoiceBroadcastData",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.VoiceBroadcastData", HFILL }},
     { &hf_gsm_map_ms_VGCSDataList_item,
-      { "VGCSDataList", "gsm_map.ms.VGCSDataList_item",
+      { "VoiceGroupCallData", "gsm_map.ms.VoiceGroupCallData",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.VoiceGroupCallData", HFILL }},
     { &hf_gsm_map_ms_groupId,
@@ -20853,7 +20853,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map_ms.PDP_ContextInfoList", HFILL }},
     { &hf_gsm_map_ms_PDP_ContextInfoList_item,
-      { "PDP-ContextInfoList", "gsm_map.ms.PDP_ContextInfoList_item",
+      { "PDP-ContextInfo", "gsm_map.ms.PDP_ContextInfo",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.PDP_ContextInfo", HFILL }},
     { &hf_gsm_map_ms_pdp_ContextIdentifier,
@@ -21005,7 +21005,7 @@ void proto_register_gsm_map(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.NULL", HFILL }},
     { &hf_gsm_map_ms_MSISDN_BS_List_item,
-      { "MSISDN-BS-List", "gsm_map.ms.MSISDN_BS_List_item",
+      { "MSISDN-BS", "gsm_map.ms.MSISDN_BS",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.MSISDN_BS", HFILL }},
     { &hf_gsm_map_ms_password,
@@ -22267,7 +22267,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map_lcs.AreaList", HFILL }},
     { &hf_gsm_map_lcs_AreaList_item,
-      { "AreaList", "gsm_map.lcs.AreaList_item",
+      { "Area", "gsm_map.lcs.Area",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_lcs.Area", HFILL }},
     { &hf_gsm_map_lcs_areaType,
@@ -22295,7 +22295,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map_lcs.PLMNList", HFILL }},
     { &hf_gsm_map_lcs_PLMNList_item,
-      { "PLMNList", "gsm_map.lcs.PLMNList_item",
+      { "ReportingPLMN", "gsm_map.lcs.ReportingPLMN",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_lcs.ReportingPLMN", HFILL }},
     { &hf_gsm_map_lcs_plmn_Id,
@@ -22832,7 +22832,7 @@ void proto_register_gsm_map(void) {
         FT_BYTES, BASE_HEX, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_old_SendAuthenticationInfoResOld_item,
-      { "SendAuthenticationInfoResOld", "gsm_old.SendAuthenticationInfoResOld_item",
+      { "SendAuthenticationInfoResOld item", "gsm_old.SendAuthenticationInfoResOld_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_old.SendAuthenticationInfoResOld_item", HFILL }},
     { &hf_gsm_old_rand,
@@ -22852,7 +22852,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_old.TripletListold", HFILL }},
     { &hf_gsm_old_TripletListold_item,
-      { "TripletListold", "gsm_old.TripletListold_item",
+      { "AuthenticationTriplet-v2", "gsm_old.AuthenticationTriplet_v2",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_old.AuthenticationTriplet_v2", HFILL }},
     { &hf_gsm_old_channelType,
@@ -22912,7 +22912,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_old.T_operatorSS_Code", HFILL }},
     { &hf_gsm_old_operatorSS_Code_item,
-      { "operatorSS-Code", "gsm_old.operatorSS_Code_item",
+      { "operatorSS-Code item", "gsm_old.operatorSS_Code_item",
         FT_BYTES, BASE_HEX, NULL, 0,
         "gsm_old.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_gsm_old_sm_RP_DA,