Updated GSM dissectors display filters per checkfiltername.pl

Tried to provide consistency with GSM dissector (protocol) names, even if the filenames now don't match the dissector name.

svn path=/trunk/; revision=44162

1 files changed, 89 insertions, 89 deletions

diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c
index 2b9b48f28f..10dd34b1b7 100644
--- a/epan/dissectors/packet-rsl.c
+++ b/epan/dissectors/packet-rsl.c
@@ -3917,424 +3917,424 @@ void proto_register_rsl(void)
     /* Setup list of header fields */
     static hf_register_info hf[] = {
         { &hf_rsl_msg_dsc,
-          { "Message discriminator",           "rsl.msg_dsc",
+          { "Message discriminator",           "gsm_a_rsl.msg_dsc",
             FT_UINT8, BASE_DEC, VALS(rsl_msg_disc_vals), 0xfe,
             NULL, HFILL }
         },
         { &hf_rsl_T_bit,
-          { "T bit",           "rsl.T_bit",
+          { "T bit",           "gsm_a_rsl.T_bit",
             FT_BOOLEAN, 8, TFS(&rsl_t_bit_vals), 0x01,
             NULL, HFILL }
         },
         { &hf_rsl_msg_type,
-          { "Message type",           "rsl.msg_type",
+          { "Message type",           "gsm_a_rsl.msg_type",
             FT_UINT8, BASE_HEX_DEC|BASE_EXT_STRING, &rsl_msg_type_vals_ext, 0x7f,
             NULL, HFILL }
         },
         { &hf_rsl_ie_id,
-          { "Element identifier",           "rsl.ie_id",
+          { "Element identifier",           "gsm_a_rsl.ie_id",
             FT_UINT8, BASE_HEX_DEC|BASE_EXT_STRING, &rsl_ie_type_vals_ext, 0x0,
             NULL, HFILL }
         },
         { &hf_rsl_ie_length,
-          { "Length",           "rsl.ie_length",
+          { "Length",           "gsm_a_rsl.ie_length",
             FT_UINT16, BASE_DEC, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_rsl_ch_no_Cbits,
-          { "C-bits",           "rsl.ch_no_Cbits",
+          { "C-bits",           "gsm_a_rsl.ch_no_Cbits",
             FT_UINT8, BASE_DEC|BASE_EXT_STRING, &rsl_ch_no_Cbits_vals_ext, 0xf8,
             NULL, HFILL }
         },
         { &hf_rsl_ch_no_TN,
-          { "Time slot number (TN)",  "rsl.ch_no_TN",
+          { "Time slot number (TN)",  "gsm_a_rsl.ch_no_TN",
             FT_UINT8, BASE_DEC, NULL, 0x07,
             NULL, HFILL }
         },
         { &hf_rsl_rtd,
-          { "Round Trip Delay (RTD)",  "rsl.rtd",
+          { "Round Trip Delay (RTD)",  "gsm_a_rsl.rtd",
             FT_UINT8, BASE_DEC, NULL, 0xfe,
             NULL, HFILL }
         },
         { &hf_rsl_delay_ind,
-          { "Delay IND",  "rsl.delay_ind",
+          { "Delay IND",  "gsm_a_rsl.delay_ind",
             FT_UINT8, BASE_DEC, rsl_delay_ind_vals, 0x01,
             NULL, HFILL }
         },
         { &hf_rsl_tfo,
-          { "TFO",           "rsl.tfo",
+          { "TFO",           "gsm_a_rsl.tfo",
             FT_BOOLEAN, 8, TFS(&rsl_tfo_vals), 0x01,
             NULL, HFILL }
         },
         { &hf_rsl_req_ref_ra,
-          { "Random Access Information (RA)", "rsl.req_ref_ra",
+          { "Random Access Information (RA)", "gsm_a_rsl.req_ref_ra",
             FT_UINT8, BASE_DEC, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_rsl_req_ref_T1prim,
-          { "T1'",           "rsl.req_ref_T1prim",
+          { "T1'",           "gsm_a_rsl.req_ref_T1prim",
             FT_UINT8, BASE_DEC, NULL, 0xf8,
             NULL, HFILL }
         },
         { &hf_rsl_req_ref_T3,
-          { "T3",           "rsl.req_ref_T3",
+          { "T3",           "gsm_a_rsl.req_ref_T3",
             FT_UINT16, BASE_DEC, NULL, 0x07e0,
             NULL, HFILL }
         },
         { &hf_rsl_req_ref_T2,
-          { "T2",           "rsl.req_ref_T2",
+          { "T2",           "gsm_a_rsl.req_ref_T2",
             FT_UINT8, BASE_DEC, NULL, 0x1f,
             NULL, HFILL }
         },
         { &hf_rsl_timing_adv,
-          { "Timing Advance",           "rsl.timing_adv",
+          { "Timing Advance",           "gsm_a_rsl.timing_adv",
             FT_UINT8, BASE_DEC, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_rsl_ho_ref,
-          { "Hand-over reference",           "rsl.ho_ref",
+          { "Hand-over reference",           "gsm_a_rsl.ho_ref",
             FT_UINT8, BASE_DEC, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_rsl_l1inf_power_lev,
-          { "MS power level",           "rsl.ms_power_lev",
+          { "MS power level",           "gsm_a_rsl.ms_power_lev",
             FT_UINT8, BASE_DEC, NULL, 0xf8,
             NULL, HFILL }
         },
         { &hf_rsl_l1inf_fpc,
-          { "FPC/EPC",           "rsl.ms_fpc",
+          { "FPC/EPC",           "gsm_a_rsl.ms_fpc",
             FT_BOOLEAN, 8, TFS(&rsl_ms_fpc_epc_mode_vals), 0x04,
             NULL, HFILL }
         },
         { &hf_rsl_ms_power_lev,
-          { "MS power level",           "rsl.ms_power_lev",
+          { "MS power level",           "gsm_a_rsl.ms_power_lev",
             FT_UINT8, BASE_DEC, NULL, 0x1f,
             NULL, HFILL }
         },
         { &hf_rsl_ms_fpc,
-          { "FPC/EPC",           "rsl.ms_fpc",
+          { "FPC/EPC",           "gsm_a_rsl.ms_fpc",
             FT_BOOLEAN, 8, TFS(&rsl_ms_fpc_epc_mode_vals), 0x20,
             NULL, HFILL }
         },
         { &hf_rsl_act_timing_adv,
-          { "Actual Timing Advance",           "rsl.act_timing_adv",
+          { "Actual Timing Advance",           "gsm_a_rsl.act_timing_adv",
             FT_UINT8, BASE_DEC, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_rsl_dtxd,
-          { "DTXd",           "rsl.dtxd",
+          { "DTXd",           "gsm_a_rsl.dtxd",
             FT_BOOLEAN, 8, TFS(&rsl_dtxd_vals), 0x40,
             NULL, HFILL }
         },
         { &hf_rsl_rxlev_full_up,
-          { "RXLEV.FULL.up",           "rsl.rxlev_full_up",
+          { "RXLEV.FULL.up",           "gsm_a_rsl.rxlev_full_up",
             FT_UINT8, BASE_DEC, NULL, 0x3f,
             NULL, HFILL }
         },
         { &hf_rsl_rxlev_sub_up,
-          { "RXLEV.SUB.up",           "rsl.rxlev_sub_up",
+          { "RXLEV.SUB.up",           "gsm_a_rsl.rxlev_sub_up",
             FT_UINT8, BASE_DEC, NULL, 0x3f,
             NULL, HFILL }
         },
         { &hf_rsl_rxqual_full_up,
-          { "RXQUAL.FULL.up",           "rsl.rxqual_full_up",
+          { "RXQUAL.FULL.up",           "gsm_a_rsl.rxqual_full_up",
             FT_UINT8, BASE_DEC, NULL, 0x38,
             NULL, HFILL }
         },
         { &hf_rsl_rxqual_sub_up,
-          { "RXQUAL.SUB.up",           "rsl.rxqual_sub_up",
+          { "RXQUAL.SUB.up",           "gsm_a_rsl.rxqual_sub_up",
             FT_UINT8, BASE_DEC, NULL, 0x07,
             NULL, HFILL }
         },
         { &hf_rsl_acc_delay,
-          { "Access Delay",           "rsl.acc_del",
+          { "Access Delay",           "gsm_a_rsl.acc_del",
             FT_UINT8, BASE_DEC, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_rsl_rach_slot_cnt,
-          { "RACH Slot Count",           "rsl.rach_slot_cnt",
+          { "RACH Slot Count",           "gsm_a_rsl.rach_slot_cnt",
             FT_UINT16, BASE_DEC, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_rsl_rach_busy_cnt,
-          { "RACH Busy Count",           "rsl.rach_busy_cnt",
+          { "RACH Busy Count",           "gsm_a_rsl.rach_busy_cnt",
             FT_UINT16, BASE_DEC, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_rsl_rach_acc_cnt,
-          { "RACH Access Count",           "rsl.rach_acc_cnt",
+          { "RACH Access Count",           "gsm_a_rsl.rach_acc_cnt",
             FT_UINT16, BASE_DEC, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_rsl_phy_ctx,
-          { "Physical Context",           "rsl.phy_ctx",
+          { "Physical Context",           "gsm_a_rsl.phy_ctx",
             FT_BYTES, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_rsl_na,
-          { "Not applicable (NA)",           "rsl.na",
+          { "Not applicable (NA)",           "gsm_a_rsl.na",
             FT_BOOLEAN, 8, TFS(&rsl_na_vals), 0x20,
             NULL, HFILL }
         },
         { &hf_rsl_ch_type,
-          { "channel type",           "rsl.ch_type",
+          { "channel type",           "gsm_a_rsl.ch_type",
             FT_UINT8, BASE_DEC, VALS(rsl_ch_type_vals), 0xc0,
             NULL, HFILL }
         },
         { &hf_rsl_prio,
-          { "Priority",           "rsl.prio",
+          { "Priority",           "gsm_a_rsl.prio",
             FT_UINT8, BASE_DEC, VALS(rsl_prio_vals), 0x18,
             NULL, HFILL }
         },
         { &hf_rsl_sapi,
-          { "SAPI",           "rsl.sapi",
+          { "SAPI",           "gsm_a_rsl.sapi",
             FT_UINT8, BASE_DEC, NULL, 0x07,
             NULL, HFILL }
         },
         { &hf_rsl_rbit,
-          { "R",           "rsl.rbit",
+          { "R",           "gsm_a_rsl.rbit",
             FT_BOOLEAN, 8, TFS(&rsl_rbit_vals), 0x80,
             NULL, HFILL }
         },
         { &hf_rsl_a3a2,
-          { "A3A2",           "rsl.a3a2",
+          { "A3A2",           "gsm_a_rsl.a3a2",
             FT_UINT8, BASE_DEC, VALS(rsl_a3a2_vals), 0x06,
             NULL, HFILL }
         },
         { &hf_rsl_a1_0,
-          { "A1",           "rsl.a1_0",
+          { "A1",           "gsm_a_rsl.a1_0",
             FT_BOOLEAN, 8, TFS(&rsl_a1_0_vals), 0x01,
             NULL, HFILL }
         },
         { &hf_rsl_a1_1,
-          { "A1",           "rsl.a1_1",
+          { "A1",           "gsm_a_rsl.a1_1",
             FT_BOOLEAN, 8, TFS(&rsl_a1_1_vals), 0x01,
             NULL, HFILL }
         },
         { &hf_rsl_a1_2,
-          { "A1",           "rsl.a2_0",
+          { "A1",           "gsm_a_rsl.a2_0",
             FT_BOOLEAN, 8, TFS(&rsl_a1_2_vals), 0x01,
             NULL, HFILL }
         },
         { &hf_rsl_epc_mode,
-          { "EPC mode", "rsl.epc_mode",
+          { "EPC mode", "gsm_a_rsl.epc_mode",
             FT_BOOLEAN, 8, TFS(&rsl_epc_mode_vals), 0x20,
             NULL, HFILL }
         },
         { &hf_rsl_bs_fpc_epc_mode,
-          { "FPC-EPC mode", "rsl.fpc_epc_mode",
+          { "FPC-EPC mode", "gsm_a_rsl.fpc_epc_mode",
             FT_BOOLEAN, 8, TFS(&rsl_fpc_epc_mode_vals), 0x10,
             NULL, HFILL }
         },
         { &hf_rsl_bs_power,
-          { "Power Level",           "rsl.bs_power",
+          { "Power Level",           "gsm_a_rsl.bs_power",
             FT_UINT8, BASE_DEC|BASE_EXT_STRING, &rsl_rlm_bs_power_vals_ext, 0x0f,
             NULL, HFILL }
         },
         { &hf_rsl_cm_dtxd,
-          { "DTXd", "rsl.cm_dtxd",
+          { "DTXd", "gsm_a_rsl.cm_dtxd",
             FT_BOOLEAN, 8, TFS(&rsl_dtx_vals), 0x02,
             NULL, HFILL }
         },
         { &hf_rsl_cm_dtxu,
-          { "DTXu", "rsl.cm_dtxu",
+          { "DTXu", "gsm_a_rsl.cm_dtxu",
             FT_BOOLEAN, 8, TFS(&rsl_dtx_vals), 0x01,
             NULL, HFILL }
         },
         { &hf_rsl_speech_or_data,
-          { "Speech or data indicator",           "rsl.speech_or_data",
+          { "Speech or data indicator",           "gsm_a_rsl.speech_or_data",
             FT_UINT8, BASE_DEC, VALS(rsl_speech_or_data_vals), 0x0,
             NULL, HFILL }
         },
         { &hf_rsl_ch_rate_and_type,
-          { "Channel rate and type",           "rsl.ch_rate_and_type",
+          { "Channel rate and type",           "gsm_a_rsl.ch_rate_and_type",
             FT_UINT8, BASE_DEC|BASE_EXT_STRING, &rsl_ch_rate_and_type_vals_ext, 0x0,
             NULL, HFILL }
         },
         { &hf_rsl_speech_coding_alg,
-          { "Speech coding algorithm",           "rsl.speech_coding_alg",
+          { "Speech coding algorithm",           "gsm_a_rsl.speech_coding_alg",
             FT_UINT8, BASE_DEC, VALS(rsl_speech_coding_alg_vals), 0x0,
             NULL, HFILL }
         },
         { &hf_rsl_t_nt_bit,
-          { "Transparent indication", "rsl.t_nt_bit",
+          { "Transparent indication", "gsm_a_rsl.t_nt_bit",
             FT_BOOLEAN, 8, TFS(&t_nt_bit_vals), 0x40,
             NULL, HFILL }
         },
         { &hf_rsl_ra_if_data_rte,
-          { "Radio interface data rate",           "rsl.ra_if_data_rte",
+          { "Radio interface data rate",           "gsm_a_rsl.ra_if_data_rte",
             FT_UINT8, BASE_DEC, VALS(rsl_ra_if_data_rte_vals), 0x3f,
             NULL, HFILL }
         },
         { &hf_rsl_data_rte,
-          { "Data rate",           "rsl.data_rte",
+          { "Data rate",           "gsm_a_rsl.data_rte",
             FT_UINT8, BASE_DEC, VALS(rsl_ra_if_data_rte_vals), 0x3f,
             NULL, HFILL }
         },
         { &hf_rsl_alg_id,
-          { "Algorithm Identifier",           "rsl.alg_id",
+          { "Algorithm Identifier",           "gsm_a_rsl.alg_id",
             FT_UINT8, BASE_DEC, VALS(rsl_algorithm_id_vals), 0x0,
             NULL, HFILL }
         },
         { &hf_rsl_key,
-          { "KEY",           "rsl.key",
+          { "KEY",           "gsm_a_rsl.key",
             FT_BYTES, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_rsl_cause,
-          { "Cause",           "rsl.cause",
+          { "Cause",           "gsm_a_rsl.cause",
             FT_UINT8, BASE_DEC|BASE_EXT_STRING, &rsl_rlm_cause_vals_ext, 0x7f,
             NULL, HFILL }
         },
         { &hf_rsl_rel_mode,
-          { "Release Mode",           "rsl.rel_mode",
+          { "Release Mode",           "gsm_a_rsl.rel_mode",
             FT_UINT8, BASE_DEC, VALS(rel_mode_vals), 0x01,
             NULL, HFILL }
         },
         { &hf_rsl_interf_band,
-          { "Interf Band",           "rsl.interf_band",
+          { "Interf Band",           "gsm_a_rsl.interf_band",
             FT_UINT8, BASE_DEC, NULL, 0xe0,
             NULL, HFILL }
         },
         { &hf_rsl_interf_band_reserved,
-          { "Interf Band reserved bits",           "rsl.interf_band_reserved",
+          { "Interf Band reserved bits",           "gsm_a_rsl.interf_band_reserved",
             FT_UINT8, BASE_DEC, NULL, 0x1f,
             NULL, HFILL }
         },
         { &hf_rsl_meas_res_no,
-          { "Measurement result number",           "rsl.meas_res_no",
+          { "Measurement result number",           "gsm_a_rsl.meas_res_no",
             FT_UINT8, BASE_DEC, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_rsl_extension_bit,
-          { "Extension", "rsl.extension_bit",
+          { "Extension", "gsm_a_rsl.extension_bit",
             FT_BOOLEAN, 8, TFS(&rsl_extension_bit_value), 0x80,
             NULL, HFILL }},
         { &hf_rsl_class,
-          { "Class",           "rsl.class",
+          { "Class",           "gsm_a_rsl.class",
             FT_UINT8, BASE_DEC, VALS(rsl_class_vals), 0x70,
             NULL, HFILL }
         },
         { &hf_rsl_paging_grp,
-          { "Paging Group",           "rsl.paging_grp",
+          { "Paging Group",           "gsm_a_rsl.paging_grp",
             FT_UINT8, BASE_DEC, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_rsl_paging_load,
-          { "Paging Buffer Space",           "rsl.paging_load",
+          { "Paging Buffer Space",           "gsm_a_rsl.paging_load",
             FT_UINT16, BASE_DEC, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_rsl_sys_info_type,
-          { "System Info Type",           "rsl.sys_info_type",
+          { "System Info Type",           "gsm_a_rsl.sys_info_type",
             FT_UINT8, BASE_DEC|BASE_EXT_STRING, &rsl_sys_info_type_vals_ext, 0x0,
             NULL, HFILL }
         },
         { &hf_rsl_timing_offset,
-          { "Timing Offset",           "rsl.timing_offset",
+          { "Timing Offset",           "gsm_a_rsl.timing_offset",
             FT_UINT8, BASE_DEC, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_rsl_ch_needed,
-          { "Channel Needed",           "rsl.ch_needed",
+          { "Channel Needed",           "gsm_a_rsl.ch_needed",
             FT_UINT8, BASE_DEC, VALS(rsl_ch_needed_vals), 0x03,
             NULL, HFILL }
         },
         { &hf_rsl_cbch_load_type,
-          { "CBCH Load Type", "rsl.cbch_load_type",
+          { "CBCH Load Type", "gsm_a_rsl.cbch_load_type",
             FT_BOOLEAN, 8, TFS(&rsl_cbch_load_type_vals), 0x80,
             NULL, HFILL }
         },
         { &hf_rsl_msg_slt_cnt,
-          { "Message Slot Count", "rsl.sg_slt_cnt",
+          { "Message Slot Count", "gsm_a_rsl.sg_slt_cnt",
             FT_UINT8, BASE_DEC, NULL, 0x0f,
             NULL, HFILL }
         },
         { &hf_rsl_ch_ind,
-          { "Channel Ind",           "rsl.ch_ind",
+          { "Channel Ind",           "gsm_a_rsl.ch_ind",
             FT_UINT8, BASE_DEC, VALS(rsl_ch_ind_vals), 0x0f,
             NULL, HFILL }
         },
         { &hf_rsl_command,
-          { "Command",           "rsl.cmd",
+          { "Command",           "gsm_a_rsl.cmd",
             FT_UINT16, BASE_DEC, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_rsl_emlpp_prio,
-          { "eMLPP Priority",           "rsl.emlpp_prio",
+          { "eMLPP Priority",           "gsm_a_rsl.emlpp_prio",
             FT_UINT8, BASE_DEC, VALS(rsl_emlpp_prio_vals), 0x03,
             NULL, HFILL }
         },
         { &hf_rsl_speech_mode_s,
-          { "ip.access Speech Mode S", "rsl.ipacc.speech_mode_s",
+          { "ip.access Speech Mode S", "gsm_a_rsl.ipacc.speech_mode_s",
             FT_UINT8, BASE_HEX, VALS(rsl_ipacc_spm_s_vals),
             0xf, NULL, HFILL }
         },
         { &hf_rsl_speech_mode_m,
-          { "ip.access Speech Mode M", "rsl.ipacc.speech_mode_m",
+          { "ip.access Speech Mode M", "gsm_a_rsl.ipacc.speech_mode_m",
             FT_UINT8, BASE_HEX, VALS(rsl_ipacc_spm_m_vals),
             0xf0, NULL, HFILL }
         },
         { &hf_rsl_conn_id,
-          { "ip.access Connection ID",	"rsl.ipacc.conn_id",
+          { "ip.access Connection ID",	"gsm_a_rsl.ipacc.conn_id",
             FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
         },
         { &hf_rsl_rtp_payload,
-          { "ip.access RTP Payload Type",	"rsl.ipacc.rtp_payload",
+          { "ip.access RTP Payload Type",	"gsm_a_rsl.ipacc.rtp_payload",
             FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
         },
         { &hf_rsl_rtp_csd_fmt_d,
-          { "ip.access RTP CSD Format D", "rsl.ipacc.rtp_csd_fmt_d",
+          { "ip.access RTP CSD Format D", "gsm_a_rsl.ipacc.rtp_csd_fmt_d",
             FT_UINT8, BASE_HEX, VALS(rsl_ipacc_rtp_csd_fmt_d_vals),
             0x0f, NULL, HFILL },
         },
         { &hf_rsl_rtp_csd_fmt_ir,
-          { "ip.access RTP CSD Format IR", "rsl.ipacc.rtp_csd_fmt_ir",
+          { "ip.access RTP CSD Format IR", "gsm_a_rsl.ipacc.rtp_csd_fmt_ir",
             FT_UINT8, BASE_HEX, VALS(rsl_ipacc_rtp_csd_fmt_ir_vals),
             0xf0, NULL, HFILL },
         },
         { &hf_rsl_local_port,
-          { "ip.access Local RTP Port",	"rsl.ipacc.local_port",
+          { "ip.access Local RTP Port",	"gsm_a_rsl.ipacc.local_port",
             FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
         },
         { &hf_rsl_remote_port,
-          { "ip.access Remote RTP Port", "rsl.ipacc.remote_port",
+          { "ip.access Remote RTP Port", "gsm_a_rsl.ipacc.remote_port",
             FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
         },
         { &hf_rsl_local_ip,
-          { "ip.access Local IP Address", "rsl.ipacc.local_ip",
+          { "ip.access Local IP Address", "gsm_a_rsl.ipacc.local_ip",
             FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL },
         },
         { &hf_rsl_remote_ip,
-          { "ip.access Remote IP Address", "rsl.ipacc.remote_ip",
+          { "ip.access Remote IP Address", "gsm_a_rsl.ipacc.remote_ip",
             FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL },
         },
         { &hf_rsl_cstat_tx_pkts,
-          { "Packets Sent", "rsl.ipacc.cstat.tx_pkts",
+          { "Packets Sent", "gsm_a_rsl.ipacc.cstat.tx_pkts",
             FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }
         },
         { &hf_rsl_cstat_tx_octs,
-          { "Octets Sent", "rsl.ipacc.cstat.tx_octets",
+          { "Octets Sent", "gsm_a_rsl.ipacc.cstat.tx_octets",
             FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }
         },
         { &hf_rsl_cstat_rx_pkts,
-          { "Packets Received", "rsl.ipacc.cstat.rx_pkts",
+          { "Packets Received", "gsm_a_rsl.ipacc.cstat.rx_pkts",
             FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }
         },
         { &hf_rsl_cstat_rx_octs,
-          { "Octets Received", "rsl.ipacc.cstat.rx_octets",
+          { "Octets Received", "gsm_a_rsl.ipacc.cstat.rx_octets",
             FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }
         },
         { &hf_rsl_cstat_lost_pkts,
-          { "Packets Lost", "rsl.ipacc.cstat.lost_pkts",
+          { "Packets Lost", "gsm_a_rsl.ipacc.cstat.lost_pkts",
             FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }
         },
         { &hf_rsl_cstat_ia_jitter,
-          { "Inter-arrival Jitter", "rsl.ipacc.cstat.ia_jitter",
+          { "Inter-arrival Jitter", "gsm_a_rsl.ipacc.cstat.ia_jitter",
             FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }
         },
         { &hf_rsl_cstat_avg_tx_dly,
-          { "Average Tx Delay", "rsl.ipacc.cstat.avg_tx_delay",
+          { "Average Tx Delay", "gsm_a_rsl.ipacc.cstat.avg_tx_delay",
             FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }
         },
     };
@@ -4484,12 +4484,12 @@ void proto_register_rsl(void)
     RSL_ATT_TLVDEF(RSL_IE_IPAC_RTP_CSD_FMT, TLV_TYPE_TV,            0);
 
     /* Register the protocol name and description */
-    proto_rsl = proto_register_protocol("Radio Signalling Link (RSL)", "RSL", "rsl");
+    proto_rsl = proto_register_protocol("Radio Signalling Link (RSL)", "RSL", "gsm_a_rsl");
 
     proto_register_field_array(proto_rsl, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
-    new_register_dissector("gsm_abis_rsl", dissect_rsl, proto_rsl);
+    new_register_dissector("gsm_a_rsl", dissect_rsl, proto_rsl);
 
     rsl_module = prefs_register_protocol(proto_rsl, proto_reg_handoff_rsl);
     prefs_register_bool_preference(rsl_module, "use_ipaccess_rsl",