diff --git a/src/components/TradeRouting/index.tsx b/src/components/TradeRouting/index.tsx
index 4b95a5261b..a6e611f465 100644
--- a/src/components/TradeRouting/index.tsx
+++ b/src/components/TradeRouting/index.tsx
@@ -74,7 +74,7 @@ const RouteRow = ({ route, chainId, backgroundColor }: RouteRowProps) => {
                         const dex = getDexInfoByPool(pool, allDexes)
                         const poolId = pool.id.split('-')?.[0]
                         const link = (i => {
-                          // TODO: Dungz remove condition
+                          // TODO: viet-nv remove condition
                           return isAddress(chainId, poolId) && !['1inch', 'paraswap', '0x'].includes(pool.exchange) ? (
                             <StyledExchange
                               key={`${i}-${pool.id}`}
diff --git a/src/constants/permit.ts b/src/constants/permit.ts
index 752a27f274..891e6b48b8 100644
--- a/src/constants/permit.ts
+++ b/src/constants/permit.ts
@@ -17,7 +17,7 @@ export const PERMITTABLE_TOKENS: {
   }
 } = {
   [ChainId.MAINNET]: {
-    // '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48': { type: PermitType.SALT, version: '1' }, // USDC // TODO: Diep will check these tokens later
+    // '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48': { type: PermitType.SALT, version: '1' }, // USDC // TODO: viet-nv will check these tokens later
     // '0x6B175474E89094C44Da98b954EedeAC495271d0F': { type: PermitType.SALT, version: '1' }, // DAI
     '0xba100000625a3754423978a60c9317c58a424e3D': { type: PermitType.AMOUNT, version: '1' }, // BAL
     '0xC18360217D8F7Ab5e7c516566761Ea12Ce7F9D72': { type: PermitType.AMOUNT, version: '1' }, // ENS
diff --git a/src/hooks/useChainsConfig.ts b/src/hooks/useChainsConfig.ts
index 686398bb76..1ee40edce3 100644
--- a/src/hooks/useChainsConfig.ts
+++ b/src/hooks/useChainsConfig.ts
@@ -16,7 +16,7 @@ export enum ChainState {
 export type ChainStateMap = { [chain in ChainId]: ChainState }
 
 const cacheInfo: { [chain: string]: NetworkInfo } = {}
-// todo danh, when chain setting from admin ready, update all place use this
+// todo viet-nv, when chain setting from admin ready, update all place use this
 export const NETWORKS_INFO = new Proxy(NETWORKS_INFO_HARDCODE, {
   get(target, p) {
     const prop = p as any as ChainId
diff --git a/src/services/coingecko.ts b/src/services/coingecko.ts
index 6ed6458bb6..704cd9b598 100644
--- a/src/services/coingecko.ts
+++ b/src/services/coingecko.ts
@@ -63,7 +63,7 @@ const coingeckoApi = createApi({
   }),
 })
 
-// todo danh (not for now) move basic chart api to this file
+// todo viet-nv (now) move basic chart api to this file
 export const { useGetMarketTokenInfoQuery, useGetLiquidityMarketsQuery, useGetSecurityTokenInfoQuery } = coingeckoApi
 
 export default coingeckoApi
diff --git a/src/state/farms/classic/knUpdater.tsx b/src/state/farms/classic/knUpdater.tsx
index c767c2b598..7a4f16d69d 100644
--- a/src/state/farms/classic/knUpdater.tsx
+++ b/src/state/farms/classic/knUpdater.tsx
@@ -41,7 +41,7 @@ const KNUpdater = ({ isInterval = true }: { isInterval?: boolean }) => {
             //     : farmPool.version === 2
             //     ? FairLaunchVersion.V2
             //     : FairLaunchVersion.V3
-            // todo namgold: subgraph issue, revert this later
+            // todo viet-nv: subgraph issue, revert this later
             const version: FairLaunchVersion =
               Number(farmPool.start) < 1_000_000_000 ? FairLaunchVersion.V1 : FairLaunchVersion.V2
             const rewardTokens: Token[] = farmPool.rewardTokens.map(({ id, decimals, symbol, name }) =>
diff --git a/src/state/pools/hooks.ts b/src/state/pools/hooks.ts
index 7694657542..6eac354ac7 100644
--- a/src/state/pools/hooks.ts
+++ b/src/state/pools/hooks.ts
@@ -215,7 +215,7 @@ async function getBulkPoolDataWithPagination(
         current.data.pools.map(async (pool: any) => {
           let data = { ...pool }
           const oneDayHistory = oneDayData?.[pool.id]
-          // TODO nguyenhuudungz: If number of pools > 1000 then uncomment this.
+          // TODO viet-nv: If number of pools > 1000 then uncomment this.
           // if (!oneDayHistory) {
           //   const newData = await apolloClient.query({
           //     query: POOL_DATA(pool.id, b1),