diff --git a/contracts/interfaces/IPoolAddressesProvider.sol b/contracts/interfaces/IPoolAddressesProvider.sol
index 245a67176..943735e8c 100644
--- a/contracts/interfaces/IPoolAddressesProvider.sol
+++ b/contracts/interfaces/IPoolAddressesProvider.sol
@@ -14,7 +14,7 @@ interface IPoolAddressesProvider {
   event ConfigurationAdminUpdated(address indexed newAddress);
   event EmergencyAdminUpdated(address indexed newAddress);
   event PoolConfiguratorUpdated(address indexed newAddress);
-  event LendingPoolCollateralManagerUpdated(address indexed newAddress);
+  event PoolCollateralManagerUpdated(address indexed newAddress);
   event PriceOracleUpdated(address indexed newAddress);
   event LendingRateOracleUpdated(address indexed newAddress);
   event ProxyCreated(bytes32 id, address indexed newAddress);
@@ -40,7 +40,7 @@ interface IPoolAddressesProvider {
 
   function getPoolCollateralManager() external view returns (address);
 
-  function setLendingPoolCollateralManager(address manager) external;
+  function setPoolCollateralManager(address manager) external;
 
   function getPoolAdmin() external view returns (address);
 
diff --git a/contracts/protocol/configuration/PoolAddressesProvider.sol b/contracts/protocol/configuration/PoolAddressesProvider.sol
index 81b02edab..e6806ce1a 100644
--- a/contracts/protocol/configuration/PoolAddressesProvider.sol
+++ b/contracts/protocol/configuration/PoolAddressesProvider.sol
@@ -136,9 +136,9 @@ contract PoolAddressesProvider is Ownable, IPoolAddressesProvider {
    * @dev Updates the address of the PoolCollateralManager
    * @param manager The new PoolCollateralManager address
    **/
-  function setLendingPoolCollateralManager(address manager) external override onlyOwner {
+  function setPoolCollateralManager(address manager) external override onlyOwner {
     _addresses[POOL_COLLATERAL_MANAGER] = manager;
-    emit LendingPoolCollateralManagerUpdated(manager);
+    emit PoolCollateralManagerUpdated(manager);
   }
 
   /**
diff --git a/tasks/dev/5_initialize.ts b/tasks/dev/5_initialize.ts
index 9f36c6b98..af018aeb8 100644
--- a/tasks/dev/5_initialize.ts
+++ b/tasks/dev/5_initialize.ts
@@ -74,7 +74,7 @@ task('dev:initialize-pool', 'Initialize pool configuration.')
 
     const collateralManager = await deployPoolCollateralManager(verify);
     await waitForTx(
-      await addressesProvider.setLendingPoolCollateralManager(collateralManager.address)
+      await addressesProvider.setPoolCollateralManager(collateralManager.address)
     );
 
     const mockFlashLoanReceiver = await deployMockFlashLoanReceiver(
diff --git a/tasks/full/6-initialize.ts b/tasks/full/6-initialize.ts
index 1a09a9c77..63920fd82 100644
--- a/tasks/full/6-initialize.ts
+++ b/tasks/full/6-initialize.ts
@@ -85,7 +85,7 @@ task('full:initialize-pool', 'Initialize pool configuration.')
         collateralManagerAddress
       );
       await waitForTx(
-        await addressesProvider.setLendingPoolCollateralManager(collateralManagerAddress)
+        await addressesProvider.setPoolCollateralManager(collateralManagerAddress)
       );
 
       console.log(
diff --git a/test-suites/test-aave/__setup.spec.ts b/test-suites/test-aave/__setup.spec.ts
index 915bfea4c..350afcf4e 100644
--- a/test-suites/test-aave/__setup.spec.ts
+++ b/test-suites/test-aave/__setup.spec.ts
@@ -271,7 +271,7 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
 
   const collateralManager = await deployPoolCollateralManager();
   await waitForTx(
-    await addressesProvider.setLendingPoolCollateralManager(collateralManager.address)
+    await addressesProvider.setPoolCollateralManager(collateralManager.address)
   );
   await deployMockFlashLoanReceiver(addressesProvider.address);
 
diff --git a/test-suites/test-aave/pool-addresses-provider.spec.ts b/test-suites/test-aave/pool-addresses-provider.spec.ts
index bf4d1d23e..1c50e53de 100644
--- a/test-suites/test-aave/pool-addresses-provider.spec.ts
+++ b/test-suites/test-aave/pool-addresses-provider.spec.ts
@@ -21,7 +21,7 @@ makeSuite('PoolAddressesProvider', (testEnv: TestEnv) => {
       addressesProvider.setMarketId,
       addressesProvider.setPoolImpl,
       addressesProvider.setPoolConfiguratorImpl,
-      addressesProvider.setLendingPoolCollateralManager,
+      addressesProvider.setPoolCollateralManager,
       addressesProvider.setPoolAdmin,
       addressesProvider.setPriceOracle,
       addressesProvider.setLendingRateOracle,
diff --git a/test-suites/test-amm/__setup.spec.ts b/test-suites/test-amm/__setup.spec.ts
index f200ef930..5c1d5fa75 100644
--- a/test-suites/test-amm/__setup.spec.ts
+++ b/test-suites/test-amm/__setup.spec.ts
@@ -264,7 +264,7 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
 
   const collateralManager = await deployPoolCollateralManager();
   await waitForTx(
-    await addressesProvider.setLendingPoolCollateralManager(collateralManager.address)
+    await addressesProvider.setPoolCollateralManager(collateralManager.address)
   );
   await deployMockFlashLoanReceiver(addressesProvider.address);
 
diff --git a/test-suites/test-amm/pool-addresses-provider.spec.ts b/test-suites/test-amm/pool-addresses-provider.spec.ts
index bf4d1d23e..1c50e53de 100644
--- a/test-suites/test-amm/pool-addresses-provider.spec.ts
+++ b/test-suites/test-amm/pool-addresses-provider.spec.ts
@@ -21,7 +21,7 @@ makeSuite('PoolAddressesProvider', (testEnv: TestEnv) => {
       addressesProvider.setMarketId,
       addressesProvider.setPoolImpl,
       addressesProvider.setPoolConfiguratorImpl,
-      addressesProvider.setLendingPoolCollateralManager,
+      addressesProvider.setPoolCollateralManager,
       addressesProvider.setPoolAdmin,
       addressesProvider.setPriceOracle,
       addressesProvider.setLendingRateOracle,