diff --git a/contracts/misc/ChainlinkProxyPriceProvider.sol b/contracts/misc/AaveOracle.sol
similarity index 97%
rename from contracts/misc/ChainlinkProxyPriceProvider.sol
rename to contracts/misc/AaveOracle.sol
index f6516abc..91168d13 100644
--- a/contracts/misc/ChainlinkProxyPriceProvider.sol
+++ b/contracts/misc/AaveOracle.sol
@@ -8,14 +8,14 @@ import {IPriceOracleGetter} from '../interfaces/IPriceOracleGetter.sol';
 import {IChainlinkAggregator} from '../interfaces/IChainlinkAggregator.sol';
 import {SafeERC20} from '../dependencies/openzeppelin/contracts/SafeERC20.sol';
 
-/// @title ChainlinkProxyPriceProvider
+/// @title AaveOracle
 /// @author Aave
 /// @notice Proxy smart contract to get the price of an asset from a price source, with Chainlink Aggregator
 ///         smart contracts as primary option
 /// - If the returned price by a Chainlink aggregator is <= 0, the call is forwarded to a fallbackOracle
 /// - Owned by the Aave governance system, allowed to add sources for assets, replace them
 ///   and change the fallbackOracle
-contract ChainlinkProxyPriceProvider is IPriceOracleGetter, Ownable {
+contract AaveOracle is IPriceOracleGetter, Ownable {
   using SafeERC20 for IERC20;
 
   event WethSet(address indexed weth);
diff --git a/coverage.json b/coverage.json
index 2b521a35..f8cd9953 100644
--- a/coverage.json
+++ b/coverage.json
@@ -5565,7 +5565,7 @@
       }
     }
   },
