diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c
index 7708dc3072..5ce2f452d3 100644
--- a/epan/dissectors/packet-bthci_acl.c
+++ b/epan/dissectors/packet-bthci_acl.c
@@ -230,35 +230,35 @@ proto_register_btacl(void)
 	/* Setup list of header fields  See Section 1.6.1 for details*/
 	static hf_register_info hf[] = {
 		{ &hf_btacl_chandle,
-			{ "Connection Handle",           "btacl.chandle",
+			{ "Connection Handle",           "bthci_acl.chandle",
 				FT_UINT16, BASE_HEX, NULL, 0x0FFF,
 				NULL, HFILL }
 		},
 		{ &hf_btacl_pb_flag,
-			{ "PB Flag",           "btacl.pb_flag",
+			{ "PB Flag",           "bthci_acl.pb_flag",
 				FT_UINT16, BASE_DEC, VALS(pb_flag_vals), 0x3000,
 				"Packet Boundary Flag", HFILL }
 		},
 		{ &hf_btacl_bc_flag,
-			{ "BC Flag",           "btacl.bc_flag",
+			{ "BC Flag",           "bthci_acl.bc_flag",
 				FT_UINT16, BASE_DEC, VALS(bc_flag_vals), 0xC000,
 				"Broadcast Flag", HFILL }
 		},
 		{ &hf_btacl_length,
-			{ "Data Total Length",           "btacl.length",
+			{ "Data Total Length",           "bthci_acl.length",
 				FT_UINT16, BASE_DEC, NULL, 0x0,
 				NULL, HFILL }
 		},
 		{ &hf_btacl_data,
-			{ "Data",           "btacl.data",
+			{ "Data",           "bthci_acl.data",
 				FT_NONE, BASE_NONE, NULL, 0x0,
 				NULL, HFILL }
 		},
 		{ &hf_btacl_continuation_to,
-			{ "This is a continuation to the PDU in frame",		"btacl.continuation_to", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
+			{ "This is a continuation to the PDU in frame",		"bthci_acl.continuation_to", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
 			"This is a continuation to the PDU in frame #", HFILL }},
 		{ &hf_btacl_reassembled_in,
-			{ "This PDU is reassembled in frame",		"btacl.reassembled_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
+			{ "This PDU is reassembled in frame",		"bthci_acl.reassembled_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
 			"This PDU is reassembled in frame #", HFILL }},
 	};
 
diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c
index 3733f5b3d0..d29ff5da65 100644
--- a/epan/dissectors/packet-bthci_evt.c
+++ b/epan/dissectors/packet-bthci_evt.c
@@ -3475,32 +3475,32 @@ proto_register_bthci_evt(void)
 				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_eir_data,
-			{"Data", "bthci_cmd.eir_data",
+			{"Data", "bthci_evt.eir_data",
 				FT_BYTES, BASE_NONE, NULL, 0x0,
 				"EIR Data", HFILL}
 		},
 		{ &hf_bthci_evt_eir_struct_length,
-			{ "Length",           "bthci_cmd.eir_struct_length",
+			{ "Length",           "bthci_evt.eir_struct_length",
 				FT_UINT8, BASE_DEC, NULL, 0x0,
 				"Structure Length", HFILL }
 		},
 		{ &hf_bthci_evt_eir_struct_type,
-			{ "Type",           "bthci_cmd.eir_data_type",
+			{ "Type",           "bthci_evt.eir_data_type",
 				FT_UINT8, BASE_HEX|BASE_EXT_STRING, &bthci_cmd_eir_data_type_vals_ext, 0x0,
 				"Data Type", HFILL }
 		},
 		{ &hf_bthci_evt_sc_uuid16,
-			{ "UUID",           "bthci_cmd.service_class_uuid16",
+			{ "UUID",           "bthci_evt.service_class_uuid16",
 				FT_UINT16, BASE_HEX|BASE_EXT_STRING, &bthci_cmd_service_class_type_vals_ext, 0x0,
 				"16-bit Service Class UUID", HFILL }
 		},
 		{ &hf_bthci_evt_sc_uuid32,
-			{ "UUID",           "bthci_cmd.service_class_uuid32",
+			{ "UUID",           "bthci_evt.service_class_uuid32",
 				FT_UINT32, BASE_HEX, NULL, 0x0,
 				"32-bit Service Class UUID", HFILL }
 		},
 		{ &hf_bthci_evt_sc_uuid128,
-			{ "UUID",           "bthci_cmd.service_class_uuid128",
+			{ "UUID",           "bthci_evt.service_class_uuid128",
 				FT_BYTES, BASE_NONE, NULL, 0x0,
 				"128-bit Service Class UUID", HFILL }
 		}
diff --git a/epan/dissectors/packet-bthci_sco.c b/epan/dissectors/packet-bthci_sco.c
index dda9e0199e..773cf1d208 100644
--- a/epan/dissectors/packet-bthci_sco.c
+++ b/epan/dissectors/packet-bthci_sco.c
@@ -72,17 +72,17 @@ proto_register_btsco(void)
 {                 
 	static hf_register_info hf[] = {
 		{ &hf_btsco_chandle,
-			{ "Connection Handle",           "btsco.chandle",
+			{ "Connection Handle",           "bthci_sco.chandle",
 			FT_UINT16, BASE_HEX, NULL, 0x0FFF,          
 			NULL, HFILL }
 		},
 		{ &hf_btsco_length,
-			{ "Data Total Length",           "btsco.length",
+			{ "Data Total Length",           "bthci_sco.length",
 			FT_UINT8, BASE_DEC, NULL, 0x0,          
 			NULL, HFILL }
 		},
 		{ &hf_btsco_data,
-			{ "Data",           "btsco.data",
+			{ "Data",           "bthci_sco.data",
 			FT_NONE, BASE_NONE, NULL, 0x0,          
 			NULL, HFILL }
 		},