diff --git a/features/FEATURE_BLE/ble/gap/Types.h b/features/FEATURE_BLE/ble/gap/Types.h
index de3066cc7c..148c626d42 100644
--- a/features/FEATURE_BLE/ble/gap/Types.h
+++ b/features/FEATURE_BLE/ble/gap/Types.h
@@ -415,12 +415,15 @@ struct own_address_type_t : SafeEnum<own_address_type_t, uint8_t> {
     own_address_type_t(type value) : SafeEnum(value) { }
 };
 
-struct target_peer_address_type_t : ble::SafeEnum<target_peer_address_type_t, uint8_t> {
+struct target_peer_address_type_t : SafeEnum<target_peer_address_type_t, uint8_t> {
     enum type {
-        PUBLIC = 0, /**< Public Device Address or Public Identity Address. */
-        RANDOM      /**< Random Device Address or Random (static) Identity Address. */
+        PUBLIC = 0x00, /**< Public Device Address or Public Identity Address. */
+        PUBLIC_ADDRESS = 0x00,
+
+        RANDOM = 0x01, /**< Random Device Address or Random (static) Identity Address. */
+        RANDOM_ADDRESS = 0x01
     };
-    target_peer_address_type_t(type value) : ble::SafeEnum<target_peer_address_type_t, uint8_t>(value) { }
+    target_peer_address_type_t(type value) : SafeEnum(value) { }
 };
 
 /**
diff --git a/features/FEATURE_BLE/ble/pal/GapTypes.h b/features/FEATURE_BLE/ble/pal/GapTypes.h
index aaf9b2f280..68f754c9e3 100644
--- a/features/FEATURE_BLE/ble/pal/GapTypes.h
+++ b/features/FEATURE_BLE/ble/pal/GapTypes.h
@@ -28,31 +28,7 @@ typedef ble::advertising_type_t advertising_type_t;
 
 typedef ble::own_address_type_t own_address_type_t;
 
-
-/**
- * Type modeling the peer address type during direct advertising.
- */
-struct advertising_peer_address_type_t :
-    SafeEnum<advertising_peer_address_type_t, uint8_t> {
-    enum type {
-        /**
-         * Public device address or identity address.
-         */
-        PUBLIC_ADDRESS = 0x00,
-
-        /**
-         * Random device address or random (static) identity address.
-         */
-        RANDOM_ADDRESS = 0x01
-    };
-
-    /**
-     * Construct a new instance of advertising_peer_address_type_t.
-     */
-    advertising_peer_address_type_t(type value) :
-        SafeEnum<advertising_peer_address_type_t, uint8_t>(value) { }
-};
-
+typedef ble::target_peer_address_type_t advertising_peer_address_type_t;
 
 /**
  * Peer address type used during connection initiating.
diff --git a/features/FEATURE_BLE/source/generic/GenericGap.cpp b/features/FEATURE_BLE/source/generic/GenericGap.cpp
index 57cf57eb56..ce73789bdc 100644
--- a/features/FEATURE_BLE/source/generic/GenericGap.cpp
+++ b/features/FEATURE_BLE/source/generic/GenericGap.cpp
@@ -1763,7 +1763,7 @@ ble_error_t GenericGap::setAdvertisingParameters(
             params.getMaxPrimaryInterval().value(),
             params.getType(),
             params.getOwnAddressType(),
-            (pal::advertising_peer_address_type_t::type) params.getPeerAddressType().value(),
+            params.getPeerAddressType(),
             params.getPeerAddress(),
             channel_map,
             params.getPolicyMode()
@@ -1800,7 +1800,7 @@ ble_error_t GenericGap::setExtendedAdvertisingParameters(
         params.getMaxPrimaryInterval().value(),
         channel_map,
         params.getOwnAddressType(),
-        (pal::advertising_peer_address_type_t::type) params.getPeerAddressType().value(),
+        params.getPeerAddressType(),
         params.getPeerAddress(),
         params.getPolicyMode(),
         params.getTxPower(),