diff --git a/headers/os/bluetooth/HCI/btHCI_command.h b/headers/os/bluetooth/HCI/btHCI_command.h
index f3815605dc..065eb5c667 100644
--- a/headers/os/bluetooth/HCI/btHCI_command.h
+++ b/headers/os/bluetooth/HCI/btHCI_command.h
@@ -100,9 +100,9 @@ struct hci_command_header {
     
     #define OCF_WRITE_LOCAL_NAME	0x0013
     #define OCF_READ_LOCAL_NAME		0x0014
-    struct hci_read_local_name {
+    struct hci_rp_read_local_name {
     	uint8	status;
-    	char	local_name[248];
+    	char	local_name[HCI_DEVICE_NAME_SIZE];
     } __attribute__ ((packed));
     
     #define OCF_WRITE_CA_TIMEOUT  	0x0016	
diff --git a/headers/os/bluetooth/HCI/btHCI_module.h b/headers/os/bluetooth/HCI/btHCI_module.h
index 1f2d6db671..45563d50d6 100644
--- a/headers/os/bluetooth/HCI/btHCI_module.h
+++ b/headers/os/bluetooth/HCI/btHCI_module.h
@@ -12,7 +12,7 @@
 
 #include <bluetooth/HCI/btHCI.h>
 #include <bluetooth/HCI/btHCI_transport.h>
-#include <net/net_buffer.h>
+#include <net_buffer.h>
 
 /* defines */
 #define	BT_HCI_MODULE_NAME	"bus_managers/hci/v1"
diff --git a/headers/os/bluetooth/HCI/btHCI_transport.h b/headers/os/bluetooth/HCI/btHCI_transport.h
index 0e94d0d031..32a44257c0 100644
--- a/headers/os/bluetooth/HCI/btHCI_transport.h
+++ b/headers/os/bluetooth/HCI/btHCI_transport.h
@@ -10,7 +10,7 @@
 
 #include <bluetooth/HCI/btHCI.h>
 
-#include <net/net_buffer.h>
+#include <net_buffer.h>
 #include <Drivers.h>
 
 typedef enum { ANCILLYANT = 1, 
diff --git a/headers/os/bluetooth/LocalDevice.h b/headers/os/bluetooth/LocalDevice.h
index 61230c0fb4..47e5a17f39 100644
--- a/headers/os/bluetooth/LocalDevice.h
+++ b/headers/os/bluetooth/LocalDevice.h
@@ -37,7 +37,7 @@ class LocalDevice {
                  BString GetFriendlyName();
                  DeviceClass GetDeviceClass();
         /* Possible throwing */
-                 bool SetDiscoverable(int mode);
+                 status_t SetDiscoverable(int mode);
                  
                  BString GetProperty(const char* property);                     
                  void GetProperty(const char* property, uint32* value);