diff --git a/public/BLEDevice.h b/public/BLEDevice.h
index bac82ca..3cbf84d 100644
--- a/public/BLEDevice.h
+++ b/public/BLEDevice.h
@@ -56,13 +56,13 @@ public:
      * Set the BTLE MAC address and type.
      * @return BLE_ERROR_NONE on success.
      */
-    ble_error_t setAddress(Gap::addr_type_t type, const Gap::address_t address);
+    ble_error_t setAddress(Gap::AddressType_t type, const Gap::address_t address);
 
     /**
      * Fetch the BTLE MAC address and type.
      * @return BLE_ERROR_NONE on success.
      */
-    ble_error_t getAddress(Gap::addr_type_t *typeP, Gap::address_t address);
+    ble_error_t getAddress(Gap::AddressType_t *typeP, Gap::address_t address);
 
     /**
      * @param[in] advType
@@ -649,13 +649,13 @@ BLEDevice::shutdown(void)
 }
 
 inline ble_error_t
-BLEDevice::setAddress(Gap::addr_type_t type, const Gap::address_t address)
+BLEDevice::setAddress(Gap::AddressType_t type, const Gap::address_t address)
 {
     return transport->getGap().setAddress(type, address);
 }
 
 inline ble_error_t
-BLEDevice::getAddress(Gap::addr_type_t *typeP, Gap::address_t address)
+BLEDevice::getAddress(Gap::AddressType_t *typeP, Gap::address_t address)
 {
     return transport->getGap().getAddress(typeP, address);
 }
diff --git a/public/Gap.h b/public/Gap.h
index e56e20f..00805b4 100644
--- a/public/Gap.h
+++ b/public/Gap.h
@@ -142,8 +142,8 @@ public:
 
     typedef void (*EventCallback_t)(void);
     typedef void (*ConnectionEventCallback_t)(Handle_t,
-                                              addr_type_t peerAddrType, const Address_t peerAddr,
-                                              addr_type_t ownAddrType,  const Address_t ownAddr,
+                                              AddressType_t peerAddrType, const Address_t peerAddr,
+                                              AddressType_t ownAddrType,  const Address_t ownAddr,
                                               const ConnectionParams_t *);
     typedef void (*HandleSpecificEvent_t)(Handle_t handle);
     typedef void (*DisconnectionEventCallback_t)(Handle_t, DisconnectionReason_t);
@@ -167,8 +167,8 @@ public:
 
 private:
     /* These functions must be defined in the sub-class */
-    virtual ble_error_t setAddress(addr_type_t type,   const Address_t address)                    = 0;
-    virtual ble_error_t getAddress(addr_type_t *typeP, Address_t address)                          = 0;
+    virtual ble_error_t setAddress(AddressType_t type,   const Address_t address)                    = 0;
+    virtual ble_error_t getAddress(AddressType_t *typeP, Address_t address)                          = 0;
     virtual ble_error_t setAdvertisingData(const GapAdvertisingData &, const GapAdvertisingData &) = 0;
     virtual ble_error_t startAdvertising(const GapAdvertisingParams &)                             = 0;
     virtual ble_error_t stopAdvertising(void)                                                      = 0;
@@ -299,7 +299,7 @@ protected:
     }
 
 public:
-    void processConnectionEvent(Handle_t handle, addr_type_t peerAddrType, const Address_t peerAddr, addr_type_t ownAddrType, const Address_t ownAddr, const ConnectionParams_t *params) {
+    void processConnectionEvent(Handle_t handle, AddressType_t peerAddrType, const Address_t peerAddr, AddressType_t ownAddrType, const Address_t ownAddr, const ConnectionParams_t *params) {
         state.connected = 1;
         if (onConnection) {
             onConnection(handle, peerAddrType, peerAddr, ownAddrType, ownAddr, params);