-  "contracts/misc/ChainlinkProxyPriceProvider.sol": {
+  "contracts/misc/AaveOracle.sol": {
     "l": {
       "37": 3,
       "38": 3,
@@ -5591,7 +5591,7 @@
       "107": 0,
       "113": 0
     },
-    "path": "/src/contracts/misc/ChainlinkProxyPriceProvider.sol",
+    "path": "/src/contracts/misc/AaveOracle.sol",
     "s": {
       "1": 3,
       "2": 3,
diff --git a/helpers/contracts-deployments.ts b/helpers/contracts-deployments.ts
index 4bf686a7..aea69f41 100644
--- a/helpers/contracts-deployments.ts
+++ b/helpers/contracts-deployments.ts
@@ -21,7 +21,7 @@ import {
   AaveProtocolDataProviderFactory,
   ATokenFactory,
   ATokensAndRatesHelperFactory,
-  ChainlinkProxyPriceProviderFactory,
+  AaveOracleFactory,
   DefaultReserveInterestRateStrategyFactory,
   DelegationAwareATokenFactory,
   InitializableAdminUpgradeabilityProxyFactory,
@@ -199,13 +199,13 @@ export const deployMockAggregator = async (price: tStringTokenSmallUnits, verify
     verify
   );
 
-export const deployChainlinkProxyPriceProvider = async (
+export const deployAaveOracle = async (
   args: [tEthereumAddress[], tEthereumAddress[], tEthereumAddress, tEthereumAddress],
   verify?: boolean
 ) =>
   withSaveAndVerify(
-    await new ChainlinkProxyPriceProviderFactory(await getFirstSigner()).deploy(...args),
-    eContractid.ChainlinkProxyPriceProvider,
+    await new AaveOracleFactory(await getFirstSigner()).deploy(...args),
+    eContractid.AaveOracle,
     args,
     verify
   );
diff --git a/helpers/contracts-getters.ts b/helpers/contracts-getters.ts
index 791a9185..3c8752bf 100644
--- a/helpers/contracts-getters.ts
+++ b/helpers/contracts-getters.ts
@@ -2,7 +2,7 @@ import {
   AaveProtocolDataProviderFactory,
   ATokenFactory,
   ATokensAndRatesHelperFactory,
-  ChainlinkProxyPriceProviderFactory,
+  AaveOracleFactory,
   DefaultReserveInterestRateStrategyFactory,
   GenericLogicFactory,
   InitializableAdminUpgradeabilityProxyFactory,
@@ -324,9 +324,7 @@ export const getAddressById = async (id: string) =>
   (await getDb().get(`${id}.${DRE.network.name}`).value()).address;
 
 export const getChainlinkPriceProvider = async (address?: tEthereumAddress) =>
-  await ChainlinkProxyPriceProviderFactory.connect(
-    address ||
-      (await getDb().get(`${eContractid.ChainlinkProxyPriceProvider}.${DRE.network.name}`).value())
-        .address,
+  await AaveOracleFactory.connect(
+    address || (await getDb().get(`${eContractid.AaveOracle}.${DRE.network.name}`).value()).address,
     await getFirstSigner()
   );
diff --git a/helpers/types.ts b/helpers/types.ts
index a549a473..4c75ab6a 100644
--- a/helpers/types.ts
+++ b/helpers/types.ts
@@ -41,7 +41,7 @@ export enum eContractid {
   Proxy = 'Proxy',
   MockAggregator = 'MockAggregator',
   LendingRateOracle = 'LendingRateOracle',
-  ChainlinkProxyPriceProvider = 'ChainlinkProxyPriceProvider',
+  AaveOracle = 'AaveOracle',
   DefaultReserveInterestRateStrategy = 'DefaultReserveInterestRateStrategy',
   LendingPoolCollateralManager = 'LendingPoolCollateralManager',
   InitializableAdminUpgradeabilityProxy = 'InitializableAdminUpgradeabilityProxy',
@@ -391,7 +391,7 @@ export interface ICommonConfiguration {
   LendingRateOracleRatesCommon: iMultiPoolsAssets<IMarketRates>;
   LendingRateOracle: iParamsPerNetwork<tEthereumAddress>;
   TokenDistributor: iParamsPerNetwork<tEthereumAddress>;
-  ChainlinkProxyPriceProvider: iParamsPerNetwork<tEthereumAddress>;
+  AaveOracle: iParamsPerNetwork<tEthereumAddress>;
   FallbackOracle: iParamsPerNetwork<tEthereumAddress>;
   ChainlinkAggregator: iParamsPerNetwork<ITokenAddress>;
   PoolAdmin: iParamsPerNetwork<tEthereumAddress | undefined>;
diff --git a/markets/aave/commons.ts b/markets/aave/commons.ts
index 3186ccf6..ebeae617 100644
--- a/markets/aave/commons.ts
+++ b/markets/aave/commons.ts
@@ -180,7 +180,7 @@ export const CommonsConfig: ICommonConfiguration = {
     [EthereumNetwork.main]: '0xe3d9988f676457123c5fd01297605efdd0cba1ae',
     [EthereumNetwork.tenderlyMain]: '0xe3d9988f676457123c5fd01297605efdd0cba1ae',
   },
-  ChainlinkProxyPriceProvider: {
+  AaveOracle: {
     [eEthereumNetwork.coverage]: '',
     [eEthereumNetwork.hardhat]: '',
     [eEthereumNetwork.buidlerevm]: '',
diff --git a/package.json b/package.json
index 4a656381..a271d20f 100644
--- a/package.json
+++ b/package.json
@@ -29,10 +29,10 @@
     "test:main:check-list": "MAINNET_FORK=true TS_NODE_TRANSPILE_ONLY=1 hardhat test  test/__setup.spec.ts test/mainnet/check-list.spec.ts",
     "dev:coverage": "buidler compile --force && buidler coverage --network coverage",
     "aave:evm:dev:migration": "npm run compile && hardhat aave:dev",
-    "aave:docker:full:migration": "npm run compile && npm run hardhat:docker -- aave:full",
-    "aave:kovan:full:migration": "npm run compile && npm run hardhat:kovan -- aave:full --verify",
+    "aave:docker:full:migration": "npm run compile && npm run hardhat:docker -- aave:mainnet",
+    "aave:kovan:full:migration": "npm run compile && npm run hardhat:kovan -- aave:mainnet --verify",
     "aave:kovan:full:initialize": "npm run hardhat:kovan -- full:initialize-lending-pool --verify --pool Aave",
-    "aave:ropsten:full:migration": "npm run compile && npm run hardhat:ropsten -- aave:full --verify",
+    "aave:ropsten:full:migration": "npm run compile && npm run hardhat:ropsten -- aave:mainnet --verify",
     "aave:fork:main:tenderly": "npm run compile && npm run hardhat:tenderly-main -- aave:mainnet",
     "aave:fork:main": "MAINNET_FORK=true npm run compile && hardhat aave:mainnet",
     "aave:main:full:migration": "npm run hardhat:main -- aave:mainnet --verify",
diff --git a/tasks/dev/4_oracles.ts b/tasks/dev/4_oracles.ts
index c315491d..e95fdc3f 100644
--- a/tasks/dev/4_oracles.ts
+++ b/tasks/dev/4_oracles.ts
@@ -1,7 +1,7 @@
 import {task} from 'hardhat/config';
 import {
   deployPriceOracle,
-  deployChainlinkProxyPriceProvider,
+  deployAaveOracle,
   deployLendingRateOracle,
 } from '../../helpers/contracts-deployments';
 
@@ -58,7 +58,7 @@ task('dev:deploy-oracles', 'Deploy oracles for dev enviroment')
       allAggregatorsAddresses
     );
 
-    await deployChainlinkProxyPriceProvider(
+    await deployAaveOracle(
       [tokens, aggregators, fallbackOracle.address, await getWethAddress(poolConfig)],
       verify
     );
diff --git a/tasks/full/3_oracles.ts b/tasks/full/3_oracles.ts
index 16049d4b..4df4ffa7 100644
--- a/tasks/full/3_oracles.ts
+++ b/tasks/full/3_oracles.ts
@@ -1,9 +1,6 @@
 import {task} from 'hardhat/config';
 import {getEthersSignersAddresses, getParamPerNetwork} from '../../helpers/contracts-helpers';
-import {
-  deployChainlinkProxyPriceProvider,
-  deployLendingRateOracle,
-} from '../../helpers/contracts-deployments';
+import {deployAaveOracle, deployLendingRateOracle} from '../../helpers/contracts-deployments';
 import {setInitialMarketRatesInRatesOracleByHelper} from '../../helpers/oracles-helpers';
 import {ICommonConfiguration, eEthereumNetwork, SymbolMap} from '../../helpers/types';
 import {waitForTx, filterMapBy, notFalsyOrZeroAddress} from '../../helpers/misc-utils';
@@ -53,7 +50,7 @@ task('full:deploy-oracles', 'Deploy oracles for dev enviroment')
 
       const chainlinkProviderPriceProvider = notFalsyOrZeroAddress(proxyPriceProviderAddress)
         ? await getChainlinkPriceProvider(proxyPriceProviderAddress)
-        : await deployChainlinkProxyPriceProvider(
+        : await deployAaveOracle(
             [tokens, aggregators, fallbackOracleAddress, await getWethAddress(poolConfig)],
             verify
           );
diff --git a/test/__setup.spec.ts b/test/__setup.spec.ts
index 6d7dc9c5..beda3b98 100644
--- a/test/__setup.spec.ts
+++ b/test/__setup.spec.ts
@@ -12,7 +12,7 @@ import {
   deployLendingPoolConfigurator,
   deployLendingPool,
   deployPriceOracle,
-  deployChainlinkProxyPriceProvider,
+  deployAaveOracle,
   deployLendingPoolCollateralManager,
   deployMockFlashLoanReceiver,
   deployWalletBalancerProvider,
@@ -201,7 +201,7 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
 
   const [tokens, aggregators] = getPairsTokenAggregator(allTokenAddresses, allAggregatorsAddresses);
 
-  const chainlinkProxyPriceProvider = await deployChainlinkProxyPriceProvider([
+  const aaveOracle = await deployAaveOracle([
     tokens,
     aggregators,
     fallbackOracle.address,
diff --git a/test/helpers/make-suite.ts b/test/helpers/make-suite.ts
index ec4f5533..7612fce1 100644
--- a/test/helpers/make-suite.ts
+++ b/test/helpers/make-suite.ts
@@ -106,28 +106,22 @@ export async function initializeMakeSuite() {
 
   testEnv.helpersContract = await getAaveProtocolDataProvider();
 
-  console.log('het cpmtra');
   const allTokens = await testEnv.helpersContract.getAllATokens();
-  console.log('tokann');
   const aDaiAddress = allTokens.find((aToken) => aToken.symbol === 'aDAI')?.tokenAddress;
 
   const aWEthAddress = allTokens.find((aToken) => aToken.symbol === 'aWETH')?.tokenAddress;
 
-  console.log('priah');
   const reservesTokens = await testEnv.helpersContract.getAllReservesTokens();
 
-  console.log('all tokan');
   const daiAddress = reservesTokens.find((token) => token.symbol === 'DAI')?.tokenAddress;
   const usdcAddress = reservesTokens.find((token) => token.symbol === 'USDC')?.tokenAddress;
   const aaveAddress = reservesTokens.find((token) => token.symbol === 'AAVE')?.tokenAddress;
   const wethAddress = reservesTokens.find((token) => token.symbol === 'WETH')?.tokenAddress;
 
   if (!aDaiAddress || !aWEthAddress) {
-    console.log(`atoken-modifiers.spec: aTokens not correctly initialized`);
     process.exit(1);
   }
   if (!daiAddress || !usdcAddress || !aaveAddress || !wethAddress) {
-    console.log(`atoken-modifiers.spec: USDC or DAI not correctly initialized`);
     process.exit(1);
   }
 
@@ -139,7 +133,6 @@ export async function initializeMakeSuite() {
   testEnv.aave = await getMintableErc20(aaveAddress);
   testEnv.weth = await getWETHMocked(wethAddress);
   testEnv.wethGateway = await getWETHGateway();
-  console.log('laa');
 }
 
 export function makeSuite(name: string, tests: (testEnv: TestEnv) => void) {