diff --git a/lib/aave-address-book b/lib/aave-address-book
index 8edb87440..e65e63cec 160000
--- a/lib/aave-address-book
+++ b/lib/aave-address-book
@@ -1 +1 @@
-Subproject commit 8edb874407adffc6e288d5b3869ed1421a2b7743
+Subproject commit e65e63cec1dd61e7a21ed0db34795a708577a503
diff --git a/scripts/AaveV3ConfigEngine.s.sol b/scripts/AaveV3ConfigEngine.s.sol
index fa69d383d..6de18f756 100644
--- a/scripts/AaveV3ConfigEngine.s.sol
+++ b/scripts/AaveV3ConfigEngine.s.sol
@@ -6,7 +6,7 @@ import {AaveV3ConfigEngine as Engine} from '../src/v3-config-engine/AaveV3Config
 import {IAaveV3ConfigEngine as IEngine} from '../src/v3-config-engine/IAaveV3ConfigEngine.sol';
 import {IV3RateStrategyFactory} from '../src/v3-config-engine/IV3RateStrategyFactory.sol';
 import {AaveV3Ethereum} from 'aave-address-book/AaveV3Ethereum.sol';
-import {AaveV3Bnb} from 'aave-address-book/AaveV3Bnb.sol';
+import {AaveV3BNB} from 'aave-address-book/AaveV3BNB.sol';
 import {AaveV3Optimism} from 'aave-address-book/AaveV3Optimism.sol';
 import {AaveV3Arbitrum} from 'aave-address-book/AaveV3Arbitrum.sol';
 import {AaveV3Polygon} from 'aave-address-book/AaveV3Polygon.sol';
