diff --git a/features/FEATURE_BLE/ble/gap/Events.h b/features/FEATURE_BLE/ble/gap/Events.h
index c4db81e4ce..d01233acfd 100644
--- a/features/FEATURE_BLE/ble/gap/Events.h
+++ b/features/FEATURE_BLE/ble/gap/Events.h
@@ -491,7 +491,7 @@ struct ScanTimeoutEvent { };
  *
  * @see ble::Gap::EventHandler::onAdvertisingEnd().
  */
-struct AdvertisingEndEvent_t {
+struct AdvertisingEndEvent {
 #if !defined(DOXYGEN_ONLY)
     /** Create advertising end event.
      *
@@ -500,7 +500,7 @@ struct AdvertisingEndEvent_t {
      * @param completed_events Number of events created during before advertising end.
      * @param connected True if connection has been established.
      */
-    AdvertisingEndEvent_t(
+    AdvertisingEndEvent(
         advertising_handle_t advHandle,
         connection_handle_t connection,
         uint8_t completed_events,
@@ -548,7 +548,7 @@ private:
  *
  * @see ble::Gap::EventHandler::onScanRequestReceived().
  */
-struct ScanRequestEvent_t {
+struct ScanRequestEvent {
 #if !defined(DOXYGEN_ONLY)
     /** Create scan request event.
      *
@@ -556,7 +556,7 @@ struct ScanRequestEvent_t {
      * @param peerAddressType Peer address type.
      * @param peerAddress Peer address.
      */
-    ScanRequestEvent_t(
+    ScanRequestEvent(
         advertising_handle_t advHandle,
         const peer_address_type_t &peerAddressType,
         const address_t &peerAddress
diff --git a/features/FEATURE_BLE/ble/gap/Gap.h b/features/FEATURE_BLE/ble/gap/Gap.h
index b86fa0f6a5..73f99b5ecf 100644
--- a/features/FEATURE_BLE/ble/gap/Gap.h
+++ b/features/FEATURE_BLE/ble/gap/Gap.h
@@ -39,13 +39,13 @@ public:
          *
          * @param event Scan request event: @see ScanRequestEvent_t for details.
          */
-        virtual void onScanRequestReceived(const ScanRequestEvent_t &event) { }
+        virtual void onScanRequestReceived(const ScanRequestEvent &event) { }
 
         /** Called when advertising ends.
          *
          *  @param event Advertising end event: @see AdvertisingEndEvent_t for details.
          */
-        virtual void onAdvertisingEnd(const AdvertisingEndEvent_t &event) { }
+        virtual void onAdvertisingEnd(const AdvertisingEndEvent &event) { }
 
         /** Called when scanning reads an advertising packet during passive scan or receives
          *  a scan response during an active scan.
diff --git a/features/FEATURE_BLE/source/generic/GenericGap.cpp b/features/FEATURE_BLE/source/generic/GenericGap.cpp
index 107ff57d38..9aa61a0891 100644
--- a/features/FEATURE_BLE/source/generic/GenericGap.cpp
+++ b/features/FEATURE_BLE/source/generic/GenericGap.cpp
@@ -2430,7 +2430,7 @@ void GenericGap::on_advertising_set_terminated(
     }
 
     _eventHandler->onAdvertisingEnd(
-        AdvertisingEndEvent_t(
+        AdvertisingEndEvent(
             advertising_handle,
             connection_handle,
             number_of_completed_extended_advertising_events,
@@ -2450,7 +2450,7 @@ void GenericGap::on_scan_request_received(
     }
 
     _eventHandler->onScanRequestReceived(
-        ScanRequestEvent_t(
+        ScanRequestEvent(
             advertising_handle,
             (peer_address_type_t::type) scanner_address_type.value(),
             address