diff --git a/src/apps/idle/ethereum/idle.vault.contract-position-fetcher.ts b/src/apps/idle/ethereum/idle.best-yield.contract-position-fetcher.ts
similarity index 83%
rename from src/apps/idle/ethereum/idle.vault.contract-position-fetcher.ts
rename to src/apps/idle/ethereum/idle.best-yield.contract-position-fetcher.ts
index 241123190..897bca658 100644
--- a/src/apps/idle/ethereum/idle.vault.contract-position-fetcher.ts
+++ b/src/apps/idle/ethereum/idle.best-yield.contract-position-fetcher.ts
@@ -4,8 +4,8 @@ import _ from 'lodash';
 import { APP_TOOLKIT, IAppToolkit } from '~app-toolkit/app-toolkit.interface';
 import { PositionTemplate } from '~app-toolkit/decorators/position-template.decorator';
 import { getLabelFromToken } from '~app-toolkit/helpers/presentation/image.present';
+import { DefaultDataProps } from '~position/display.interface';
 import { MetaType } from '~position/position.interface';
-import { DefaultAppTokenDataProps } from '~position/template/app-token.template.types';
 import { ContractPositionTemplatePositionFetcher } from '~position/template/contract-position.template.position-fetcher';
 import {
   GetDisplayPropsParams,
@@ -15,18 +15,18 @@ import {
 
 import { IdleContractFactory, IdleToken } from '../contracts';
 
-export type IdleVaultTokenDefinition = {
+export type IdleBestYieldTokenDefinition = {
   address: string;
   rewardTokenAddresses: string[];
 };
 
 @PositionTemplate()
-export class EthereumIdleVaultContractPositionFetcher extends ContractPositionTemplatePositionFetcher<
+export class EthereumIdleBestYieldContractPositionFetcher extends ContractPositionTemplatePositionFetcher<
   IdleToken,
-  DefaultAppTokenDataProps,
-  IdleVaultTokenDefinition
+  DefaultDataProps,
+  IdleBestYieldTokenDefinition
 > {
-  groupLabel = 'Vault';
+  groupLabel = 'Best Yield';
 
   constructor(
     @Inject(APP_TOOLKIT) protected readonly appToolkit: IAppToolkit,
@@ -39,15 +39,15 @@ export class EthereumIdleVaultContractPositionFetcher extends ContractPositionTe
     return this.contractFactory.idleToken({ address, network: this.network });
   }
 
-  async getDefinitions(): Promise<IdleVaultTokenDefinition[]> {
+  async getDefinitions(): Promise<IdleBestYieldTokenDefinition[]> {
     const multicall = this.appToolkit.getMulticall(this.network);
     const appTokens = await this.appToolkit.getAppTokenPositions({
       appId: this.appId,
-      groupIds: [this.groupId],
+      groupIds: ['vault'],
       network: this.network,
     });
 
-    const vaultDefinitions = await Promise.all(
+    const definitions = await Promise.all(
       appTokens.map(async appToken => {
         const idleTokenContract = this.contractFactory.idleToken({ address: appToken.address, network: this.network });
         const isRiskAdjusted = await multicall.wrap(idleTokenContract).isRiskAdjusted();
@@ -62,10 +62,10 @@ export class EthereumIdleVaultContractPositionFetcher extends ContractPositionTe
       }),
     );
 
-    return _.compact(vaultDefinitions);
+    return _.compact(definitions);
   }
 
-  async getTokenDefinitions({ definition }: GetTokenDefinitionsParams<IdleToken, IdleVaultTokenDefinition>) {
+  async getTokenDefinitions({ definition }: GetTokenDefinitionsParams<IdleToken, IdleBestYieldTokenDefinition>) {
     return [
       {
         metaType: MetaType.SUPPLIED,
diff --git a/src/apps/idle/ethereum/idle.junior-tranche.token-fetcher.ts b/src/apps/idle/ethereum/idle.junior-tranche.token-fetcher.ts
index b85b6eb90..e08f9f1bd 100644
--- a/src/apps/idle/ethereum/idle.junior-tranche.token-fetcher.ts
+++ b/src/apps/idle/ethereum/idle.junior-tranche.token-fetcher.ts
@@ -2,12 +2,6 @@ import { PositionTemplate } from '~app-toolkit/decorators/position-template.deco
 
 import { EthereumIdleTranchesPoolTokenFetcher } from '../common/idle.tranche.token-fetcher';
 
-export type IdleAppTokenDefinition = {
-  address: string;
-  cdoAddress: string;
-  underlyingTokenAddress: string;
-};
-
 @PositionTemplate()
 export class EthereumIdleJuniorTranchesPoolTokenFetcher extends EthereumIdleTranchesPoolTokenFetcher {
   groupLabel = 'Junior Tranches';
diff --git a/src/apps/idle/ethereum/idle.senior-tranche.token-fetcher.ts b/src/apps/idle/ethereum/idle.senior-tranche.token-fetcher.ts
index a2caaeffd..2eb45e61a 100644
--- a/src/apps/idle/ethereum/idle.senior-tranche.token-fetcher.ts
+++ b/src/apps/idle/ethereum/idle.senior-tranche.token-fetcher.ts
@@ -2,12 +2,6 @@ import { PositionTemplate } from '~app-toolkit/decorators/position-template.deco
 
 import { EthereumIdleTranchesPoolTokenFetcher } from '../common/idle.tranche.token-fetcher';
 
-export type IdleAppTokenDefinition = {
-  address: string;
-  cdoAddress: string;
-  underlyingTokenAddress: string;
-};
-
 @PositionTemplate()
 export class EthereumIdleSeniorTranchesPoolTokenFetcher extends EthereumIdleTranchesPoolTokenFetcher {
   groupLabel = 'Senior Tranches';
diff --git a/src/apps/idle/idle.module.ts b/src/apps/idle/idle.module.ts
index c2963bd41..f1d65eed1 100644
--- a/src/apps/idle/idle.module.ts
+++ b/src/apps/idle/idle.module.ts
@@ -4,16 +4,16 @@ import { AbstractApp } from '~app/app.dynamic-module';
 
 import { IdleTranchesDefinitionsResolver } from './common/idle.tranche.token-definitions-resolver';
 import { IdleContractFactory } from './contracts';
+import { EthereumIdleBestYieldContractPositionFetcher } from './ethereum/idle.best-yield.contract-position-fetcher';
 import { EthereumIdleJuniorTranchesPoolTokenFetcher } from './ethereum/idle.junior-tranche.token-fetcher';
 import { EthereumIdleSeniorTranchesPoolTokenFetcher } from './ethereum/idle.senior-tranche.token-fetcher';
-import { EthereumIdleVaultContractPositionFetcher } from './ethereum/idle.vault.contract-position-fetcher';
 import { EthereumIdleVaultTokenFetcher } from './ethereum/idle.vault.token-fetcher';
 
 @Module({
   providers: [
     IdleContractFactory,
     IdleTranchesDefinitionsResolver,
-    EthereumIdleVaultContractPositionFetcher,
+    EthereumIdleBestYieldContractPositionFetcher,
     EthereumIdleVaultTokenFetcher,
     EthereumIdleJuniorTranchesPoolTokenFetcher,
     EthereumIdleSeniorTranchesPoolTokenFetcher,