diff --git a/helpers/constants.ts b/helpers/constants.ts
index 9fa3e822..cbf1337f 100644
--- a/helpers/constants.ts
+++ b/helpers/constants.ts
@@ -73,8 +73,8 @@ export const MOCK_CHAINLINK_AGGREGATORS_PRICES = {
   xSUSHI: oneEther.multipliedBy('0.00913428586').toFixed(),
   USD: '5848466240000000',
   REW: oneEther.multipliedBy('0.00137893825230').toFixed(),
-  'a3CRV-gauge': '0',
-  'saCRV-gauge': '0',
+  a3CRVGauge: '0',
+  saCRVGauge: '0',
 };
 
 export const MOCK_CHAINLINK_AGGREGATORS_USD_CURVE_AMM_PRICES = {
@@ -87,8 +87,8 @@ export const MOCK_CHAINLINK_AGGREGATORS_USD_CURVE_AMM_PRICES = {
   USDC: oneUsd.toFixed(),
   USDT: oneUsd.toFixed(),
   USD: oneUsd.toFixed(),
-  'a3CRV-gauge': oneUsd.multipliedBy('1.0536').toFixed(),
-  'saCRV-gauge': oneUsd.multipliedBy('1.0318').toFixed(),
+  a3CRVGauge: oneUsd.multipliedBy('1.0536').toFixed(),
+  saCRVGauge: oneUsd.multipliedBy('1.0318').toFixed(),
 };
 
 export const CRV_TOKEN = {
diff --git a/helpers/types.ts b/helpers/types.ts
index d481f994..d9e00d21 100644
--- a/helpers/types.ts
+++ b/helpers/types.ts
@@ -244,8 +244,8 @@ export interface iAssetBase<T> {
   xSUSHI: T;
   STAKE: T;
   REW: T;
-  'a3CRV-gauge': T;
-  'saCRV-gauge': T;
+  a3CRVGauge: T;
+  saCRVGauge: T;
 }
 
 export type iAssetsWithoutETH<T> = Omit<iAssetBase<T>, 'ETH'>;
@@ -304,7 +304,7 @@ export type iLpPoolAssets<T> = Pick<
 
 export type iUsdLpPoolAssets<T> = Pick<
   iAssetsWithoutUSD<T>,
-  'WETH' | 'WBTC' | 'DAI' | 'SUSD' | 'USDC' | 'USDT' | 'a3CRV-gauge' | 'saCRV-gauge'
+  'DAI' | 'SUSD' | 'USDC' | 'USDT' | 'a3CRVGauge' | 'saCRVGauge'
 >;
 
 export type iMaticPoolAssets<T> = Pick<
diff --git a/markets/usd-amm/index.ts b/markets/usd-amm/index.ts
index 3d8193bf..05f6164a 100644
--- a/markets/usd-amm/index.ts
+++ b/markets/usd-amm/index.ts
@@ -25,7 +25,7 @@ export const AmmConfig: IUsdAmmConfiguration = {
   ATokenNamePrefix: 'Aave USD AMM Market',
   StableDebtTokenNamePrefix: 'Aave USD AMM Market stable debt',
   VariableDebtTokenNamePrefix: 'Aave USD AMM Market variable debt',
-  SymbolPrefix: 'usdAmm',
+  SymbolPrefix: 'UsdAmm',
   OracleQuoteCurrency: 'USD',
   OracleQuoteUnit: oneUsd.toString(),
   ProtocolGlobalParams: {
@@ -151,8 +151,8 @@ export const AmmConfig: IUsdAmmConfiguration = {
     [eEthereumNetwork.buidlerevm]: '',
     [eEthereumNetwork.kovan]: '0x8fb777d67e9945e2c01936e319057f9d41d559e6', // Need to re-deploy because of onlyOwner
     [eEthereumNetwork.ropsten]: ZERO_ADDRESS,
-    [eEthereumNetwork.main]: '', // Need to re-deploy due USD oracle
-    [eEthereumNetwork.tenderlyMain]: '',
+    [eEthereumNetwork.main]: '0x35ec8Af921Fd99aA2370D329AF2Ef6605469012c',
+    [eEthereumNetwork.tenderlyMain]: '0x35ec8Af921Fd99aA2370D329AF2Ef6605469012c',
   },
   FallbackOracle: {
     [eEthereumNetwork.coverage]: '',
@@ -170,24 +170,20 @@ export const AmmConfig: IUsdAmmConfiguration = {
     [eEthereumNetwork.kovan]: {},
     [eEthereumNetwork.ropsten]: {},
     [eEthereumNetwork.main]: {
-      WETH: '0x8A753747A1Fa494EC906cE90E9f37563A8AF630e',
-      WBTC: '0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c',
       DAI: '0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9',
       SUSD: '0xad35Bd71b9aFE6e4bDc266B345c198eaDEf9Ad94',
       USDC: '0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6',
       USDT: '0x3E7d1eAB13ad0104d2750B8863b489D65364e32D',
-      'a3CRV-gauge': ZERO_ADDRESS,
-      'saCRV-gauge': ZERO_ADDRESS,
+      a3CRVGauge: ZERO_ADDRESS,
+      saCRVGauge: ZERO_ADDRESS,
     },
     [eEthereumNetwork.tenderlyMain]: {
-      WETH: '0x8A753747A1Fa494EC906cE90E9f37563A8AF630e',
-      WBTC: '0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c',
       DAI: '0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9',
       SUSD: '0xad35Bd71b9aFE6e4bDc266B345c198eaDEf9Ad94',
       USDC: '0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6',
       USDT: '0x3E7d1eAB13ad0104d2750B8863b489D65364e32D',
-      'a3CRV-gauge': ZERO_ADDRESS,
-      'saCRV-gauge': ZERO_ADDRESS,
+      a3CRVGauge: ZERO_ADDRESS,
+      saCRVGauge: ZERO_ADDRESS,
     },
   },
   ATokenDomainSeparator: {
@@ -239,14 +235,12 @@ export const AmmConfig: IUsdAmmConfiguration = {
     [eEthereumNetwork.tenderlyMain]: '0xd784927Ff2f95ba542BfC824c8a8a98F3495f6b5',
   },
   ReservesConfig: {
-    WETH: strategyWETH,
-    WBTC: strategyWBTC,
     DAI: strategyDAI,
     SUSD: strategySUSD,
     USDC: strategyUSDC,
     USDT: strategyUSDT,
-    'a3CRV-gauge': strategyCurveLP,
-    'saCRV-gauge': strategyCurveLP,
+    a3CRVGauge: strategyCurveLP,
+    saCRVGauge: strategyCurveLP,
   },
   ReserveAssets: {
     [eEthereumNetwork.buidlerevm]: {},
@@ -255,24 +249,20 @@ export const AmmConfig: IUsdAmmConfiguration = {
     [eEthereumNetwork.ropsten]: {},
     [eEthereumNetwork.kovan]: {},
     [eEthereumNetwork.main]: {
-      WETH: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
-      WBTC: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
       DAI: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
       SUSD: '0x57Ab1ec28D129707052df4dF418D58a2D46d5f51',
       USDC: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
       USDT: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
-      'a3CRV-gauge': '0xd662908ADA2Ea1916B3318327A97eB18aD588b5d',
-      'saCRV-gauge': '0x462253b8F74B72304c145DB0e4Eebd326B22ca39',
+      a3CRVGauge: '0xd662908ADA2Ea1916B3318327A97eB18aD588b5d',
+      saCRVGauge: '0x462253b8F74B72304c145DB0e4Eebd326B22ca39',
     },
     [eEthereumNetwork.tenderlyMain]: {
-      WETH: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
-      WBTC: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
       DAI: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
       SUSD: '0x57Ab1ec28D129707052df4dF418D58a2D46d5f51',
       USDC: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
       USDT: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
-      'a3CRV-gauge': '0xd662908ADA2Ea1916B3318327A97eB18aD588b5d',
-      'saCRV-gauge': '0x462253b8F74B72304c145DB0e4Eebd326B22ca39',
+      a3CRVGauge: '0xd662908ADA2Ea1916B3318327A97eB18aD588b5d',
+      saCRVGauge: '0x462253b8F74B72304c145DB0e4Eebd326B22ca39',
     },
   },
 };
diff --git a/package-lock.json b/package-lock.json
index 6642f59e..ed0a6356 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14654,7 +14654,7 @@
               }
             },
             "ethereumjs-abi": {
-              "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#1a27c59c15ab1e95ee8e5c4ed6ad814c49cc439e",
+              "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#ee3994657fa7a427238e6ba92a84d0b529bbcde0",
               "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
               "dev": true,
               "requires": {
diff --git a/tasks/full/3_oracles.ts b/tasks/full/3_oracles.ts
index b3868250..a4f3f5c8 100644
--- a/tasks/full/3_oracles.ts
+++ b/tasks/full/3_oracles.ts
@@ -18,7 +18,7 @@ import {
   getLendingRateOracle,
   getPairsTokenAggregator,
 } from '../../helpers/contracts-getters';
-import { AaveOracle, LendingRateOracle } from '../../types';
+import { AaveOracle, AaveOracleV2, LendingRateOracle } from '../../types';
 
 task('full:deploy-oracles', 'Deploy oracles for dev enviroment')
   .addFlag('verify', 'Verify contracts at Etherscan')
@@ -53,7 +53,7 @@ task('full:deploy-oracles', 'Deploy oracles for dev enviroment')
         poolConfig.OracleQuoteCurrency
       );
 
-      let aaveOracle: AaveOracle;
+      let aaveOracle: AaveOracle | AaveOracleV2;
       let lendingRateOracle: LendingRateOracle;
 
       if (notFalsyOrZeroAddress(aaveOracleAddress)) {