diff --git a/helpers/types.ts b/helpers/types.ts
index 9c15dd13..664e3e62 100644
--- a/helpers/types.ts
+++ b/helpers/types.ts
@@ -215,13 +215,8 @@ export interface iAssetBase<T> {
   USD: T;
   REN: T;
   ENJ: T;
-  UNI_WETH: T;
-  UNI_WBTC: T;
-  UNI_DAI: T;
-  UNI_USDC: T;
-  UNI_USDT: T;
-  UNI_WETHDAI: T;
-  UNI_WETHWBTC: T;
+  WETHDAI: T;
+  WETHWBTC: T;
 }
 
 export type iAssetsWithoutETH<T> = Omit<iAssetBase<T>, 'ETH'>;
@@ -254,13 +249,13 @@ export type iAavePoolAssets<T> = Pick<
 
 export type iUniswapPoolAssets<T> = Pick<
   iAssetsWithoutUSD<T>,
-  | 'UNI_DAI'
-  | 'UNI_USDC'
-  | 'UNI_USDT'
-  | 'UNI_WBTC'
-  | 'UNI_WETH'
-  | 'UNI_WETHDAI'
-  | 'UNI_WETHWBTC'
+  | 'DAI'
+  | 'USDC'
+  | 'USDT'
+  | 'WBTC'
+  | 'WETH'
+  | 'WETHDAI'
+  | 'WETHWBTC'
 >;
 
 export type iMultiPoolsAssets<T> = iAssetCommon<T> | iAavePoolAssets<T>;
@@ -291,13 +286,8 @@ export enum TokenContractId {
   YFI = 'YFI',
   UNI = 'UNI',
   ENJ = 'ENJ',
-  UNI_WETH = 'WETH',
-  UNI_WBTC = 'WBTC',
-  UNI_DAI = 'DAI',
-  UNI_USDC = 'USDC',
-  UNI_USDT = 'USDT',
-  UNI_WETHDAI = 'WETHDAI',
-  UNI_WETHWBTC = 'WETHWBTC',
+  WETHDAI = 'WETHDAI',
+  WETHWBTC = 'WETHWBTC',
 }
 
 export interface IReserveParams extends IReserveBorrowParams, IReserveCollateralParams {
diff --git a/markets/aave/commons.ts b/markets/aave/commons.ts
index e059c961..fecd714f 100644
--- a/markets/aave/commons.ts
+++ b/markets/aave/commons.ts
@@ -23,13 +23,8 @@ const MOCK_CHAINLINK_AGGREGATORS_PRICES = {
   WBTC: oneEther.multipliedBy('47.332685').toFixed(),
   YFI: oneEther.multipliedBy('22.407436').toFixed(),
   ZRX: oneEther.multipliedBy('0.001151').toFixed(),
-  UNI_WETH:oneEther.toFixed(),
-  UNI_WBTC: oneEther.multipliedBy('47.332685').toFixed(),
-  UNI_DAI: oneEther.multipliedBy('0.00369068412860').toFixed(),
-  UNI_USDC: oneEther.multipliedBy('0.00367714136416').toFixed(),
-  UNI_USDT: oneEther.multipliedBy('0.00369068412860').toFixed(),
-  UNI_WETHDAI: oneEther.multipliedBy('22.407436').toFixed(),
-  UNI_WETHWBTC: oneEther.multipliedBy('22.407436').toFixed(),
+  WETHDAI: oneEther.multipliedBy('22.407436').toFixed(),
+  WETHWBTC: oneEther.multipliedBy('22.407436').toFixed(),
   USD: '5848466240000000',
 };
 // ----------------
diff --git a/markets/uniswap/commons.ts b/markets/uniswap/commons.ts
index c12b4570..660a210a 100644
--- a/markets/uniswap/commons.ts
+++ b/markets/uniswap/commons.ts
@@ -23,13 +23,8 @@ const MOCK_CHAINLINK_AGGREGATORS_PRICES = {
   WBTC: oneEther.multipliedBy('47.332685').toFixed(),
   YFI: oneEther.multipliedBy('22.407436').toFixed(),
   ZRX: oneEther.multipliedBy('0.001151').toFixed(),
-  UNI_WETH:oneEther.toFixed(),
-  UNI_WBTC: oneEther.multipliedBy('47.332685').toFixed(),
-  UNI_DAI: oneEther.multipliedBy('0.00369068412860').toFixed(),
-  UNI_USDC: oneEther.multipliedBy('0.00367714136416').toFixed(),
-  UNI_USDT: oneEther.multipliedBy('0.00369068412860').toFixed(),
-  UNI_WETHDAI: oneEther.multipliedBy('22.407436').toFixed(),
-  UNI_WETHWBTC: oneEther.multipliedBy('22.407436').toFixed(),
+  WETHDAI: oneEther.multipliedBy('22.407436').toFixed(),
+  WETHWBTC: oneEther.multipliedBy('22.407436').toFixed(),
   USD: '5848466240000000',
 };
 // ----------------
@@ -59,25 +54,25 @@ export const CommonsConfig: ICommonConfiguration = {
   },
   // TODO: reorg alphabetically, checking the reason of tests failing
   LendingRateOracleRatesCommon: {
-    UNI_WETH: {
+    WETH: {
       borrowRate: oneRay.multipliedBy(0.03).toFixed(),
     },
-    UNI_DAI: {
+    DAI: {
       borrowRate: oneRay.multipliedBy(0.039).toFixed(),
     },
-    UNI_USDC: {
+    USDC: {
       borrowRate: oneRay.multipliedBy(0.039).toFixed(),
     },
-    UNI_USDT: {
+    USDT: {
       borrowRate: oneRay.multipliedBy(0.035).toFixed(),
     },
-    UNI_WBTC: {
+    WBTC: {
       borrowRate: oneRay.multipliedBy(0.03).toFixed(),
     },
-    UNI_WETHDAI: {
+    WETHDAI: {
       borrowRate: oneRay.multipliedBy(0.05).toFixed(),
     },
-    UNI_WETHWBTC: {
+    WETHWBTC: {
       borrowRate: oneRay.multipliedBy(0.05).toFixed(),
     },
   },
diff --git a/markets/uniswap/index.ts b/markets/uniswap/index.ts
index d92518df..37daa4af 100644
--- a/markets/uniswap/index.ts
+++ b/markets/uniswap/index.ts
@@ -21,13 +21,13 @@ export const UniswapConfig: IUniswapConfiguration = {
   MarketId: 'Uniswap V2 market',
   ProviderId: 2,
   ReservesConfig: {
-    UNI_DAI: strategyDAI,
-    UNI_USDC: strategyUSDC,
-    UNI_USDT: strategyUSDT,
-    UNI_WBTC: strategyWBTC,
-    UNI_WETH: strategyWETH,
-    UNI_WETHDAI: strategyWETHDAI,
-    UNI_WETHWBTC: strategyWETHWBTC
+    DAI: strategyDAI,
+    USDC: strategyUSDC,
+    USDT: strategyUSDT,
+    WBTC: strategyWBTC,
+    WETH: strategyWETH,
+    WETHDAI: strategyWETHDAI,
+    WETHWBTC: strategyWETHWBTC
   },
   ReserveAssets: {
     [eEthereumNetwork.buidlerevm]: {},