diff --git a/doc/manual/docs/how_to.md b/doc/manual/docs/how_to.md
index d8dd60820..b88e467d0 100644
--- a/doc/manual/docs/how_to.md
+++ b/doc/manual/docs/how_to.md
@@ -446,7 +446,7 @@ and address from the *gap_event_advertising_report* event use following getters:
 <!-- -->
     uint8_t address type = gap_event_advertising_report_get_address_type(event);
     bd_addr_t address;
-    gap_event_advertising_report_get_address(event, &address);
+    gap_event_advertising_report_get_address(event, address);
 
 
 ## Bluetooth HCI Packet Logs {#sec:packetlogsHowTo}
diff --git a/doc/manual/docs/profiles.md b/doc/manual/docs/profiles.md
index 7b2995f5f..9f0600c28 100644
--- a/doc/manual/docs/profiles.md
+++ b/doc/manual/docs/profiles.md
@@ -136,7 +136,7 @@ PIN, see Listing [below](#lst:PinCodeRequest).
             case HCI_EVENT_PIN_CODE_REQUEST:
                 // inform about pin code request
                 printf("Pin code request - using '0000'\n\r");
-                bt_flip_addr(bd_addr, &packet[2]);
+                hci_event_pin_code_request_get_bd_addr(packet, bd_addr);
                 
                 // baseband address, pin length, PIN: c-string
                 hci_send_cmd(&hci_pin_code_request_reply, &bd_addr, 4, "0000");
diff --git a/example/panu_demo.c b/example/panu_demo.c
index dda9198b3..8693c7e02 100644
--- a/example/panu_demo.c
+++ b/example/panu_demo.c
@@ -451,7 +451,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
                 case HCI_EVENT_PIN_CODE_REQUEST:
 					// inform about pin code request
                     printf("Pin code request - using '0000'\n");
-                    reverse_bd_addr(&packet[2], event_addr);
+                    hci_event_pin_code_request_get_bd_addr(packet, event_addr);
 					hci_send_cmd(&hci_pin_code_request_reply, &event_addr, 4, "0000");
 					break;
 
diff --git a/example/spp_and_le_counter.c b/example/spp_and_le_counter.c
index 27f401c97..2b0271a33 100644
--- a/example/spp_and_le_counter.c
+++ b/example/spp_and_le_counter.c
@@ -105,7 +105,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
 				case HCI_EVENT_PIN_CODE_REQUEST:
 					// inform about pin code request
                     printf("Pin code request - using '0000'\n");
-                    reverse_bd_addr(&packet[2], event_addr);
+                    hci_event_pin_code_request_get_bd_addr(packet, event_addr);
 					hci_send_cmd(&hci_pin_code_request_reply, &event_addr, 4, "0000");
 					break;
 
diff --git a/example/spp_counter.c b/example/spp_counter.c
index 425cf0830..7f562cc56 100644
--- a/example/spp_counter.c
+++ b/example/spp_counter.c
@@ -189,7 +189,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
                 case HCI_EVENT_PIN_CODE_REQUEST:
                     // pre-ssp: inform about pin code request
                     printf("Pin code request - using '0000'\n");
-                    reverse_bd_addr(&packet[2], event_addr);
+                    hci_event_pin_code_request_get_bd_addr(packet, event_addr);
                     hci_send_cmd(&hci_pin_code_request_reply, &event_addr, 4, "0000");
                     break;
 
diff --git a/example/spp_flowcontrol.c b/example/spp_flowcontrol.c
index f3bbe205d..b0022497c 100644
--- a/example/spp_flowcontrol.c
+++ b/example/spp_flowcontrol.c
@@ -162,7 +162,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
                 case HCI_EVENT_PIN_CODE_REQUEST:
                     // inform about pin code request
                     printf("Pin code request - using '0000'\n\r");
-                    reverse_bd_addr(&packet[2], event_addr);
+                    hci_event_pin_code_request_get_bd_addr(packet, event_addr);
                     hci_send_cmd(&hci_pin_code_request_reply, &event_addr, 4, "0000");
                     break;
                 
diff --git a/platform/daemon/example/l2cap_server.c b/platform/daemon/example/l2cap_server.c
index 55f5216f6..b6cc7e563 100644
--- a/platform/daemon/example/l2cap_server.c
+++ b/platform/daemon/example/l2cap_server.c
@@ -138,8 +138,7 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint
 						pin[i] = '\0';
 					}
 					printf("PIN = '%s'\n", pin);
-					reverse_bd_addr(&packet[2],
-							event_addr); 
+					hci_event_pin_code_request_get_bd_addr(packet, event_addr); 
 					bt_send_cmd(&hci_pin_code_request_reply, &event_addr, strlen(pin), pin);
 					break;
 					
diff --git a/platform/daemon/example/l2cap_throughput.c b/platform/daemon/example/l2cap_throughput.c
index dd3585c3c..4763d33ca 100644
--- a/platform/daemon/example/l2cap_throughput.c
+++ b/platform/daemon/example/l2cap_throughput.c
@@ -152,8 +152,7 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint
 						i--;
 					}
 					printf("PIN (%u)= '%s'\n", i, pin);
-					reverse_bd_addr(&packet[2],
-							event_addr); 
+					hci_event_pin_code_request_get_bd_addr(packet, event_addr); 
 					bt_send_cmd(&hci_pin_code_request_reply, &event_addr, i, pin);
 					break;
 					
