diff --git a/features/FEATURE_BLE/ble/pal/GapTypes.h b/features/FEATURE_BLE/ble/pal/GapTypes.h
index b769ca2edf..b8262e2fc5 100644
--- a/features/FEATURE_BLE/ble/pal/GapTypes.h
+++ b/features/FEATURE_BLE/ble/pal/GapTypes.h
@@ -998,7 +998,7 @@ struct clock_accuracy_t : SafeEnum<clock_accuracy_t, uint8_t >{
      *
      * @return Parts per million as a number.
      */
-    uint16_t getPpm() {
+    uint16_t get_ppm() {
         uint16_t ppm = 0;
 
         switch(value()) {
diff --git a/features/FEATURE_BLE/source/generic/GenericGap.cpp b/features/FEATURE_BLE/source/generic/GenericGap.cpp
index c09eeae1b8..b10e212eba 100644
--- a/features/FEATURE_BLE/source/generic/GenericGap.cpp
+++ b/features/FEATURE_BLE/source/generic/GenericGap.cpp
@@ -1571,24 +1571,24 @@ void GenericGap::update_random_address()
                 );
             }
         }
-    } else {
-        ble::address_t address;
-
-        if (!getUnresolvableRandomAddress(address)) {
-            return;
-        }
-
-        ble_error_t err = _pal_gap.set_random_address(
-            address
-        );
-
-        if (err) {
-            return;
-        }
-
-        _address_type = LegacyAddressType::RANDOM_PRIVATE_NON_RESOLVABLE;
-        _address = address;
     }
+
+    ble::address_t address;
+
+    if (!getUnresolvableRandomAddress(address)) {
+        return;
+    }
+
+    ble_error_t err = _pal_gap.set_random_address(
+        address
+    );
+
+    if (err) {
+        return;
+    }
+
+    _address_type = LegacyAddressType::RANDOM_PRIVATE_NON_RESOLVABLE;
+    _address = address;
 }
 
 bool GenericGap::getUnresolvableRandomAddress(ble::address_t& address) {
@@ -2189,7 +2189,7 @@ void GenericGap::on_enhanced_connection_complete(
             connection_interval * 1250,
             connection_latency,
             supervision_timeout * 10,
-            master_clock_accuracy.getPpm()
+            master_clock_accuracy.get_ppm()
         };
 
         _eventHandler->onConnectionComplete(event);