diff --git a/example/panu_demo.c b/example/panu_demo.c
index 8693c7e02..2e69d894d 100644
--- a/example/panu_demo.c
+++ b/example/panu_demo.c
@@ -473,13 +473,13 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
                  * the BNEP Channel ID, which is used for sending Ethernet packets over BNEP.
                  */  
 				case BNEP_EVENT_CHANNEL_OPENED:
-                    if (packet[2]) {
-                        printf("BNEP channel open failed, status %02x\n", packet[2]);
+                    if (bnep_event_channel_opened_get_status(packet)) {
+                        printf("BNEP channel open failed, status %02x\n", bnep_event_channel_opened_get_status(packet));
                     } else {
-                        bnep_cid    = little_endian_read_16(packet, 3);
-                        uuid_source = little_endian_read_16(packet, 5);
-                        uuid_dest   = little_endian_read_16(packet, 7);
-                        mtu         = little_endian_read_16(packet, 9);
+                        bnep_cid    = bnep_event_channel_opened_get_bnep_cid(packet);
+                        uuid_source = bnep_event_channel_opened_get_source_uuid(packet);
+                        uuid_dest   = bnep_event_channel_opened_get_destination_uuid(packet);
+                        mtu         = bnep_event_channel_opened_get_mtu(packet);
                         //bt_flip_addr(event_addr, &packet[9]); 
                         memcpy(&event_addr, &packet[11], sizeof(bd_addr_t));
                         printf("BNEP connection open succeeded to %s source UUID 0x%04x dest UUID: 0x%04x, max frame size %u\n", bd_addr_to_str(event_addr), uuid_source, uuid_dest, mtu);
diff --git a/example/spp_flowcontrol.c b/example/spp_flowcontrol.c
index c76e257eb..09710dce0 100644
--- a/example/spp_flowcontrol.c
+++ b/example/spp_flowcontrol.c
@@ -155,7 +155,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
                 case HCI_EVENT_LINK_KEY_REQUEST:
                     // deny link key request
                     printf("Link key request\n\r");
-                    reverse_bd_addr(&packet[2], event_addr);
+                    hci_event_link_key_request_get_bd_addr(packet, event_addr);
                     hci_send_cmd(&hci_link_key_request_negative_reply, &event_addr);
                     break;
                     
diff --git a/platform/daemon/example/l2cap_server.c b/platform/daemon/example/l2cap_server.c
index b6cc7e563..093b39bfc 100644
--- a/platform/daemon/example/l2cap_server.c
+++ b/platform/daemon/example/l2cap_server.c
@@ -124,8 +124,7 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint
 					
 				case HCI_EVENT_LINK_KEY_REQUEST:
 					// link key request
-					reverse_bd_addr(&packet[2],
-							event_addr); 
+					hci_event_link_key_request_get_bd_addr(packet, event_addr); 
 					bt_send_cmd(&hci_link_key_request_negative_reply, &event_addr);
 					break;
 					
diff --git a/platform/daemon/example/l2cap_throughput.c b/platform/daemon/example/l2cap_throughput.c
index 4763d33ca..02a1698b6 100644
--- a/platform/daemon/example/l2cap_throughput.c
+++ b/platform/daemon/example/l2cap_throughput.c
@@ -137,8 +137,7 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint
 					
 				case HCI_EVENT_LINK_KEY_REQUEST:
 					// link key request
-					reverse_bd_addr(&packet[2],
-							event_addr); 
+					hci_event_link_key_request_get_bd_addr(packet, event_addr);
 					bt_send_cmd(&hci_link_key_request_negative_reply, &event_addr);
 					break;
 					
diff --git a/port/ez430-rf2560/example/ant_test.c b/port/ez430-rf2560/example/ant_test.c
index b075e9e03..0732ef6e7 100644
--- a/port/ez430-rf2560/example/ant_test.c
+++ b/port/ez430-rf2560/example/ant_test.c
@@ -112,7 +112,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
 				case HCI_EVENT_LINK_KEY_REQUEST:
 					// deny link key request
                     printf("Link key request\n\r");
-                    reverse_bd_addr(&packet[2], event_addr);
+                    hci_event_link_key_request_get_bd_addr(packet, event_addr);
 					hci_send_cmd(&hci_link_key_request_negative_reply, &event_addr);
 					break;
 					
diff --git a/port/ez430-rf2560/example/spp_accel.c b/port/ez430-rf2560/example/spp_accel.c
index 3506c775f..6c2cacdd5 100644
--- a/port/ez430-rf2560/example/spp_accel.c
+++ b/port/ez430-rf2560/example/spp_accel.c
@@ -149,7 +149,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
                 case HCI_EVENT_LINK_KEY_REQUEST:
                     // deny link key request
                     printf("Link key request\n\r");
-                    reverse_bd_addr(&packet[2], event_addr);
+                    hci_event_link_key_request_get_bd_addr(packet, event_addr);
                     hci_send_cmd(&hci_link_key_request_negative_reply, &event_addr);
                     break;
                     
diff --git a/port/msp-exp430f5438-cc2564b/example/ant_test.c b/port/msp-exp430f5438-cc2564b/example/ant_test.c
index ac4e33728..d8c5f9f4c 100644
--- a/port/msp-exp430f5438-cc2564b/example/ant_test.c
+++ b/port/msp-exp430f5438-cc2564b/example/ant_test.c
@@ -111,7 +111,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
 				case HCI_EVENT_LINK_KEY_REQUEST:
 					// deny link key request
                     printf("Link key request\n\r");
-                    reverse_bd_addr(&packet[2], event_addr);
+                    hci_event_link_key_request_get_bd_addr(packet, event_addr);
 					hci_send_cmd(&hci_link_key_request_negative_reply, &event_addr);
 					break;
 					
diff --git a/port/msp-exp430f5438-cc2564b/example/spp_accel.c b/port/msp-exp430f5438-cc2564b/example/spp_accel.c
index be0f87581..5cde2bbf7 100644
--- a/port/msp-exp430f5438-cc2564b/example/spp_accel.c
+++ b/port/msp-exp430f5438-cc2564b/example/spp_accel.c
@@ -150,7 +150,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
                 case HCI_EVENT_LINK_KEY_REQUEST:
                     // deny link key request
                     printf("Link key request\n\r");
-                    reverse_bd_addr(&packet[2], event_addr);
+                    hci_event_link_key_request_get_bd_addr(packet, event_addr);
                     hci_send_cmd(&hci_link_key_request_negative_reply, &event_addr);
                     break;
                     
diff --git a/test/pts/bnep_test.c b/test/pts/bnep_test.c
index 4c90847fa..4621d3afd 100644
--- a/test/pts/bnep_test.c
+++ b/test/pts/bnep_test.c
@@ -701,16 +701,16 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
                     printf("SSP User Confirmation Request with numeric value '%06u'\n", little_endian_read_32(packet, 8));
                     printf("SSP User Confirmation Auto accept\n");
                     break;
-					
+				
 				case BNEP_EVENT_CHANNEL_OPENED:
-                    if (packet[2]) {
-                        printf("BNEP channel open failed, status %02x\n", packet[2]);
+                    if (bnep_event_channel_opened_get_status(packet)) {
+                        printf("BNEP channel open failed, status %02x\n", bnep_event_channel_opened_get_status(packet));
                     } else {
                         // data: event(8), len(8), status (8), bnep source uuid (16), bnep destination uuid (16), remote_address (48)
-                        bnep_cid    = little_endian_read_16(packet, 3);
-                        uuid_source = little_endian_read_16(packet, 5);
-                        uuid_dest   = little_endian_read_16(packet, 7);
-                        mtu         = little_endian_read_16(packet, 9);
+                        bnep_cid    = bnep_event_channel_opened_get_cid(packet);
+                        uuid_source = bnep_event_channel_opened_get_source_uuid(packet);
+                        uuid_dest   = bnep_event_channel_opened_get_destination_uuid(packet);
+                        mtu         = bnep_event_channel_opened_get_mtu(packet);
                         //bt_flip_addr(event_addr, &packet[9]); 
                         memcpy(&event_addr, &packet[11], sizeof(bd_addr_t));
                         printf("BNEP connection open succeeded to %s source UUID 0x%04x dest UUID: 0x%04x, max frame size %u\n", bd_addr_to_str(event_addr), uuid_source, uuid_dest, mtu);