diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle.cpp
index abfeb9f6b6..811e715254 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle.cpp
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle.cpp
@@ -50,7 +50,7 @@ extern "C" {
 #include "ble_stack_handler_types.h"
 }
 
-#include "ble_hci.h"
+#include "nrf_ble_hci.h"
 #include "btle_discovery.h"
 
 #include "nRF5xGattClient.h"
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle.h
index 26f9cf5542..021dd50513 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle.h
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle.h
@@ -24,7 +24,7 @@ extern "C" {
 #include "common/common.h"
 
 #include "ble_srv_common.h"
-#include "headers/ble.h"
+#include "headers/nrf_ble.h"
 
 error_t     btle_init(void);
 
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle_gap.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle_gap.cpp
index a70f7165be..8bc8600d7b 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle_gap.cpp
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle_gap.cpp
@@ -15,7 +15,7 @@
  */
 #include "common/common.h"
 
-#include "ble_gap.h"
+#include "headers/nrf_ble_gap.h"
 #include "ble_conn_params.h"
 
 static inline uint32_t msec_to_1_25msec(uint32_t interval_ms) ATTR_ALWAYS_INLINE ATTR_CONST;
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/custom/custom_helper.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/custom/custom_helper.h
index 6d6f272aca..af47fb9852 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/custom/custom_helper.h
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/custom/custom_helper.h
@@ -18,7 +18,7 @@
 #define _CUSTOM_HELPER_H_
 
 #include "common/common.h"
-#include "headers/ble.h"
+#include "headers/nrf_ble.h"
 #include "ble/UUID.h"
 #include "ble/GattCharacteristic.h"
 
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xCharacteristicDescriptorDiscoverer.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xCharacteristicDescriptorDiscoverer.cpp
index c0761fec48..0dee44efbf 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xCharacteristicDescriptorDiscoverer.cpp
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xCharacteristicDescriptorDiscoverer.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #include "nRF5xCharacteristicDescriptorDiscoverer.h"
-#include "ble_err.h"
+#include "headers/nrf_ble_err.h"
 #include "ble/DiscoveredCharacteristicDescriptor.h"
 
 nRF5xCharacteristicDescriptorDiscoverer::nRF5xCharacteristicDescriptorDiscoverer() :
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xCharacteristicDescriptorDiscoverer.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xCharacteristicDescriptorDiscoverer.h
index 26692ff936..753e368f0f 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xCharacteristicDescriptorDiscoverer.h
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xCharacteristicDescriptorDiscoverer.h
@@ -21,7 +21,7 @@
 #include "ble/DiscoveredCharacteristic.h"
 #include "ble/CharacteristicDescriptorDiscovery.h"
 #include "ble/GattClient.h"
-#include "ble_gattc.h"
+#include "headers/nrf_ble_gattc.h"
 
 /**
  * @brief Manage the discovery of Characteristic descriptors
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xDiscoveredCharacteristic.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xDiscoveredCharacteristic.cpp
index a44d0af7a0..f7d6996f4d 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xDiscoveredCharacteristic.cpp
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xDiscoveredCharacteristic.cpp
@@ -16,7 +16,7 @@
 
 #include "nRF5xDiscoveredCharacteristic.h"
 #include "nRF5xGattClient.h"
-#include "ble_gatt.h"
+#include "headers/nrf_ble_gatt.h"
 
 void
 nRF5xDiscoveredCharacteristic::setup(nRF5xGattClient         *gattcIn,
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xDiscoveredCharacteristic.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xDiscoveredCharacteristic.h
index b2f0a0a87b..87ebbbf767 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xDiscoveredCharacteristic.h
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xDiscoveredCharacteristic.h
@@ -18,7 +18,7 @@
 #define __NRF_DISCOVERED_CHARACTERISTIC_H__
 
 #include "ble/DiscoveredCharacteristic.h"
-#include "ble_gatt.h"
+#include "headers/nrf_ble_gatt.h"
 
 class nRF5xGattClient; /* forward declaration */
 
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xGap.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xGap.cpp
index e6827ee445..56c9218fee 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xGap.cpp
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xGap.cpp
@@ -24,7 +24,7 @@
 
 #include "common/common.h"
 #include "ble_advdata.h"
-#include "ble_hci.h"
+#include "headers/nrf_ble_hci.h"
 
 #if  (NRF_SD_BLE_API_VERSION >= 3)
     #include "peer_manager.h"
@@ -141,6 +141,9 @@ ble_error_t nRF5xGap::setAdvertisingData(const GapAdvertisingData &advData, cons
 /**************************************************************************/
 ble_error_t nRF5xGap::startAdvertising(const GapAdvertisingParams &params)
 {
+    uint32_t             err;
+    ble_gap_adv_params_t adv_para = {0};
+    
     /* Make sure we support the advertising type */
     if (params.getAdvertisingType() == GapAdvertisingParams::ADV_CONNECTABLE_DIRECTED) {
         /* ToDo: This requires a propery security implementation, etc. */
@@ -173,10 +176,7 @@ ble_error_t nRF5xGap::startAdvertising(const GapAdvertisingParams &params)
         (params.getTimeout() > GapAdvertisingParams::GAP_ADV_PARAMS_TIMEOUT_MAX)) {
         return BLE_ERROR_PARAM_OUT_OF_RANGE;
     }
-    uint32_t err;
-    
-    ble_gap_adv_params_t adv_para = {0};
-        
+
 #if (NRF_SD_BLE_API_VERSION <= 2)
     /* Allocate the stack's whitelist statically */
     ble_gap_whitelist_t  whitelist;
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xGap.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xGap.h
index d5cc670299..922260954a 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xGap.h
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xGap.h
@@ -39,7 +39,7 @@
     #define YOTTA_CFG_IRK_TABLE_MAX_SIZE BLE_GAP_WHITELIST_IRK_MAX_COUNT
 #endif
 #include "ble/blecommon.h"
-#include "headers/ble.h"
+#include "headers/nrf_ble.h"
 #include "ble/GapAdvertisingParams.h"
 #include "ble/GapAdvertisingData.h"
 #include "ble/Gap.h"
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xGattServer.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xGattServer.h
index f69f0e9b88..77bfd26d90 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xGattServer.h
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xGattServer.h
@@ -20,7 +20,7 @@
 #include <stddef.h>
 
 #include "ble/blecommon.h"
-#include "headers/ble.h" /* nordic ble */
+#include "headers/nrf_ble.h" /* nordic ble */
 #include "ble/Gap.h"
 #include "ble/GattServer.h"
 
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xServiceDiscovery.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xServiceDiscovery.h
index a2bfa6fa8d..9fb28f1d79 100644
--- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xServiceDiscovery.h
+++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xServiceDiscovery.h
@@ -21,8 +21,8 @@
 #include "ble/DiscoveredService.h"
 #include "nRF5xDiscoveredCharacteristic.h"
 
-#include "headers/ble.h"
-#include "ble_gattc.h"
+#include "headers/nrf_ble.h"
+#include "headers/nrf_ble_gattc.h"
 
 class nRF5xGattClient; /* forward declaration */
 
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble.h
deleted file mode 100644
index 283f8a644b..0000000000
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf_ble.h"
\ No newline at end of file
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_err.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_err.h
deleted file mode 100644
index 2dcf1646dc..0000000000
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_err.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf_ble_err.h"
\ No newline at end of file
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_gap.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_gap.h
deleted file mode 100644
index 38b5c61aa6..0000000000
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_gap.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf_ble_gap.h"
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_gatt.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_gatt.h
deleted file mode 100644
index 9961e11842..0000000000
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_gatt.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf_ble_gatt.h"
\ No newline at end of file
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_gattc.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_gattc.h
deleted file mode 100644
index 5a8fd0e6e8..0000000000
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_gattc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf_ble_gattc.h"
\ No newline at end of file
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_gatts.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_gatts.h
deleted file mode 100644
index 21acc199a6..0000000000
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_gatts.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf_ble_gatts.h"
\ No newline at end of file
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_hci.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_hci.h
deleted file mode 100644
index a513c1013a..0000000000
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_hci.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf_ble_hci.h"
\ No newline at end of file
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_l2capi.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_l2capi.h
deleted file mode 100644
index 33e6828f39..0000000000
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_l2capi.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf_ble_l2cap.h"
\ No newline at end of file
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_ranges.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_ranges.h
deleted file mode 100644
index 5830dd1e12..0000000000
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_ranges.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf_ble_ranges.h"
\ No newline at end of file
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_types.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_types.h
deleted file mode 100644
index 9708c8634d..0000000000
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/ble_types.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf_ble_types.h"
\ No newline at end of file
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble.h
deleted file mode 100644
index 283f8a644b..0000000000
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf_ble.h"
\ No newline at end of file
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_err.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_err.h
deleted file mode 100644
index 2dcf1646dc..0000000000
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_err.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf_ble_err.h"
\ No newline at end of file
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_gap.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_gap.h
deleted file mode 100644
index 38b5c61aa6..0000000000
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_gap.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf_ble_gap.h"
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_gatt.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_gatt.h
deleted file mode 100644
index 9961e11842..0000000000
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_gatt.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf_ble_gatt.h"
\ No newline at end of file
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_gattc.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_gattc.h
deleted file mode 100644
index 5a8fd0e6e8..0000000000
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_gattc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf_ble_gattc.h"
\ No newline at end of file
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_gatts.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_gatts.h
deleted file mode 100644
index 21acc199a6..0000000000
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_gatts.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf_ble_gatts.h"
\ No newline at end of file
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_hci.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_hci.h
deleted file mode 100644
index a513c1013a..0000000000
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_hci.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf_ble_hci.h"
\ No newline at end of file
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_l2capi.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_l2capi.h
deleted file mode 100644
index 33e6828f39..0000000000
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_l2capi.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf_ble_l2cap.h"
\ No newline at end of file
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_ranges.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_ranges.h
deleted file mode 100644
index 5830dd1e12..0000000000
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_ranges.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf_ble_ranges.h"
\ No newline at end of file
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_types.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_types.h
deleted file mode 100644
index 9708c8634d..0000000000
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_types.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "nrf_ble_types.h"
\ No newline at end of file
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble.h
similarity index 99%
rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble.h
rename to targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble.h
index 86d4d9adff..60b18442bc 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble.h
@@ -49,13 +49,13 @@
 #ifndef BLE_H__
 #define BLE_H__
 
-#include "ble_ranges.h"
-#include "ble_types.h"
-#include "ble_gap.h"
-#include "ble_l2cap.h"
-#include "ble_gatt.h"
-#include "ble_gattc.h"
-#include "ble_gatts.h"
+#include "nrf_ble_ranges.h"
+#include "nrf_ble_types.h"
+#include "nrf_ble_gap.h"
+#include "nrf_ble_l2cap.h"
+#include "nrf_ble_gatt.h"
+#include "nrf_ble_gattc.h"
+#include "nrf_ble_gatts.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble_err.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble_err.h
similarity index 100%
rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble_err.h
rename to targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble_err.h
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble_gap.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble_gap.h
similarity index 99%
rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble_gap.h
rename to targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble_gap.h
index 7748702e82..8f651e21dd 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble_gap.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble_gap.h
@@ -45,8 +45,8 @@
 #ifndef BLE_GAP_H__
 #define BLE_GAP_H__
 
-#include "ble_types.h"
-#include "ble_ranges.h"
+#include "nrf_ble_types.h"
+#include "nrf_ble_ranges.h"
 #include "nrf_svc.h"
 
 #ifdef __cplusplus
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble_gatt.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble_gatt.h
similarity index 99%
rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble_gatt.h
rename to targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble_gatt.h
index cfa3860b5f..ceafee8a46 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble_gatt.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble_gatt.h
@@ -45,8 +45,8 @@
 #ifndef BLE_GATT_H__
 #define BLE_GATT_H__
 
-#include "ble_types.h"
-#include "ble_ranges.h"
+#include "nrf_ble_types.h"
+#include "nrf_ble_ranges.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble_gattc.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble_gattc.h
similarity index 99%
rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble_gattc.h
rename to targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble_gattc.h
index c36a4d7e34..eb1f7753d7 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble_gattc.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble_gattc.h
@@ -45,9 +45,9 @@
 #ifndef BLE_GATTC_H__
 #define BLE_GATTC_H__
 
-#include "ble_gatt.h"
-#include "ble_types.h"
-#include "ble_ranges.h"
+#include "nrf_ble_gatt.h"
+#include "nrf_ble_types.h"
+#include "nrf_ble_ranges.h"
 #include "nrf_svc.h"
 #include "nrf_error.h"
 #include "nrf.h"
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble_gatts.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble_gatts.h
similarity index 99%
rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble_gatts.h
rename to targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble_gatts.h
index b85735ec31..588edcc002 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble_gatts.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble_gatts.h
@@ -45,11 +45,11 @@
 #ifndef BLE_GATTS_H__
 #define BLE_GATTS_H__
 
-#include "ble_types.h"
-#include "ble_ranges.h"
-#include "ble_l2cap.h"
-#include "ble_gap.h"
-#include "ble_gatt.h"
+#include "nrf_ble_types.h"
+#include "nrf_ble_ranges.h"
+#include "nrf_ble_l2cap.h"
+#include "nrf_ble_gap.h"
+#include "nrf_ble_gatt.h"
 #include "nrf_svc.h"
 
 #ifdef __cplusplus
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble_hci.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble_hci.h
similarity index 100%
rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble_hci.h
rename to targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble_hci.h
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble_l2cap.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble_l2cap.h
similarity index 98%
rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble_l2cap.h
rename to targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble_l2cap.h
index eaad7e50fc..d3cc747b10 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble_l2cap.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble_l2cap.h
@@ -45,9 +45,9 @@
 #ifndef BLE_L2CAP_H__
 #define BLE_L2CAP_H__
 
-#include "ble_types.h"
-#include "ble_ranges.h"
-#include "ble_err.h"
+#include "nrf_ble_types.h"
+#include "nrf_ble_ranges.h"
+#include "nrf_ble_err.h"
 #include "nrf_svc.h"
 
 #ifdef __cplusplus
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble_ranges.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble_ranges.h
similarity index 100%
rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble_ranges.h
rename to targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble_ranges.h
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble_types.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble_types.h
similarity index 100%
rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble_types.h
rename to targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_ble_types.h
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/ble_advertising/ble_advertising.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/ble_advertising/ble_advertising.h
index af409e8f18..9b436d7a08 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/ble_advertising/ble_advertising.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/ble_advertising/ble_advertising.h
@@ -62,8 +62,8 @@
 
 #include <stdint.h>
 #include "nrf_error.h"
-#include "headers/ble.h"
-#include "ble_gattc.h"
+#include "headers/nrf_ble.h"
+#include "headers/nrf_ble_gattc.h"
 #include "ble_advdata.h"
 
 #ifdef __cplusplus
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/ble_db_discovery/ble_db_discovery.c b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/ble_db_discovery/ble_db_discovery.c
index eba5b3285d..96bbe91a22 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/ble_db_discovery/ble_db_discovery.c
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/ble_db_discovery/ble_db_discovery.c
@@ -40,7 +40,7 @@
 #if NRF_MODULE_ENABLED(BLE_DB_DISCOVERY)
 #include "ble_db_discovery.h"
 #include <stdlib.h>
-#include "headers\ble.h"
+#include "headers/nrf_ble.h"
 #include "ble_srv_common.h"
 #define NRF_LOG_MODULE_NAME "BLE_DB_DISC"
 #include "nrf_log.h"
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/ble_db_discovery/ble_db_discovery.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/ble_db_discovery/ble_db_discovery.h
index 0372a68fad..dccfe70ad6 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/ble_db_discovery/ble_db_discovery.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/ble_db_discovery/ble_db_discovery.h
@@ -70,8 +70,8 @@
 
 #include <stdint.h>
 #include "nrf_error.h"
-#include "headers\ble.h"
-#include "ble_gattc.h"
+#include "headers/nrf_ble.h"
+#include "headers/nrf_ble_gattc.h"
 #include "ble_srv_common.h"
 #include "ble_gatt_db.h"
 
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/ble_racp/ble_racp.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/ble_racp/ble_racp.h
index a6a60614ce..97b8f56d4c 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/ble_racp/ble_racp.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/ble_racp/ble_racp.h
@@ -49,8 +49,8 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include "headers\ble.h"
-#include "ble_types.h"
+#include "headers/nrf_ble.h"
+#include "headers/nrf_ble_types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_advdata.c b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_advdata.c
index f114952fba..9dcc8201cf 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_advdata.c
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_advdata.c
@@ -37,7 +37,7 @@
  */
 
 #include "ble_advdata.h"
-#include "ble_gap.h"
+#include "headers/nrf_ble_gap.h"
 #include "ble_srv_common.h"
 #include "sdk_common.h"
 
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_advdata.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_advdata.h
index d67ca5fab7..d9bb01a769 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_advdata.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_advdata.h
@@ -51,7 +51,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
-#include "headers/ble.h"
+#include "headers/nrf_ble.h"
 #include "app_util.h"
 
 #ifdef __cplusplus
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_conn_params.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_conn_params.h
index eaf7d84a71..f9ff64c12d 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_conn_params.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_conn_params.h
@@ -48,7 +48,7 @@
 #define BLE_CONN_PARAMS_H__
 
 #include <stdint.h>
-#include "headers/ble.h"
+#include "headers/nrf_ble.h"
 #include "ble_srv_common.h"
 
 #ifdef __cplusplus
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_conn_state.c b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_conn_state.c
index 6303b50f2c..b4fb337a2e 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_conn_state.c
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_conn_state.c
@@ -40,7 +40,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
-#include "headers/ble.h"
+#include "headers/nrf_ble.h"
 #include "sdk_mapped_flags.h"
 #include "app_error.h"
 
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_conn_state.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_conn_state.h
index 8a4417df19..e310f7b3b5 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_conn_state.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_conn_state.h
@@ -68,7 +68,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include "headers/ble.h"
+#include "headers/nrf_ble.h"
 #include "sdk_mapped_flags.h"
 
 #ifdef __cplusplus
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_gatt_db.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_gatt_db.h
index 712e0520d1..9d6f0e87f6 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_gatt_db.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_gatt_db.h
@@ -47,8 +47,8 @@
 #define BLE_GATT_DB_H__
 
 #include <stdint.h>
-#include "headers/ble.h"
-#include "ble_gattc.h"
+#include "headers/nrf_ble.h"
+#include "headers/nrf_ble_gattc.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_srv_common.c b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_srv_common.c
index 5f3dd17df3..8b821cdbc6 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_srv_common.c
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_srv_common.c
@@ -45,7 +45,7 @@
 #include <string.h>
 #include "nordic_common.h"
 #include "app_error.h"
-#include "headers/ble.h"
+#include "headers/nrf_ble.h"
 
 bool ble_srv_is_notification_enabled(uint8_t const * p_encoded_data)
 {
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_srv_common.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_srv_common.h
index 660e9bf7f5..85df97e00b 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_srv_common.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/common/ble_srv_common.h
@@ -49,11 +49,11 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include "ble_types.h"
+#include "headers/nrf_ble_types.h"
 #include "app_util.h"
-#include "headers/ble.h"
-#include "ble_gap.h"
-#include "ble_gatt.h"
+#include "headers/nrf_ble.h"
+#include "headers/nrf_ble_gap.h"
+#include "headers/nrf_ble_gatt.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/gatt_cache_manager.c b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/gatt_cache_manager.c
index ba19efadd3..0e2f2a1835 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/gatt_cache_manager.c
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/gatt_cache_manager.c
@@ -40,7 +40,7 @@
 #if NRF_MODULE_ENABLED(PEER_MANAGER)
 #include "gatt_cache_manager.h"
 
-#include "ble_gap.h"
+#include "headers/nrf_ble_gap.h"
 #include "ble_conn_state.h"
 #include "peer_manager_types.h"
 #include "peer_manager_internal.h"
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/gatt_cache_manager.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/gatt_cache_manager.h
index fe95dba545..79d4d71836 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/gatt_cache_manager.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/gatt_cache_manager.h
@@ -42,8 +42,8 @@
 
 #include <stdint.h>
 #include "sdk_errors.h"
-#include "headers/ble.h"
-#include "ble_gap.h"
+#include "headers/nrf_ble.h"
+#include "headers/nrf_ble_gap.h"
 #include "peer_manager_types.h"
 
 #ifdef __cplusplus
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/gatts_cache_manager.c b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/gatts_cache_manager.c
index 3f6b89c8bc..3f4ac47060 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/gatts_cache_manager.c
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/gatts_cache_manager.c
@@ -41,7 +41,7 @@
 #include "gatts_cache_manager.h"
 
 #include <string.h>
-#include "ble_gap.h"
+#include "headers/nrf_ble_gap.h"
 #include "peer_manager_types.h"
 #include "peer_manager_internal.h"
 #include "peer_database.h"
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/gatts_cache_manager.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/gatts_cache_manager.h
index 628276ceab..48c314d215 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/gatts_cache_manager.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/gatts_cache_manager.h
@@ -42,8 +42,8 @@
 
 #include <stdint.h>
 #include "sdk_errors.h"
-#include "headers/ble.h"
-#include "ble_gap.h"
+#include "headers/nrf_ble.h"
+#include "headers/nrf_ble_gap.h"
 #include "peer_manager_types.h"
 
 #ifdef __cplusplus
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/id_manager.c b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/id_manager.c
index b999a85277..03cf432591 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/id_manager.c
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/id_manager.c
@@ -41,8 +41,8 @@
 #include "id_manager.h"
 
 #include <string.h>
-#include "headers/ble.h"
-#include "ble_gap.h"
+#include "headers/nrf_ble.h"
+#include "headers/nrf_ble_gap.h"
 #include "ble_conn_state.h"
 #include "peer_manager_types.h"
 #include "peer_database.h"
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/id_manager.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/id_manager.h
index e680f41089..2268884460 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/id_manager.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/id_manager.h
@@ -42,8 +42,8 @@
 
 #include <stdint.h>
 #include "sdk_errors.h"
-#include "headers/ble.h"
-#include "ble_gap.h"
+#include "headers/nrf_ble.h"
+#include "headers/nrf_ble_gap.h"
 #include "peer_manager_types.h"
 
 #ifdef __cplusplus
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/peer_data_storage.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/peer_data_storage.h
index f9b6349924..0b6343e7a4 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/peer_data_storage.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/peer_data_storage.h
@@ -43,7 +43,7 @@
 
 #include <stdint.h>
 #include "sdk_errors.h"
-#include "ble_gap.h"
+#include "headers/nrf_ble_gap.h"
 #include "peer_manager_types.h"
 #include "peer_manager_internal.h"
 
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/peer_id.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/peer_id.h
index 0c1116c8cb..1e05ac5a9e 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/peer_id.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/peer_id.h
@@ -43,7 +43,7 @@
 
 #include <stdint.h>
 #include "sdk_errors.h"
-#include "ble_gap.h"
+#include "headers/nrf_ble_gap.h"
 #include "peer_manager_types.h"
 
 #ifdef __cplusplus
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/peer_manager.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/peer_manager.h
index b5cc5af781..ee25754674 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/peer_manager.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/peer_manager.h
@@ -62,8 +62,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "sdk_common.h"
-#include "headers/ble.h"
-#include "ble_gap.h"
+#include "headers/nrf_ble.h"
+#include "headers/nrf_ble_gap.h"
 #include "peer_manager_types.h"
 #include "peer_database.h"
 
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/peer_manager_internal.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/peer_manager_internal.h
index 79551404e9..c66bd3dd53 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/peer_manager_internal.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/peer_manager_internal.h
@@ -42,8 +42,8 @@
 
 #include <stdint.h>
 #include "sdk_errors.h"
-#include "headers/ble.h"
-#include "ble_gap.h"
+#include "headers/nrf_ble.h"
+#include "headers/nrf_ble_gap.h"
 #include "peer_manager_types.h"
 
 #ifdef __cplusplus
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/peer_manager_types.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/peer_manager_types.h
index 7e085b26c2..a934e14c72 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/peer_manager_types.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/peer_manager_types.h
@@ -51,8 +51,8 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include "nrf.h"
-#include "ble_gap.h"
-#include "ble_hci.h"
+#include "headers/nrf_ble_gap.h"
+#include "headers/nrf_ble_hci.h"
 #include "ble_gatt_db.h"
 #include "app_util.h"
 #include "app_util_platform.h"
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/security_dispatcher.c b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/security_dispatcher.c
index a87030bf34..723a6a9777 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/security_dispatcher.c
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/security_dispatcher.c
@@ -41,8 +41,8 @@
 #include "security_dispatcher.h"
 
 #include <string.h>
-#include "headers/ble.h"
-#include "ble_gap.h"
+#include "headers/nrf_ble.h"
+#include "headers/nrf_ble_gap.h"
 #include "ble_conn_state.h"
 #include "peer_manager_types.h"
 #include "peer_database.h"
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/security_dispatcher.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/security_dispatcher.h
index 7d0b45dc46..92f8365b64 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/security_dispatcher.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/security_dispatcher.h
@@ -42,8 +42,8 @@
 
 #include <stdint.h>
 #include "sdk_errors.h"
-#include "headers/ble.h"
-#include "ble_gap.h"
+#include "headers/nrf_ble.h"
+#include "headers/nrf_ble_gap.h"
 #include "peer_manager_types.h"
 
 #ifdef __cplusplus
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/security_manager.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/security_manager.h
index c1043a6a3d..73cb69c1c8 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/security_manager.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/ble/peer_manager/security_manager.h
@@ -42,8 +42,8 @@
 
 #include <stdint.h>
 #include "sdk_errors.h"
-#include "headers/ble.h"
-#include "ble_gap.h"
+#include "headers/nrf_ble.h"
+#include "headers/nrf_ble_gap.h"
 #include "peer_manager_types.h"
 #include "security_dispatcher.h"
 
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/softdevice/common/softdevice_handler/ble_stack_handler_types.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/softdevice/common/softdevice_handler/ble_stack_handler_types.h
index 7be7850f58..30da33c756 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/softdevice/common/softdevice_handler/ble_stack_handler_types.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/softdevice/common/softdevice_handler/ble_stack_handler_types.h
@@ -55,7 +55,7 @@ extern "C" {
 #ifdef BLE_STACK_SUPPORT_REQD
 
 #include <stdlib.h>
-#include "headers/ble.h"
+#include "headers/nrf_ble.h"
 #include "nrf_sdm.h"
 #include "app_error.h"
 #include "app_util.h"
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/softdevice/common/softdevice_handler/softdevice_handler.c b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/softdevice/common/softdevice_handler/softdevice_handler.c
index 34e534e9f6..868532b485 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/softdevice/common/softdevice_handler/softdevice_handler.c
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/softdevice/common/softdevice_handler/softdevice_handler.c
@@ -62,7 +62,7 @@
 #elif defined(ANT_STACK_SUPPORT_REQD)
     #include "ant_interface.h"
 #elif defined(BLE_STACK_SUPPORT_REQD)
-    #include "headers/ble.h"
+    #include "headers/nrf_ble.h"
 #endif
 
 #define RAM_START_ADDRESS         0x20000000
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/softdevice/common/softdevice_handler/softdevice_handler.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/softdevice/common/softdevice_handler/softdevice_handler.h
index 59bc60f3d5..64d4465be0 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/softdevice/common/softdevice_handler/softdevice_handler.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK13/softdevice/common/softdevice_handler/softdevice_handler.h
@@ -66,7 +66,7 @@
 #include "ble_stack_handler_types.h"
 #include "ant_stack_handler_types.h"
 #if defined(BLE_STACK_SUPPORT_REQD)
-    #include "headers/ble.h"
+    #include "headers/nrf_ble.h"
 #endif
 #include "app_ram_base.h"
 
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/gpio_api.c b/targets/TARGET_NORDIC/TARGET_NRF5/gpio_api.c
index 01ed6cdc98..ec73afa6a3 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/gpio_api.c
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/gpio_api.c
@@ -56,7 +56,7 @@ static gpio_cfg_t  m_gpio_cfg[GPIO_PIN_COUNT];
 
 static gpio_irq_handler m_irq_handler;
 static uint32_t m_channel_ids[GPIO_PIN_COUNT] = {0};
-static uint32_t m_gpio_irq_enabled;
+static gpio_mask_t m_gpio_irq_enabled;
 
 
 static void gpiote_irq_handler(nrf_drv_gpiote_pin_t pin, nrf_gpiote_polarity_t action)
@@ -90,6 +90,7 @@ void gpio_init(gpio_t *obj, PinName pin)
 }
 
 #ifdef TARGET_SDK11
+// implement polyfill of gpio hal for the nRF5 SDK v11
 __STATIC_INLINE uint32_t nrf_gpio_pin_out_read(uint32_t pin)
 {
     return (NRF_GPIO->OUTSET & (1UL << (pin)));
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/port_api.c b/targets/TARGET_NORDIC/TARGET_NRF5/port_api.c
index cc40994cb9..e8c57184a5 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/port_api.c
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/port_api.c
@@ -55,7 +55,7 @@ static NRF_GPIO_Type * const m_ports[] = GPIO_REG_LIST;
     #error not recognized gpio count for mcu
 #endif
 
-#define GPIO_PORT_COUNT (sizeof(m_gpio_pin_count)/sizeof(uint32_t))
+#define GPIO_PORT_COUNT (sizeof(m_gpio_pin_count)/sizeof(m_gpio_pin_count[0]))
 
 
 PinName port_pin(PortName port, int pin_n)
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/us_ticker.c b/targets/TARGET_NORDIC/TARGET_NRF5/us_ticker.c
index d170b03fcc..bde1be7473 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/us_ticker.c
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/us_ticker.c
@@ -139,10 +139,10 @@ void common_rtc_init(void)
     // energy efficient).
     nrf_rtc_int_enable(COMMON_RTC_INSTANCE,
 #if DEVICE_LOWPOWERTIMER
-                       LP_TICKER_INT_MASK |
+        LP_TICKER_INT_MASK |
 #endif
-                       US_TICKER_INT_MASK |
-                       NRF_RTC_INT_OVERFLOW_MASK);
+        US_TICKER_INT_MASK |
+        NRF_RTC_INT_OVERFLOW_MASK);
 
     // This event is enabled permanently, since overflow indications are needed
     // continuously.
@@ -150,20 +150,20 @@ void common_rtc_init(void)
     // All other relevant events are initially disabled.
     nrf_rtc_event_disable(COMMON_RTC_INSTANCE,
 #if defined(TARGET_MCU_NRF51822)
-                          OS_TICK_INT_MASK |
+        OS_TICK_INT_MASK |
 #endif
 #if DEVICE_LOWPOWERTIMER
-                          LP_TICKER_INT_MASK |
+        LP_TICKER_INT_MASK |
 #endif
-                          US_TICKER_INT_MASK);
+        US_TICKER_INT_MASK);
 
     nrf_drv_common_irq_enable(nrf_drv_get_IRQn(COMMON_RTC_INSTANCE),
 #ifdef NRF51
-                              APP_IRQ_PRIORITY_LOW
+        APP_IRQ_PRIORITY_LOW
 #elif defined(NRF52) || defined(NRF52840_XXAA)
-                              APP_IRQ_PRIORITY_LOWEST
+        APP_IRQ_PRIORITY_LOWEST
 #endif
-                             );
+        );
 
     nrf_rtc_task_trigger(COMMON_RTC_INSTANCE, NRF_RTC_TASK_START);
 
@@ -542,7 +542,7 @@ static void register_next_tick()
     // the RTC1 keeps running.
     // This code is very short 20-38 cycles in the worst case, it shouldn't
     // disturb softdevice.
-    core_util_critical_section_enter();
+    __disable_irq();
     uint32_t current_counter = nrf_rtc_counter_get(COMMON_RTC_INSTANCE);
 
     // If an overflow occur, set the next tick in COUNTER + delta clock cycles
@@ -553,7 +553,7 @@ static void register_next_tick()
     // Enable generation of the compare event for the value set above (this
     // event will trigger the interrupt).
     nrf_rtc_event_enable(COMMON_RTC_INSTANCE, OS_TICK_INT_MASK);
-    core_util_critical_section_exit();
+    __enable_irq();
 }
 
 /**