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.


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

1 files changed, 115 insertions, 115 deletions

diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c
index d3f002740f..d5afe2e329 100644
--- a/epan/dissectors/packet-gsm_a_gm.c
+++ b/epan/dissectors/packet-gsm_a_gm.c
@@ -6903,12 +6903,12 @@ proto_register_gsm_a_gm(void)
 
 	static hf_register_info hf[] = {
 		{ &hf_gsm_a_dtap_msg_gmm_type,
-		  { "DTAP GPRS Mobility Management Message Type",	"gsm_a.dtap_msg_gmm_type",
+		  { "DTAP GPRS Mobility Management Message Type",	"gsm_a_dtap.msg_gmm_type",
 		    FT_UINT8, BASE_HEX, VALS(gsm_a_dtap_msg_gmm_strings), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_dtap_msg_sm_type,
-		  { "DTAP GPRS Session Management Message Type",	"gsm_a.dtap_msg_sm_type",
+		  { "DTAP GPRS Session Management Message Type",	"gsm_a_dtap.msg_sm_type",
 		    FT_UINT8, BASE_HEX, VALS(gsm_a_dtap_msg_sm_strings), 0x0,
 		    NULL, HFILL }
 		},
@@ -7073,282 +7073,282 @@ proto_register_gsm_a_gm(void)
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_acc_tech_type,
-		  { "Access Technology Type", "gsm_a.gm.acc_tech_type",
+		  { "Access Technology Type", "gsm_a_gm.acc_tech_type",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_acc_tech_type_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_acc_cap_struct_len,
-		  { "Length in bits", "gsm_a.gm.acc_cap_struct_len",
+		  { "Length in bits", "gsm_a_gm.acc_cap_struct_len",
 		    FT_UINT8, BASE_HEX_DEC, NULL, 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_sms_value,
-		  { "SMS_VALUE (Switch-Measure-Switch)", "gsm_a.gm.sms",
+		  { "SMS_VALUE (Switch-Measure-Switch)", "gsm_a_gm.sms",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_sms_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_sm_value,
-		  { "(SM_VALUE) Switch-Measure", "gsm_a.gm.sm",
+		  { "(SM_VALUE) Switch-Measure", "gsm_a_gm.sm",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_sms_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_sm_ext,
-		  { "Ext", "gsm_a.gm.sm.ext",
+		  { "Ext", "gsm_a_gm.sm.ext",
 		    FT_UINT8, BASE_HEX, NULL, 0x80,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_link_dir,
-		  { "Link direction", "gsm_a.gm.link_dir",
+		  { "Link direction", "gsm_a_gm.link_dir",
 		    FT_INT32, BASE_DEC, VALS(gsm_a_gm_link_dir_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_cause,
-		  { "gmm Cause", "gsm_a.gm.cause",
+		  { "gmm Cause", "gsm_a_gm.cause",
 		    FT_UINT8, BASE_DEC|BASE_RANGE_STRING, RVALS(gmm_cause_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_fop,
-		  { "Follow-on proceed", "gsm_a.gm.fop",
+		  { "Follow-on proceed", "gsm_a_gm.fop",
 		    FT_BOOLEAN, 8, NULL, 0x08,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_res_of_attach,
-		  { "Result of attach", "gsm_a.gm.res_of_attach",
+		  { "Result of attach", "gsm_a_gm.res_of_attach",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_res_of_attach_vals), 0x07,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_type_of_ciph_alg,
-		  { "Type of ciphering algorithm", "gsm_a.gm.type_of_ciph_alg",
+		  { "Type of ciphering algorithm", "gsm_a_gm.type_of_ciph_alg",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_type_of_ciph_alg_vals), 0x07,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_imeisv_req,
-		  { "IMEISV request", "gsm_a.gm.imeisv_req",
+		  { "IMEISV request", "gsm_a_gm.imeisv_req",
 		    FT_UINT8, BASE_DEC|BASE_RANGE_STRING, RVALS(gsm_a_gm_imeisv_req_vals), 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_ac_ref_nr,
-		  { "A&C reference number", "gsm_a.gm.ac_ref_nr",
+		  { "A&C reference number", "gsm_a_gm.ac_ref_nr",
 		    FT_UINT8, BASE_DEC, NULL, 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_force_to_standby,
-		  { "Force to standby", "gsm_a.gm.force_to_standby",
+		  { "Force to standby", "gsm_a_gm.force_to_standby",
 		    FT_UINT8, BASE_DEC|BASE_RANGE_STRING, RVALS(gsm_a_gm_force_to_standby_vals), 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_ciph_key_seq_num,
-		  { "Ciphering key sequence number", "gsm_a.gm.ciph_key_seq_num",
+		  { "Ciphering key sequence number", "gsm_a_gm.ciph_key_seq_num",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_serv_type,
-		  { "Service type", "gsm_a.gm.serv_type",
+		  { "Service type", "gsm_a_gm.serv_type",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_serv_type_vals), 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_for,
-		  { "Follow-on request pending", "gsm_a.gm.for",
+		  { "Follow-on request pending", "gsm_a_gm.for",
 		    FT_BOOLEAN, 8, NULL, 0x08,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_type_of_attach,
-		  { "Type of attach", "gsm_a.gm.type_of_attach",
+		  { "Type of attach", "gsm_a_gm.type_of_attach",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_type_of_attach_vals), 0x07,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_tmsi_flag,
-		  { "TMSI flag", "gsm_a.gm.tmsi_flag",
+		  { "TMSI flag", "gsm_a_gm.tmsi_flag",
 		    FT_BOOLEAN, 8, TFS(&gsm_a_gm_tmsi_flag_value), 0x01,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_update_type,
-		  { "Update type", "gsm_a.gm.update_type",
+		  { "Update type", "gsm_a_gm.update_type",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_update_type_vals), 0x07,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_gprs_timer_unit,
-		  { "Unit", "gsm_a.gm.gprs_timer_unit",
+		  { "Unit", "gsm_a_gm.gprs_timer_unit",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_gprs_timer_unit_vals), 0xe0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_gprs_timer_value,
-		  { "Timer value", "gsm_a.gm.gprs_timer_value",
+		  { "Timer value", "gsm_a_gm.gprs_timer_value",
 		    FT_UINT8, BASE_DEC, NULL, 0x1f,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_gprs_timer2_unit,
-		  { "Unit", "gsm_a.gm.gprs_timer2_unit",
+		  { "Unit", "gsm_a_gm.gprs_timer2_unit",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_gprs_timer_unit_vals), 0xe0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_gprs_timer2_value,
-		  { "Timer value", "gsm_a.gm.gprs_timer2_value",
+		  { "Timer value", "gsm_a_gm.gprs_timer2_value",
 		    FT_UINT8, BASE_DEC, NULL, 0x1f,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_gprs_timer3_unit,
-		  { "Unit", "gsm_a.gm.gprs_timer3_unit",
+		  { "Unit", "gsm_a_gm.gprs_timer3_unit",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_gprs_timer3_unit_vals), 0xe0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_gprs_timer3_value,
-		  { "Timer value", "gsm_a.gm.gprs_timer3_value",
+		  { "Timer value", "gsm_a_gm.gprs_timer3_value",
 		    FT_UINT8, BASE_DEC, NULL, 0x1f,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_nsapi_5_ul_stat,
-		  { "NSAPI(5) uplink status", "gsm_a.gm.nsapi_5_ul_stat",
+		  { "NSAPI(5) uplink status", "gsm_a_gm.nsapi_5_ul_stat",
 		    FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_nsapi_ul_stat_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_nsapi_6_ul_stat,
-		  { "NSAPI(6) uplink status", "gsm_a.gm.nsapi_6_ul_stat",
+		  { "NSAPI(6) uplink status", "gsm_a_gm.nsapi_6_ul_stat",
 		    FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_nsapi_ul_stat_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_nsapi_7_ul_stat,
-		  { "NSAPI(7) uplink status", "gsm_a.gm.nsapi_7_ul_stat",
+		  { "NSAPI(7) uplink status", "gsm_a_gm.nsapi_7_ul_stat",
 		    FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_nsapi_ul_stat_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_nsapi_8_ul_stat,
-		  { "NSAPI(8) uplink status", "gsm_a.gm.nsapi_8_ul_stat",
+		  { "NSAPI(8) uplink status", "gsm_a_gm.nsapi_8_ul_stat",
 		    FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_nsapi_ul_stat_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_nsapi_9_ul_stat,
-		  { "NSAPI(9) uplink status", "gsm_a.gm.nsapi_9_ul_stat",
+		  { "NSAPI(9) uplink status", "gsm_a_gm.nsapi_9_ul_stat",
 		    FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_nsapi_ul_stat_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_nsapi_10_ul_stat,
-		  { "NSAPI(10) uplink status", "gsm_a.gm.nsapi_10_ul_stat",
+		  { "NSAPI(10) uplink status", "gsm_a_gm.nsapi_10_ul_stat",
 		    FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_nsapi_ul_stat_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_nsapi_11_ul_stat,
-		  { "NSAPI(11) uplink status", "gsm_a.gm.nsapi_11_ul_stat",
+		  { "NSAPI(11) uplink status", "gsm_a_gm.nsapi_11_ul_stat",
 		    FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_nsapi_ul_stat_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_nsapi_12_ul_stat,
-		  { "NSAPI(12) uplink status", "gsm_a.gm.nsapi_12_ul_stat",
+		  { "NSAPI(12) uplink status", "gsm_a_gm.nsapi_12_ul_stat",
 		    FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_nsapi_ul_stat_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_nsapi_13_ul_stat,
-		  { "NSAPI(13) uplink status", "gsm_a.gm.nsapi_13_ul_stat",
+		  { "NSAPI(13) uplink status", "gsm_a_gm.nsapi_13_ul_stat",
 		    FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_nsapi_ul_stat_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_nsapi_14_ul_stat,
-		  { "NSAPI(14) uplink status", "gsm_a.gm.nsapi_14_ul_stat",
+		  { "NSAPI(14) uplink status", "gsm_a_gm.nsapi_14_ul_stat",
 		    FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_nsapi_ul_stat_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_nsapi_15_ul_stat,
-		  { "NSAPI(15) uplink status", "gsm_a.gm.nsapi_15_ul_stat",
+		  { "NSAPI(15) uplink status", "gsm_a_gm.nsapi_15_ul_stat",
 		    FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_nsapi_ul_stat_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_device_prop_low_prio,
-		  { "Low priority", "gsm_a.gm.device_prop_low_prio",
+		  { "Low priority", "gsm_a_gm.device_prop_low_prio",
 		    FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_device_prop_low_prio_value), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_pco_pid,
-		  { "Protocol or Container ID", "gsm_a.gm.pco_pid",
+		  { "Protocol or Container ID", "gsm_a_gm.pco_pid",
 		    FT_UINT16, BASE_DEC, NULL, 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_pco_app_spec_info,
-		  { "Application specific information", "gsm_a.gm.app_spec_info",
+		  { "Application specific information", "gsm_a_gm.app_spec_info",
 		    FT_BYTES, BASE_NONE, NULL, 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_type_of_identity,
-		  { "Type of identity", "gsm_a.gm.type_of_identity",
+		  { "Type of identity", "gsm_a_gm.type_of_identity",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_type_of_identity_vals), 0x07,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac,
-		  { "Routing Area Code (RAC)", "gsm_a.gm.rac",
+		  { "Routing Area Code (RAC)", "gsm_a_gm.rac",
 		    FT_UINT8, BASE_HEX_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_apc,
-		  { "APC", "gsm_a.gm.apc",
+		  { "APC", "gsm_a_gm.apc",
 		    FT_BOOLEAN, 8, TFS(&gsm_a_gm_apc_vals), 0x20,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_otd_a,
-		  { "OTD-A", "gsm_a.gm.otd_a",
+		  { "OTD-A", "gsm_a_gm.otd_a",
 		    FT_BOOLEAN, 8, TFS(&gsm_a_gm_otd_a_vals), 0x10,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_otd_b,
-		  { "OTD-B", "gsm_a.gm.otd_b",
+		  { "OTD-B", "gsm_a_gm.otd_b",
 		    FT_BOOLEAN, 8, TFS(&gsm_a_gm_otd_b_vals), 0x08,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_gps_a,
-		  { "GPS-A", "gsm_a.gm.gps_a",
+		  { "GPS-A", "gsm_a_gm.gps_a",
 		    FT_BOOLEAN, 8, TFS(&gsm_a_gm_gps_a_vals), 0x04,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_gps_b,
-		  { "GPS-B", "gsm_a.gm.gps_b",
+		  { "GPS-B", "gsm_a_gm.gps_b",
 		    FT_BOOLEAN, 8, TFS(&gsm_a_gm_gps_b_vals), 0x02,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_gps_c,
-		  { "GPS-C", "gsm_a.gm.gps_c",
+		  { "GPS-C", "gsm_a_gm.gps_c",
 		    FT_BOOLEAN, 8, TFS(&gsm_a_gm_gps_c_vals), 0x01,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_lcs_molr,
-		  { "LCS-MOLR", "gsm_a.gm.lcs_molr",
+		  { "LCS-MOLR", "gsm_a_gm.lcs_molr",
 		    FT_BOOLEAN, 8, TFS(&gsm_a_gm_lcs_molr_value), 0x08,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_mbms,
-		  { "MBMS", "gsm_a.gm.mbms",
+		  { "MBMS", "gsm_a_gm.mbms",
 		    FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_ims_vops,
-		  { "IMS VoPS", "gsm_a.gm.ims_vops",
+		  { "IMS VoPS", "gsm_a_gm.ims_vops",
 		    FT_BOOLEAN, 8, TFS(&gsm_a_gm_ims_vops_value), 0x02,
 		    "IMS voice over PS session indicator", HFILL }
 		},
 		{ &hf_gsm_a_gm_emc_bs,
-		  { "EMC BS", "gsm_a.gm.emc_bs",
+		  { "EMC BS", "gsm_a_gm.emc_bs",
 		    FT_BOOLEAN, 8, TFS(&gsm_a_gm_emc_bs_value), 0x01,
 		    "Emergency bearer services indicator", HFILL }
 		},
 		{ &hf_gsm_a_gm_req_ms_info_irat,
-		  { "I-RAT", "gsm_a.gm.req_ms_info_irat",
+		  { "I-RAT", "gsm_a_gm.req_ms_info_irat",
 		    FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_req_ms_info_irat_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_req_ms_info_irat2,
-		  { "I-RAT2", "gsm_a.gm.req_ms_info_irat2",
+		  { "I-RAT2", "gsm_a_gm.req_ms_info_irat2",
 		    FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_req_ms_info_irat2_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_ue_usage_setting,
-		  { "UE's usage setting", "gsm_a.gm.ue_usage_setting",
+		  { "UE's usage setting", "gsm_a_gm.ue_usage_setting",
 		    FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_ue_usage_setting_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_voice_domain_pref_for_eutran,
-		  { "Voice domain preference for E-UTRAN", "gsm_a.gm.voice_domain_pref_for_eutran",
+		  { "Voice domain preference for E-UTRAN", "gsm_a_gm.voice_domain_pref_for_eutran",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_voice_domain_pref_for_eutran_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_ptmsi_type,
-		  { "P-TMSI type", "gsm_a.gm.ptmsi_type",
+		  { "P-TMSI type", "gsm_a_gm.ptmsi_type",
 		    FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_ptmsi_type_value), 0x0,
 		    NULL, HFILL }
 		},
@@ -7593,287 +7593,287 @@ proto_register_gsm_a_gm(void)
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_ctrled_early_cm_sending,
-		  { "Controlled early Classmark Sending", "gsm_a.gm.rac.ctrled_early_cm_sending",
+		  { "Controlled early Classmark Sending", "gsm_a_gm.rac.ctrled_early_cm_sending",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_implemented_not_implemented), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_pseudo_sync,
-		  { "Pseudo Synchronisation", "gsm_a.gm.rac.pseudo_sync",
+		  { "Pseudo Synchronisation", "gsm_a_gm.rac.pseudo_sync",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_present_not_present), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_vgcs,
-		  { "Voice Group Call Service", "gsm_a.gm.rac.vgcs",
+		  { "Voice Group Call Service", "gsm_a_gm.rac.vgcs",
 		    FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_vgcs), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_vbs,
-		  { "Voice Broadcast Service", "gsm_a.gm.rac.vbs",
+		  { "Voice Broadcast Service", "gsm_a_gm.rac.vbs",
 		    FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_vbs), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_multislot_capability,
-		  { "Multislot capability struct", "gsm_a.gm.rac.multislot_capability",
+		  { "Multislot capability struct", "gsm_a_gm.rac.multislot_capability",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_present_not_present), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_hscsd_multi_slot_class,
-		  { "HSCSD multislot class", "gsm_a.gm.rac.hscsd_multi_slot_class",
+		  { "HSCSD multislot class", "gsm_a_gm.rac.hscsd_multi_slot_class",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_multi_slot_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_gprs_multi_slot_class,
-		  { "GPRS multislot class", "gsm_a.gm.rac.gprs_multi_slot_class",
+		  { "GPRS multislot class", "gsm_a_gm.rac.gprs_multi_slot_class",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_multi_slot_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_gprs_ext_dyn_alloc_cap,
-		  { "GPRS Extended Dynamic Allocation Capability", "gsm_a.gm.rac.gprs_ext_dyn_alloc_cap",
+		  { "GPRS Extended Dynamic Allocation Capability", "gsm_a_gm.rac.gprs_ext_dyn_alloc_cap",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_implemented_not_implemented), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_ecsd_multi_slot_class,
-		  { "ECSD multislot class", "gsm_a.gm.rac.ecsd_multi_slot_class",
+		  { "ECSD multislot class", "gsm_a_gm.rac.ecsd_multi_slot_class",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_multi_slot_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_egprs_multi_slot_class,
-		  { "EGPRS multislot class", "gsm_a.gm.rac.egprs_multi_slot_class",
+		  { "EGPRS multislot class", "gsm_a_gm.rac.egprs_multi_slot_class",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_multi_slot_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_egprs_ext_dyn_alloc_cap,
-		  { "EGPRS Extended Dynamic Allocation Capability", "gsm_a.gm.rac.egprs_ext_dyn_alloc_cap",
+		  { "EGPRS Extended Dynamic Allocation Capability", "gsm_a_gm.rac.egprs_ext_dyn_alloc_cap",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_implemented_not_implemented), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_dtm_gprs_multi_slot_class,
-		  { "DTM GPRS Multi Slot Class", "gsm_a.gm.rac.dtm_gprs_multi_slot_class",
+		  { "DTM GPRS Multi Slot Class", "gsm_a_gm.rac.dtm_gprs_multi_slot_class",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_dtm_gprs_multi_slot_class_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_single_slt_dtm,
-		  { "Single Slot DTM", "gsm_a.gm.rac.single_slt_dtm",
+		  { "Single Slot DTM", "gsm_a_gm.rac.single_slt_dtm",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_dtm_egprs_multi_slot_cls_pres,
-		  { "DTM EGPRS Multi Slot Class", "gsm_a.gm.rac.dtm_egprs_multi_slot_cls_pres",
+		  { "DTM EGPRS Multi Slot Class", "gsm_a_gm.rac.dtm_egprs_multi_slot_cls_pres",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_present_not_present), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_dtm_egprs_multi_slot_class,
-		  { "DTM EGPRS Multi Slot Class", "gsm_a.gm.rac.dtm_egprs_multi_slot_class",
+		  { "DTM EGPRS Multi Slot Class", "gsm_a_gm.rac.dtm_egprs_multi_slot_class",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_dtm_gprs_multi_slot_class_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_8psk_pow_cap_pres,
-		  { "8PSK Power Capability Bits", "gsm_a.gm.rac.8psk_pow_cap_pres",
+		  { "8PSK Power Capability Bits", "gsm_a_gm.rac.8psk_pow_cap_pres",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_present_not_present), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_comp_int_meas_cap,
-		  { "COMPACT Interference Measurement Capability", "gsm_a.gm.rac.comp_int_meas_cap",
+		  { "COMPACT Interference Measurement Capability", "gsm_a_gm.rac.comp_int_meas_cap",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_implemented_not_implemented), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rel_lev_ind,
-		  { "Revision Level Indicator", "gsm_a.gm.rel_lev_ind",
+		  { "Revision Level Indicator", "gsm_a_gm.rel_lev_ind",
 		    FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_revision_level_indicator), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_umts_fdd_cap,
-		  { "UMTS FDD Radio Access Technology Capability", "gsm_a.gm.rac.umts_fdd_cap",
+		  { "UMTS FDD Radio Access Technology Capability", "gsm_a_gm.rac.umts_fdd_cap",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_umts_384_tdd_ra_cap,
-		  { "UMTS 3.84 Mcps TDD Radio Access Technology Capability", "gsm_a.gm.rac.umts_384_tdd_ra_cap",
+		  { "UMTS 3.84 Mcps TDD Radio Access Technology Capability", "gsm_a_gm.rac.umts_384_tdd_ra_cap",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_cdma2000_cap,
-		  { "CDMA 2000 Radio Access Technology Capability", "gsm_a.gm.rac.cdma2000_cap",
+		  { "CDMA 2000 Radio Access Technology Capability", "gsm_a_gm.rac.cdma2000_cap",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_umts_128_tdd_ra_cap,
-		  { "UMTS 1.28 Mcps TDD Radio Access Technology Capability", "gsm_a.gm.rac.umts_128_tdd_ra_cap",
+		  { "UMTS 1.28 Mcps TDD Radio Access Technology Capability", "gsm_a_gm.rac.umts_128_tdd_ra_cap",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_geran_feat_pkg,
-		  { "GERAN Feature Package 1", "gsm_a.gm.rac.geran_feat_pkg",
+		  { "GERAN Feature Package 1", "gsm_a_gm.rac.geran_feat_pkg",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_mod_based_multi_slot_class_support,
-		  { "Modulation based multislot class support", "gsm_a.gm.rac.mod_based_multi_slot_class_support",
+		  { "Modulation based multislot class support", "gsm_a_gm.rac.mod_based_multi_slot_class_support",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_geran_iu_mode_cap,
-		  { "GERAN Iu mode", "gsm_a.gm.rac.geran_iu_mode_cap",
+		  { "GERAN Iu mode", "gsm_a_gm.rac.geran_iu_mode_cap",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_flo_iu_cap,
-		  { "FLO Iu Capability", "gsm_a.gm.rac.flo_iu_cap",
+		  { "FLO Iu Capability", "gsm_a_gm.rac.flo_iu_cap",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_mult_tbf_cap,
-		  { "Multiple TBF Capability", "gsm_a.gm.rac.mult_tbf_cap",
+		  { "Multiple TBF Capability", "gsm_a_gm.rac.mult_tbf_cap",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_down_adv_rec_perf,
-		  { "Downlink Advanced Receiver Performance", "gsm_a.gm.rac.down_adv_rec_perf",
+		  { "Downlink Advanced Receiver Performance", "gsm_a_gm.rac.down_adv_rec_perf",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_down_adv_rec_perf_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_ext_rlc_mac_ctrl_msg_seg_cap,
-		  { "Extended RLC/MAC Control Message Segmentation Capability", "gsm_a.gm.rac.ext_rlc_mac_ctrl_msg_seg_cap",
+		  { "Extended RLC/MAC Control Message Segmentation Capability", "gsm_a_gm.rac.ext_rlc_mac_ctrl_msg_seg_cap",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_dtm_enh_cap,
-		  { "DTM Enhancements Capability", "gsm_a.gm.rac.dtm_enh_cap",
+		  { "DTM Enhancements Capability", "gsm_a_gm.rac.dtm_enh_cap",
 		    FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_dtm_enh_cap), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_dtm_gprs_high_multi_slot_class,
-		  { "DTM GPRS High Multi Slot Class", "gsm_a.gm.rac.dtm_gprs_high_multi_slot_class",
+		  { "DTM GPRS High Multi Slot Class", "gsm_a_gm.rac.dtm_gprs_high_multi_slot_class",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_dtm_gprs_high_multi_slot_class_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_dtm_egprs_high_multi_slot_class,
-		  { "DTM EGPRS High Multi Slot Class", "gsm_a.gm.rac.dtm_egprs_high_multi_slot_class",
+		  { "DTM EGPRS High Multi Slot Class", "gsm_a_gm.rac.dtm_egprs_high_multi_slot_class",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_dtm_gprs_high_multi_slot_class_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_ps_ho_cap,
-		  { "PS Handover Capability", "gsm_a.gm.rac.ps_ho_cap",
+		  { "PS Handover Capability", "gsm_a_gm.rac.ps_ho_cap",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_dtm_ho_cap,
-		  { "DTM Handover Capability", "gsm_a.gm.rac.dtm_ho_cap",
+		  { "DTM Handover Capability", "gsm_a_gm.rac.dtm_ho_cap",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_multi_slot_cap_red_down_dual_carrier,
-		  { "Multislot Capability Reduction for Downlink Dual Carrier", "gsm_a.gm.rac.multi_slot_cap_red_down_dual_carrier",
+		  { "Multislot Capability Reduction for Downlink Dual Carrier", "gsm_a_gm.rac.multi_slot_cap_red_down_dual_carrier",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_multi_slot_cap_red_down_dual_carrier_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_down_dual_carrier_dtm_cap,
-		  { "Downlink Dual Carrier for DTM Capability", "gsm_a.gm.rac.down_dual_carrier_dtm_cap",
+		  { "Downlink Dual Carrier for DTM Capability", "gsm_a_gm.rac.down_dual_carrier_dtm_cap",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_flex_ts_assign,
-		  { "Flexible Timeslot Assignment", "gsm_a.gm.rac.flex_ts_assign",
+		  { "Flexible Timeslot Assignment", "gsm_a_gm.rac.flex_ts_assign",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_gan_ps_ho_cap,
-		  { "GAN PS Handover Capability", "gsm_a.gm.rac.gan_ps_ho_cap",
+		  { "GAN PS Handover Capability", "gsm_a_gm.rac.gan_ps_ho_cap",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_rlc_non_pers_mode,
-		  { "RLC Non-persistent Mode", "gsm_a.gm.rac.rlc_non_pers_mode",
+		  { "RLC Non-persistent Mode", "gsm_a_gm.rac.rlc_non_pers_mode",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_reduced_lat_cap,
-		  { "Reduced Latency Capability", "gsm_a.gm.rac.reduced_lat_cap",
+		  { "Reduced Latency Capability", "gsm_a_gm.rac.reduced_lat_cap",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_ul_egprs2,
-		  { "Uplink EGPRS2", "gsm_a.gm.rac.ul_egprs2",
+		  { "Uplink EGPRS2", "gsm_a_gm.rac.ul_egprs2",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_ul_egprs2_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_dl_egprs2,
-		  { "Downlink EGPRS2", "gsm_a.gm.rac.dl_egprs2",
+		  { "Downlink EGPRS2", "gsm_a_gm.rac.dl_egprs2",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_dl_egprs2_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_eutra_fdd_support,
-		  { "E-UTRA FDD support", "gsm_a.gm.rac.eutra_fdd_support",
+		  { "E-UTRA FDD support", "gsm_a_gm.rac.eutra_fdd_support",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_eutra_tdd_support,
-		  { "E-UTRA TDD support", "gsm_a.gm.rac.eutra_tdd_support",
+		  { "E-UTRA TDD support", "gsm_a_gm.rac.eutra_tdd_support",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_geran_to_eutra_support_in_geran_ptm,
-		  { "GERAN to E-UTRA support in GERAN packet transfer mode", "gsm_a.gm.rac.geran_to_eutra_support_in_geran_ptm",
+		  { "GERAN to E-UTRA support in GERAN packet transfer mode", "gsm_a_gm.rac.geran_to_eutra_support_in_geran_ptm",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_geran_to_eutra_support_in_geran_ptm_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_prio_based_resel_support,
-		  { "Priority-based reselection support", "gsm_a.gm.rac.prio_based_resel_support",
+		  { "Priority-based reselection support", "gsm_a_gm.rac.prio_based_resel_support",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_alt_efta_multi_slot_class,
-		  { "Alternative EFTA Multislot Class", "gsm_a.gm.rac.alt_efta_multi_slot_class",
+		  { "Alternative EFTA Multislot Class", "gsm_a_gm.rac.alt_efta_multi_slot_class",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_alt_efta_multi_slot_class_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_efta_multi_slot_cap_red_down_dual_carrier,
-		  { "EFTA Multislot Capability Reduction for Downlink Dual Carrier", "gsm_a.gm.rac.efta_multi_slot_cap_red_down_dual_carrier",
+		  { "EFTA Multislot Capability Reduction for Downlink Dual Carrier", "gsm_a_gm.rac.efta_multi_slot_cap_red_down_dual_carrier",
 		    FT_UINT8, BASE_DEC, VALS(gsm_a_gm_multi_slot_cap_red_down_dual_carrier_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_ind_up_layer_pdu_start_cap_for_rlc_um,
-		  { "Indication of Upper Layer PDU Start Capability for RLC UM", "gsm_a.gm.rac.ind_up_layer_pdu_start_cap_for_rlc_um",
+		  { "Indication of Upper Layer PDU Start Capability for RLC UM", "gsm_a_gm.rac.ind_up_layer_pdu_start_cap_for_rlc_um",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_emst_cap,
-		  { "Enhanced Multiplexing for Single TBF Capability", "gsm_a.gm.rac.emst_cap",
+		  { "Enhanced Multiplexing for Single TBF Capability", "gsm_a_gm.rac.emst_cap",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_mtti_cap,
-		  { "Multiple TTI Capability", "gsm_a.gm.rac.mtti_cap",
+		  { "Multiple TTI Capability", "gsm_a_gm.rac.mtti_cap",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_utra_csg_cell_report,
-		  { "Reporting of UTRAN CSG cells in packet transfer mode", "gsm_a.gm.rac.utra_csg_cell_report",
+		  { "Reporting of UTRAN CSG cells in packet transfer mode", "gsm_a_gm.rac.utra_csg_cell_report",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_eutra_csg_cell_report,
-		  { "Reporting of E-UTRAN CSG cells in packet transfer mode", "gsm_a.gm.rac.eutra_csg_cell_report",
+		  { "Reporting of E-UTRAN CSG cells in packet transfer mode", "gsm_a_gm.rac.eutra_csg_cell_report",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_dtr_cap,
-		  { "Dynamic Timeslot Reduction Capability", "gsm_a.gm.rac.dtr_cap",
+		  { "Dynamic Timeslot Reduction Capability", "gsm_a_gm.rac.dtr_cap",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_emsr_cap,
-		  { "Enhanced Multiplexing for Single RLC Entity Capability", "gsm_a.gm.rac.emsr_cap",
+		  { "Enhanced Multiplexing for Single RLC Entity Capability", "gsm_a_gm.rac.emsr_cap",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_fast_down_freq_switch_cap,
-		  { "Fast Downlink Frequency Switching Capability", "gsm_a.gm.rac.fast_down_freq_switch_cap",
+		  { "Fast Downlink Frequency Switching Capability", "gsm_a_gm.rac.fast_down_freq_switch_cap",
 		    FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_gsm_a_gm_rac_tighter_cap,
-		  { "TIGHTER Capability", "gsm_a.gm.rac.tighter_cap",
+		  { "TIGHTER Capability", "gsm_a_gm.rac.tighter_cap",
 		    FT_UINT8, BASE_DEC, VALS(tighter_cap_level_vals), 0x0,
 		    NULL, HFILL }
 		},