diff --git a/headers/os/bluetooth/HCI/btHCI.h b/headers/os/bluetooth/HCI/btHCI.h
index dec4680408..3a4bbb3ed2 100644
--- a/headers/os/bluetooth/HCI/btHCI.h
+++ b/headers/os/bluetooth/HCI/btHCI.h
@@ -13,13 +13,13 @@ typedef int32 hci_id;
 
 typedef enum { H2 = 2, H3, H4, H5 } transport_type; 
 
-// TODO: something more authomatic here? 
-#define HCI_NUM_PACKET_TYPES 5
 typedef enum { BT_COMMAND = 0, 
                BT_EVENT, 
                BT_ACL, 
                BT_SCO,
-               BT_ESCO
+               BT_ESCO,
+               // more packet types
+               HCI_NUM_PACKET_TYPES //max
               } bt_packet_t;
 
 
diff --git a/headers/os/bluetooth/HCI/btHCI_event.h b/headers/os/bluetooth/HCI/btHCI_event.h
index 73111451bd..5d9744a115 100644
--- a/headers/os/bluetooth/HCI/btHCI_event.h
+++ b/headers/os/bluetooth/HCI/btHCI_event.h
@@ -49,7 +49,7 @@ struct hci_ev_conn_request {
 } __attribute__ ((packed));
 
 #define HCI_EVENT_DISCONNECTION_COMPLETE	0x05
-struct hci_disconnection_complete_reply {
+struct hci_ev_disconnection_complete_reply {
 	uint8     status;
 	uint16    handle;
 	uint8     reason;
@@ -62,7 +62,7 @@ struct hci_ev_auth_complete {
 } __attribute__ ((packed));
 
 #define HCI_EVENT_REMOTE_NAME_REQUEST_COMPLETE	0x07
-struct hci_remote_name_request_complete_reply {
+struct hci_ev_remote_name_request_complete_reply {
 	uint8     status;
 	bdaddr_t  bdaddr;
 	char	  remote_name[248];