@@ -298,20 +298,20 @@ library DeployEngineBnbLib {
       capsEngine: Create2Utils._create2Deploy('v1', type(CapsEngine).creationCode)
     });
     IEngine.EngineConstants memory engineConstants = IEngine.EngineConstants({
-      pool: AaveV3Bnb.POOL,
-      poolConfigurator: AaveV3Bnb.POOL_CONFIGURATOR,
-      ratesStrategyFactory: IV3RateStrategyFactory(AaveV3Bnb.RATES_FACTORY),
-      oracle: AaveV3Bnb.ORACLE,
-      rewardsController: AaveV3Bnb.DEFAULT_INCENTIVES_CONTROLLER,
-      collector: address(AaveV3Bnb.COLLECTOR)
+      pool: AaveV3BNB.POOL,
+      poolConfigurator: AaveV3BNB.POOL_CONFIGURATOR,
+      ratesStrategyFactory: IV3RateStrategyFactory(AaveV3BNB.RATES_FACTORY),
+      oracle: AaveV3BNB.ORACLE,
+      rewardsController: AaveV3BNB.DEFAULT_INCENTIVES_CONTROLLER,
+      collector: address(AaveV3BNB.COLLECTOR)
     });
 
     return
       address(
         new Engine(
-          AaveV3Bnb.DEFAULT_A_TOKEN_IMPL_REV_1,
-          AaveV3Bnb.DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1,
-          AaveV3Bnb.DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1,
+          AaveV3BNB.DEFAULT_A_TOKEN_IMPL_REV_1,
+          AaveV3BNB.DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1,
+          AaveV3BNB.DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1,
           engineConstants,
           engineLibraries
         )
diff --git a/scripts/FreezingStewards.s.sol b/scripts/FreezingStewards.s.sol
index adc618363..8ae86dcec 100644
--- a/scripts/FreezingStewards.s.sol
+++ b/scripts/FreezingStewards.s.sol
@@ -3,23 +3,17 @@ pragma solidity ^0.8.0;
 
 import '../src/ScriptUtils.sol';
 import {FreezingSteward} from '../src/riskstewards/FreezingSteward.sol';
-import {AaveV3Bnb} from 'aave-address-book/AaveV3Bnb.sol';
+import {AaveV3BNB} from 'aave-address-book/AaveV3BNB.sol';
 import {AaveV3Gnosis} from 'aave-address-book/AaveV3Gnosis.sol';
 
 contract DeployGno is GnosisScript {
   function run() external broadcast {
-    new FreezingSteward(
-      AaveV3Gnosis.ACL_MANAGER,
-      AaveV3Gnosis.POOL_CONFIGURATOR
-    );
+    new FreezingSteward(AaveV3Gnosis.ACL_MANAGER, AaveV3Gnosis.POOL_CONFIGURATOR);
   }
 }
 
 contract DeployBnb is BNBScript {
   function run() external broadcast {
-    new FreezingSteward(
-      AaveV3Bnb.ACL_MANAGER,
-      AaveV3Bnb.POOL_CONFIGURATOR
-    );
+    new FreezingSteward(AaveV3BNB.ACL_MANAGER, AaveV3BNB.POOL_CONFIGURATOR);
   }
 }
diff --git a/scripts/RiskStewards.s.sol b/scripts/RiskStewards.s.sol
index 4bc89bb64..201fcb6c9 100644
--- a/scripts/RiskStewards.s.sol
+++ b/scripts/RiskStewards.s.sol
@@ -12,7 +12,7 @@ import {AaveV3Arbitrum} from 'aave-address-book/AaveV3Arbitrum.sol';
 import {AaveV3Optimism} from 'aave-address-book/AaveV3Optimism.sol';
 import {AaveV3Base} from 'aave-address-book/AaveV3Base.sol';
 import {AaveV3Gnosis} from 'aave-address-book/AaveV3Gnosis.sol';
-import {AaveV3Bnb} from 'aave-address-book/AaveV3Bnb.sol';
+import {AaveV3BNB} from 'aave-address-book/AaveV3BNB.sol';
 
 contract DeployEth is EthereumScript {
   function run() external broadcast {
@@ -94,12 +94,12 @@ contract DeployGno is GnosisScript {
   }
 }
 
-contract DeployBnb is BNBScript {
+contract DeployBNB is BNBScript {
   function run() external broadcast {
     new CapsPlusRiskSteward(
-      AaveV3Bnb.AAVE_PROTOCOL_DATA_PROVIDER,
-      IAaveV3ConfigEngine(AaveV3Bnb.CONFIG_ENGINE),
+      AaveV3BNB.AAVE_PROTOCOL_DATA_PROVIDER,
+      IAaveV3ConfigEngine(AaveV3BNB.CONFIG_ENGINE),
       0x126dc589cc75f17385dD95516F3F1788d862E7bc
     );
   }
-}
\ No newline at end of file
+}
diff --git a/scripts/V3RateStrategyFactory.s.sol b/scripts/V3RateStrategyFactory.s.sol
index 22560e8be..14cc07c3e 100644
--- a/scripts/V3RateStrategyFactory.s.sol
+++ b/scripts/V3RateStrategyFactory.s.sol
@@ -21,7 +21,7 @@ import {AaveV3Avalanche} from 'aave-address-book/AaveV3Avalanche.sol';
 import {AaveV3Metis} from 'aave-address-book/AaveV3Metis.sol';
 import {AaveV3Base} from 'aave-address-book/AaveV3Base.sol';
 import {AaveV3Gnosis} from 'aave-address-book/AaveV3Gnosis.sol';
-import {AaveV3Bnb} from 'aave-address-book/AaveV3Bnb.sol';
+import {AaveV3BNB} from 'aave-address-book/AaveV3BNB.sol';
 import {ITransparentProxyFactory} from 'solidity-utils/contracts/transparent-proxy/interfaces/ITransparentProxyFactory.sol';
 import {V3RateStrategyFactory} from '../src/v3-config-engine/V3RateStrategyFactory.sol';
 
@@ -175,7 +175,7 @@ library DeployRatesFactoryBnbLib {
   function deploy() internal returns (address, address[] memory) {
     return
       DeployRatesFactoryLib._createAndSetupRatesFactory(
-        AaveV3Bnb.POOL_ADDRESSES_PROVIDER,
+        AaveV3BNB.POOL_ADDRESSES_PROVIDER,
         MiscBNB.TRANSPARENT_PROXY_FACTORY,
         MiscBNB.PROXY_ADMIN
       );
diff --git a/src/v3-config-engine/AaveV3PayloadBnb.sol b/src/v3-config-engine/AaveV3PayloadBnb.sol
index 1627a4504..e7d1b948b 100644
--- a/src/v3-config-engine/AaveV3PayloadBnb.sol
+++ b/src/v3-config-engine/AaveV3PayloadBnb.sol
@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {AaveV3Bnb} from 'aave-address-book/AaveV3Bnb.sol';
+import {AaveV3BNB} from 'aave-address-book/AaveV3BNB.sol';
 import './AaveV3Payload.sol';
 
 /**
  * @dev Base smart contract for an Aave v3.0.2 (compatible with 3.0.0) listing on v3 Bnb.
  * @author BGD Labs
  */
-abstract contract AaveV3PayloadBnb is AaveV3Payload(IEngine(AaveV3Bnb.CONFIG_ENGINE)) {
+abstract contract AaveV3PayloadBnb is AaveV3Payload(IEngine(AaveV3BNB.CONFIG_ENGINE)) {
   function getPoolContext() public pure override returns (IEngine.PoolContext memory) {
     return IEngine.PoolContext({networkName: 'BNB Smart Chain', networkAbbreviation: 'Bnb'});
   }