effectively revert r44161, having the display filters favor '.' over '_'

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

3 files changed, 184 insertions, 184 deletions

diff --git a/epan/dissectors/packet-gmr1_bcch.c b/epan/dissectors/packet-gmr1_bcch.c
index feca8d5ec4..950f5740d2 100644
--- a/epan/dissectors/packet-gmr1_bcch.c
+++ b/epan/dissectors/packet-gmr1_bcch.c
@@ -1072,338 +1072,338 @@ proto_register_gmr1_bcch(void)
 	static hf_register_info hf[] = {
 		/* Segment 1A - [3] 11.5.2.66 */
 		{ &hf_seg1a_class_2_version,
-		  { "Class 2 version", "gmr1_bcch.seg1a.class_2_version",
+		  { "Class 2 version", "gmr1.bcch.seg1a.class_2_version",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    "Version number for current Class 2 information", HFILL }
 		},
 		{ &hf_seg1a_class_3_version,
-		  { "Class 3 version", "gmr1_bcch.seg1a.class_3_version",
+		  { "Class 3 version", "gmr1.bcch.seg1a.class_3_version",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    "Version number for current Class 3 information", HFILL }
 		},
 		{ &hf_seg1a_syncinfo_sb_frame_ts_offset,
-		  { "SB_FRAME_TS_OFFSET", "gmr1_bcch.seg1a.syncinfo.sb_frame_ts_offset",
+		  { "SB_FRAME_TS_OFFSET", "gmr1.bcch.seg1a.syncinfo.sb_frame_ts_offset",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg1a_syncinfo_sb_symbol_offset,
-		  { "SB_SYMBOL_OFFSET", "gmr1_bcch.seg1a.syncinfo.sb_symbol_offset",
+		  { "SB_SYMBOL_OFFSET", "gmr1.bcch.seg1a.syncinfo.sb_symbol_offset",
 		    FT_INT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg1a_syncinfo_sa_freq_offset,
-		  { "SA_FREQ_OFFSET", "gmr1_bcch.seg1a.syncinfo.sa_freq_offset",
+		  { "SA_FREQ_OFFSET", "gmr1.bcch.seg1a.syncinfo.sa_freq_offset",
 		    FT_UINT8, BASE_CUSTOM, seg1a_syncinfo_sa_freq_offset_fmt, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg1a_rachctrl_max_retrans,
-		  { "Max Retrans", "gmr1_bcch.seg1a.rachctrl.max_retrans",
+		  { "Max Retrans", "gmr1.bcch.seg1a.rachctrl.max_retrans",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg1a_rachctrl_acc[15],
-		  { "AC15", "gmr1_bcch.seg1a.rachctrl.ac15",
+		  { "AC15", "gmr1.bcch.seg1a.rachctrl.ac15",
 		    FT_UINT8, BASE_DEC, VALS(seg1a_rachctrl_acc_vals), 0x00,
 		    "Access Class 15 barred", HFILL }
 		},
 		{ &hf_seg1a_rachctrl_acc[14],
-		  { "AC14", "gmr1_bcch.seg1a.rachctrl.ac14",
+		  { "AC14", "gmr1.bcch.seg1a.rachctrl.ac14",
 		    FT_UINT8, BASE_DEC, VALS(seg1a_rachctrl_acc_vals), 0x00,
 		    "Access Class 14 barred", HFILL }
 		},
 		{ &hf_seg1a_rachctrl_acc[13],
-		  { "AC13", "gmr1_bcch.seg1a.rachctrl.ac13",
+		  { "AC13", "gmr1.bcch.seg1a.rachctrl.ac13",
 		    FT_UINT8, BASE_DEC, VALS(seg1a_rachctrl_acc_vals), 0x00,
 		    "Access Class 13 barred", HFILL }
 		},
 		{ &hf_seg1a_rachctrl_acc[12],
-		  { "AC12", "gmr1_bcch.seg1a.rachctrl.ac12",
+		  { "AC12", "gmr1.bcch.seg1a.rachctrl.ac12",
 		    FT_UINT8, BASE_DEC, VALS(seg1a_rachctrl_acc_vals), 0x00,
 		    "Access Class 12 barred", HFILL }
 		},
 		{ &hf_seg1a_rachctrl_acc[11],
-		  { "AC11", "gmr1_bcch.seg1a.rachctrl.ac11",
+		  { "AC11", "gmr1.bcch.seg1a.rachctrl.ac11",
 		    FT_UINT8, BASE_DEC, VALS(seg1a_rachctrl_acc_vals), 0x00,
 		    "Access Class 11 barred", HFILL }
 		},
 		{ &hf_seg1a_rachctrl_acc[10],
-		  { "EC10", "gmr1_bcch.seg1a.rachctrl.ac10",
+		  { "EC10", "gmr1.bcch.seg1a.rachctrl.ac10",
 		    FT_UINT8, BASE_DEC, VALS(seg1a_rachctrl_acc_vals), 0x00,
 		    "Emergency Class 10 barred", HFILL }
 		},
 		{ &hf_seg1a_rachctrl_acc[9],
-		  { "AC9", "gmr1_bcch.seg1a.rachctrl.ac9",
+		  { "AC9", "gmr1.bcch.seg1a.rachctrl.ac9",
 		    FT_UINT8, BASE_DEC, VALS(seg1a_rachctrl_acc_vals), 0x00,
 		    "Access Class 9 barred", HFILL }
 		},
 		{ &hf_seg1a_rachctrl_acc[8],
-		  { "AC8", "gmr1_bcch.seg1a.rachctrl.ac8",
+		  { "AC8", "gmr1.bcch.seg1a.rachctrl.ac8",
 		    FT_UINT8, BASE_DEC, VALS(seg1a_rachctrl_acc_vals), 0x00,
 		    "Access Class 8 barred", HFILL }
 		},
 		{ &hf_seg1a_rachctrl_acc[7],
-		  { "AC7", "gmr1_bcch.seg1a.rachctrl.ac7",
+		  { "AC7", "gmr1.bcch.seg1a.rachctrl.ac7",
 		    FT_UINT8, BASE_DEC, VALS(seg1a_rachctrl_acc_vals), 0x00,
 		    "Access Class 7 barred", HFILL }
 		},
 		{ &hf_seg1a_rachctrl_acc[6],
-		  { "AC6", "gmr1_bcch.seg1a.rachctrl.ac6",
+		  { "AC6", "gmr1.bcch.seg1a.rachctrl.ac6",
 		    FT_UINT8, BASE_DEC, VALS(seg1a_rachctrl_acc_vals), 0x00,
 		    "Access Class 6 barred", HFILL }
 		},
 		{ &hf_seg1a_rachctrl_acc[5],
-		  { "AC5", "gmr1_bcch.seg1a.rachctrl.ac5",
+		  { "AC5", "gmr1.bcch.seg1a.rachctrl.ac5",
 		    FT_UINT8, BASE_DEC, VALS(seg1a_rachctrl_acc_vals), 0x00,
 		    "Access Class 5 barred", HFILL }
 		},
 		{ &hf_seg1a_rachctrl_acc[4],
-		  { "AC4", "gmr1_bcch.seg1a.rachctrl.ac4",
+		  { "AC4", "gmr1.bcch.seg1a.rachctrl.ac4",
 		    FT_UINT8, BASE_DEC, VALS(seg1a_rachctrl_acc_vals), 0x00,
 		    "Access Class 4 barred", HFILL }
 		},
 		{ &hf_seg1a_rachctrl_acc[3],
-		  { "AC3", "gmr1_bcch.seg1a.rachctrl.ac3",
+		  { "AC3", "gmr1.bcch.seg1a.rachctrl.ac3",
 		    FT_UINT8, BASE_DEC, VALS(seg1a_rachctrl_acc_vals), 0x00,
 		    "Access Class 3 barred", HFILL }
 		},
 		{ &hf_seg1a_rachctrl_acc[2],
-		  { "AC2", "gmr1_bcch.seg1a.rachctrl.ac2",
+		  { "AC2", "gmr1.bcch.seg1a.rachctrl.ac2",
 		    FT_UINT8, BASE_DEC, VALS(seg1a_rachctrl_acc_vals), 0x00,
 		    "Access Class 2 barred", HFILL }
 		},
 		{ &hf_seg1a_rachctrl_acc[1],
-		  { "AC1", "gmr1_bcch.seg1a.rachctrl.ac1",
+		  { "AC1", "gmr1.bcch.seg1a.rachctrl.ac1",
 		    FT_UINT8, BASE_DEC, VALS(seg1a_rachctrl_acc_vals), 0x00,
 		    "Access Class 1 barred", HFILL }
 		},
 		{ &hf_seg1a_rachctrl_acc[0],
-		  { "AC0", "gmr1_bcch.seg1a.rachctrl.ac0",
+		  { "AC0", "gmr1.bcch.seg1a.rachctrl.ac0",
 		    FT_UINT8, BASE_DEC, VALS(seg1a_rachctrl_acc_vals), 0x00,
 		    "Access Class 0 barred", HFILL }
 		},
 		{ &hf_seg1a_rachctrl_cell_bar_access,
-		  { "CELL_BAR_ACCESS", "gmr1_bcch.seg1a.rachctrl.cell_bar_access",
+		  { "CELL_BAR_ACCESS", "gmr1.bcch.seg1a.rachctrl.cell_bar_access",
 		    FT_UINT8, BASE_DEC, VALS(seg1a_rachctrl_cell_bar_access_vals), 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg1a_miscinfo_sb_reselection_hysteresis,
-		  { "SB_RESELECTION_HYSTERESIS", "gmr1_bcch.seg1a.miscinfo.sb_reselection_hysteresis",
+		  { "SB_RESELECTION_HYSTERESIS", "gmr1.bcch.seg1a.miscinfo.sb_reselection_hysteresis",
 		    FT_UINT8, BASE_CUSTOM, segx_half_db_value_fmt, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg1a_miscinfo_spare,
-		  { "Spare", "gmr1_bcch.seg1a.miscinfo.spare",
+		  { "Spare", "gmr1.bcch.seg1a.miscinfo.spare",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg1a_miscinfo_priority_access_ind,
-		  { "Priority Access Ind", "gmr1_bcch.seg1a.miscinfo.priority_access_ind",
+		  { "Priority Access Ind", "gmr1.bcch.seg1a.miscinfo.priority_access_ind",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    "Reserved for future use", HFILL }
 		},
 		{ &hf_seg1a_gbch_present,
-		  { "GBCH Present", "gmr1_bcch.seg1a.gbch_present",
+		  { "GBCH Present", "gmr1.bcch.seg1a.gbch_present",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg1a_test_gs,
-		  { "Test GS", "gmr1_bcch.seg1a.test_gs",
+		  { "Test GS", "gmr1.bcch.seg1a.test_gs",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg1a_test_gs2,
-		  { "Test GS2", "gmr1_bcch.seg1a.test_gs2",
+		  { "Test GS2", "gmr1.bcch.seg1a.test_gs2",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg1a_spare1,
-		  { "Spare", "gmr1_bcch.seg1a.spare1",
+		  { "Spare", "gmr1.bcch.seg1a.spare1",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg1a_cell_bar_access_extension2,
-		  { "CELL_BAR_ACCESS_EXTENSION2", "gmr1_bcch.seg1a.cell_bar_access_extension2",
+		  { "CELL_BAR_ACCESS_EXTENSION2", "gmr1.bcch.seg1a.cell_bar_access_extension2",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg1a_spare2,
-		  { "Spare", "gmr1_bcch.seg1a.spare2",
+		  { "Spare", "gmr1.bcch.seg1a.spare2",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg1a_cell_bar_access_extension,
-		  { "CELL_BAR_ACCESS_EXTENSION", "gmr1_bcch.seg1a.cell_bar_access_extension",
+		  { "CELL_BAR_ACCESS_EXTENSION", "gmr1.bcch.seg1a.cell_bar_access_extension",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 
 		/* Segment 2A - [1] 11.5.2.67 */
 		{ &hf_seg2a_class_4_version,
-		  { "Class 4 version", "gmr1_bcch.seg2a.class_4_version",
+		  { "Class 4 version", "gmr1.bcch.seg2a.class_4_version",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    "Version number for current Class 4 information", HFILL }
 		},
 		{ &hf_seg2a_syncinfo_sa_sirfn_delay,
-		  { "SA_SIRFN_DELAY", "gmr1_bcch.seg2a.syncinfo.sa_sirfn_delay",
+		  { "SA_SIRFN_DELAY", "gmr1.bcch.seg2a.syncinfo.sa_sirfn_delay",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    "Delay of system information relative to superframe", HFILL }
 		},
 		{ &hf_seg2a_syncinfo_sa_bcch_stn,
-		  { "SA_BCCH_STN", "gmr1_bcch.seg2a.syncinfo.sa_bcch_stn",
+		  { "SA_BCCH_STN", "gmr1.bcch.seg2a.syncinfo.sa_bcch_stn",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    "Starting timeslot number", HFILL }
 		},
 		{ &hf_seg2a_syncinfo_superframe_num,
-		  { "Superframe Number", "gmr1_bcch.seg2a.syncinfo.superframe_num",
+		  { "Superframe Number", "gmr1.bcch.seg2a.syncinfo.superframe_num",
 		    FT_UINT16, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg2a_syncinfo_multiframe_num,
-		  { "Multiframe Number", "gmr1_bcch.seg2a.syncinfo.multiframe_num",
+		  { "Multiframe Number", "gmr1.bcch.seg2a.syncinfo.multiframe_num",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    "Multiframe number in a superframe", HFILL }
 		},
 		{ &hf_seg2a_syncinfo_mffn_high_bit,
-		  { "MFFN high bit", "gmr1_bcch.seg2a.syncinfo.mffn_high_bit",
+		  { "MFFN high bit", "gmr1.bcch.seg2a.syncinfo.mffn_high_bit",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    "High bit of the TDMA FN in a multiframe", HFILL }
 		},
 		{ &hf_seg2a_selcrit_rxlev_select_min,
-		  { "RXLEV_SELECT_MIN", "gmr1_bcch.seg2a.selcrit.rxlev_select_min",
+		  { "RXLEV_SELECT_MIN", "gmr1.bcch.seg2a.selcrit.rxlev_select_min",
 		    FT_UINT8, BASE_CUSTOM, segx_half_db_value_fmt, 0x00,
 		    "Adjustment to threshold to camp-on system", HFILL }
 		},
 		{ &hf_seg2a_miscinfo_sb_selection_power,
-		  { "SB_SELECTION_POWER", "gmr1_bcch.seg2a.miscinfo.sb_selection_power",
+		  { "SB_SELECTION_POWER", "gmr1.bcch.seg2a.miscinfo.sb_selection_power",
 		    FT_UINT8, BASE_CUSTOM, segx_half_db_value_fmt, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg2a_lainfo_sa_pch_config,
-		  { "SA_PCH_CONFIG", "gmr1_bcch.seg2a.lainfo.sa_pch_config",
+		  { "SA_PCH_CONFIG", "gmr1.bcch.seg2a.lainfo.sa_pch_config",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    "Paging group configuration information", HFILL }
 		},
 		{ &hf_seg2a_lainfo_sa_bach_config,
-		  { "SA_BACH_CONFIG", "gmr1_bcch.seg2a.lainfo.sa_bach_config",
+		  { "SA_BACH_CONFIG", "gmr1.bcch.seg2a.lainfo.sa_bach_config",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    "Alerting group configuration information", HFILL }
 		},
 		{ &hf_seg2a_lainfo_rach_ts_offset,
-		  { "RACH_TS_OFFSET", "gmr1_bcch.seg2a.lainfo.rach_ts_offset",
+		  { "RACH_TS_OFFSET", "gmr1.bcch.seg2a.lainfo.rach_ts_offset",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    "Start of RACH window with respect to BCCH", HFILL }
 		},
 		{ &hf_seg2a_lainfo_n_page_occurrences,
-		  { "N Page Occurrences", "gmr1_bcch.seg2a.lainfo.n_page_occurrences",
+		  { "N Page Occurrences", "gmr1.bcch.seg2a.lainfo.n_page_occurrences",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    "Number of times a page shall be retransmitted after the initial transmission", HFILL }
 		},
 		{ &hf_seg2a_lainfo_imsi_attach_detach_ind,
-		  { "IMSI attach-detach ind", "gmr1_bcch.seg2a.lainfo.imsi_attach_detach_ind",
+		  { "IMSI attach-detach ind", "gmr1.bcch.seg2a.lainfo.imsi_attach_detach_ind",
 		    FT_UINT8, BASE_DEC, VALS(seg2a_lainfo_imsi_attach_detach_ind_vals), 0x00,
 		    "Should MESs apply IMSI attach and detach procedure for this LA", HFILL }
 		},
 		{ &hf_seg2a_lainfo_ecsc_indication,
-		  { "ECSC indication", "gmr1_bcch.seg2a.lainfo.ecsc_indication",
+		  { "ECSC indication", "gmr1.bcch.seg2a.lainfo.ecsc_indication",
 		    FT_UINT8, BASE_DEC, VALS(seg2a_lainfo_ecsc_indication_vals), 0x00,
 		    "Early Classmark Sending Control", HFILL }
 		},
 		{ &hf_seg2a_lainfo_si_update_ind,
-		  { "SI update ind", "gmr1_bcch.seg2a.lainfo.si_update_ind",
+		  { "SI update ind", "gmr1.bcch.seg2a.lainfo.si_update_ind",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    "Flag for BACH reorganization. Value changes after each reorganization", HFILL }
 		},
 
 		/* Segment 3A - [1] 11.5.2.71 */
 		{ &hf_seg3a_lai_mcc,
-		  { "Mobile Country Code (MCC)", "gmr1_bcch.seg3a.lai.mcc",
+		  { "Mobile Country Code (MCC)", "gmr1.bcch.seg3a.lai.mcc",
 		    FT_UINT16, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg3a_lai_mnc,
-		  { "Mobile Network Code (MNC)", "gmr1_bcch.seg3a.lai.mnc",
+		  { "Mobile Network Code (MNC)", "gmr1.bcch.seg3a.lai.mnc",
 		    FT_UINT16, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg3a_lai_lac,
-		  { "Location Area Code (LAC)", "gmr1_bcch.seg3a.lai.lac",
+		  { "Location Area Code (LAC)", "gmr1.bcch.seg3a.lai.lac",
 		    FT_UINT16, BASE_HEX, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg3a_lai_msc_id,
-		  { "MSC ID", "gmr1_bcch.seg3a.lai.msc_id",
+		  { "MSC ID", "gmr1.bcch.seg3a.lai.msc_id",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg3a_lai_spot_beam_id,
-		  { "Spot Beam ID", "gmr1_bcch.seg3a.lai.spot_beam_id",
+		  { "Spot Beam ID", "gmr1.bcch.seg3a.lai.spot_beam_id",
 		    FT_UINT16, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg3a_system_sat_id,
-		  { "Satellite ID", "gmr1_bcch.seg3a.system.sat_id",
+		  { "Satellite ID", "gmr1.bcch.seg3a.system.sat_id",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg3a_system_sys_id,
-		  { "System ID", "gmr1_bcch.seg3a.system.sys_id",
+		  { "System ID", "gmr1.bcch.seg3a.system.sys_id",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg3a_satpos_latitude,
-		  { "Latitude", "gmr1_bcch.seg3a.satpos.latitude",
+		  { "Latitude", "gmr1.bcch.seg3a.satpos.latitude",
 		    FT_INT8, BASE_CUSTOM, seg3a_latitude_fmt, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg3a_satpos_longitude,
-		  { "Longitude", "gmr1_bcch.seg3a.satpos.longitude",
+		  { "Longitude", "gmr1.bcch.seg3a.satpos.longitude",
 		    FT_UINT16, BASE_CUSTOM, seg3a_longitude_fmt, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg3a_satpos_radius,
-		  { "Radius", "gmr1_bcch.seg3a.satpos.radius",
+		  { "Radius", "gmr1.bcch.seg3a.satpos.radius",
 		    FT_INT16, BASE_CUSTOM, seg3a_satpos_radius_fmt, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg3a_beam_latitude,
-		  { "Latitude", "gmr1_bcch.seg3a.beam.latitude",
+		  { "Latitude", "gmr1.bcch.seg3a.beam.latitude",
 		    FT_INT16, BASE_CUSTOM, seg3a_latitude_fmt, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg3a_beam_longitude,
-		  { "Longitude", "gmr1_bcch.seg3a.beam.longitude",
+		  { "Longitude", "gmr1.bcch.seg3a.beam.longitude",
 		    FT_UINT16, BASE_CUSTOM, seg3a_longitude_fmt, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg3a_miscinfo_sb_reselection_timer,
-		  { "SB_RESELECTION_TIMER", "gmr1_bcch.seg3a.sb_reselection_timer",
+		  { "SB_RESELECTION_TIMER", "gmr1.bcch.seg3a.sb_reselection_timer",
 		    FT_UINT8, BASE_CUSTOM, seg3a_miscinfo_sb_reselection_timer_fmt, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_seg3a_spare,
-		  { "Spare", "gmr1_bcch.seg3a.spare",
+		  { "Spare", "gmr1.bcch.seg3a.spare",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 
 		/* System Information fields - [1] 10.1.31 & 10.1.32 */
 		{ &hf_si_protocol_version,
-		  { "Protocol version", "gmr1_bcch.si.protocol_version",
+		  { "Protocol version", "gmr1.bcch.si.protocol_version",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_si_block_type,
-		  { "Block Type", "gmr1_bcch.si.block_type",
+		  { "Block Type", "gmr1.bcch.si.block_type",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_si_spare,
-		  { "Spare", "gmr1_bcch.si.spare",
+		  { "Spare", "gmr1.bcch.si.spare",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_si1_randomization_period,
-		  { "Randomization Period", "gmr1_bcch.si.randomization_period",
+		  { "Randomization Period", "gmr1.bcch.si.randomization_period",
 		    FT_UINT8, BASE_DEC, VALS(si1_randomization_period_vals), 0x00,
 		    NULL, HFILL }
 		},
@@ -1413,7 +1413,7 @@ proto_register_gmr1_bcch(void)
 		&ett_gmr1_bcch,
 	};
 
-	proto_gmr1_bcch = proto_register_protocol("GEO-Mobile Radio (1) BCCH", "GMR-1 BCCH", "gmr1_bcch");
+	proto_gmr1_bcch = proto_register_protocol("GEO-Mobile Radio (1) BCCH", "GMR-1 BCCH", "gmr1.bcch");
 
 	proto_register_field_array(proto_gmr1_bcch, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-gmr1_common.c b/epan/dissectors/packet-gmr1_common.c
index 8e19bc975a..ef63b960de 100644
--- a/epan/dissectors/packet-gmr1_common.c
+++ b/epan/dissectors/packet-gmr1_common.c
@@ -293,79 +293,79 @@ proto_register_gmr1_common(void)
 		    NULL, HFILL }
 		},
 		{ &hf_com_cm2_spare1,
-		  { "Spare", "gmr1_common.cm2.spare1",
+		  { "Spare", "gmr1.common.cm2.spare1",
 		    FT_UINT8, BASE_DEC, NULL, 0x80,
 		    NULL, HFILL }
 		},
 		{ &hf_com_cm2_revision,
-		  { "Revision Level", "gmr1_common.cm2.revision",
+		  { "Revision Level", "gmr1.common.cm2.revision",
 		    FT_UINT8, BASE_DEC, VALS(com_cm2_revision_vals), 0x60,
 		    NULL, HFILL }
 		},
 		{ &hf_com_cm2_early_send,
-		  { "ES IND", "gmr1_common.cm2.early_send",
+		  { "ES IND", "gmr1.common.cm2.early_send",
 		    FT_UINT8, BASE_DEC, VALS(com_cm2_early_send_vals), 0x10,
 		    NULL, HFILL }
 		},
 		{ &hf_com_cm2_a5_1,
-		  { "A5/1", "gmr1_common.cm2.a5_1",
+		  { "A5/1", "gmr1.common.cm2.a5_1",
 		    FT_UINT8, BASE_DEC, VALS(com_cm2_a5_1_vals), 0x08,
 		    NULL, HFILL }
 		},
 		{ &hf_com_cm2_mes_type,
-		  { "MES terminal type", "gmr1_common.cm2.mes_type",
+		  { "MES terminal type", "gmr1.common.cm2.mes_type",
 		    FT_UINT8, BASE_DEC, VALS(com_cm2_mes_type_vals), 0x07,
 		    NULL, HFILL }
 		},
 		{ &hf_com_cm2_spare2,
-		  { "Spare", "gmr1_common.cm2.spare2",
+		  { "Spare", "gmr1.common.cm2.spare2",
 		    FT_UINT8, BASE_DEC, NULL, 0xc0,
 		    NULL, HFILL }
 		},
 		{ &hf_com_cm2_ss_screen_ind,
-		  { "SS Screening Indicator", "gmr1_common.cm2.ss_screen_ind",
+		  { "SS Screening Indicator", "gmr1.common.cm2.ss_screen_ind",
 		    FT_UINT8, BASE_DEC, VALS(com_cm2_ss_screen_ind_vals), 0x30,
 		    NULL, HFILL }
 		},
 		{ &hf_com_cm2_sms_cap,
-		  { "SM capability", "gmr1_common.cm2.sms_cap",
+		  { "SM capability", "gmr1.common.cm2.sms_cap",
 		    FT_UINT8, BASE_DEC, VALS(com_cm2_sms_cap_vals), 0x08,
 		    NULL, HFILL }
 		},
 		{ &hf_com_cm2_spare3,
-		  { "Spare", "gmr1_common.cm2.spare3",
+		  { "Spare", "gmr1.common.cm2.spare3",
 		    FT_UINT8, BASE_DEC, NULL, 0x06,
 		    NULL, HFILL }
 		},
 		{ &hf_com_cm2_freq_cap,
-		  { "FC", "gmr1_common.cm2.freq_cap",
+		  { "FC", "gmr1.common.cm2.freq_cap",
 		    FT_UINT8, BASE_DEC, VALS(com_cm2_freq_cap_vals), 0x01,
 		    NULL, HFILL }
 		},
 		{ &hf_com_cm2_cm3_presence,
-		  { "CM3", "gmr1_common.cm2.cm3_presence",
+		  { "CM3", "gmr1.common.cm2.cm3_presence",
 		    FT_UINT8, BASE_DEC, VALS(com_cm3_presence_vals), 0x80,
 		    NULL, HFILL }
 		},
 		{ &hf_com_cm2_spare4,
-		  { "Spare", "gmr1_common.cm2.spare4",
+		  { "Spare", "gmr1.common.cm2.spare4",
 		    FT_UINT8, BASE_DEC, NULL, 0x7c,
 		    NULL, HFILL }
 		},
 		{ &hf_com_cm2_a5_3,
-		  { "A5/3", "gmr1_common.cm2.a5_3",
+		  { "A5/3", "gmr1.common.cm2.a5_3",
 		    FT_UINT8, BASE_DEC, VALS(com_cm2_a5_3_vals), 0x02,
 		    NULL, HFILL }
 		},
 		{ &hf_com_cm2_a5_2_gmr1,
-		  { "A5/2 GMR-1", "gmr1_common.cm2.a5_2_gmr1",
+		  { "A5/2 GMR-1", "gmr1.common.cm2.a5_2_gmr1",
 		    FT_UINT8, BASE_DEC, VALS(com_cm2_a5_2_gmr1_vals), 0x01,
 		    NULL, HFILL }
 		},
 	};
 
 	/* Register the protocol name and field description */
-	proto_gmr1_common = proto_register_protocol("GEO-Mobile Radio (1) Common", "GMR-1 Common", "gmr1_common");
+	proto_gmr1_common = proto_register_protocol("GEO-Mobile Radio (1) Common", "GMR-1 Common", "gmr1.common");
 
 	proto_register_field_array(proto_gmr1_common, hf, array_length(hf));
 }
diff --git a/epan/dissectors/packet-gmr1_rr.c b/epan/dissectors/packet-gmr1_rr.c
index 242d393f7e..0b58e8086e 100644
--- a/epan/dissectors/packet-gmr1_rr.c
+++ b/epan/dissectors/packet-gmr1_rr.c
@@ -1843,502 +1843,502 @@ proto_register_gmr1_rr(void)
 {
 	static hf_register_info hf[] = {
 		{ &hf_rr_msg_type,
-		  { "Radio Resources Management Message Type", "gmr1_rr.msg_type",
+		  { "Radio Resources Management Message Type", "gmr1.rr.msg_type",
 		    FT_UINT8, BASE_HEX, VALS(gmr1_msg_rr_strings), 0x00,
 		    NULL, HFILL }	/* FIXME handle CCCH/DCCH conflicts */
 		},
 		{ &hf_rr_chan_desc_kab_loc,
-		  { "KAB Location", "gmr1_rr.chan_desc.kab_loc",
+		  { "KAB Location", "gmr1.rr.chan_desc.kab_loc",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_chan_desc_rx_tn,
-		  { "RX Timeslot", "gmr1_rr.chan_desc.rx_tn",
+		  { "RX Timeslot", "gmr1.rr.chan_desc.rx_tn",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_chan_desc_arfcn,
-		  { "ARFCN", "gmr1_rr.chan_desc.arfcn",
+		  { "ARFCN", "gmr1.rr.chan_desc.arfcn",
 		    FT_UINT16, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_chan_desc_tx_tn,
-		  { "TX Timeslot", "gmr1_rr.chan_desc.tx_tn",
+		  { "TX Timeslot", "gmr1.rr.chan_desc.tx_tn",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_chan_desc_chan_type,
-		  { "Channel Type", "gmr1_rr.chan_desc.chan_type",
+		  { "Channel Type", "gmr1.rr.chan_desc.chan_type",
 		    FT_UINT8, BASE_DEC, VALS(rr_chan_desc_chan_type_vals), 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_chan_mode,
-		  { "Channel Mode", "gmr1_rr.chan_mode",
+		  { "Channel Mode", "gmr1.rr.chan_mode",
 		    FT_UINT8, BASE_DEC, VALS(rr_chan_mode_vals), 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_ciph_mode_setting_sc,
-		  { "SC", "gmr1_rr.ciph_mode_setting.sc",
+		  { "SC", "gmr1.rr.ciph_mode_setting.sc",
 		    FT_UINT8, BASE_DEC, VALS(rr_ciph_mode_setting_sc_vals), 0x01,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_ciph_mode_setting_algo,
-		  { "Algorithm", "gmr1_rr.ciph_mode_setting.algo",
+		  { "Algorithm", "gmr1.rr.ciph_mode_setting.algo",
 		    FT_UINT8, BASE_DEC, VALS(rr_ciph_mode_setting_algo_vals), 0x0e,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_ciph_resp_cr,
-		  { "CR", "gmr1_rr.ciph_resp.cr",
+		  { "CR", "gmr1.rr.ciph_resp.cr",
 		    FT_UINT8, BASE_DEC, VALS(rr_ciph_resp_cr_vals), 0x10,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_ciph_resp_spare,
-		  { "Spare", "gmr1_rr.ciph_resp.spare",
+		  { "Spare", "gmr1.rr.ciph_resp.spare",
 		    FT_UINT8, BASE_DEC, NULL, 0xe0,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_l2_pseudo_len,
-		  { "L2 Pseudo Length value", "gmr1_rr.l2_pseudo_len",
+		  { "L2 Pseudo Length value", "gmr1.rr.l2_pseudo_len",
 		    FT_UINT8, BASE_DEC, NULL, 0xfc,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_page_mode,
-		  { "Page Mode", "gmr1_rr.page_mode.mode",
+		  { "Page Mode", "gmr1.rr.page_mode.mode",
 		    FT_UINT8, BASE_DEC, VALS(rr_page_mode_vals), 0x03,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_page_mode_spare,
-		  { "Spare", "gmr1_rr.page_mode.spare",
+		  { "Spare", "gmr1.rr.page_mode.spare",
 		    FT_UINT8, BASE_DEC, NULL, 0x0c,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_req_ref_est_cause,
-		  { "Establishment cause group ID", "gmr1_rr.req_ref.est_cause",
+		  { "Establishment cause group ID", "gmr1.rr.req_ref.est_cause",
 		    FT_UINT8, BASE_DEC, VALS(rr_req_ref_est_cause_vals), 0xe0,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_req_ref_ra,
-		  { "Random Access Information", "gmr1_rr.req_ref.ra",
+		  { "Random Access Information", "gmr1.rr.req_ref.ra",
 		    FT_UINT8, BASE_HEX, NULL, 0x1f,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_req_ref_fn,
-		  { "Frame Number mod 256", "gmr1_rr.req_ref.fn",
+		  { "Frame Number mod 256", "gmr1.rr.req_ref.fn",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_cause,
-		  { "RR Cause", "gmr1_rr.cause",
+		  { "RR Cause", "gmr1.rr.cause",
 		    FT_UINT8, BASE_DEC, VALS(rr_cause_vals), 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_timing_ofs_ti,
-		  { "TI", "gmr1_rr.timing_offset.ti",
+		  { "TI", "gmr1.rr.timing_offset.ti",
 		    FT_UINT8, BASE_DEC, VALS(rr_timing_ofs_ti_vals), 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_timing_ofs_value,
-		  { "Timing Offset value", "gmr1_rr.timing_offset.value",
+		  { "Timing Offset value", "gmr1.rr.timing_offset.value",
 		    FT_INT16, BASE_CUSTOM, rr_timing_ofs_value_fmt, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_tmsi_ptmsi,
-		  { "TMSI/P-TMSI Value","gmr1_rr.tmsi_ptmsi",
+		  { "TMSI/P-TMSI Value","gmr1.rr.tmsi_ptmsi",
 		    FT_UINT32,BASE_HEX,  NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_wait_ind_timeout,
-		  { "T3122/T3142 timeout", "gmr1_rr.wait_ind.timeout",
+		  { "T3122/T3142 timeout", "gmr1.rr.wait_ind.timeout",
 		    FT_UINT8, BASE_CUSTOM, rr_gen_ie_seconds_fmt, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_mif_mes1_ab,
-		  { "MES1 - Assignment Type", "gmr1_rr.mes_info_flag.1.ab",
+		  { "MES1 - Assignment Type", "gmr1.rr.mes_info_flag.1.ab",
 		    FT_UINT8, BASE_DEC, VALS(rr_mif_mes1_ab_vals), 0x03,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_mif_mes1_i,
-		  { "MES1 - Idle mode position update", "gmr1_rr.mes_info_flag.1.i",
+		  { "MES1 - Idle mode position update", "gmr1.rr.mes_info_flag.1.i",
 		    FT_UINT8, BASE_DEC, VALS(rr_gen_ie_presence_vals), 0x04,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_mif_mes1_d,
-		  { "MES1 - Dedicated mode position update", "gmr1_rr.mes_info_flag.1.d",
+		  { "MES1 - Dedicated mode position update", "gmr1.rr.mes_info_flag.1.d",
 		    FT_UINT8, BASE_DEC, VALS(rr_gen_ie_presence_vals), 0x08,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_mif_mes2,
-		  { "MES2", "gmr1_rr.mes_info_flag.2",
+		  { "MES2", "gmr1.rr.mes_info_flag.2",
 		    FT_UINT8, BASE_DEC, VALS(rr_mif_mes234_vals), 0x10,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_mif_mes3,
-		  { "MES3", "gmr1_rr.mes_info_flag.3",
+		  { "MES3", "gmr1.rr.mes_info_flag.3",
 		    FT_UINT8, BASE_DEC, VALS(rr_mif_mes234_vals), 0x20,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_mif_mes4,
-		  { "MES4", "gmr1_rr.mes_info_flag.4",
+		  { "MES4", "gmr1.rr.mes_info_flag.4",
 		    FT_UINT8, BASE_DEC, VALS(rr_mif_mes234_vals), 0x40,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_mif_pv,
-		  { "Position Verification indicator", "gmr1_rr.mes_info_flag.pv",
+		  { "Position Verification indicator", "gmr1.rr.mes_info_flag.pv",
 		    FT_UINT8, BASE_DEC, VALS(rr_mif_pv_vals), 0x80,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_freq_ofs_fi,
-		  { "FI", "gmr1_rr.frequency_offset.fi",
+		  { "FI", "gmr1.rr.frequency_offset.fi",
 		    FT_UINT8, BASE_DEC, VALS(rr_freq_ofs_fi_vals), 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_freq_ofs_value,
-		  { "Frequency Offset value", "gmr1_rr.frequency_offset.value",
+		  { "Frequency Offset value", "gmr1.rr.frequency_offset.value",
 		    FT_INT16, BASE_CUSTOM, rr_freq_ofs_value_fmt, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_freq_ofs_spare,
-		  { "Spare", "gmr1_rr.frequency_offset.spare",
+		  { "Spare", "gmr1.rr.frequency_offset.spare",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_page_info_msc_id,
-		  { "MSC ID", "gmr1_rr.paging_info.msc_id",
+		  { "MSC ID", "gmr1.rr.paging_info.msc_id",
 		    FT_UINT8, BASE_DEC, NULL, 0xfc,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_page_info_chan_needed,
-		  { "Channel Needed", "gmr1_rr.paging_info.chan_needed",
+		  { "Channel Needed", "gmr1.rr.paging_info.chan_needed",
 		    FT_UINT8, BASE_DEC, VALS(rr_page_info_chan_needed_vals), 0x03,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pos_display_flag,
-		  { "Display Information Flag", "gmr1_rr.pos_display.flag",
+		  { "Display Information Flag", "gmr1.rr.pos_display.flag",
 		    FT_UINT8, BASE_DEC, VALS(rr_pos_display_flag_vals), 0xf0,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pos_display_text,
-		  { "Country and Region name", "gmr1_rr.pos_display.text",
+		  { "Country and Region name", "gmr1.rr.pos_display.text",
 		    FT_STRING, BASE_NONE, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pos_upd_info_v,
-		  { "Valid", "gmr1_rr.pos_upd_info.valid",
+		  { "Valid", "gmr1.rr.pos_upd_info.valid",
 		    FT_UINT8, BASE_DEC, VALS(rr_pos_upd_info_v_vals), 0x01,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pos_upd_info_dist,
-		  { "GPS Update Distance", "gmr1_rr.pos_upd_info.distance",
+		  { "GPS Update Distance", "gmr1.rr.pos_upd_info.distance",
 		    FT_UINT8, BASE_CUSTOM, rr_pos_upd_info_dist_fmt, 0xfe,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pos_upd_info_time,
-		  { "GPS Update Timer", "gmr1_rr.pos_upd_info.time",
+		  { "GPS Update Timer", "gmr1.rr.pos_upd_info.time",
 		    FT_UINT8, BASE_CUSTOM, rr_pos_upd_info_time_fmt, 0xff,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_bcch_carrier_arfcn,
-		  { "ARFCN", "gmr1_rr.bcch_carrier.arfcn",
+		  { "ARFCN", "gmr1.rr.bcch_carrier.arfcn",
 		    FT_UINT16, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_bcch_carrier_si,
-		  { "Satellite Indication", "gmr1_rr.bcch_carrier.si",
+		  { "Satellite Indication", "gmr1.rr.bcch_carrier.si",
 		    FT_UINT8, BASE_DEC, VALS(rr_bcch_carrier_si_vals), 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_bcch_carrier_ri,
-		  { "Reselection Indication", "gmr1_rr.bcch_carrier.ri",
+		  { "Reselection Indication", "gmr1.rr.bcch_carrier.ri",
 		    FT_UINT8, BASE_DEC, VALS(rr_bcch_carrier_ri_vals), 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_bcch_carrier_spare,
-		  { "Spare", "gmr1_rr.bcch_carrier.spare",
+		  { "Spare", "gmr1.rr.bcch_carrier.spare",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_reject_cause,
-		  { "Cause", "gmr1_rr.reject_cause.cause",
+		  { "Cause", "gmr1.rr.reject_cause.cause",
 		    FT_UINT8, BASE_DEC, VALS(rr_reject_cause_vals), 0xfc,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_reject_cause_b,
-		  { "BCCH Carrier IE presence", "gmr1_rr.reject_cause.b",
+		  { "BCCH Carrier IE presence", "gmr1.rr.reject_cause.b",
 		    FT_UINT8, BASE_DEC, VALS(rr_gen_ie_presence_vals), 0x01,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_gps_timestamp,
-		  { "GPS timestamp", "gmr1_rr.gps_timestamp",
+		  { "GPS timestamp", "gmr1.rr.gps_timestamp",
 		    FT_UINT16, BASE_CUSTOM, rr_gps_timestamp_fmt, 0xffff,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_tmsi_avail_msk_tmsi[0],
-		  { "TMSI 1 Presence", "gmr1_rr.tmsi_avail_msk.tmsi1",
+		  { "TMSI 1 Presence", "gmr1.rr.tmsi_avail_msk.tmsi1",
 		    FT_UINT8, BASE_DEC, VALS(rr_gen_ie_presence_vals), 0x10,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_tmsi_avail_msk_tmsi[1],
-		  { "TMSI 2 Presence", "gmr1_rr.tmsi_avail_msk.tmsi2",
+		  { "TMSI 2 Presence", "gmr1.rr.tmsi_avail_msk.tmsi2",
 		    FT_UINT8, BASE_DEC, VALS(rr_gen_ie_presence_vals), 0x20,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_tmsi_avail_msk_tmsi[2],
-		  { "TMSI 3 Presence", "gmr1_rr.tmsi_avail_msk.tmsi3",
+		  { "TMSI 3 Presence", "gmr1.rr.tmsi_avail_msk.tmsi3",
 		    FT_UINT8, BASE_DEC, VALS(rr_gen_ie_presence_vals), 0x40,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_tmsi_avail_msk_tmsi[3],
-		  { "TMSI 4 Presence", "gmr1_rr.tmsi_avail_msk.tmsi4",
+		  { "TMSI 4 Presence", "gmr1.rr.tmsi_avail_msk.tmsi4",
 		    FT_UINT8, BASE_DEC, VALS(rr_gen_ie_presence_vals), 0x80,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_gps_almanac_pn,
-		  { "Page Number", "gmr1_rr.gps_almanac.pn",
+		  { "Page Number", "gmr1.rr.gps_almanac.pn",
 		    FT_UINT8, BASE_CUSTOM, rr_gps_almanac_pn_fmt, 0xf8,
 		    "See ICD-GPS-200", HFILL }
 		},
 		{ &hf_rr_gps_almanac_wn,
-		  { "Word Number", "gmr1_rr.gps_almanac.wn",
+		  { "Word Number", "gmr1.rr.gps_almanac.wn",
 		    FT_UINT8, BASE_DEC, NULL, 0x07,
 		    "See ICD-GPS-200", HFILL }
 		},
 		{ &hf_rr_gps_almanac_word,
-		  { "GPS Almanac Word", "gmr1_rr.gps_almanac.word",
+		  { "GPS Almanac Word", "gmr1.rr.gps_almanac.word",
 		    FT_UINT24, BASE_HEX, NULL, 0x00,
 		    "See ICD-GPS-200", HFILL }
 		},
 		{ &hf_rr_gps_almanac_sfn,
-		  { "Sub Frame Number", "gmr1_rr.gps_almanac.sfn",
+		  { "Sub Frame Number", "gmr1.rr.gps_almanac.sfn",
 		    FT_UINT8, BASE_DEC, VALS(rr_gps_almanac_sfn_vals), 0x80,
 		    "See ICD-GPS-200", HFILL }
 		},
 		{ &hf_rr_gps_almanac_co,
-		  { "CO", "gmr1_rr.gps_almanac.co",
+		  { "CO", "gmr1.rr.gps_almanac.co",
 		    FT_UINT8, BASE_DEC, NULL, 0x40,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_gps_almanac_spare,
-		  { "Spare", "gmr1_rr.gps_almanac.spare",
+		  { "Spare", "gmr1.rr.gps_almanac.spare",
 		    FT_UINT8, BASE_DEC, NULL, 0x3f,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_msc_id,
-		  { "MSC ID", "gmr1_rr.msc_id",
+		  { "MSC ID", "gmr1.rr.msc_id",
 		    FT_UINT8, BASE_DEC, NULL, 0xfc,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_msc_id_spare,
-		  { "Spare", "gmr1_rr.msc_id.spare",
+		  { "Spare", "gmr1.rr.msc_id.spare",
 		    FT_UINT8, BASE_DEC, NULL, 0x03,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_gps_discr,
-		  { "GPS Position field CRC-16", "gmr1_rr.gps_discriminator",
+		  { "GPS Position field CRC-16", "gmr1.rr.gps_discriminator",
 		    FT_UINT16, BASE_HEX, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_3_prm_rlc_mode,
-		  { "RLC Mode", "gmr1_rr.pkt_imm_ass_3_prm",
+		  { "RLC Mode", "gmr1.rr.pkt_imm_ass_3_prm",
 		    FT_UINT8, BASE_DEC, VALS(rr_pkt_imm_ass_3_prm_rlc_mode_vals), 0x01,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_3_prm_spare,
-		  { "Spare", "gmr1_rr.pkt_imm_ass_3_prm.spare",
+		  { "Spare", "gmr1.rr.pkt_imm_ass_3_prm.spare",
 		    FT_UINT8, BASE_DEC, NULL, 0x1e,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_3_prm_dl_tfi,
-		  { "Downlink TFI", "gmr1_rr.pkt_imm_ass_3_prm.tfi",
+		  { "Downlink TFI", "gmr1.rr.pkt_imm_ass_3_prm.tfi",
 		    FT_UINT8, BASE_HEX, NULL, 0x00,
 		    "Temporary Flow Identifier", HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_3_prm_start_fn,
-		  { "Start Framenumber", "gmr1_rr.pkt_imm_ass_3_prm.start_fn",
+		  { "Start Framenumber", "gmr1.rr.pkt_imm_ass_3_prm.start_fn",
 		    FT_UINT8, BASE_DEC, NULL, 0xf0,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_3_prm_mac_slot_alloc,
-		  { "MAC-slot Allocation", "gmr1_rr.pkt_imm_ass_3_prm.mac_slot_alloc",
+		  { "MAC-slot Allocation", "gmr1.rr.pkt_imm_ass_3_prm.mac_slot_alloc",
 		    FT_UINT8, BASE_HEX, NULL, 0xff,
 		    "LSB=slot 0, MSB=slot 7", HFILL }
 		},
 		{ &hf_rr_pkt_freq_prm_arfcn,
-		  { "ARFCN", "gmr1_rr.pkt_freq_prm.arfcn",
+		  { "ARFCN", "gmr1.rr.pkt_freq_prm.arfcn",
 		    FT_UINT16, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_freq_prm_dl_freq_plan_id,
-		  { "Downlink Freq. Plan ID", "gmr1_rr.pkt_freq_prm.dl_freq_plan_id",
+		  { "Downlink Freq. Plan ID", "gmr1.rr.pkt_freq_prm.dl_freq_plan_id",
 		    FT_UINT8, BASE_DEC, VALS(rr_pkt_freq_prm_dl_freq_plan_id_vals), 0x08,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_freq_prm_dl_bw,
-		  { "Downlink Bandwidth", "gmr1_rr.pkt_freq_prm.dl_bw",
+		  { "Downlink Bandwidth", "gmr1.rr.pkt_freq_prm.dl_bw",
 		    FT_UINT8, BASE_CUSTOM, rr_pkt_freq_prm_xx_bw_fmt, 0x70,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_freq_prm_ul_freq_dist,
-		  { "Uplink Freq. Distance", "gmr1_rr.pkt_freq_prm.ul_freq_dist",
+		  { "Uplink Freq. Distance", "gmr1.rr.pkt_freq_prm.ul_freq_dist",
 		    FT_INT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_freq_prm_ul_bw,
-		  { "Uplink Bandwidth", "gmr1_rr.pkt_freq_prm.ul_bw",
+		  { "Uplink Bandwidth", "gmr1.rr.pkt_freq_prm.ul_bw",
 		    FT_UINT8, BASE_CUSTOM, rr_pkt_freq_prm_xx_bw_fmt, 0x70,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_freq_prm_spare,
-		  { "Spare", "gmr1_rr.pkt_freq_prm.spare",
+		  { "Spare", "gmr1.rr.pkt_freq_prm.spare",
 		    FT_UINT8, BASE_DEC, NULL, 0x80,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_ac_spare1,
-		  { "Spare", "gmr1_rr.pkt_imm_ass_2_prm.ac.spare1",
+		  { "Spare", "gmr1.rr.pkt_imm_ass_2_prm.ac.spare1",
 		    FT_UINT8, BASE_DEC, NULL, 0x01,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_ac_final_alloc,
-		  { "Final Allocation", "gmr1_rr.pkt_imm_ass_2_prm.ac.final_alloc",
+		  { "Final Allocation", "gmr1.rr.pkt_imm_ass_2_prm.ac.final_alloc",
 		    FT_UINT8, BASE_DEC, NULL, 0x02,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_ac_usf_granularity,
-		  { "USF Granularity", "gmr1_rr.pkt_imm_ass_2_prm.ac.usf_granularity",
+		  { "USF Granularity", "gmr1.rr.pkt_imm_ass_2_prm.ac.usf_granularity",
 		    FT_UINT8, BASE_DEC, NULL, 0x04,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_ac_dl_ctl_mac_slot,
-		  { "Downlink Control MAC-slot", "gmr1_rr.pkt_imm_ass_2_prm.ac.dl_ctl_mac_slot",
+		  { "Downlink Control MAC-slot", "gmr1.rr.pkt_imm_ass_2_prm.ac.dl_ctl_mac_slot",
 		    FT_UINT8, BASE_DEC, NULL, 0x38,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_ac_mac_mode,
-		  { "MAC mode", "gmr1_rr.pkt_imm_ass_2_prm.ac.mac_mode",
+		  { "MAC mode", "gmr1.rr.pkt_imm_ass_2_prm.ac.mac_mode",
 		    FT_UINT8, BASE_DEC, VALS(rr_pkt_imm_ass_2_prm_ac_mac_mode_vals), 0xc0,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_ac_start_fn,
-		  { "Starting Frame Number", "gmr1_rr.pkt_imm_ass_2_prm.ac.start_fn",
+		  { "Starting Frame Number", "gmr1.rr.pkt_imm_ass_2_prm.ac.start_fn",
 		    FT_UINT8, BASE_DEC, NULL, 0x0f,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_ac_rlc_dblk_gnt,
-		  { "RLC Data Blocks Granted", "gmr1_rr.pkt_imm_ass_2_prm.ac.rlc_dblk_gnt",
+		  { "RLC Data Blocks Granted", "gmr1.rr.pkt_imm_ass_2_prm.ac.rlc_dblk_gnt",
 		    FT_UINT8, BASE_DEC, NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_ac_mcs,
-		  { "MCS", "gmr1_rr.pkt_imm_ass_2_prm.ac.mcs",
+		  { "MCS", "gmr1.rr.pkt_imm_ass_2_prm.ac.mcs",
 		    FT_UINT8, BASE_DEC, NULL, 0xf8,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_ac_tfi,
-		  { "TFI", "gmr1_rr.pkt_imm_ass_2_prm.ac.tfi",
+		  { "TFI", "gmr1.rr.pkt_imm_ass_2_prm.ac.tfi",
 		    FT_UINT8, BASE_HEX, NULL, 0x7f,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_ac_spare2,
-		  { "Spare", "gmr1_rr.pkt_imm_ass_2_prm.ac.spare2",
+		  { "Spare", "gmr1.rr.pkt_imm_ass_2_prm.ac.spare2",
 		    FT_UINT8, BASE_HEX, NULL, 0x80,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_ac_mac_slot_alloc,
-		  { "MAC-slot Allocation", "gmr1_rr.pkt_imm_ass_2_prm.ac.mac_slot_alloc",
+		  { "MAC-slot Allocation", "gmr1.rr.pkt_imm_ass_2_prm.ac.mac_slot_alloc",
 		    FT_UINT8, BASE_HEX, NULL, 0xff,
 		    "LSB=slot 0, MSB=slot 7", HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_d_chan_mcs_cmd,
-		  { "Channel MCS Command", "gmr1_rr.pkt_imm_ass_2_prm.d.chan_mcs_cmd",
+		  { "Channel MCS Command", "gmr1.rr.pkt_imm_ass_2_prm.d.chan_mcs_cmd",
 		    FT_UINT8, BASE_HEX, NULL, 0x0f,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_d_chan_mcs_cmd_pnb512,
-		  { "Channel MCS Command PNB 5,12", "gmr1_rr.pkt_imm_ass_2_prm.d.chan_mcs_cmd_pnb512",
+		  { "Channel MCS Command PNB 5,12", "gmr1.rr.pkt_imm_ass_2_prm.d.chan_mcs_cmd_pnb512",
 		    FT_UINT8, BASE_HEX, NULL, 0xf0,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_d_spare1,
-		  { "Spare", "gmr1_rr.pkt_imm_ass_2_prm.d.spare1",
+		  { "Spare", "gmr1.rr.pkt_imm_ass_2_prm.d.spare1",
 		    FT_UINT8, BASE_HEX, NULL, 0xff,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_d_rlc_dblk_gnt,
-		  { "RLC Data Blocks Granted", "gmr1_rr.pkt_imm_ass_2_prm.d.rlc_dblk_gnt",
+		  { "RLC Data Blocks Granted", "gmr1.rr.pkt_imm_ass_2_prm.d.rlc_dblk_gnt",
 		    FT_UINT8, BASE_DEC, NULL, 0x7f,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_d_spare2,
-		  { "Spare", "gmr1_rr.pkt_imm_ass_2_prm.d.spare2",
+		  { "Spare", "gmr1.rr.pkt_imm_ass_2_prm.d.spare2",
 		    FT_UINT8, BASE_HEX, NULL, 0x80,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_d_tfi,
-		  { "TFI", "gmr1_rr.pkt_imm_ass_2_prm.d.tfi",
+		  { "TFI", "gmr1.rr.pkt_imm_ass_2_prm.d.tfi",
 		    FT_UINT8, BASE_HEX, NULL, 0x7f,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_d_usf_granularity,
-		  { "USF Granularity", "gmr1_rr.pkt_imm_ass_2_prm.ac.usf_granularity",
+		  { "USF Granularity", "gmr1.rr.pkt_imm_ass_2_prm.ac.usf_granularity",
 		    FT_UINT8, BASE_DEC, NULL, 0x80,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_imm_ass_2_prm_d_mac_slot_alloc,
-		  { "MAC-slot Allocation", "gmr1_rr.pkt_imm_ass_2_prm.d.mac_slot_alloc",
+		  { "MAC-slot Allocation", "gmr1.rr.pkt_imm_ass_2_prm.d.mac_slot_alloc",
 		    FT_UINT8, BASE_HEX, NULL, 0xff,
 		    "LSB=slot 0, MSB=slot 7", HFILL }
 		},
 		{ &hf_rr_usf_value,
-		  { "Uplink state flag (USF)", "gmr1_rr.usf.value",
+		  { "Uplink state flag (USF)", "gmr1.rr.usf.value",
 		    FT_UINT8, BASE_HEX, NULL, 0x3f,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_usf_spare,
-		  { "Spare", "gmr1_rr.usf.spare",
+		  { "Spare", "gmr1.rr.usf.spare",
 		    FT_UINT24, BASE_DEC, NULL, 0xffffc0,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_timing_adv_idx_value,
-		  { "TAI Value", "gmr1_rr.timing_adv_idx.tai",
+		  { "TAI Value", "gmr1.rr.timing_adv_idx.tai",
 		    FT_UINT8, BASE_DEC, NULL, 0x7f,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_timing_adv_idx_spare,
-		  { "Spare", "gmr1_rr.timing_adv_idx.spare",
+		  { "Spare", "gmr1.rr.timing_adv_idx.spare",
 		    FT_UINT8, BASE_DEC, NULL, 0x80,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_tlli,
-		  { "TLLI", "gmr1_rr.tlli",
+		  { "TLLI", "gmr1.rr.tlli",
 		    FT_UINT32, BASE_HEX,  NULL, 0x00,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_pwr_ctrl_prm_par,
-		  { "Power Attenuation Request (PAR)", "gmr1_rr.pkt_pwr_ctrl_prm.par",
+		  { "Power Attenuation Request (PAR)", "gmr1.rr.pkt_pwr_ctrl_prm.par",
 		    FT_UINT8, BASE_CUSTOM, rr_pkt_pwr_ctrl_prm_par_fmt, 0x3f,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_pkt_pwr_ctrl_prm_spare,
-		  { "Spare", "gmr1_rr.pkt_pwr_ctrl_prm.spare",
+		  { "Spare", "gmr1.rr.pkt_pwr_ctrl_prm.spare",
 		    FT_UINT8, BASE_DEC, NULL, 0xc0,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_persistence_lvl[0],
-		  { "for Radio priority 1", "gmr1_rr.persistence_lvl.p1",
+		  { "for Radio priority 1", "gmr1.rr.persistence_lvl.p1",
 		    FT_UINT8, BASE_DEC, NULL, 0xf0,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_persistence_lvl[1],
-		  { "for Radio priority 2", "gmr1_rr.persistence_lvl.p2",
+		  { "for Radio priority 2", "gmr1.rr.persistence_lvl.p2",
 		    FT_UINT8, BASE_DEC, NULL, 0x0f,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_persistence_lvl[2],
-		  { "for Radio priority 3", "gmr1_rr.persistence_lvl.p3",
+		  { "for Radio priority 3", "gmr1.rr.persistence_lvl.p3",
 		    FT_UINT8, BASE_DEC, NULL, 0xf0,
 		    NULL, HFILL }
 		},
 		{ &hf_rr_persistence_lvl[3],
-		  { "for Radio priority 4", "gmr1_rr.persistence_lvl.p4",
+		  { "for Radio priority 4", "gmr1.rr.persistence_lvl.p4",
 		    FT_UINT8, BASE_DEC, NULL, 0x0f,
 		    NULL, HFILL }
 		},
@@ -2370,12 +2370,12 @@ proto_register_gmr1_rr(void)
 	proto_register_subtree_array(ett, array_length(ett));
 
 	/* Register the protocol name and field description */
-	proto_gmr1_rr = proto_register_protocol("GEO-Mobile Radio (1) RR", "GMR-1 RR", "gmr1_rr");
+	proto_gmr1_rr = proto_register_protocol("GEO-Mobile Radio (1) RR", "GMR-1 RR", "gmr1.rr");
 
 	proto_register_field_array(proto_gmr1_rr, hf, array_length(hf));
 
 	/* Register the protocol name and field description */
-	proto_gmr1_ccch = proto_register_protocol("GEO-Mobile Radio (1) CCCH", "GMR-1 CCCH", "gmr1_ccch");
+	proto_gmr1_ccch = proto_register_protocol("GEO-Mobile Radio (1) CCCH", "GMR-1 CCCH", "gmr1.ccch");
 
 	/* Register dissector */
 	register_dissector("gmr1_ccch", dissect_gmr1_ccch, proto_gmr1_ccch);