diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xGap.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xGap.cpp
index e441fd4717..f4b0d393b2 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xGap.cpp
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xGap.cpp
@@ -79,7 +79,7 @@ peer_address_type_t convert_nordic_address(uint8_t address) {
 }
 
 peer_address_type_t convert_identity_address(advertising_peer_address_type_t address) {
-    if (address == advertising_peer_address_type_t::PUBLIC_ADDRESS) {
+    if (address == advertising_peer_address_type_t::PUBLIC) {
         return peer_address_type_t::PUBLIC_IDENTITY;
     } else {
         return peer_address_type_t::RANDOM_STATIC_IDENTITY;
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xPalSecurityManager.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xPalSecurityManager.cpp
index e797b85223..36c7c1e0a2 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xPalSecurityManager.cpp
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xPalSecurityManager.cpp
@@ -988,10 +988,10 @@ bool nRF5xSecurityManager::sm_handler(const ble_evt_t *evt)
                         );
 
                         advertising_peer_address_type_t
-                            address_type(advertising_peer_address_type_t::PUBLIC_ADDRESS);
+                            address_type(advertising_peer_address_type_t::PUBLIC);
 
                         if (pairing_cb->peer_id_key.id_addr_info.addr_type) {
-                            address_type = advertising_peer_address_type_t::RANDOM_ADDRESS;
+                            address_type = advertising_peer_address_type_t::RANDOM;
                         }
 
                         handler->on_keys_distributed_bdaddr(
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xPalSecurityManager.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xPalSecurityManager.h
index 46482fcee4..32184507da 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xPalSecurityManager.h
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xPalSecurityManager.h
@@ -90,7 +90,7 @@ public:
     struct resolving_list_entry_t {
         resolving_list_entry_t() :
             peer_identity_address_type(
-                advertising_peer_address_type_t::PUBLIC_ADDRESS
+                advertising_peer_address_type_t::PUBLIC
             )
         { }
 
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xGap.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xGap.cpp
index ae12ee7c27..5c343eafa5 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xGap.cpp
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xGap.cpp
@@ -108,7 +108,7 @@ peer_address_type_t convert_nordic_address(bool identity, uint8_t address) {
 }
 
 peer_address_type_t convert_identity_address(advertising_peer_address_type_t address) {
-    if (address == advertising_peer_address_type_t::PUBLIC_ADDRESS) {
+    if (address == advertising_peer_address_type_t::PUBLIC) {
         return peer_address_type_t::PUBLIC_IDENTITY;
     } else {
         return peer_address_type_t::RANDOM_STATIC_IDENTITY;
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xPalSecurityManager.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xPalSecurityManager.cpp
index 5eb1310bb4..a1d6b1e7e9 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xPalSecurityManager.cpp
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xPalSecurityManager.cpp
@@ -1022,10 +1022,10 @@ bool nRF5xSecurityManager::sm_handler(const ble_evt_t *evt)
                         );
 
                         advertising_peer_address_type_t
-                            address_type(advertising_peer_address_type_t::PUBLIC_ADDRESS);
+                            address_type(advertising_peer_address_type_t::PUBLIC);
 
                         if (pairing_cb->peer_id_key.id_addr_info.addr_type) {
-                            address_type = advertising_peer_address_type_t::RANDOM_ADDRESS;
+                            address_type = advertising_peer_address_type_t::RANDOM;
                         }
 
                         handler->on_keys_distributed_bdaddr(