Remove "pkg" prefix from display filters.

Also rename base protocol filter name to match prefix of all other fields

Change-Id: Iff234c1443252b9f8e6d87fd7a76925746b5e513
Reviewed-on: https://code.wireshark.org/review/2449
Reviewed-by: Anders Broman <a.broman58@gmail.com>

3 files changed, 239 insertions, 239 deletions

diff --git a/epan/dissectors/packet-h248_annex_c.c b/epan/dissectors/packet-h248_annex_c.c
index db31f5c012..9f0522971c 100644
--- a/epan/dissectors/packet-h248_annex_c.c
+++ b/epan/dissectors/packet-h248_annex_c.c
@@ -1,5 +1,5 @@
 /*
- *  packet-h248-annex_c.c
+ *  packet-h248_annex_c.c
  *  H.248 annex C
  *
  *  (c) 2006, Luis E. Garcia Ontanon <luis@ontanon.org>
@@ -33,7 +33,7 @@ void proto_register_h248_annex_c(void);
 
 #define PNAME  "H.248 Annex C"
 #define PSNAME "H248C"
-#define PFNAME "h248c"
+#define PFNAME "h248.annexc"
 
 /* H.248 Annex C */
 static int proto_h248_pkg_annexc = -1;
@@ -979,522 +979,522 @@ static h248_package_t h248_annexc_package = {
 void proto_register_h248_annex_c(void) {
 	static hf_register_info hf[] = {
 		{ &hf_h248_pkg_annexc_media,
-			{ "Media", "h248.pkg.annexc.media", FT_UINT32, BASE_HEX, VALS(h248_annexc_media_vals), 0, "Media Type", HFILL }},
+			{ "Media", "h248.annexc.media", FT_UINT32, BASE_HEX, VALS(h248_annexc_media_vals), 0, "Media Type", HFILL }},
 		{ &hf_h248_pkg_annexc_ACodec,
-		{ "ACodec", "h248.pkg.annexc.ACodec",
+		{ "ACodec", "h248.annexc.ACodec",
 			FT_BYTES, BASE_NONE, NULL, 0,
 			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_Mediatx,
-		{ "Mediatx", "h248.pkg.annexc.Mediatx",
+		{ "Mediatx", "h248.annexc.Mediatx",
 			FT_UINT32, BASE_DEC, VALS(h248_pkg_annexc_Mediatx_vals), 0,
 			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_BIR,
-		{ "BIR", "h248.pkg.annexc.BIR",
+		{ "BIR", "h248.annexc.BIR",
 			FT_BYTES, BASE_NONE, NULL, 0,
 			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_NSAP,
-		{ "NSAP", "h248.pkg.annexc.NSAP",
+		{ "NSAP", "h248.annexc.NSAP",
 			FT_BYTES, BASE_NONE, NULL, 0,
 			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_transmission_mode,
-		{ "Transmission Mode", "h248.pkg.annexc.transmission_mode",
+		{ "Transmission Mode", "h248.annexc.transmission_mode",
 			FT_UINT32, BASE_DEC, VALS(h248_annexc_transmission_mode), 0,
 			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_num_of_channels,
-		{ "Number of Channels", "h248.pkg.annexc.num_of_channels",
+		{ "Number of Channels", "h248.annexc.num_of_channels",
 			FT_UINT32, BASE_DEC, NULL, 0,
 			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_sampling_rate,
-		{ "Sampling Rate", "h248.pkg.annexc.sampling_rate",
+		{ "Sampling Rate", "h248.annexc.sampling_rate",
 			FT_UINT32, BASE_DEC, NULL, 0,
 			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_bit_rate,
-		{ "Bit Rate", "h248.pkg.annexc.bit_rate",
+		{ "Bit Rate", "h248.annexc.bit_rate",
 			FT_UINT32, BASE_DEC, NULL, 0,
 			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_samplepp,
-		{ "Samplepp", "h248.pkg.annexc.samplepp",
+		{ "Samplepp", "h248.annexc.samplepp",
 			FT_UINT32, BASE_DEC, NULL, 0,
 			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_silence_supp,
-		{ "SilenceSupp", "h248.pkg.annexc.silence_supp",
+		{ "SilenceSupp", "h248.annexc.silence_supp",
 			FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			"Silence Suppression", HFILL }},
 		{ &hf_h248_pkg_annexc_encrypt_type,
-		{ "Encrypttype", "h248.pkg.annexc.encrypt_type",
+		{ "Encrypttype", "h248.annexc.encrypt_type",
 			FT_BYTES, BASE_NONE, NULL, 0,
 			"Encryption Type", HFILL }},
 		{ &hf_h248_pkg_annexc_encrypt_key,
-		{ "Encrypt Key", "h248.pkg.annexc.encrypt_key",
+		{ "Encrypt Key", "h248.annexc.encrypt_key",
 			FT_UINT32, BASE_DEC, NULL, 0,
 			"Encryption Key", HFILL }},
 		{ &hf_h248_pkg_annexc_gain,
-		{ "Gain", "h248.pkg.annexc.gain",
+		{ "Gain", "h248.annexc.gain",
 			FT_UINT32, BASE_DEC, NULL, 0,
 			"Gain (dB)", HFILL }},
 		{ &hf_h248_pkg_annexc_jitterbuf,
-		{ "JitterBuff", "h248.pkg.annexc.jitterbuf",
+		{ "JitterBuff", "h248.annexc.jitterbuf",
 			FT_UINT32, BASE_DEC, NULL, 0,
 			"Jitter Buffer Size (ms)", HFILL }},
 		{ &hf_h248_pkg_annexc_propdelay,
-		{ "Propagation Delay", "h248.pkg.annexc.encrypt_type",
+		{ "Propagation Delay", "h248.annexc.encrypt_type",
 			FT_UINT32, BASE_DEC, NULL, 0,
 			"Propagation Delay (ms)", HFILL }},
 		{ &hf_h248_pkg_annexc_rtp_payload,
-		{ "RTP Payload type", "h248.pkg.annexc.rtp_payload",
+		{ "RTP Payload type", "h248.annexc.rtp_payload",
 			FT_UINT32, BASE_DEC, NULL, 0,
 			"Payload type in RTP Profile", HFILL }},
 		{ &hf_h248_pkg_annexc_h222,
-		{ "H222LogicalChannelParameters", "h248.pkg.annexc.h222",
+		{ "H222LogicalChannelParameters", "h248.annexc.h222",
 			FT_BYTES, BASE_NONE, NULL, 0,
 			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_h223,
-		{ "H223LogicalChannelParameters", "h248.pkg.annexc.h223",
+		{ "H223LogicalChannelParameters", "h248.annexc.h223",
 			FT_BYTES, BASE_NONE, NULL, 0,
 			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_v76,
-		{ "V76LogicalChannelParameters", "h248.pkg.annexc.v76",
+		{ "V76LogicalChannelParameters", "h248.annexc.v76",
 			FT_BYTES, BASE_NONE, NULL, 0,
 			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_h2250,
-		{ "H2250LogicalChannelParameters", "h248.pkg.annexc.h2250",
+		{ "H2250LogicalChannelParameters", "h248.annexc.h2250",
 			FT_BYTES, BASE_NONE, NULL, 0,
 			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_aesa,
-		{ "AESA", "h248.pkg.annexc.aesa",
+		{ "AESA", "h248.annexc.aesa",
 			FT_BYTES, BASE_NONE, NULL, 0,
 			"ATM End System Address", HFILL }},
 		{ &hf_h248_pkg_annexc_vp,
-		{ "VPI", "h248.pkg.annexc.vpi",
+		{ "VPI", "h248.annexc.vpi",
 			FT_UINT16, BASE_DEC, NULL, 0,
 			"Virtual Path Identifier", HFILL }},
 		{ &hf_h248_pkg_annexc_vc,
-		{ "VCI", "h248.pkg.annexc.vci",
+		{ "VCI", "h248.annexc.vci",
 			FT_UINT16, BASE_DEC, NULL, 0,
 			"Virtual Circuit Identifier", HFILL }},
 		{ &hf_h248_pkg_annexc_sc,
-		{ "Service Class", "h248.pkg.annexc.sc",
+		{ "Service Class", "h248.annexc.sc",
 			FT_UINT32, BASE_DEC, NULL, 0,
 			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_bcob,
-		{ "BCOB", "h248.pkg.annexc.bcob",
+		{ "BCOB", "h248.annexc.bcob",
 			FT_UINT8, BASE_DEC, NULL, 0x1F,
 			"Broadband Bearer Class", HFILL }},
 		{ &hf_h248_pkg_annexc_bbtc,
-		{ "BBTC", "h248.pkg.annexc.bbtc",
+		{ "BBTC", "h248.annexc.bbtc",
 			FT_UINT8, BASE_DEC, NULL, 0x3F,
 			"Broadband Transfer Capability", HFILL }},
 		{ &hf_h248_pkg_annexc_atc,
-		{ "ATC", "h248.pkg.annexc.atc",
+		{ "ATC", "h248.annexc.atc",
 			FT_UINT32, BASE_DEC, VALS(h248_pkg_annexc_atc_values), 0x0,
 			"ATM Traffic Capability", HFILL }},
 		{ &hf_h248_pkg_annexc_stc,
-		{ "STC", "h248.pkg.annexc.stc",
+		{ "STC", "h248.annexc.stc",
 			FT_UINT8, BASE_DEC, VALS(h248_pkg_annexc_stc_values), 0x03,
 			"Susceptibility to Clipping", HFILL }},
 		{ &hf_h248_pkg_annexc_uppc,
-		{ "UPPC", "h248.pkg.annexc.uppc",
+		{ "UPPC", "h248.annexc.uppc",
 			FT_UINT8, BASE_DEC, VALS(h248_pkg_annexc_uppc_values), 0x03,
 			"User Plane Connection Configuration", HFILL }},
 
 		{ &hf_h248_pkg_annexc_pcr0,
-		{ "PCR0", "h248.pkg.annexc.pcr0",
+		{ "PCR0", "h248.annexc.pcr0",
 			FT_UINT24, BASE_DEC, NULL, 0,
 			"Peak Cell Rate for CLP=0", HFILL }},
 		{ &hf_h248_pkg_annexc_scr0,
-		{ "SCR0", "h248.pkg.annexc.scr0",
+		{ "SCR0", "h248.annexc.scr0",
 			FT_UINT24, BASE_DEC, NULL, 0,
 			"Sustained Cell Rate for CLP=0", HFILL }},
 		{ &hf_h248_pkg_annexc_mbs0,
-		{ "MBS0", "h248.pkg.annexc.mbs0",
+		{ "MBS0", "h248.annexc.mbs0",
 			FT_UINT24, BASE_DEC, NULL, 0,
 			"Maximum Burst Size for CLP=0", HFILL }},
 
 		{ &hf_h248_pkg_annexc_pcr1,
-		{ "PCR1", "h248.pkg.annexc.pcr1",
+		{ "PCR1", "h248.annexc.pcr1",
 			FT_UINT24, BASE_DEC, NULL, 0,
 			"Peak Cell Rate for CLP=1", HFILL }},
 		{ &hf_h248_pkg_annexc_scr1,
-		{ "SCR1", "h248.pkg.annexc.scr1",
+		{ "SCR1", "h248.annexc.scr1",
 			FT_UINT24, BASE_DEC, NULL, 0,
 			"Sustained Cell Rate for CLP=1", HFILL }},
 		{ &hf_h248_pkg_annexc_mbs1,
-		{ "MBS1", "h248.pkg.annexc.mbs1",
+		{ "MBS1", "h248.annexc.mbs1",
 			FT_UINT24, BASE_DEC, NULL, 0,
 			"Maximum Burst Size for CLP=1", HFILL }},
 
 		{ &hf_h248_pkg_annexc_bei,
-		{ "BEI", "h248.pkg.annexc.bei",
+		{ "BEI", "h248.annexc.bei",
 			FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			"Best Effort Indicator", HFILL }},
 		{ &hf_h248_pkg_annexc_ti,
-		{ "TI", "h248.pkg.annexc.ti",
+		{ "TI", "h248.annexc.ti",
 			FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			"Tagging Indicator", HFILL }},
 		{ &hf_h248_pkg_annexc_fd,
-		{ "FD", "h248.pkg.annexc.fd",
+		{ "FD", "h248.annexc.fd",
 			FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			"Frame Discard", HFILL }},
 
 		{ &hf_h248_pkg_annexc_a2pcdv,
-		{ "A2PCDV", "h248.pkg.annexc.a2pcdv",
+		{ "A2PCDV", "h248.annexc.a2pcdv",
 			FT_UINT24, BASE_DEC, NULL, 0,
 			"Acceptable 2 point CDV", HFILL }},
 		{ &hf_h248_pkg_annexc_c2pcdv,
-		{ "C2PCDV", "h248.pkg.annexc.c2pcdv",
+		{ "C2PCDV", "h248.annexc.c2pcdv",
 			FT_UINT24, BASE_DEC, NULL, 0,
 			"Cumulative 2 point CDV", HFILL }},
 		{ &hf_h248_pkg_annexc_appcdv,
-		{ "APPCDV", "h248.pkg.annexc.appcdv",
+		{ "APPCDV", "h248.annexc.appcdv",
 			FT_UINT24, BASE_DEC, NULL, 0,
 			"Acceptable Point to Point CDV", HFILL }},
 		{ &hf_h248_pkg_annexc_cppcdv,
-		{ "CPPCDV", "h248.pkg.annexc.cppcdv",
+		{ "CPPCDV", "h248.annexc.cppcdv",
 			FT_UINT24, BASE_DEC, NULL, 0,
 			"Cumulative Point to Point CDV", HFILL }},
 		{ &hf_h248_pkg_annexc_aclr,
-		{ "ACLR", "h248.pkg.annexc.aclr",
+		{ "ACLR", "h248.annexc.aclr",
 			FT_UINT8, BASE_DEC, NULL, 0,
 			"Acceptable Cell Loss Ratio (Q.2965.2 ATMF UNI 4.0)", HFILL }},
 
 		{ &hf_h248_pkg_annexc_meetd,
-		{ "MEETD", "h248.pkg.annexc.meetd",
+		{ "MEETD", "h248.annexc.meetd",
 			FT_UINT16, BASE_DEC, NULL, 0,
 			"Maximum End-to-End Transit Delay (Q.2965.2 ATMF UNI 4.0)", HFILL }},
 		{ &hf_h248_pkg_annexc_ceetd,
-		{ "CEETD", "h248.pkg.annexc.ceetd",
+		{ "CEETD", "h248.annexc.ceetd",
 			FT_UINT16, BASE_DEC, NULL, 0,
 			"Cumulative End-to-End Transit Delay (Q.2965.2 ATMF UNI 4.0)", HFILL }},
 		{ &hf_h248_pkg_annexc_QosClass,
-		{ "QosClass", "h248.pkg.annexc.qosclass",
+		{ "QosClass", "h248.annexc.qosclass",
 			FT_UINT16, BASE_DEC, VALS(h248_pkg_annexc_QosClass_values), 0,
 			"QoS Class (Q.2965.1)", HFILL }},
 		{ &hf_h248_pkg_annexc_AALtype,
-		{ "AALtype", "h248.pkg.annexc.aaltype",
+		{ "AALtype", "h248.annexc.aaltype",
 			FT_UINT8, BASE_DEC, VALS(h248_pkg_annexc_AALtype_values), 0,
 			"AAL Type", HFILL }},
 
 		{ &hf_h248_pkg_annexc_dlci,
-		{ "DLCI", "h248.pkg.annexc.dlci",
+		{ "DLCI", "h248.annexc.dlci",
 			FT_UINT32, BASE_DEC, NULL, 0,
 			"Data Link Connection ID (FR)", HFILL }},
 		{ &hf_h248_pkg_annexc_cid,
-		{ "CID", "h248.pkg.annexc.cid",
+		{ "CID", "h248.annexc.cid",
 			FT_UINT32, BASE_DEC, NULL, 0,
 			"Channel-Id", HFILL }},
 		{ &hf_h248_pkg_annexc_sid,
-		{ "SID", "h248.pkg.annexc.sid",
+		{ "SID", "h248.annexc.sid",
 			FT_UINT32, BASE_DEC, NULL, 0,
 			"Silence Insertion Descriptor", HFILL }},
 		{ &hf_h248_pkg_annexc_ppt,
-		{ "PPT", "h248.pkg.annexc.ppt",
+		{ "PPT", "h248.annexc.ppt",
 			FT_UINT32, BASE_DEC, NULL, 0,
 			"Primary Payload Type", HFILL }},
 
 		{ &hf_h248_pkg_annexc_ipv4,
-		{ "IPv4", "h248.pkg.annexc.ipv4",
+		{ "IPv4", "h248.annexc.ipv4",
 			FT_IPv4, BASE_NONE, NULL, 0,
 			"IPv4 Address", HFILL }},
 		{ &hf_h248_pkg_annexc_ipv6,
-		{ "IPv6", "h248.pkg.annexc.ipv6",
+		{ "IPv6", "h248.annexc.ipv6",
 			FT_IPv6, BASE_NONE, NULL, 0,
 			"IPv6 Address", HFILL }},
 		{ &hf_h248_pkg_annexc_port,
-		{ "Port", "h248.pkg.annexc.port",
+		{ "Port", "h248.annexc.port",
 			FT_UINT16, BASE_DEC, NULL, 0,
 			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_porttype,
-		{ "PortType", "h248.pkg.annexc.porttype",
+		{ "PortType", "h248.annexc.porttype",
 			FT_UINT32, BASE_DEC, VALS(h248_pkg_annexc_porttype_values), 0,
 			"Port Type", HFILL }},
 
 		{ &hf_h248_pkg_annexc_alc,
-		{ "ALC", "h248.pkg.annexc.alc",
+		{ "ALC", "h248.annexc.alc",
 			FT_BYTES, BASE_NONE, NULL, 0,
 			"AAL2 Link Characteristics", HFILL }},
 		{ &hf_h248_pkg_annexc_sut,
-		{ "SUT", "h248.pkg.annexc.sut",
+		{ "SUT", "h248.annexc.sut",
 			FT_BYTES, BASE_NONE, NULL, 0,
 			"Served User Transport", HFILL }},
 		{ &hf_h248_pkg_annexc_tci,
-		{ "TCI", "h248.pkg.annexc.tci",
+		{ "TCI", "h248.annexc.tci",
 			FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			"Test Connection Indicator", HFILL }},
 		{ &hf_h248_pkg_annexc_timer_cu,
-		{ "Timer CU", "h248.pkg.annexc.timer_cu",
+		{ "Timer CU", "h248.annexc.timer_cu",
 			FT_UINT32, BASE_DEC, NULL, 0,
 			"Milliseconds to hold the  partially filled cell before sending", HFILL }},
 		{ &hf_h248_pkg_annexc_maxcpssdu,
-		{ "Max CPS SDU", "h248.pkg.annexc.maxcpssdu",
+		{ "Max CPS SDU", "h248.annexc.maxcpssdu",
 			FT_UINT8, BASE_DEC, NULL, 0,
 			"Maximum Common Part Sublayer Service Data Unit size", HFILL }},
 
 		{ &hf_h248_pkg_annexc_aal1st,
-		{ "AAL1ST", "h248.pkg.annexc.aal1st",
+		{ "AAL1ST", "h248.annexc.aal1st",
 			FT_UINT8, BASE_DEC, VALS(h248_pkg_annexc_aal1st_values), 0,
 			"AAL1 subtype", HFILL }},
 		{ &hf_h248_pkg_annexc_cbrr,
-		{ "CBRR", "h248.pkg.annexc.cbrr",
+		{ "CBRR", "h248.annexc.cbrr",
 			FT_UINT8, BASE_DEC, VALS(h248_pkg_annexc_cbrr_values), 0,
 			"CBR rate", HFILL }},
 		{ &hf_h248_pkg_annexc_scri,
-		{ "SCRI", "h248.pkg.annexc.scri",
+		{ "SCRI", "h248.annexc.scri",
 			FT_UINT8, BASE_DEC, VALS(h248_pkg_annexc_scri_values), 0,
 			"Source Clock frequency Recovery Method", HFILL }},
 		{ &hf_h248_pkg_annexc_ecm,
-		{ "ECM", "h248.pkg.annexc.ecm",
+		{ "ECM", "h248.annexc.ecm",
 			FT_UINT8, BASE_DEC, VALS(h248_pkg_annexc_ecm_values), 0,
 			"Error Correction Method", HFILL }},
 		{ &hf_h248_pkg_annexc_sdbt,
-		{ "SDBT", "h248.pkg.annexc.sdbt",
+		{ "SDBT", "h248.annexc.sdbt",
 			FT_UINT16, BASE_DEC, NULL, 0,
 			"Structured Data Transfer Blocksize", HFILL }},
 		{ &hf_h248_pkg_annexc_pfci,
-		{ "PFCI", "h248.pkg.annexc.pfci",
+		{ "PFCI", "h248.annexc.pfci",
 			FT_UINT8, BASE_DEC, NULL, 0,
 			"Partially Filled Cells Identifier", HFILL }},
 
 		{ &hf_h248_pkg_annexc_tmr,
-		{ "TMR", "h248.pkg.annexc.tmr",
+		{ "TMR", "h248.annexc.tmr",
 			FT_UINT8, BASE_HEX|BASE_EXT_STRING, &isup_transmission_medium_requirement_value_ext, 0,
 			"Transmission Medium Requirement", HFILL }},
 		{ &hf_h248_pkg_annexc_tmrsr,
-		{ "TMSR", "h248.pkg.annexc.tmsr",
+		{ "TMSR", "h248.annexc.tmsr",
 			FT_UINT8, BASE_HEX, VALS(h248_pkg_annexc_tmrsr_values), 0,
 			"Transmission Medium Requirement Subrate", HFILL }},
 		{ &hf_h248_pkg_annexc_contcheck,
-		{ "Continuity Check", "h248.pkg.annexc.tmsr",
+		{ "Continuity Check", "h248.annexc.tmsr",
 			FT_UINT8, BASE_DEC, VALS(h248_pkg_annexc_contcheck_values), 0x0C,
 			NULL, HFILL }},
 
 		{ &hf_h248_pkg_annexc_itc,
-		{ "ITC", "h248.pkg.annexc.itc",
+		{ "ITC", "h248.annexc.itc",
 			FT_UINT8, BASE_DEC, VALS(h248_pkg_annexc_itc_values), 0x1f,
 			"Information Transfer Capability", HFILL }},
 		{ &hf_h248_pkg_annexc_transmode,
-		{ "TransMode", "h248.pkg.annexc.transmode",
+		{ "TransMode", "h248.annexc.transmode",
 			FT_UINT8, BASE_DEC, VALS(h248_pkg_annexc_transmode_values), 0x60,
 			"Transfer Mode", HFILL }},
 		{ &hf_h248_pkg_annexc_transrate,
-		{ "TransRate", "h248.pkg.annexc.transrate",
+		{ "TransRate", "h248.annexc.transrate",
 			FT_UINT8, BASE_DEC, VALS(h248_pkg_annexc_transrate_values), 0x1f,
 			"Transfer Rate", HFILL }},
 		{ &hf_h248_pkg_annexc_mult,
-		{ "Rate Multiplier", "h248.pkg.annexc.mult",
+		{ "Rate Multiplier", "h248.annexc.mult",
 			FT_UINT8, BASE_DEC, NULL, 0,
 			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_syncasync,
-		{ "SyncAsync", "h248.pkg.annexc.syncasync",
+		{ "SyncAsync", "h248.annexc.syncasync",
 			FT_UINT8, BASE_DEC, VALS(h248_pkg_annexc_syncasync_values), 0x80,
 			"Synchronous/Asynchronous", HFILL }},
 		{ &hf_h248_pkg_annexc_negotiation,
-		{ "UPPC", "h248.pkg.annexc.negotiation",
+		{ "UPPC", "h248.annexc.negotiation",
 			FT_UINT8, BASE_DEC, VALS(h248_pkg_annexc_negotiation_values), 0x40,
 			"Negotiation", HFILL }},
 
 		{ &hf_h248_pkg_annexc_userrate,
-		{ "Userrate", "h248.pkg.annexc.userrate",
+		{ "Userrate", "h248.annexc.userrate",
 			FT_UINT8, BASE_HEX, VALS(h248_pkg_annexc_userrate_values), 0x1f,
 			"User Rate", HFILL }},
 		{ &hf_h248_pkg_annexc_intrate,
-		{ "UPPC", "h248.pkg.annexc.intrate",
+		{ "UPPC", "h248.annexc.intrate",
 			FT_UINT8, BASE_HEX, VALS(h248_pkg_annexc_intrate_values), 0xc0,
 			"Intermediate Rate", HFILL }},
 		{ &hf_h248_pkg_annexc_nictx,
-		{ "nictx", "h248.pkg.annexc.nictx",
+		{ "nictx", "h248.annexc.nictx",
 			FT_UINT8, BASE_HEX, VALS(h248_pkg_annexc_nictx_values), 0xc0,
 			"Network independent clock on transmission", HFILL }},
 		{ &hf_h248_pkg_annexc_nicrx,
-		{ "nicrx", "h248.pkg.annexc.nicrx",
+		{ "nicrx", "h248.annexc.nicrx",
 			FT_UINT8, BASE_HEX, VALS(h248_pkg_annexc_nicrx_values), 0xc0,
 			"Network independent clock on reception", HFILL }},
 		{ &hf_h248_pkg_annexc_flowconttx,
-		{ "flowconttx", "h248.pkg.annexc.flowconttx",
+		{ "flowconttx", "h248.annexc.flowconttx",
 			FT_UINT8, BASE_HEX, VALS(h248_pkg_annexc_flowconttx_values), 0xc0,
 			"Flow Control on Transmission", HFILL }},
 		{ &hf_h248_pkg_annexc_flowcontrx,
-		{ "flowcontrx", "h248.pkg.annexc.flowcontrx",
+		{ "flowcontrx", "h248.annexc.flowcontrx",
 			FT_UINT8, BASE_HEX, VALS(h248_pkg_annexc_flowcontrx_values), 0xc0,
 			"Flow Control on Reception", HFILL }},
 		{ &hf_h248_pkg_annexc_rateadapthdr,
-		{ "rateadapthdr", "h248.pkg.annexc.rateadapthdr",
+		{ "rateadapthdr", "h248.annexc.rateadapthdr",
 			FT_UINT8, BASE_HEX, VALS(h248_pkg_annexc_rateadapthdr_values), 0xc0,
 			"Rate Adaptation Header/No-Header", HFILL }},
 		{ &hf_h248_pkg_annexc_multiframe,
-		{ "multiframe", "h248.pkg.annexc.multiframe",
+		{ "multiframe", "h248.annexc.multiframe",
 			FT_UINT8, BASE_HEX, VALS(h248_pkg_annexc_multiframe_values), 0xc0,
 			"Multiple Frame establishment support in datalink", HFILL }},
 		{ &hf_h248_pkg_annexc_opmode,
-		{ "OPMODE", "h248.pkg.annexc.opmode",
+		{ "OPMODE", "h248.annexc.opmode",
 			FT_UINT8, BASE_HEX, VALS(h248_pkg_annexc_opmode_values), 0xc0,
 			"Mode of operation", HFILL }},
 		{ &hf_h248_pkg_annexc_llidnegot,
-		{ "llidnegot", "h248.pkg.annexc.llidnegot",
+		{ "llidnegot", "h248.annexc.llidnegot",
 			FT_UINT8, BASE_HEX, VALS(h248_pkg_annexc_llidnegot_values), 0xc0,
 			"Logical Link Identifier negotiation", HFILL }},
 
 		{ &hf_h248_pkg_annexc_assign,
-		{ "llidnegot", "h248.pkg.annexc.assign",
+		{ "llidnegot", "h248.annexc.assign",
 			FT_UINT8, BASE_HEX, VALS(h248_pkg_annexc_assign_values), 0xc0,
 			"Assignor/Assignee", HFILL }},
 		{ &hf_h248_pkg_annexc_inbandneg,
-		{ "inbandneg", "h248.pkg.annexc.inbandneg",
+		{ "inbandneg", "h248.annexc.inbandneg",
 			FT_UINT8, BASE_HEX, VALS(h248_pkg_annexc_inbandneg_values), 0xc0,
 			"In-band/Out-band negotiation", HFILL }},
 		{ &hf_h248_pkg_annexc_stopbits,
-		{ "stopbits", "h248.pkg.annexc.stopbits",
+		{ "stopbits", "h248.annexc.stopbits",
 			FT_UINT8, BASE_HEX, VALS(h248_pkg_annexc_stopbits_values), 0xc0,
 			"Number of stop bits", HFILL }},
 		{ &hf_h248_pkg_annexc_databits,
-		{ "databits", "h248.pkg.annexc.databits",
+		{ "databits", "h248.annexc.databits",
 			FT_UINT8, BASE_HEX, VALS(h248_pkg_annexc_databits_values), 0xc0,
 			"Number of data bits", HFILL }},
 		{ &hf_h248_pkg_annexc_parity,
-		{ "parity", "h248.pkg.annexc.parity",
+		{ "parity", "h248.annexc.parity",
 			FT_UINT8, BASE_HEX, VALS(h248_pkg_annexc_parity_values), 0xe0,
 			"Parity Information Bits", HFILL }},
 		{ &hf_h248_pkg_annexc_duplexmode,
-		{ "duplexmode", "h248.pkg.annexc.duplexmode",
+		{ "duplexmode", "h248.annexc.duplexmode",
 			FT_UINT8, BASE_HEX, VALS(h248_pkg_annexc_duplexmode_values), 0x80,
 			"Mode Duplex", HFILL }},
 
 		{ &hf_h248_pkg_annexc_modem,
-		{ "modem", "h248.pkg.annexc.modem",
+		{ "modem", "h248.annexc.modem",
 			FT_UINT8, BASE_HEX, VALS(h248_pkg_annexc_modem_values), 0xfc,
 			"Modem Type", HFILL }},
 		{ &hf_h248_pkg_annexc_layer2prot,
-		{ "layer2prot", "h248.pkg.annexc.layer2prot",
+		{ "layer2prot", "h248.annexc.layer2prot",
 			FT_UINT8, BASE_HEX, VALS(h248_pkg_annexc_layer2prot_values), 0x80,
 			"Layer 2 protocol", HFILL }},
 		{ &hf_h248_pkg_annexc_layer3prot,
-		{ "layer3prot", "h248.pkg.annexc.layer3prot",
+		{ "layer3prot", "h248.annexc.layer3prot",
 			FT_UINT8, BASE_HEX, VALS(h248_pkg_annexc_layer3prot_values), 0x80,
 			"Layer 3 protocol", HFILL }},
 		{ &hf_h248_pkg_annexc_addlayer3prot,
-		{ "addlayer3prot", "h248.pkg.annexc.addlayer3prot",
+		{ "addlayer3prot", "h248.annexc.addlayer3prot",
 			FT_UINT8, BASE_HEX, VALS(h248_pkg_annexc_addlayer3prot_values), 0x80,
 			"Additional User Information Layer 3 protocol", HFILL }},
 		{ &hf_h248_pkg_annexc_dialedn,
-		{ "Dialed Number", "h248.pkg.annexc.dialedn",
+		{ "Dialed Number", "h248.annexc.dialedn",
 			FT_BYTES, BASE_NONE, NULL, 0,
 			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_dialingn,
-		{ "Dialing Number", "h248.pkg.annexc.dialingn",
+		{ "Dialing Number", "h248.annexc.dialingn",
 			FT_BYTES, BASE_NONE, NULL, 0,
 			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_echoci,
-		{ "ECHOCI", "h248.pkg.annexc.echoci",
+		{ "ECHOCI", "h248.annexc.echoci",
 			FT_BYTES, BASE_NONE, NULL, 0,
 			"Not used", HFILL }},
 		{ &hf_h248_pkg_annexc_nci,
-		{ "NCI", "h248.pkg.annexc.nci",
+		{ "NCI", "h248.annexc.nci",
 			FT_UINT8, BASE_HEX, NULL, 0xff,
 			"Nature of Connection Indicator", HFILL }},
 
 
 		{ &hf_h248_pkg_annexc_USI,
-		{ "USI", "h248.pkg.annexc.USI",
+		{ "USI", "h248.annexc.USI",
 			FT_BYTES, BASE_NONE, NULL, 0,
 			"User Service Information", HFILL }},
 
 
 		{ &hf_h248_pkg_annexc_fmsdu,
-		{ "fmsdu", "h248.pkg.annexc.fmsdu",
+		{ "fmsdu", "h248.annexc.fmsdu",
 			FT_BYTES, BASE_NONE, NULL, 0,
 			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_bmsdu,
-		{ "bmsdu", "h248.pkg.annexc.bmsdu",
+		{ "bmsdu", "h248.annexc.bmsdu",
 			FT_BYTES, BASE_NONE, NULL, 0,
 			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_sscs,
-		{ "sscs", "h248.pkg.annexc.sscs",
+		{ "sscs", "h248.annexc.sscs",
 			FT_BYTES, BASE_NONE, NULL, 0,
 			NULL, HFILL }},
 
 
 		{ &hf_h248_pkg_annexc_sdp_v,
-		{ "sdp_v", "h248.pkg.annexc.sdp_v",
+		{ "sdp_v", "h248.annexc.sdp_v",
 			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP V", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_o,
-		{ "sdp_o", "h248.pkg.annexc.sdp_o",
+		{ "sdp_o", "h248.annexc.sdp_o",
 			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP O", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_s,
-		{ "sdp_s", "h248.pkg.annexc.sdp_s",
+		{ "sdp_s", "h248.annexc.sdp_s",
 			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP S", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_i,
-		{ "sdp_i", "h248.pkg.annexc.sdp_i",
+		{ "sdp_i", "h248.annexc.sdp_i",
 			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP I", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_u,
-		{ "sdp_u", "h248.pkg.annexc.sdp_u",
+		{ "sdp_u", "h248.annexc.sdp_u",
 			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP U", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_e,
-		{ "sdp_e", "h248.pkg.annexc.sdp_e",
+		{ "sdp_e", "h248.annexc.sdp_e",
 			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP E", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_p,
-		{ "sdp_p", "h248.pkg.annexc.sdp_p",
+		{ "sdp_p", "h248.annexc.sdp_p",
 			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP P", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_c,
-		{ "sdp_c", "h248.pkg.annexc.sdp_c",
+		{ "sdp_c", "h248.annexc.sdp_c",
 			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP C", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_b,
-		{ "sdp_b", "h248.pkg.annexc.sdp_b",
+		{ "sdp_b", "h248.annexc.sdp_b",
 			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP B", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_z,
-		{ "sdp_z", "h248.pkg.annexc.sdp_z",
+		{ "sdp_z", "h248.annexc.sdp_z",
 			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP Z", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_k,
-		{ "sdp_k", "h248.pkg.annexc.sdp_k",
+		{ "sdp_k", "h248.annexc.sdp_k",
 			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP K", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_a,
-		{ "sdp_a", "h248.pkg.annexc.sdp_a",
+		{ "sdp_a", "h248.annexc.sdp_a",
 			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP A", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_t,
-		{ "sdp_t", "h248.pkg.annexc.sdp_t",
+		{ "sdp_t", "h248.annexc.sdp_t",
 			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP T", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_r,
-		{ "sdp_r", "h248.pkg.annexc.sdp_r",
+		{ "sdp_r", "h248.annexc.sdp_r",
 			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP R", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_m,
-		{ "sdp_m", "h248.pkg.annexc.sdp_m",
+		{ "sdp_m", "h248.annexc.sdp_m",
 			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP M", HFILL }},
 
 		{ &hf_h248_pkg_annexc_olc,
-		{ "OLC", "h248.pkg.annexc.olc",
+		{ "OLC", "h248.annexc.olc",
 			FT_BYTES, BASE_NONE, NULL, 0,
 			"Open Logical Channel", HFILL }},
 		{ &hf_h248_pkg_annexc_olcack,
-		{ "OLCack", "h248.pkg.annexc.olcack",
+		{ "OLCack", "h248.annexc.olcack",
 			FT_BYTES, BASE_NONE, NULL, 0,
 			"Open Logical Channel Acknowledge", HFILL }},
 		{ &hf_h248_pkg_annexc_olccnf,
-		{ "OLCcnf", "h248.pkg.annexc.olccnf",
+		{ "OLCcnf", "h248.annexc.olccnf",
 			FT_BYTES, BASE_NONE, NULL, 0,
 			"Open Logical Channel CNF", HFILL }},
 		{ &hf_h248_pkg_annexc_olcrej,
-		{ "OLCrej", "h248.pkg.annexc.olcrej",
+		{ "OLCrej", "h248.annexc.olcrej",
 			FT_BYTES, BASE_NONE, NULL, 0,
 			"Open Logical Channel Reject", HFILL }},
 		{ &hf_h248_pkg_annexc_clc,
-		{ "CLC", "h248.pkg.annexc.clc",
+		{ "CLC", "h248.annexc.clc",
 			FT_BYTES, BASE_NONE, NULL, 0,
 			"Close Logical Channel", HFILL }},
 		{ &hf_h248_pkg_annexc_clcack,
-		{ "CLCack", "h248.pkg.annexc.clcack",
+		{ "CLCack", "h248.annexc.clcack",
 			FT_BYTES, BASE_NONE, NULL, 0,
 			NULL, HFILL }},
 	};
diff --git a/epan/dissectors/packet-h248_annex_e.c b/epan/dissectors/packet-h248_annex_e.c
index 851bc3e1b2..4c5ddfd43a 100644
--- a/epan/dissectors/packet-h248_annex_e.c
+++ b/epan/dissectors/packet-h248_annex_e.c
@@ -1,5 +1,5 @@
 /*
- *  packet-h248-annex_e.c
+ *  packet-h248_annex_e.c
  *  H.248 Annex E
  *
  *  (c) 2006, Luis E. Garcia Ontanon <luis@ontanon.org>
@@ -960,113 +960,113 @@ static h248_package_t h248_pkg_tdmc = {
 void proto_register_h248_annex_e(void) {
 	static hf_register_info hf[] = {
 		/* H.248.1 E.1  Generic Package */
-		{ &hf_h248_pkg_generic, { "Generic Package", "h248.pkg.generic", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_generic_cause_evt, { "Cause Event", "h248.pkg.generic.cause", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_generic_cause_gencause, { "Generic Cause", "h248.pkg.generic.cause.gencause", FT_UINT32, BASE_HEX, VALS(h248_pkg_generic_cause_gencause_vals), 0, NULL, HFILL }},
-		{ &hf_h248_pkg_generic_cause_failurecause, { "Generic Cause", "h248.pkg.generic.cause.failurecause", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_generic_sc_evt, {"Signal Completion2","h248.pkg.generic.sc",FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL}},
-		{ &hf_h248_pkg_generic_sc_sig_id, { "Signal Identity", "h248.pkg.generic.sc.sig_id", FT_BYTES, BASE_NONE, NULL , 0, NULL, HFILL }},
-		{ &hf_h248_pkg_generic_sc_meth, { "Termination Method", "h248.pkg.generic.sc.meth", FT_UINT32, BASE_DEC, VALS(h248_pkg_generic_sc_vals) , 0, NULL, HFILL }},
-		{ &hf_h248_pkg_generic_sc_slid, { "Signal List ID", "h248.pkg.generic.sc.slid", FT_UINT32, BASE_DEC, NULL , 0, NULL, HFILL }},
-		{ &hf_h248_pkg_generic_sc_rid, { "Request ID", "h248.pkg.generic.sc.rid", FT_UINT32, BASE_DEC,  NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_generic, { "Generic Package", "h248.generic", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_generic_cause_evt, { "Cause Event", "h248.generic.cause", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_generic_cause_gencause, { "Generic Cause", "h248.generic.cause.gencause", FT_UINT32, BASE_HEX, VALS(h248_pkg_generic_cause_gencause_vals), 0, NULL, HFILL }},
+		{ &hf_h248_pkg_generic_cause_failurecause, { "Generic Cause", "h248.generic.cause.failurecause", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_generic_sc_evt, {"Signal Completion2","h248.generic.sc",FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL}},
+		{ &hf_h248_pkg_generic_sc_sig_id, { "Signal Identity", "h248.generic.sc.sig_id", FT_BYTES, BASE_NONE, NULL , 0, NULL, HFILL }},
+		{ &hf_h248_pkg_generic_sc_meth, { "Termination Method", "h248.generic.sc.meth", FT_UINT32, BASE_DEC, VALS(h248_pkg_generic_sc_vals) , 0, NULL, HFILL }},
+		{ &hf_h248_pkg_generic_sc_slid, { "Signal List ID", "h248.generic.sc.slid", FT_UINT32, BASE_DEC, NULL , 0, NULL, HFILL }},
+		{ &hf_h248_pkg_generic_sc_rid, { "Request ID", "h248.generic.sc.rid", FT_UINT32, BASE_DEC,  NULL, 0, NULL, HFILL }},
 
 		/* H.248.1.E 3 Tone Generator (tonegeg) */
-		{ &hf_h248_pkg_tonegen, { "Tone Generator (tonegen)", "h248.pkg.tonegen", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_tonegen_sig_pt, { "Play Tone (pt)", "h248.pkg.tonegen.pg", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_tonegen_sig_pt_tl, { "Tone List ID (tl)", "h248.pkg.tonegen.pt.tl", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_tonegen_sig_pt_ind, { "Inter-signal Duration (ind)", "h248.pkg.tonegem.pt.ind", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_tonegen_sig_pg_btd, { "Tone Direction (btd)", "h248.pkg.tonegen.pt.btd", FT_UINT32, BASE_HEX, VALS(h248_pkg_tonegen_pt_btd_param_vals), 0, NULL, HFILL }},
+		{ &hf_h248_pkg_tonegen, { "Tone Generator (tonegen)", "h248.tonegen", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_tonegen_sig_pt, { "Play Tone (pt)", "h248.tonegen.pg", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_tonegen_sig_pt_tl, { "Tone List ID (tl)", "h248.tonegen.pt.tl", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_tonegen_sig_pt_ind, { "Inter-signal Duration (ind)", "h248.tonegem.pt.ind", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_tonegen_sig_pg_btd, { "Tone Direction (btd)", "h248.tonegen.pt.btd", FT_UINT32, BASE_HEX, VALS(h248_pkg_tonegen_pt_btd_param_vals), 0, NULL, HFILL }},
 
 		/* H.248.1 E.4 Tone Detection (tonedet) */
-		{ &hf_h248_pkg_tonedet, { "Tone Detection Package", "h248.pkg.tonedet", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_tonedet_evt_std, { "Start Tone", "h248.pkg.tonedet.std", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_tonedet_evt_etd, { "End Tone", "h248.pkg.tonedet.etd",  FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_tonedet_evt_ltd, { "Long Tone", "h248.pkg.tonedet.ltd", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_tonedet_evt_tl_param, {"Tone Detail", "h248.pkg.tonedet.evt.tl", FT_UINT16, BASE_DEC, VALS(h248_pkg_tonedet_tl_params_vals), 0, NULL, HFILL }},
-		{ &hf_h248_pkg_tonedet_evt_dur_param, {"Duration (ms)", "h248.pkg.tonedet.evt.dur", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_tonedet_evt_tid_param, {"Tone ID", "h248.pkg.tonedet.evt.tid", FT_UINT16, BASE_DEC, VALS(h248_pkg_tonedet_tl_params_vals), 0, NULL, HFILL }},
+		{ &hf_h248_pkg_tonedet, { "Tone Detection Package", "h248.tonedet", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_tonedet_evt_std, { "Start Tone", "h248.tonedet.std", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_tonedet_evt_etd, { "End Tone", "h248.tonedet.etd",  FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_tonedet_evt_ltd, { "Long Tone", "h248.tonedet.ltd", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_tonedet_evt_tl_param, {"Tone Detail", "h248.tonedet.evt.tl", FT_UINT16, BASE_DEC, VALS(h248_pkg_tonedet_tl_params_vals), 0, NULL, HFILL }},
+		{ &hf_h248_pkg_tonedet_evt_dur_param, {"Duration (ms)", "h248.tonedet.evt.dur", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_tonedet_evt_tid_param, {"Tone ID", "h248.tonedet.evt.tid", FT_UINT16, BASE_DEC, VALS(h248_pkg_tonedet_tl_params_vals), 0, NULL, HFILL }},
 
 
 		/* H.248.1 E.5 Basic DTMF Generator Package */
-		{ &hf_h248_pkg_dg, { "Basic DTMF Generator Package (dg)", "h248.pkg.dg", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_dg_sig_pt, { "Play Tone", "h248.pkg.dg.pt", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_dg_sig_d0, { "Digit 0", "h248.pkg.dg.d0", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_dg_sig_d1, { "Digit 1", "h248.pkg.dg.d1", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_dg_sig_d2, { "Digit 2", "h248.pkg.dg.d2", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_dg_sig_d3, { "Digit 3", "h248.pkg.dg.d3", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_dg_sig_d4, { "Digit 4", "h248.pkg.dg.d4", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_dg_sig_d5, { "Digit 5", "h248.pkg.dg.d5", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_dg_sig_d6, { "Digit 6", "h248.pkg.dg.d6", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_dg_sig_d7, { "Digit 7", "h248.pkg.dg.d7", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_dg_sig_d8, { "Digit 8", "h248.pkg.dg.d8", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_dg_sig_d9, { "Digit 9", "h248.pkg.dg.d9", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_dg_sig_da, { "Digit A", "h248.pkg.dg.da", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_dg_sig_db, { "Digit B", "h248.pkg.dg.db", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_dg_sig_dc, { "Digit C", "h248.pkg.dg.dc", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_dg_sig_dd, { "Digit D", "h248.pkg.dg.dd", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_dg_sig_ds, { "Digit *", "h248.pkg.dg.ds", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_dg_sig_do, { "Digit #", "h248.pkg.dg.do", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_dg_sig_params, { "Event Parameters", "h248.pkg.dg.signal.direction", FT_UINT16, BASE_DEC, VALS(h248_pkg_dg_sig_btd_vals), 0, NULL, HFILL }},
+		{ &hf_h248_pkg_dg, { "Basic DTMF Generator Package (dg)", "h248.dg", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_dg_sig_pt, { "Play Tone", "h248.dg.pt", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_dg_sig_d0, { "Digit 0", "h248.dg.d0", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_dg_sig_d1, { "Digit 1", "h248.dg.d1", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_dg_sig_d2, { "Digit 2", "h248.dg.d2", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_dg_sig_d3, { "Digit 3", "h248.dg.d3", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_dg_sig_d4, { "Digit 4", "h248.dg.d4", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_dg_sig_d5, { "Digit 5", "h248.dg.d5", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_dg_sig_d6, { "Digit 6", "h248.dg.d6", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_dg_sig_d7, { "Digit 7", "h248.dg.d7", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_dg_sig_d8, { "Digit 8", "h248.dg.d8", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_dg_sig_d9, { "Digit 9", "h248.dg.d9", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_dg_sig_da, { "Digit A", "h248.dg.da", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_dg_sig_db, { "Digit B", "h248.dg.db", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_dg_sig_dc, { "Digit C", "h248.dg.dc", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_dg_sig_dd, { "Digit D", "h248.dg.dd", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_dg_sig_ds, { "Digit *", "h248.dg.ds", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_dg_sig_do, { "Digit #", "h248.dg.do", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_dg_sig_params, { "Event Parameters", "h248.dg.signal.direction", FT_UINT16, BASE_DEC, VALS(h248_pkg_dg_sig_btd_vals), 0, NULL, HFILL }},
 
 		/* H.248.1 E.6 DTMF Detection Package */
 #if 0
-		{ &hf_h248_pkg_dd_evt_ce_ds, { "Digit(s) Detected", "h248.pkg.dd.ce.ds", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_dd_evt_ce_meth, { "Method Used", "h248.pkg.dd.ce.meth", FT_UINT16, BASE_DEC, VALS(h248_pkg_dd_event_params_vals), 0, NULL, HFILL }},
-		{ &hf_h248_pkg_dd_evt_tl_param, {"Tone Detail", "h248.pkg.dd.evt.tl", FT_UINT16, BASE_DEC, VALS(h248_pkg_dd_event_vals), 0, NULL, HFILL }},
-		{ &hf_h248_pkg_dd_evt_dur_param, {"Duration (ms)", "h248.pkg.dd.evt.dur", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_dd_evt_tid_param, {"Tone ID", "h248.pkg.dd.evt.tid", FT_UINT16, BASE_DEC, VALS(h248_pkg_dd_event_vals), 0, NULL, HFILL }},
+		{ &hf_h248_pkg_dd_evt_ce_ds, { "Digit(s) Detected", "h248.dd.ce.ds", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_dd_evt_ce_meth, { "Method Used", "h248.dd.ce.meth", FT_UINT16, BASE_DEC, VALS(h248_pkg_dd_event_params_vals), 0, NULL, HFILL }},
+		{ &hf_h248_pkg_dd_evt_tl_param, {"Tone Detail", "h248.dd.evt.tl", FT_UINT16, BASE_DEC, VALS(h248_pkg_dd_event_vals), 0, NULL, HFILL }},
+		{ &hf_h248_pkg_dd_evt_dur_param, {"Duration (ms)", "h248.dd.evt.dur", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_dd_evt_tid_param, {"Tone ID", "h248.dd.evt.tid", FT_UINT16, BASE_DEC, VALS(h248_pkg_dd_event_vals), 0, NULL, HFILL }},
 #endif
 
 		/* H.248.1.E.7 Call Progress Tones Generator package */
-		{ &hf_h248_pkg_cg, { "Call Progress Tones Generator", "h248.pkg.cg", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_cg_sig_pt, { "Play Tone (pt)", "h248.pkg.cg.pt", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
-		{ &hf_h248_pkg_cg_sig_pt_tl, {"Tone List", "h248.pkg.cg.pt.tl", FT_UINT16, BASE_DEC_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
-		{ &hf_h248_pkg_cg_sig_pt_ind, { "Inter-Signal Duration (ind)", "h248.pkg.cg.pt.ind", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_cg_sig_pt_btd, { "Tone Direction (btd)", "h248.pkg.cg.pt.btd", FT_UINT8, BASE_DEC, VALS(h248_pkg_cg_pt_btd_param_vals), 0, NULL, HFILL }},
-
-		{ &hf_h248_pkg_cg_sig_dt, { "Dial Tone (dt)", "h248.pkg.cg.dt", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
-		{ &hf_h248_pkg_cg_sig_rt, { "Ring Tone (rt)", "h248.pkg.cg.rt",FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
-		{ &hf_h248_pkg_cg_sig_bt, { "Buzy Tone (bt)", "h248.pkg.cg.bt", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
-		{ &hf_h248_pkg_cg_sig_ct, { "Congestion Tone (ct)", "h248.pkg.cg.ct", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
-		{ &hf_h248_pkg_cg_sig_sit, { "Special Information Tone (sit)", "h248.pkg.cg.sit", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
-		{ &hf_h248_pkg_cg_sig_wt, { "(Recording) Warning Tone (wt)", "h248.pkg.cg.wt", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
-		{ &hf_h248_pkg_cg_sig_prt, { "Payphone Recognition Tone (prt)", "h248.pkg.cg.prt", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
-		{ &hf_h248_pkg_cg_sig_cw, { "Call Waiting Tone (wt)", "h248.pkg.cg.cw", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
-		{ &hf_h248_pkg_cg_sig_cr, { "Caller Waiting Tone (rt)", "h248.pkg.cg.cr", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
+		{ &hf_h248_pkg_cg, { "Call Progress Tones Generator", "h248.cg", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_cg_sig_pt, { "Play Tone (pt)", "h248.cg.pt", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
+		{ &hf_h248_pkg_cg_sig_pt_tl, {"Tone List", "h248.cg.pt.tl", FT_UINT16, BASE_DEC_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
+		{ &hf_h248_pkg_cg_sig_pt_ind, { "Inter-Signal Duration (ind)", "h248.cg.pt.ind", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_cg_sig_pt_btd, { "Tone Direction (btd)", "h248.cg.pt.btd", FT_UINT8, BASE_DEC, VALS(h248_pkg_cg_pt_btd_param_vals), 0, NULL, HFILL }},
+
+		{ &hf_h248_pkg_cg_sig_dt, { "Dial Tone (dt)", "h248.cg.dt", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
+		{ &hf_h248_pkg_cg_sig_rt, { "Ring Tone (rt)", "h248.cg.rt",FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
+		{ &hf_h248_pkg_cg_sig_bt, { "Buzy Tone (bt)", "h248.cg.bt", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
+		{ &hf_h248_pkg_cg_sig_ct, { "Congestion Tone (ct)", "h248.cg.ct", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
+		{ &hf_h248_pkg_cg_sig_sit, { "Special Information Tone (sit)", "h248.cg.sit", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
+		{ &hf_h248_pkg_cg_sig_wt, { "(Recording) Warning Tone (wt)", "h248.cg.wt", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
+		{ &hf_h248_pkg_cg_sig_prt, { "Payphone Recognition Tone (prt)", "h248.cg.prt", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
+		{ &hf_h248_pkg_cg_sig_cw, { "Call Waiting Tone (wt)", "h248.cg.cw", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
+		{ &hf_h248_pkg_cg_sig_cr, { "Caller Waiting Tone (rt)", "h248.cg.cr", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
 
 		/* H.248.1 E.8 Call Progress Tones Detection Package */
-		{ &hf_h248_pkg_cd, { "Call Progress Tones Detection Package", "h248.pkg.cd", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_cd, { "Call Progress Tones Detection Package", "h248.cd", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		/* H.248.1 E.9 Analog Line Supervision Package */
-		{ &hf_h248_pkg_al, { "Analog Line Supervision Package", "h248.pkg.al", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_al_sig_cadence, { "Cadence", "h248.pkg.al.sig.cadence", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_al_sig_cadence_on_off, { "On/Off Cadence", "h248.pkg.al.sig.cadence_on_off", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_al, { "Analog Line Supervision Package", "h248.al", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_al_sig_cadence, { "Cadence", "h248.al.sig.cadence", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_al_sig_cadence_on_off, { "On/Off Cadence", "h248.al.sig.cadence_on_off", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 #if 0
-		{ &hf_h248_pkg_al_sig_freq, { "Ring Frequency", "h248.pkg.al.sig.freq", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_al_sig_freq, { "Ring Frequency", "h248.al.sig.freq", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 #endif
-		{ &hf_h248_pkg_al_evt_onhook, { "onhook", "h248.pkg.al.onhook", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_al_evt_offhook, { "offhook", "h248.pkg.al.offhook", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_al_evt_flashhook, { "flashhook", "h248.pkg.al.flashhook", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_al_evt_onhook_par_strict, { "strict", "h248.pkg.al.ev.onhook.strict", FT_UINT8, BASE_DEC, VALS(h248_pkg_al_evt_onhook_strict_vals), 0, NULL, HFILL }},
-		{ &hf_h248_pkg_al_evt_onhook_par_init, { "init", "h248.pkg.al.ev.onhook.init", FT_BOOLEAN, BASE_NONE, TFS(&h248_pkg_al_evt_onhook_par_init_vals), 0x0, NULL, HFILL }},
-		{ &hf_h248_pkg_al_evt_offhook_par_strict, { "strict", "h248.pkg.al.ev.offhook.strict", FT_UINT8, BASE_DEC, VALS(h248_pkg_al_evt_onhook_strict_vals), 0, NULL, HFILL }},
-		{ &hf_h248_pkg_al_evt_offhook_par_init, { "init", "h248.pkg.al.ev.onhook.init", FT_BOOLEAN, BASE_NONE, TFS(&h248_pkg_al_evt_offhook_par_init_vals), 0x0, NULL, HFILL }},
-		{ &hf_h248_pkg_al_evt_flashhook_par_mindur, { "Minimum duration in ms", "h248.pkg.al.ev.flashhook.mindur", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_al_evt_onhook, { "onhook", "h248.al.onhook", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_al_evt_offhook, { "offhook", "h248.al.offhook", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_al_evt_flashhook, { "flashhook", "h248.al.flashhook", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_al_evt_onhook_par_strict, { "strict", "h248.al.ev.onhook.strict", FT_UINT8, BASE_DEC, VALS(h248_pkg_al_evt_onhook_strict_vals), 0, NULL, HFILL }},
+		{ &hf_h248_pkg_al_evt_onhook_par_init, { "init", "h248.al.ev.onhook.init", FT_BOOLEAN, BASE_NONE, TFS(&h248_pkg_al_evt_onhook_par_init_vals), 0x0, NULL, HFILL }},
+		{ &hf_h248_pkg_al_evt_offhook_par_strict, { "strict", "h248.al.ev.offhook.strict", FT_UINT8, BASE_DEC, VALS(h248_pkg_al_evt_onhook_strict_vals), 0, NULL, HFILL }},
+		{ &hf_h248_pkg_al_evt_offhook_par_init, { "init", "h248.al.ev.onhook.init", FT_BOOLEAN, BASE_NONE, TFS(&h248_pkg_al_evt_offhook_par_init_vals), 0x0, NULL, HFILL }},
+		{ &hf_h248_pkg_al_evt_flashhook_par_mindur, { "Minimum duration in ms", "h248.al.ev.flashhook.mindur", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		/* H.248.1 E.10 - Basic Continuity Package */
-		{ &hf_h248_pkg_ct, { "Basic Continuity package", "h248.pkg.ct", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_ct, { "Basic Continuity package", "h248.ct", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		/* H.248.1 E.11 Network Package */
-		{ &hf_h248_pkg_nt, { "Network package", "h248.pkg.nt", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_nt, { "Network package", "h248.nt", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		/* H.248.1 E.12 RTP package */
-		{ &hf_h248_pkg_rtp, { "RTP package", "h248.pkg.rtp", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_rtp_stat_ps, { "Packets Sent", "h248.pkg.rtp.stat.ps", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_rtp, { "RTP package", "h248.rtp", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_rtp_stat_ps, { "Packets Sent", "h248.rtp.stat.ps", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		/* H.248.1 E.13 TDM Circuit Package */
-		{ &hf_h248_pkg_tdmc, { "TDM Circuit Package", "h248.pkg.tdmc", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-		{ &hf_h248_pkg_tdmc_ec, { "Echo Cancellation", "h248.pkg.tdmc.ec", FT_BOOLEAN, BASE_NONE, TFS(&h248_tdmc_ec_vals), 0x0, NULL, HFILL }},
-		{ &hf_h248_pkg_tdmc_gain, { "Gain", "h248.pkg.tdmc.gain", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_tdmc, { "TDM Circuit Package", "h248.tdmc", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_tdmc_ec, { "Echo Cancellation", "h248.tdmc.ec", FT_BOOLEAN, BASE_NONE, TFS(&h248_tdmc_ec_vals), 0x0, NULL, HFILL }},
+		{ &hf_h248_pkg_tdmc_gain, { "Gain", "h248.tdmc.gain", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-h248_q1950.c b/epan/dissectors/packet-h248_q1950.c
index 21198224d9..c404443127 100644
--- a/epan/dissectors/packet-h248_q1950.c
+++ b/epan/dissectors/packet-h248_q1950.c
@@ -464,137 +464,137 @@ void proto_register_q1950(void) {
 	static hf_register_info hf[] = {
 		/* A.3 Bearer characteristics package */
 		{ &hf_h248_pkg_BCP,
-			{ "BCP (Bearer characteristics package)", "h248.pkg.BCP",
+			{ "BCP (Bearer characteristics package)", "h248.BCP",
 			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_BCP_BNCChar,
-			{ "BNCChar (BNC Characteristics)", "h248.pkg.bcp.bncchar",
+			{ "BNCChar (BNC Characteristics)", "h248.bcp.bncchar",
 			FT_UINT32, BASE_HEX|BASE_EXT_STRING, &bearer_network_connection_characteristics_vals_ext, 0, "BNC Characteristics", HFILL }
 		},
 
 		/* A.4 Bearer Network connection cut-through package */
 		{ &hf_h248_pkg_BNCCT,
-			{ "BNCCT (Bearer network connection cut-through package)", "h248.pkg.BNCCT",
+			{ "BNCCT (Bearer network connection cut-through package)", "h248.BNCCT",
 			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_BNCCT_prop,
-			{ "Bearer network connection cut-through capability", "h248.pkg.bcp.bncct",
+			{ "Bearer network connection cut-through capability", "h248.bcp.bncct",
 			FT_UINT32, BASE_HEX, VALS(h248_pkg_BNCCT_prop_vals), 0, "This property allows the MGC to ask the MG when the cut through of a bearer will occur, early or late.", HFILL }
 		},
 
 		{ &hf_h248_pkg_GB,
-			{ "GB (Generic bearer connection)", "h248.pkg.GB",
+			{ "GB (Generic bearer connection)", "h248.GB",
 			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_GB_BNCChange,
-			{ "BNCChange", "h248.pkg.GB.BNCChang",
+			{ "BNCChange", "h248.GB.BNCChang",
 			FT_BYTES, BASE_NONE, NULL, 0, "This event occurs whenever a change to a Bearer Network connection occurs", HFILL }
 		},
 		{ &hf_h248_pkg_GB_BNCChange_type,
-			{ "Type", "h248.pkg.GB.BNCChang.Type",
+			{ "Type", "h248.GB.BNCChang.Type",
 			FT_UINT32, BASE_HEX, VALS(h248_pkg_GB_BNCChange_type_vals), 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_GB_EstBNC,
-			{ "Type", "h248.pkg.GB.BNCChang.EstBNC",
+			{ "Type", "h248.GB.BNCChang.EstBNC",
 			FT_BYTES, BASE_NONE, NULL, 0, "This signal triggers the bearer control function to send bearer establishment signalling", HFILL }
 		},
 		{ &hf_h248_pkg_GB_ModBNC,
-			{ "Type", "h248.pkg.GB.BNCChang.Type",
+			{ "Type", "h248.GB.BNCChang.Type",
 			FT_BYTES, BASE_NONE, NULL, 0, "This signal triggers the bearer control function to send bearer modification", HFILL }
 		},
 		{ &hf_h248_pkg_GB_RelBNC,
-			{ "RelBNC", "h248.pkg.GB.BNCChang.RelBNC",
+			{ "RelBNC", "h248.GB.BNCChang.RelBNC",
 			FT_BYTES, BASE_NONE, NULL, 0, "This signal triggers the bearer control function to send bearer release", HFILL }
 		},
 		{ &hf_h248_pkg_GB_RelBNC_Generalcause,
-			{ "Generalcause", "h248.pkg.GB.BNCChang.RelBNC.Generalcause",
+			{ "Generalcause", "h248.GB.BNCChang.RelBNC.Generalcause",
 			FT_UINT32, BASE_HEX, VALS(h248_pkg_GB_RelBNC_Generalcause_vals), 0, "This indicates the general reason for the Release", HFILL }
 		},
 		{ &hf_h248_pkg_GB_RelBNC_Failurecause,
-			{ "Failurecause", "h248.pkg.GB.BNCChang.RelBNC.Failurecause",
+			{ "Failurecause", "h248.GB.BNCChang.RelBNC.Failurecause",
 			FT_BYTES, BASE_NONE, NULL, 0, "The Release Cause is the value generated by the Released equipment", HFILL }
 		},
 		{ &hf_h248_pkg_GB_RelBNC_Reset,
-			{ "RelBNC", "h248.pkg.GB.BNCChang.RelBNC",
+			{ "RelBNC", "h248.GB.BNCChang.RelBNC",
 			FT_BOOLEAN, BASE_NONE, NULL, 0x0, "This signal triggers the bearer control function to send bearer release", HFILL }
 		},
 
 		/* A.5 Bearer Network connection cut-through package */
 		{ &hf_h248_pkg_RI,
-			{ "RI (Reuse idle package)", "h248.pkg.RI",
+			{ "RI (Reuse idle package)", "h248.RI",
 			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_RII,
-			{ "Reuse Idle Indication", "h248.pkg.bcp.rii",
+			{ "Reuse Idle Indication", "h248.bcp.rii",
 			FT_UINT32, BASE_HEX, VALS(h248_pkg_RII_vals), 0, "This property indicates that the provided bearer network connection relates to an Idle Bearer.", HFILL }
 		},
 
 		/* A.7 Bearer control tunnelling package */
 		{ &hf_h248_pkg_bt,
-			{ "BT (Bearer control Tunneling)", "h248.pkg.BT",
+			{ "BT (Bearer control Tunneling)", "h248.BT",
 			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bt_tunopt,
-			{ "Tunnelling Options", "h248.pkg.BT.TunOpt",
+			{ "Tunnelling Options", "h248.BT.TunOpt",
 				FT_UINT32, BASE_DEC, VALS(h248_pkg_bt_tunopt_vals), 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bt_tind,
-			{ "tind (Tunnel INDication)", "h248.pkg.BT.TIND",
+			{ "tind (Tunnel INDication)", "h248.BT.TIND",
 				FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bt_bit,
-			{ "Bearer Information Transport", "h248.pkg.BT.BIT",
+			{ "Bearer Information Transport", "h248.BT.BIT",
 				FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 
 
 		/* A.8 Basic call progress tones generator with directionality */
 		{ &hf_h248_pkg_bcg,
-			{ "bcg (Basic call progress tones generator with directionality)", "h248.pkg.bcg",
+			{ "bcg (Basic call progress tones generator with directionality)", "h248.bcg",
 			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bdt_par_btd,
-			{ "btd (Tone Direction)", "h248.pkg.bcp.btd",
+			{ "btd (Tone Direction)", "h248.bcp.btd",
 			FT_UINT32, BASE_HEX, VALS(h248_pkg_bcg_sig_bdt_par_btd_vals), 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bdt,
-			{ "bdt (Dial Tone)", "h248.pkg.bcg.bdt",
+			{ "bdt (Dial Tone)", "h248.bcg.bdt",
 			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_brt,
-			{ "brt (Ringing tone)", "h248.pkg.bcg.brt",
+			{ "brt (Ringing tone)", "h248.bcg.brt",
 			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bbt,
-			{ "bbt (Busy tone)", "h248.pkg.bcg.bbt",
+			{ "bbt (Busy tone)", "h248.bcg.bbt",
 			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bct,
-			{ "bct (Congestion tone)", "h248.pkg.bcg.bct",
+			{ "bct (Congestion tone)", "h248.bcg.bct",
 			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bsit,
-			{ "bsit (Special information tone)", "h248.pkg.bcg.bsit",
+			{ "bsit (Special information tone)", "h248.bcg.bsit",
 			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bwt,
-			{ "bwt (Warning tone)", "h248.pkg.bcg.bwt",
+			{ "bwt (Warning tone)", "h248.bcg.bwt",
 			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bpt,
-			{ "bpt (Payphone recognition tone)", "h248.pkg.bcg.bpt",
+			{ "bpt (Payphone recognition tone)", "h248.bcg.bpt",
 			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bcw,
-			{ "bcw (Call waiting tone)", "h248.pkg.bcg.bcw",
+			{ "bcw (Call waiting tone)", "h248.bcg.bcw",
 			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bcr,
-			{ "bcr (Call ringing tone)", "h248.pkg.bcg.bcr",
+			{ "bcr (Call ringing tone)", "h248.bcg.bcr",
 			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bpy,
-			{ "bpy (Pay tone)", "h248.pkg.bcg.bpy",
+			{ "bpy (Pay tone)", "h248.bcg.bpy",
 			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 	};