diff --git a/platform/daemon/example/rfcomm_cat.c b/platform/daemon/example/rfcomm_cat.c
index 9a3cf7ff4..9e2c4a774 100644
--- a/platform/daemon/example/rfcomm_cat.c
+++ b/platform/daemon/example/rfcomm_cat.c
@@ -94,8 +94,7 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint
 				case HCI_EVENT_PIN_CODE_REQUEST:
 					// inform about pin code request
 					printf("Using PIN 0000\n");
-					reverse_bd_addr(&packet[2],
-							event_addr); 
+					hci_event_pin_code_request_get_bd_addr(packet, event_addr);
 					bt_send_cmd(&hci_pin_code_request_reply, &event_addr, 4, "0000");
 					break;
 										
diff --git a/platform/daemon/example/rfcomm_echo.c b/platform/daemon/example/rfcomm_echo.c
index a88f602c3..6489dcb2a 100644
--- a/platform/daemon/example/rfcomm_echo.c
+++ b/platform/daemon/example/rfcomm_echo.c
@@ -110,8 +110,7 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint
 				case HCI_EVENT_PIN_CODE_REQUEST:
 					// inform about pin code request
 					printf("Using PIN 0000\n");
-					reverse_bd_addr(&packet[2],
-							event_addr); 
+					hci_event_pin_code_request_get_bd_addr(packet, event_addr); 
 					bt_send_cmd(&hci_pin_code_request_reply, &event_addr, 4, "0000");
 					break;
 					
diff --git a/platform/daemon/example/rfcomm_test.c b/platform/daemon/example/rfcomm_test.c
index 56a334bea..023fe2e3f 100644
--- a/platform/daemon/example/rfcomm_test.c
+++ b/platform/daemon/example/rfcomm_test.c
@@ -131,8 +131,7 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint
 				case HCI_EVENT_PIN_CODE_REQUEST:
 					// inform about pin code request
 					printf("Using PIN 0000\n");
-					reverse_bd_addr(&packet[2],
-							event_addr); 
+					hci_event_pin_code_request_get_bd_addr(packet, event_addr);
 					bt_send_cmd(&hci_pin_code_request_reply, &event_addr, 4, "0000");
 					break;
 					
diff --git a/port/msp-exp430f5438-cc2564b/example/ant_test.c b/port/msp-exp430f5438-cc2564b/example/ant_test.c
index 333ef3821..89bfb6d32 100644
--- a/port/msp-exp430f5438-cc2564b/example/ant_test.c
+++ b/port/msp-exp430f5438-cc2564b/example/ant_test.c
@@ -118,7 +118,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
 				case HCI_EVENT_PIN_CODE_REQUEST:
 					// inform about pin code request
                     printf("Pin code request - using '0000'\n\r");
-                    reverse_bd_addr(&packet[2], event_addr);
+                    hci_event_pin_code_request_get_bd_addr(packet, event_addr);
 					hci_send_cmd(&hci_pin_code_request_reply, &event_addr, 4, "0000");
 					break;
                 
diff --git a/port/msp-exp430f5438-cc2564b/example/spp_accel.c b/port/msp-exp430f5438-cc2564b/example/spp_accel.c
index 868bbb099..b6c2d1114 100644
--- a/port/msp-exp430f5438-cc2564b/example/spp_accel.c
+++ b/port/msp-exp430f5438-cc2564b/example/spp_accel.c
@@ -157,7 +157,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
                 case HCI_EVENT_PIN_CODE_REQUEST:
                     // inform about pin code request
                     printf("Pin code request - using '0000'\n\r");
-                    reverse_bd_addr(&packet[2], event_addr);
+                    hci_event_pin_code_request_get_bd_addr(packet, event_addr);
                     hci_send_cmd(&hci_pin_code_request_reply, &event_addr, 4, "0000");
                     break;
                 
diff --git a/src/hci.c b/src/hci.c
index 2a8787708..9e165e073 100644
--- a/src/hci.c
+++ b/src/hci.c
@@ -1595,7 +1595,7 @@ static void event_handler(uint8_t *packet, int size){
             }
             // PIN CODE REQUEST means the link key request didn't succee -> delete stored link key
             if (!hci_stack->link_key_db) break;
-            reverse_bd_addr(&packet[2], addr);
+            hci_event_pin_code_request_get_bd_addr(packet, addr);
             hci_stack->link_key_db->delete_link_key(addr);
             break;
             
diff --git a/test/pts/classic_test.c b/test/pts/classic_test.c
index 69362ea23..e31cebb47 100644
--- a/test/pts/classic_test.c
+++ b/test/pts/classic_test.c
@@ -317,7 +317,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
             break;
 
         case HCI_EVENT_PIN_CODE_REQUEST:
-            reverse_bd_addr(&packet[2], remote);
+            hci_event_pin_code_request_get_bd_addr(packet, remote);
             printf("GAP Legacy PIN Request for %s (press ENTER to send)\nPasskey:", bd_addr_to_str(remote));
             fflush(stdout);
             ui_chars_for_pin = 1;
diff --git a/test/pts/hfp_test.c b/test/pts/hfp_test.c
index 1cda0b1d6..db5ea6ded 100644
--- a/test/pts/hfp_test.c
+++ b/test/pts/hfp_test.c
@@ -114,7 +114,7 @@ static void packet_handler(void * connection, uint8_t packet_type, uint16_t chan
         case HCI_EVENT_PIN_CODE_REQUEST:
             // inform about pin code request
             printf("Pin code request - using '0000'\n\r");
-            reverse_bd_addr(&packet[2], event_addr);
+            hci_event_pin_code_request_get_bd_addr(packet, event_addr);
             hci_send_cmd(&hci_pin_code_request_reply, &event_addr, 4, "0000");
             break;