Following r44648, revert part of r44162 and followups so as to have a top level gsm_a filter name

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44667 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 132 insertions, 132 deletions

diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c
index 3d93aa9213..89d6d8dcae 100644
--- a/epan/dissectors/packet-gsm_a_bssmap.c
+++ b/epan/dissectors/packet-gsm_a_bssmap.c
@@ -6957,659 +6957,659 @@ proto_register_gsm_a_bssmap(void)
     static hf_register_info hf[] =
     {
     { &hf_gsm_a_bssmap_msg_type,
-        { "BSSMAP Message Type",    "gsm_a_bssmap.msgtype",
+        { "BSSMAP Message Type",    "gsm_a.bssmap.msgtype",
         FT_UINT8, BASE_HEX|BASE_EXT_STRING, &gsm_a_bssmap_msg_strings_ext, 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_elem_id,
-        { "Element ID", "gsm_a_bssmap.elem_id",
+        { "Element ID", "gsm_a.bssmap.elem_id",
         FT_UINT8, BASE_HEX, NULL, 0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_field_elem_id,
-        { "Field Element ID",   "gsm_a_bssmap.field_elem_id",
+        { "Field Element ID",   "gsm_a.bssmap.field_elem_id",
         FT_UINT8, BASE_HEX, VALS(bssmap_field_element_ids), 0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_cell_ci,
-        { "Cell CI",    "gsm_a_bssmap.cell_ci",
+        { "Cell CI",    "gsm_a.bssmap.cell_ci",
         FT_UINT16, BASE_HEX_DEC, 0, 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_cell_lac,
-        { "Cell LAC",   "gsm_a_bssmap.cell_lac",
+        { "Cell LAC",   "gsm_a.bssmap.cell_lac",
         FT_UINT16, BASE_HEX_DEC, 0, 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_sac,
-        { "SAC",    "gsm_a_bssmap.sac",
+        { "SAC",    "gsm_a.bssmap.sac",
         FT_UINT16, BASE_HEX, 0, 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_dlci_cc,
-        { "Control Channel", "gsm_a_bssmap.dlci.cc",
+        { "Control Channel", "gsm_a.bssmap.dlci.cc",
         FT_UINT8, BASE_HEX, VALS(bssap_cc_values), 0xc0,
         NULL, HFILL}
     },
     { &hf_gsm_a_bssmap_dlci_spare,
-        { "Spare", "gsm_a_bssmap.dlci.spare",
+        { "Spare", "gsm_a.bssmap.dlci.spare",
         FT_UINT8, BASE_HEX, NULL, 0x38,
         NULL, HFILL}
     },
     { &hf_gsm_a_bssmap_dlci_sapi,
-        { "SAPI", "gsm_a_bssmap.dlci.sapi",
+        { "SAPI", "gsm_a.bssmap.dlci.sapi",
         FT_UINT8, BASE_HEX, VALS(bssap_sapi_values), 0x07,
         NULL, HFILL}
     },
     { &hf_gsm_a_bssmap_cause,
-        { "BSSMAP Cause",   "gsm_a_bssmap.cause",
+        { "BSSMAP Cause",   "gsm_a.bssmap.cause",
         FT_UINT8, BASE_HEX, 0, 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_be_cell_id_disc,
-        { "Cell identification discriminator","gsm_a_bssmap.be.cell_id_disc",
+        { "Cell identification discriminator","gsm_a.bssmap.be.cell_id_disc",
         FT_UINT8,BASE_DEC|BASE_EXT_STRING,  &gsm_a_be_cell_id_disc_vals_ext, 0x0f,
         NULL, HFILL }
     },
         { &hf_gsm_a_bssmap_pci,
-        { "Preemption Capability indicator(PCI)","gsm_a_bssmap.pci",
+        { "Preemption Capability indicator(PCI)","gsm_a.bssmap.pci",
         FT_BOOLEAN,8, TFS(&bssmap_pci_value), 0x40,
         NULL, HFILL }
     },
         { &hf_gsm_a_bssmap_qa,
-        { "Queuing Allowed Indicator(QA)","gsm_a_bssmap.qa",
+        { "Queuing Allowed Indicator(QA)","gsm_a.bssmap.qa",
         FT_BOOLEAN,8, TFS(&tfs_allowed_not_allowed), 0x02,
         NULL, HFILL }
     },
         { &hf_gsm_a_bssmap_pvi,
-        { "Preemption Vulnerability Indicator(PVI)","gsm_a_bssmap.pvi",
+        { "Preemption Vulnerability Indicator(PVI)","gsm_a.bssmap.pvi",
         FT_BOOLEAN,8, TFS(&bssmap_pvi_value), 0x01,
         NULL, HFILL }
     },
         { &hf_gsm_a_bssmap_interference_bands,
-        { "Acceptable interference bands","gsm_a_bssmap.interference_bands",
+        { "Acceptable interference bands","gsm_a.bssmap.interference_bands",
         FT_UINT8, BASE_HEX, NULL, 0x01f,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_lsa_only,
-        { "LSA only","gsm_a_bssmap.lsa_only",
+        { "LSA only","gsm_a.bssmap.lsa_only",
         FT_BOOLEAN,8, TFS(&bssmap_lsa_only_value), 0x01,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_act,
-        { "Active mode support","gsm_a_bssmap.act",
+        { "Active mode support","gsm_a.bssmap.act",
         FT_BOOLEAN,8, NULL, 0x20,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_pref,
-        { "Preferential access","gsm_a_bssmap.pref",
+        { "Preferential access","gsm_a.bssmap.pref",
         FT_BOOLEAN,8, NULL, 0x10,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_lsa_inf_prio,
-        { "Priority","gsm_a_bssmap.lsa_inf_prio",
+        { "Priority","gsm_a.bssmap.lsa_inf_prio",
         FT_UINT8,BASE_DEC, NULL, 0x0f,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_seq_len,
-        { "Sequence Length","gsm_a_bssmap.seq_len",
+        { "Sequence Length","gsm_a.bssmap.seq_len",
         FT_UINT8,BASE_DEC, NULL, 0xf0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_seq_no,
-        { "Sequence Number","gsm_a_bssmap.seq_no",
+        { "Sequence Number","gsm_a.bssmap.seq_no",
         FT_UINT8,BASE_DEC, NULL, 0xf,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssap_cell_id_list_seg_cell_id_disc,
-        { "Cell identification discriminator","gsm_a_bssmap.cell_id_list_seg_cell_id_disc",
+        { "Cell identification discriminator","gsm_a.bssmap.cell_id_list_seg_cell_id_disc",
         FT_UINT8,BASE_DEC, VALS(gsm_a_bssap_cell_id_list_seg_cell_id_disc_vals), 0xf,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssap_res_ind_method,
-        { "Resource indication method","gsm_a_bssmap.res_ind_method",
+        { "Resource indication method","gsm_a.bssmap.res_ind_method",
         FT_UINT8,BASE_DEC, VALS(gsm_a_bssap_resource_indication_vals), 0xf,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssap_cic_list_range,
-        { "Range","gsm_a_bssmap.cic_list_range",
+        { "Range","gsm_a.bssmap.cic_list_range",
         FT_UINT8, BASE_DEC, NULL, 0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssap_cic_list_status,
-        { "Status","gsm_a_bssmap.cic_list_status",
+        { "Status","gsm_a.bssmap.cic_list_status",
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssap_diag_error_pointer,
-        { "Error pointer","gsm_a_bssmap.diag_error_pointer",
+        { "Error pointer","gsm_a.bssmap.diag_error_pointer",
         FT_UINT16, BASE_HEX, NULL, 0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssap_diag_msg_rcv,
-        { "Message received","gsm_a_bssmap.cic_list_status",
+        { "Message received","gsm_a.bssmap.cic_list_status",
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_ch_mode,
-        { "Channel mode","gsm_a_bssmap.cch_mode",
+        { "Channel mode","gsm_a.bssmap.cch_mode",
         FT_UINT8,BASE_DEC,  VALS(gsm_a_bssmap_ch_mode_vals), 0xf0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_cur_ch_mode,
-    { "Channel Mode", "gsm_a_bssmap.fe_cur_chan_type2.chan_mode",
+    { "Channel Mode", "gsm_a.bssmap.fe_cur_chan_type2.chan_mode",
         FT_UINT8, BASE_HEX, VALS(chan_mode_vals), 0xf0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_channel,
-        { "Channel","gsm_a_bssmap.channel",
+        { "Channel","gsm_a.bssmap.channel",
         FT_UINT8,BASE_DEC,  VALS(gsm_a_bssmap_channel_vals), 0x0f,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_trace_trigger_id,
-        { "Priority Indication","gsm_a_bssmap.trace_trigger_id",
+        { "Priority Indication","gsm_a.bssmap.trace_trigger_id",
         FT_STRING, BASE_NONE, NULL, 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_trace_priority_indication,
-        { "Priority Indication","gsm_a_bssmap.trace_priority_indication",
+        { "Priority Indication","gsm_a.bssmap.trace_priority_indication",
         FT_UINT8,BASE_DEC,  NULL, 0x00,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_trace_bss_record_type,
-        { "BSS Record Type","gsm_a_bssmap.bss_record__type",
+        { "BSS Record Type","gsm_a.bssmap.bss_record__type",
         FT_UINT8,BASE_DEC,  VALS(gsm_a_bssmap_trace_bss_record_type_vals), 0x00,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_trace_msc_record_type,
-        { "MSC Record Type","gsm_a_bssmap.msc_record_type",
+        { "MSC Record Type","gsm_a.bssmap.msc_record_type",
         FT_UINT8,BASE_DEC,  VALS(gsm_a_bssmap_trace_msc_record_type_vals), 0x00,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_trace_invoking_event,
-        { "Invoking Event","gsm_a_bssmap.trace_invoking_event",
+        { "Invoking Event","gsm_a.bssmap.trace_invoking_event",
         FT_UINT8,BASE_DEC,  VALS(gsm_a_bssmap_trace_invoking_event_vals), 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_trace_reference,
-        { "Trace Reference","gsm_a_bssmap.trace_id",
+        { "Trace Reference","gsm_a.bssmap.trace_id",
         FT_UINT16,BASE_DEC,  NULL, 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_trace_omc_id,
-        { "OMC ID","gsm_a_bssmap.trace_omc_id",
+        { "OMC ID","gsm_a.bssmap.trace_omc_id",
         FT_STRING, BASE_NONE, NULL, 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_be_rnc_id,
-        { "RNC-ID","gsm_a_bssmap.be.rnc_id",
+        { "RNC-ID","gsm_a.bssmap.be.rnc_id",
         FT_UINT16,BASE_DEC,  NULL, 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_apdu_protocol_id,
-        { "Protocol ID", "gsm_a_bssmap.apdu_protocol_id",
+        { "Protocol ID", "gsm_a.bssmap.apdu_protocol_id",
         FT_UINT8, BASE_DEC, VALS(gsm_a_apdu_protocol_id_strings), 0x0,
         "APDU embedded protocol id", HFILL }
     },
     { &hf_gsm_a_bssmap_periodicity,
-        { "Periodicity", "gsm_a_bssmap.periodicity",
+        { "Periodicity", "gsm_a.bssmap.periodicity",
         FT_UINT8, BASE_DEC, NULL, 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_sm,
-        { "Subsequent Mode","gsm_a_bssmap.sm",
+        { "Subsequent Mode","gsm_a.bssmap.sm",
         FT_BOOLEAN,8, NULL, 0x02,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_tarr,
-        { "Total Accessible Resource Requested","gsm_a_bssmap.tarr",
+        { "Total Accessible Resource Requested","gsm_a.bssmap.tarr",
         FT_BOOLEAN,8, NULL, 0x01,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_tot_no_of_fullr_ch,
-        { "Total number of accessible full rate channels", "gsm_a_bssmap.tot_no_of_fullr_ch",
+        { "Total number of accessible full rate channels", "gsm_a.bssmap.tot_no_of_fullr_ch",
         FT_UINT16, BASE_DEC, NULL, 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_tot_no_of_hr_ch,
-        { "Total number of accessible half rate channels", "gsm_a_bssmap.tot_no_of_hr_ch",
+        { "Total number of accessible half rate channels", "gsm_a.bssmap.tot_no_of_hr_ch",
         FT_UINT16, BASE_DEC, NULL, 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_lsa_id,
-        { "Identification of Localised Service Area", "gsm_a_bssmap.lsa_id",
+        { "Identification of Localised Service Area", "gsm_a.bssmap.lsa_id",
         FT_UINT24, BASE_HEX, NULL, 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_ep,
-        { "EP", "gsm_a_bssmap.ep",
+        { "EP", "gsm_a.bssmap.ep",
         FT_UINT8, BASE_DEC, NULL, 0x01,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_smi,
-        { "Subsequent Modification Indication(SMI)", "gsm_a_bssmap.smi",
+        { "Subsequent Modification Indication(SMI)", "gsm_a.bssmap.smi",
         FT_UINT8, BASE_DEC, VALS(gsm_a_bssmap_smi_vals), 0x0f,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_lcs_pri,
-        { "Periodicity", "gsm_a_bssmap.lcs_pri",
+        { "Periodicity", "gsm_a.bssmap.lcs_pri",
         FT_UINT8, BASE_DEC, VALS(lcs_priority_vals), 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_num_ms,
-        { "Number of handover candidates", "gsm_a_bssmap.num_ms",
+        { "Number of handover candidates", "gsm_a.bssmap.num_ms",
         FT_UINT8, BASE_DEC,NULL, 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_talker_pri,
-        { "Priority", "gsm_a_bssmap.talker_pri",
+        { "Priority", "gsm_a.bssmap.talker_pri",
         FT_UINT8, BASE_DEC,VALS(gsm_a_bssmap_talker_pri_vals), 0x03,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_rr_mode,
-        { "RR mode", "gsm_a_bssmap.rr_mode",
+        { "RR mode", "gsm_a.bssmap.rr_mode",
         FT_UINT8, BASE_DEC, VALS(gsm_a_bssmap_rr_mode_vals), 0xc0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_group_cipher_key_nb,
-        { "Group cipher key number", "gsm_a_bssmap.group_cipher_key_nb",
+        { "Group cipher key number", "gsm_a.bssmap.group_cipher_key_nb",
         FT_UINT8, BASE_DEC, VALS(gsm_a_bssmap_group_cipher_key_nb_vals), 0x3c,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_vgcs_vbs_cell_status,
-        { "Status", "gsm_a_bssmap.vgcs_vbs_cell_status",
+        { "Status", "gsm_a.bssmap.vgcs_vbs_cell_status",
         FT_UINT8, BASE_DEC, VALS(gsm_a_bssmap_vgcs_vbs_cell_status_vals), 0x07,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_paging_cause,
-        { "Paging Cause", "gsm_a_bssmap.paging_cause",
+        { "Paging Cause", "gsm_a.bssmap.paging_cause",
         FT_UINT8, BASE_DEC,VALS(gsm_a_bssmap_paging_cause_vals), 0x06,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_paging_inf_flg,
-        { "VGCS/VBS flag","gsm_a_bssmap.paging_inf_flg",
+        { "VGCS/VBS flag","gsm_a.bssmap.paging_inf_flg",
         FT_BOOLEAN,8, TFS(&bssmap_paging_inf_flg_value), 0x01,
         "If 1, a member of a VGCS/VBS-group", HFILL }
     },
     { &hf_gsm_a_bssmap_serv_ho_inf,
-        { "Service Handover information", "gsm_a_bssmap.serv_ho_inf",
+        { "Service Handover information", "gsm_a.bssmap.serv_ho_inf",
         FT_UINT8, BASE_HEX, NULL, 0x07,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_max_nb_traffic_chan,
-        { "Maximum Number of Traffic Channels", "gsm_a_bssmap.max_nb_traffic_chan",
+        { "Maximum Number of Traffic Channels", "gsm_a.bssmap.max_nb_traffic_chan",
         FT_UINT8, BASE_DEC, VALS(gsm_a_max_nb_traffic_chan_vals), 0x07,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_acceptable_chan_coding_bit5,
-        { "TCH/F43.2", "gsm_a_bssmap.acceptable_chan_coding_bit5",
+        { "TCH/F43.2", "gsm_a.bssmap.acceptable_chan_coding_bit5",
         FT_BOOLEAN, 8, TFS(&gsm_a_bssmap_accept_not_accept_vals), 0x10,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_acceptable_chan_coding_bit4,
-        { "TCH/F43.2", "gsm_a_bssmap.acceptable_chan_coding_bit4",
+        { "TCH/F43.2", "gsm_a.bssmap.acceptable_chan_coding_bit4",
         FT_BOOLEAN, 8, TFS(&gsm_a_bssmap_accept_not_accept_vals), 0x08,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_acceptable_chan_coding_bit3,
-        { "TCH/F43.2", "gsm_a_bssmap.acceptable_chan_coding_bit3",
+        { "TCH/F43.2", "gsm_a.bssmap.acceptable_chan_coding_bit3",
         FT_BOOLEAN, 8, TFS(&gsm_a_bssmap_accept_not_accept_vals), 0x04,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_acceptable_chan_coding_bit2,
-        { "TCH/F43.2", "gsm_a_bssmap.acceptable_chan_coding_bit2",
+        { "TCH/F43.2", "gsm_a.bssmap.acceptable_chan_coding_bit2",
         FT_BOOLEAN, 8, TFS(&gsm_a_bssmap_accept_not_accept_vals), 0x02,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_acceptable_chan_coding_bit1,
-        { "TCH/F43.2", "gsm_a_bssmap.acceptable_chan_coding_bit1",
+        { "TCH/F43.2", "gsm_a.bssmap.acceptable_chan_coding_bit1",
         FT_BOOLEAN, 8, TFS(&gsm_a_bssmap_accept_not_accept_vals), 0x01,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_allowed_data_rate_bit8,
-        { "43.5 kbit/s (TCH/F43.2)", "gsm_a_bssmap.allowed_data_rate_bit8",
+        { "43.5 kbit/s (TCH/F43.2)", "gsm_a.bssmap.allowed_data_rate_bit8",
         FT_BOOLEAN, 8, TFS(&tfs_allowed_not_allowed), 0x80,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_allowed_data_rate_bit7,
-        { "32.0 kbit/s (TCH/F32.0)", "gsm_a_bssmap.allowed_data_rate_bit7",
+        { "32.0 kbit/s (TCH/F32.0)", "gsm_a.bssmap.allowed_data_rate_bit7",
         FT_BOOLEAN, 8, TFS(&tfs_allowed_not_allowed), 0x40,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_allowed_data_rate_bit6,
-        { "29.0 kbit/s (TCH/F28.8)", "gsm_a_bssmap.allowed_data_rate_bit6",
+        { "29.0 kbit/s (TCH/F28.8)", "gsm_a.bssmap.allowed_data_rate_bit6",
         FT_BOOLEAN, 8, TFS(&tfs_allowed_not_allowed), 0x20,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_allowed_data_rate_bit5,
-        { "14.5/14.4 kbit/s (TCH/F14.4)", "gsm_a_bssmap.allowed_data_rate_bit5",
+        { "14.5/14.4 kbit/s (TCH/F14.4)", "gsm_a.bssmap.allowed_data_rate_bit5",
         FT_BOOLEAN, 8, TFS(&tfs_allowed_not_allowed), 0x10,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_allowed_data_rate_bit4,
-        { "12.0/9.6 kbit/s (TCH F/9.6)", "gsm_a_bssmap.allowed_data_rate_bit4",
+        { "12.0/9.6 kbit/s (TCH F/9.6)", "gsm_a.bssmap.allowed_data_rate_bit4",
         FT_BOOLEAN, 8, TFS(&tfs_allowed_not_allowed), 0x08,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_vstk_rand,
-        { "VSTK_RAND", "gsm_a_bssmap.vstk_rand",
+        { "VSTK_RAND", "gsm_a.bssmap.vstk_rand",
         FT_UINT64, BASE_HEX, NULL, 0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_vstk,
-        { "VSTK", "gsm_a_bssmap.vstk",
+        { "VSTK", "gsm_a.bssmap.vstk",
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }
     },
 
     { &hf_gsm_a_bssmap_spare_bits,
-        { "Spare bit(s)", "gsm_a_bssmap.spare_bits",
+        { "Spare bit(s)", "gsm_a.bssmap.spare_bits",
         FT_UINT8, BASE_HEX, NULL, 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_tpind,
-        { "Talker priority indicator (TP Ind)","gsm_a_bssmap.tpind",
+        { "Talker priority indicator (TP Ind)","gsm_a.bssmap.tpind",
         FT_BOOLEAN,8, TFS(&gsm_bssmap_tpind_vals), 0x01,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_asind_b2,
-        { "A-interface resource sharing indicator (AS Ind) bit 2","gsm_a_bssmap.asind_b2",
+        { "A-interface resource sharing indicator (AS Ind) bit 2","gsm_a.bssmap.asind_b2",
         FT_BOOLEAN,8, TFS(&gsm_bssmap_asind_b2_vals), 0x02,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_asind_b3,
-        { "A-interface resource sharing indicator (AS Ind) bit 3","gsm_a_bssmap.asind_b3",
+        { "A-interface resource sharing indicator (AS Ind) bit 3","gsm_a.bssmap.asind_b3",
         FT_BOOLEAN,8, TFS(&gsm_bssmap_asind_b3_vals), 0x04,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_bss_res,
-        { "Group or broadcast call re-establishment by the BSS indicator","gsm_a_bssmap.bss_res",
+        { "Group or broadcast call re-establishment by the BSS indicator","gsm_a.bssmap.bss_res",
         FT_BOOLEAN,8, TFS(&gsm_bssmap_bss_res_vals), 0x08,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_tcp,
-        { "Talker Channel Parameter (TCP)","gsm_a_bssmap.tcp",
+        { "Talker Channel Parameter (TCP)","gsm_a.bssmap.tcp",
         FT_BOOLEAN,8, TFS(&gsm_bssmap_bss_tcp_vals), 0x10,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_filler_bits,
-        { "Filler Bits","gsm_a_bssmap.filler_bits",
+        { "Filler Bits","gsm_a.bssmap.filler_bits",
         FT_UINT8, BASE_DEC,NULL, 0x07,
         NULL, HFILL }
     },
         { &hf_gsm_a_bssmap_method,
-        { "Method","gsm_a_bssmap.method",
+        { "Method","gsm_a.bssmap.method",
         FT_UINT8, BASE_DEC,VALS(gsm_a_bssmap_method_vals), 0xc0,
         NULL, HFILL }
     },
         { &hf_gsm_a_bssmap_ganss_id,
-        { "GANSS Id","gsm_a_bssmap.ganss_id",
+        { "GANSS Id","gsm_a.bssmap.ganss_id",
         FT_UINT8, BASE_DEC,VALS(gsm_a_bssmap_ganss_id_vals), 0x38,
         NULL, HFILL }
     },
         { &hf_gsm_a_bssmap_usage,
-        { "Usage","gsm_a_bssmap.usage",
+        { "Usage","gsm_a.bssmap.usage",
         FT_UINT8, BASE_DEC,VALS(gsm_a_bssmap_usage_vals), 0x07,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_data_id,
-        { "Data Identity","gsm_a_bssmap.data_id",
+        { "Data Identity","gsm_a.bssmap.data_id",
         FT_UINT8, BASE_DEC_HEX, NULL, 0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_bt_ind,
-        { "BT Ind","gsm_a_bssmap.bt_ind",
+        { "BT Ind","gsm_a.bssmap.bt_ind",
         FT_BOOLEAN, 8, TFS(&gsm_a_bssmap_bt_ind_val), 0x01,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_aoip_trans_ipv4,
-        { "Transport Layer Address (IPv4)","gsm_a_bssmap.aoip_trans_ipv4",
+        { "Transport Layer Address (IPv4)","gsm_a.bssmap.aoip_trans_ipv4",
         FT_IPv4,BASE_NONE,  NULL, 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_aoip_trans_ipv6,
-        { "Transport Layer Address (IPv6)","gsm_a_bssmap.aoip_trans_ipv6",
+        { "Transport Layer Address (IPv6)","gsm_a.bssmap.aoip_trans_ipv6",
         FT_IPv6,BASE_NONE,  NULL, 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_aoip_trans_port,
-        { "UDP Port","gsm_a_bssmap.aoip_trans_port",
+        { "UDP Port","gsm_a.bssmap.aoip_trans_port",
         FT_UINT16, BASE_DEC,NULL, 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_fi,
-        { "FI(Full IP)","gsm_a_bssmap.fi",
+        { "FI(Full IP)","gsm_a.bssmap.fi",
         FT_BOOLEAN,8, TFS(&bssmap_fi_vals), 0x80,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_pi,
-        { "PI","gsm_a_bssmap.pi",
+        { "PI","gsm_a.bssmap.pi",
         FT_BOOLEAN,8, TFS(&bssmap_pi_vals), 0x40,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_pt,
-        { "PT","gsm_a_bssmap.pt",
+        { "PT","gsm_a.bssmap.pt",
         FT_BOOLEAN,8, TFS(&bssmap_pt_vals), 0x20,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_tf,
-        { "TF","gsm_a_bssmap.tf",
+        { "TF","gsm_a.bssmap.tf",
         FT_BOOLEAN,8, TFS(&bssmap_tf_vals), 0x10,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssap_speech_codec,
-        { "Codec Type","gsm_a_bssmap.speech_codec",
+        { "Codec Type","gsm_a.bssmap.speech_codec",
         FT_UINT8, BASE_DEC|BASE_EXT_STRING, &bssap_speech_codec_values_ext, 0x0f,
         NULL, HFILL }
     },
         { &hf_gsm_a_bssap_extended_codec,
-        { "Extended Codec Type","gsm_a_bssmap.extended_codec",
+        { "Extended Codec Type","gsm_a.bssmap.extended_codec",
         FT_UINT8, BASE_DEC, VALS(bssap_extended_codec_values), 0x0,
         NULL, HFILL }
     },
         { &hf_gsm_a_bssap_extended_codec_r2,
-        { "Redundancy Level 2","gsm_a_bssmap.r2",
+        { "Redundancy Level 2","gsm_a.bssmap.r2",
         FT_BOOLEAN,8, TFS(&tfs_supported_not_supported), 0x80,
         NULL, HFILL }
     },
         { &hf_gsm_a_bssap_extended_codec_r3,
-        { "Redundancy Level 3","gsm_a_bssmap.r3",
+        { "Redundancy Level 3","gsm_a.bssmap.r3",
         FT_BOOLEAN,8, TFS(&tfs_supported_not_supported), 0x40,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_fi2,
-        { "FI(Full IP)","gsm_a_bssmap.fi2",
+        { "FI(Full IP)","gsm_a.bssmap.fi2",
         FT_BOOLEAN,8, TFS(&bssmap_fi2_vals), 0x80,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_pi2,
-        { "PI","gsm_a_bssmap.pi2",
+        { "PI","gsm_a.bssmap.pi2",
         FT_BOOLEAN,8, TFS(&bssmap_pi2_vals), 0x40,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_pt2,
-        { "PT","gsm_a_bssmap.pt2",
+        { "PT","gsm_a.bssmap.pt2",
         FT_BOOLEAN,8, TFS(&bssmap_pt2_vals), 0x20,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_tf2,
-        { "TF","gsm_a_bssmap.tf2",
+        { "TF","gsm_a.bssmap.tf2",
         FT_BOOLEAN,8, TFS(&bssmap_tf2_vals), 0x10,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_call_id,
-        { "Call Identifier","gsm_a_bssmap.callid",
+        { "Call Identifier","gsm_a.bssmap.callid",
         FT_UINT32, BASE_DEC,NULL, 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_spare,
-        { "Spare", "gsm_a_bssmap.spare",
+        { "Spare", "gsm_a.bssmap.spare",
         FT_UINT8, BASE_HEX, NULL, 0x0,
         NULL, HFILL}
     },
     { &hf_gsm_a_bssmap_positioning_data_discriminator,
-        { "Positioning Data Discriminator", "gsm_a_bssmap.posData.discriminator",
+        { "Positioning Data Discriminator", "gsm_a.bssmap.posData.discriminator",
         FT_UINT8, BASE_HEX, NULL, 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_positioning_method,
-        { "Positioning method", "gsm_a_bssmap.posData.method",
+        { "Positioning method", "gsm_a.bssmap.posData.method",
         FT_UINT8, BASE_HEX, VALS(bssmap_positioning_methods), 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_positioning_method_usage,
-        { "Usage", "gsm_a_bssmap.posData.usage",
+        { "Usage", "gsm_a.bssmap.posData.usage",
         FT_UINT8, BASE_HEX, VALS(bssmap_positioning_methods_usage), 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_location_type_location_information,
-        { "Location Information", "gsm_a_bssmap.locationType.locationInformation",
+        { "Location Information", "gsm_a.bssmap.locationType.locationInformation",
         FT_UINT8, BASE_HEX, VALS(bssmap_location_information_vals), 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_location_type_positioning_method,
-        { "Positioning Method", "gsm_a_bssmap.locationType.positioningMethod",
+        { "Positioning Method", "gsm_a.bssmap.locationType.positioningMethod",
         FT_UINT8, BASE_HEX, VALS(bssmap_positioning_method_vals), 0x0,
         NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_chan_type_extension,
-        { "Extension", "gsm_a_bssmap.chanType.permittedIndicator.extension",
+        { "Extension", "gsm_a.bssmap.chanType.permittedIndicator.extension",
             FT_BOOLEAN, 8, TFS(&bssmap_chan_type_extension_value), 0x80,
             NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_cause_extension,
-        { "Extension", "gsm_a_bssmap.causeType.extension",
+        { "Extension", "gsm_a.bssmap.causeType.extension",
             FT_BOOLEAN, 8, TFS(&bssmap_cause_extension_value), 0x80,
             NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_emlpp_prio,
-        { "eMLPP Priority", "gsm_a_bssmap.emlpp_priority",
+        { "eMLPP Priority", "gsm_a.bssmap.emlpp_priority",
             FT_UINT8, BASE_HEX, VALS(gsm_a_bssmap_call_priority_vals), 0x07,
             NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_rip,
-        { "RIP", "gsm_a_bssmap.rip",
+        { "RIP", "gsm_a.bssmap.rip",
             FT_BOOLEAN, 8, TFS(&gsm_a_bssmap_rip_value), 0x02,
             NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_rtd,
-        { "RTD", "gsm_a_bssmap.rtd",
+        { "RTD", "gsm_a.bssmap.rtd",
             FT_BOOLEAN, 8, TFS(&gsm_a_bssmap_rtd_value), 0x01,
             NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_kc128,
-        { "Kc128", "gsm_a_bssmap.kc128",
+        { "Kc128", "gsm_a.bssmap.kc128",
             FT_BYTES, BASE_NONE, NULL, 0,
             NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_csg_id,
-        { "CSG Identity", "gsm_a_bssmap.csg_id",
+        { "CSG Identity", "gsm_a.bssmap.csg_id",
             FT_UINT32, BASE_DEC, NULL, 0,
             NULL, HFILL }
     },
     { &hf_gsm_a_bssmap_cell_access_mode,
-        { "Cell Access Mode", "gsm_a_bssmap.cell_access_mode",
+        { "Cell Access Mode", "gsm_a.bssmap.cell_access_mode",
             FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_bssmap_cell_access_mode_value), 0,
             NULL, HFILL }
     },
 
     { &hf_fe_extra_info_prec,
-        { "Pre-emption Recommendation", "gsm_a_bssmap.fe_extra_info.prec",
+        { "Pre-emption Recommendation", "gsm_a.bssmap.fe_extra_info.prec",
             FT_UINT8, BASE_DEC, VALS(fe_extra_info_prec_vals), 0x01,
             NULL, HFILL }
     },
     { &hf_fe_extra_info_lcs,
-        { "LCS Information", "gsm_a_bssmap.fe_extra_info.lcs",
+        { "LCS Information", "gsm_a.bssmap.fe_extra_info.lcs",
             FT_UINT8, BASE_DEC, VALS(fe_extra_info_lcs_vals), 0x02,
             NULL, HFILL }
     },
     { &hf_fe_extra_info_ue_prob,
-        { "UE support of UMTS", "gsm_a_bssmap.fe_extra_info.ue_prob",
+        { "UE support of UMTS", "gsm_a.bssmap.fe_extra_info.ue_prob",
             FT_UINT8, BASE_DEC, VALS(fe_extra_info_ue_prob_vals), 0x04,
             NULL, HFILL }
     },
     { &hf_fe_extra_info_spare,
-        { "Extra Information Spare bits", "gsm_a_bssmap.fe_extra_info.spare",
+        { "Extra Information Spare bits", "gsm_a.bssmap.fe_extra_info.spare",
             FT_UINT8, BASE_HEX, NULL, 0xf8,
             NULL, HFILL }
     },
     { &hf_fe_cur_chan_type2_chan_mode,
-        { "Channel Mode", "gsm_a_bssmap.fe_cur_chan_type2.chan_mode",
+        { "Channel Mode", "gsm_a.bssmap.fe_cur_chan_type2.chan_mode",
              FT_UINT8, BASE_HEX, VALS(chan_mode_vals), 0x0f,
              NULL, HFILL }
     },
     { &hf_fe_cur_chan_type2_chan_mode_spare,
-        { "Channel Mode Spare bits", "gsm_a_bssmap.fe_cur_chan_type2_chan_mode.spare",
+        { "Channel Mode Spare bits", "gsm_a.bssmap.fe_cur_chan_type2_chan_mode.spare",
             FT_UINT8, BASE_HEX, NULL, 0xf0,
             NULL, HFILL }
     },
     { &hf_fe_cur_chan_type2_chan_field,
-        { "Channel Field", "gsm_a_bssmap.fe_cur_chan_type2.chan_field",
+        { "Channel Field", "gsm_a.bssmap.fe_cur_chan_type2.chan_field",
             FT_UINT8, BASE_HEX, VALS(fe_cur_chan_type2_chan_field_vals),0x0f,
             NULL, HFILL }
     },
     { &hf_fe_cur_chan_type2_chan_field_spare,
-        { "Channel field Spare bits", "gsm_a_bssmap.fe_cur_chan_type2_chan_field.spare",
+        { "Channel field Spare bits", "gsm_a.bssmap.fe_cur_chan_type2_chan_field.spare",
             FT_UINT8, BASE_HEX, NULL, 0xf0,
             NULL, HFILL }
     },
     { &hf_fe_target_radio_cell_info_rxlev_ncell,
-        { "RXLEV-NCELL", "gsm_a_bssmap.fe_target_radio_cell_info.rxlev_ncell",
+        { "RXLEV-NCELL", "gsm_a.bssmap.fe_target_radio_cell_info.rxlev_ncell",
             FT_UINT8, BASE_HEX|BASE_EXT_STRING, &gsm_a_rr_rxlev_vals_ext, 0x3f,
             NULL, HFILL }
     },
     { &hf_fe_target_radio_cell_info_rxlev_ncell_spare,
-        { "RXLEV-NCELL Spare bits", "gsm_a_bssmap.fe_target_radio_cell_info.rxlev_ncell_spare",
+        { "RXLEV-NCELL Spare bits", "gsm_a.bssmap.fe_target_radio_cell_info.rxlev_ncell_spare",
             FT_UINT8, BASE_HEX, NULL, 0xc0,
             NULL, HFILL }
     },
     { &hf_fe_dtm_info_dtm_ind,
-        { "DTM indicator", "gsm_a_bssmap.fe_dtm_info.dtm_ind",
+        { "DTM indicator", "gsm_a.bssmap.fe_dtm_info.dtm_ind",
             FT_UINT8, BASE_HEX, VALS(gsm_a_bssmap_dtm_info_dtm_ind_vals), 0x01,
             NULL, HFILL }
     },
     { &hf_fe_dtm_info_sto_ind,
-        { "Time Slot Operation indicator", "gsm_a_bssmap.fe_dtm_info.sto_ind",
+        { "Time Slot Operation indicator", "gsm_a.bssmap.fe_dtm_info.sto_ind",
             FT_UINT8, BASE_HEX, VALS(gsm_a_bssmap_dtm_info_sto_ind_vals), 0x02,
             NULL, HFILL }
     },
     { &hf_fe_dtm_info_egprs_ind,
-        { "EGPRS indicator", "gsm_a_bssmap.fe_dtm_info.egprs_ind",
+        { "EGPRS indicator", "gsm_a.bssmap.fe_dtm_info.egprs_ind",
             FT_UINT8, BASE_HEX, VALS(gsm_a_bssmap_dtm_info_egprs_ind_vals), 0x04,
             NULL, HFILL }
     },
     { &hf_fe_dtm_info_spare_bits,
-        { "DTM Info Spare bits", "gsm_a_bssmap.fe_dtm_info.spare_bits",
+        { "DTM Info Spare bits", "gsm_a.bssmap.fe_dtm_info.spare_bits",
             FT_UINT8, BASE_HEX, NULL, 0xf8,
             NULL, HFILL }
     },
     { &hf_fe_cell_load_info_cell_capacity_class,
-        { "Cell capacity class", "gsm_a_bssmap.fe_cell_load_info.cell_capacity_class",
+        { "Cell capacity class", "gsm_a.bssmap.fe_cell_load_info.cell_capacity_class",
             FT_UINT8, BASE_DEC, NULL, 0,
             NULL, HFILL }
     },
     { &hf_fe_cell_load_info_load_value,
-        { "Load value", "gsm_a_bssmap.fe_cell_load_info.load_info",
+        { "Load value", "gsm_a.bssmap.fe_cell_load_info.load_info",
             FT_UINT8, BASE_DEC, NULL, 0,
             NULL, HFILL }
     },
     { &hf_fe_cell_load_info_rt_load_value,
-        { "Realtime load value", "gsm_a_bssmap.fe_cell_load_info.rt_load_value",
+        { "Realtime load value", "gsm_a.bssmap.fe_cell_load_info.rt_load_value",
             FT_UINT8, BASE_DEC, NULL, 0,
             NULL, HFILL }
     },
     { &hf_fe_cell_load_info_nrt_load_information_value,
-        { "Non-Realtime load information value", "gsm_a_bssmap.fe_cell_load_info.nrt_load_info_value",
+        { "Non-Realtime load information value", "gsm_a.bssmap.fe_cell_load_info.nrt_load_info_value",
             FT_UINT8, BASE_HEX, VALS(gsm_a_bssmap_cell_load_nrt_vals), 0,
             NULL, HFILL }
     },
     { &hf_fe_ps_indication,
-        { "PS Indication", "gsm_a_bssmap.fe_ps_indication.value",
+        { "PS Indication", "gsm_a.bssmap.fe_ps_indication.value",
             FT_UINT8, BASE_HEX, NULL, 0,
             NULL, HFILL }
     },
     { &hf_fe_dtm_ho_command_ind_spare,
-        { "Spare octet", "gsm_a_bssmap.fe_dtm_ho_command_ind.spare",
+        { "Spare octet", "gsm_a.bssmap.fe_dtm_ho_command_ind.spare",
             FT_UINT8, BASE_HEX, NULL, 0,
             NULL, HFILL }
     },
@@ -7643,7 +7643,7 @@ proto_register_gsm_a_bssmap(void)
     /* Register the protocol name and description */
 
     proto_a_bssmap =
-        proto_register_protocol("GSM A-I/F BSSMAP", "GSM BSSMAP", "gsm_a_bssmap");
+        proto_register_protocol("GSM A-I/F BSSMAP", "GSM BSSMAP", "gsm_a.bssmap");
 
     proto_register_field_array(proto_a_bssmap, hf, array_length(hf));