diff --git a/packages/portfolio/src/adapters/dullahan-api/api-maker.test.ts b/packages/portfolio/src/adapters/dullahan-api/api-maker.test.ts
index 1ce61ece09..48a510cdab 100644
--- a/packages/portfolio/src/adapters/dullahan-api/api-maker.test.ts
+++ b/packages/portfolio/src/adapters/dullahan-api/api-maker.test.ts
@@ -54,7 +54,7 @@ describe('portfolioApiMaker', () => {
     mockRequest.mockResolvedValue({
       tag: 'right',
       value: {
-        status: 200,
+        status: Api.HttpStatusCode.Ok,
         data: {},
       },
     })
@@ -154,7 +154,7 @@ describe('portfolioApiMaker', () => {
     mockRequest.mockResolvedValue({
       tag: 'right',
       value: {
-        status: 200,
+        status: Api.HttpStatusCode.Ok,
         data: {
           ['wrong']: [200, 'data'],
         },
@@ -272,7 +272,7 @@ describe('portfolioApiMaker', () => {
       },
     })
 
-    const resultTokenActivityUpdates = await api.tokenActivity(
+    const resultTokenActivity = await api.tokenActivity(
       tokenActivityMocks.api.request,
       Portfolio.Token.ActivityWindow.OneDay,
     )
@@ -289,7 +289,7 @@ describe('portfolioApiMaker', () => {
       },
     })
 
-    expect(resultTokenActivityUpdates).toEqual({
+    expect(resultTokenActivity).toEqual({
       tag: 'left',
       error: {
         status: -3,
@@ -331,7 +331,7 @@ describe('portfolioApiMaker', () => {
     mockRequest.mockResolvedValue({
       tag: 'left',
       value: {
-        status: 500,
+        status: Api.HttpStatusCode.InternalServerError,
         message: 'Internal Server Error',
         responseData: {},
       },
@@ -352,7 +352,7 @@ describe('portfolioApiMaker', () => {
     await expect(api.tokenInfos(mockTokenIdsWithCache)).resolves.toEqual({
       tag: 'left',
       value: {
-        status: 500,
+        status: Api.HttpStatusCode.InternalServerError,
         message: 'Internal Server Error',
         responseData: {},
       },
@@ -373,7 +373,7 @@ describe('portfolioApiMaker', () => {
     ).resolves.toEqual({
       tag: 'left',
       value: {
-        status: 500,
+        status: Api.HttpStatusCode.InternalServerError,
         message: 'Internal Server Error',
         responseData: {},
       },
@@ -396,7 +396,7 @@ describe('portfolioApiMaker', () => {
     ).resolves.toEqual({
       tag: 'left',
       value: {
-        status: 500,
+        status: Api.HttpStatusCode.InternalServerError,
         message: 'Internal Server Error',
         responseData: {},
       },
@@ -419,7 +419,7 @@ describe('portfolioApiMaker', () => {
     ).resolves.toEqual({
       tag: 'left',
       value: {
-        status: 500,
+        status: Api.HttpStatusCode.InternalServerError,
         message: 'Internal Server Error',
         responseData: {},
       },
@@ -445,7 +445,7 @@ describe('portfolioApiMaker', () => {
     ).resolves.toEqual({
       tag: 'left',
       value: {
-        status: 500,
+        status: Api.HttpStatusCode.InternalServerError,
         message: 'Internal Server Error',
         responseData: {},
       },
@@ -471,7 +471,7 @@ describe('portfolioApiMaker', () => {
     ).resolves.toEqual({
       tag: 'left',
       value: {
-        status: 500,
+        status: Api.HttpStatusCode.InternalServerError,
         message: 'Internal Server Error',
         responseData: {},
       },
@@ -492,7 +492,7 @@ describe('portfolioApiMaker', () => {
     mockRequest.mockResolvedValue({
       tag: 'right',
       value: {
-        status: 200,
+        status: Api.HttpStatusCode.Ok,
         data: tokenMocks.nftCryptoKitty.traits,
       },
     })
@@ -519,7 +519,7 @@ describe('portfolioApiMaker', () => {
     expect(result).toEqual({
       tag: 'right',
       value: {
-        status: 200,
+        status: Api.HttpStatusCode.Ok,
         data: tokenMocks.nftCryptoKitty.traits,
       },
     })
@@ -529,7 +529,7 @@ describe('portfolioApiMaker', () => {
     mockRequest.mockResolvedValue({
       tag: 'right',
       value: {
-        status: 200,
+        status: Api.HttpStatusCode.Ok,
         data: tokenMocks.nftCryptoKitty.info,
       },
     })
@@ -556,7 +556,7 @@ describe('portfolioApiMaker', () => {
     expect(result).toEqual({
       tag: 'right',
       value: {
-        status: 200,
+        status: Api.HttpStatusCode.Ok,
         data: tokenMocks.nftCryptoKitty.info,
       },
     })
@@ -593,7 +593,7 @@ describe('portfolioApiMaker', () => {
     expect(result).toEqual({
       tag: 'right',
       value: {
-        status: 200,
+        status: Api.HttpStatusCode.Ok,
         data: tokenActivityMocks.api.responseDataOnly,
       },
     })
@@ -628,7 +628,7 @@ describe('portfolioApiMaker', () => {
     expect(result).toEqual({
       tag: 'right',
       value: {
-        status: 200,
+        status: Api.HttpStatusCode.Ok,
         data: tokenHistoryMocks.api.responseDataOnly,
       },
     })
@@ -638,7 +638,7 @@ describe('portfolioApiMaker', () => {
     mockRequest.mockResolvedValue({
       tag: 'right',
       value: {
-        status: 200,
+        status: Api.HttpStatusCode.Ok,
         data: 0,
       },
     })
@@ -678,7 +678,7 @@ describe('portfolioApiMaker', () => {
     mockRequest.mockResolvedValue({
       tag: 'right',
       value: {
-        status: 200,
+        status: Api.HttpStatusCode.Ok,
         data: {
           ...tokenDiscoveryMocks.nftCryptoKitty,
           supply: undefined,
@@ -706,7 +706,7 @@ describe('portfolioApiMaker', () => {
     mockRequest.mockResolvedValue({
       tag: 'right',
       value: {
-        status: 200,
+        status: Api.HttpStatusCode.Ok,
         data: tokenDiscoveryMocks.nftCryptoKitty,
       },
     })
@@ -717,7 +717,7 @@ describe('portfolioApiMaker', () => {
     expect(right).toEqual({
       tag: 'right',
       value: {
-        status: 200,
+        status: Api.HttpStatusCode.Ok,
         data: tokenDiscoveryMocks.nftCryptoKitty,
       },
     })
@@ -727,7 +727,7 @@ describe('portfolioApiMaker', () => {
     mockRequest.mockResolvedValue({
       tag: 'right',
       value: {
-        status: 200,
+        status: Api.HttpStatusCode.Ok,
         data: {},
       },
     })
diff --git a/packages/portfolio/src/adapters/dullahan-api/api-maker.ts b/packages/portfolio/src/adapters/dullahan-api/api-maker.ts
index 32325b7fb7..a101999e22 100644
--- a/packages/portfolio/src/adapters/dullahan-api/api-maker.ts
+++ b/packages/portfolio/src/adapters/dullahan-api/api-maker.ts
@@ -13,8 +13,8 @@ import {
   toDullahanRequest,
   toProcessedMediaRequest,
   toSecondaryTokenInfos,
-  toTokenActivityUpdates,
-  toTokenHistoryUpdates,
+  toTokenActivity,
+  toTokenHistory,
 } from './transformers'
 import {
   DullahanApiCachedIdsRequest,
@@ -269,7 +269,7 @@ export const portfolioApiMaker = ({
           return firstError
 
         try {
-          const transformedResponseData = toTokenActivityUpdates(activities)
+          const transformedResponseData = toTokenActivity(activities)
 
           const transformedResponse: Api.Response<Portfolio.Api.TokenActivityResponse> =
             freeze(
@@ -311,8 +311,9 @@ export const portfolioApiMaker = ({
         })
 
         if (isRight(response)) {
-          const history: Portfolio.Token.History | undefined =
-            toTokenHistoryUpdates(response.value.data)
+          const history: Portfolio.Token.History | undefined = toTokenHistory(
+            response.value.data,
+          )
 
           if (!history) {
             return freeze(
diff --git a/packages/portfolio/src/adapters/dullahan-api/token-activity.mocks.ts b/packages/portfolio/src/adapters/dullahan-api/token-activity.mocks.ts
index 930c6851a1..7e24eaf861 100644
--- a/packages/portfolio/src/adapters/dullahan-api/token-activity.mocks.ts
+++ b/packages/portfolio/src/adapters/dullahan-api/token-activity.mocks.ts
@@ -53,7 +53,7 @@ const apiResponseSuccessDataOnly: Readonly<DullahanApiTokenActivityResponse> = {
   [tokenInfoMocks.ftNameless.id]: [Api.HttpStatusCode.Ok, ftNameless],
 }
 
-export const duallahanTokenActivityUpdatesMocks = {
+export const duallahanTokenActivityMocks = {
   primaryETH,
   rnftWhatever,
   ftNoTicker,
diff --git a/packages/portfolio/src/adapters/dullahan-api/transformers.test.ts b/packages/portfolio/src/adapters/dullahan-api/transformers.test.ts
index b0935dd1e5..52498eeb42 100644
--- a/packages/portfolio/src/adapters/dullahan-api/transformers.test.ts
+++ b/packages/portfolio/src/adapters/dullahan-api/transformers.test.ts
@@ -2,8 +2,8 @@ import {
   toDullahanRequest,
   toProcessedMediaRequest,
   toSecondaryTokenInfos,
-  toTokenActivityUpdates,
-  toTokenHistoryUpdates,
+  toTokenActivity,
+  toTokenHistory,
 } from './transformers'
 import {Portfolio, Api} from '@yoroi/types'
 
@@ -13,7 +13,7 @@ import {
   DullahanApiTokenHistoryResponse,
 } from './types'
 import {tokenActivityMocks} from '../token-activity.mocks'
-import {duallahanTokenActivityUpdatesMocks} from './token-activity.mocks'
+import {duallahanTokenActivityMocks} from './token-activity.mocks'
 import {tokenHistoryMocks} from '../token-history.mocks'
 
 describe('transformers', () => {
@@ -112,36 +112,36 @@ describe('transformers', () => {
     })
   })
 
-  describe('toTokenActivityUpdates', () => {
-    it('should return an empty object if apiTokenActivityUpdates response is empty', () => {
+  describe('toTokenActivity', () => {
+    it('should return an empty object if apiTokenActivity response is empty', () => {
       const apiTokenInfosResponse: DullahanApiTokenActivityResponse = {}
 
-      expect(toTokenActivityUpdates(apiTokenInfosResponse)).toEqual({})
+      expect(toTokenActivity(apiTokenInfosResponse)).toEqual({})
     })
 
     it('should return the data and deal with empty records', () => {
       const responseWithEmptyRecords = {
-        ...duallahanTokenActivityUpdatesMocks.api.responseSuccessDataOnly,
+        ...duallahanTokenActivityMocks.api.responseSuccessDataOnly,
         'token.4': undefined,
         'token.5': [Api.HttpStatusCode.InternalServerError, 'Not found'],
       } as any
-      const result = toTokenActivityUpdates(responseWithEmptyRecords)
+      const result = toTokenActivity(responseWithEmptyRecords)
 
       expect(result).toEqual(tokenActivityMocks.api.responseDataOnly)
     })
   })
 
-  describe('toTokenHistoryUpdates', () => {
+  describe('toTokenHistory', () => {
     it('should return undefined if apiTokenHistory response is malformed', () => {
       expect(
-        toTokenHistoryUpdates({
+        toTokenHistory({
           whatever: false,
         } as unknown as DullahanApiTokenHistoryResponse),
       ).toEqual(undefined)
     })
 
     it('should return the data', () => {
-      const result = toTokenHistoryUpdates(
+      const result = toTokenHistory(
         tokenHistoryMocks.ftNamelessRaw as unknown as DullahanApiTokenHistoryResponse,
       )
 
diff --git a/packages/portfolio/src/adapters/dullahan-api/transformers.ts b/packages/portfolio/src/adapters/dullahan-api/transformers.ts
index 19fed25ed0..421793948c 100644
--- a/packages/portfolio/src/adapters/dullahan-api/transformers.ts
+++ b/packages/portfolio/src/adapters/dullahan-api/transformers.ts
@@ -50,13 +50,11 @@ export const toSecondaryTokenInfos = (
   )
 }
 
-export const toTokenActivityUpdates = (
+export const toTokenActivity = (
   apiTokenActivityResponse: Readonly<DullahanApiTokenActivityResponse>,
 ) => {
-  const tokenActivityUpdates: Record<
-    Portfolio.Token.Id,
-    Portfolio.Token.Activity
-  > = {}
+  const toTokenActivity: Record<Portfolio.Token.Id, Portfolio.Token.Activity> =
+    {}
 
   return freeze(
     Object.entries(apiTokenActivityResponse).reduce(
@@ -84,13 +82,13 @@ export const toTokenActivityUpdates = (
 
         return acc
       },
-      tokenActivityUpdates,
+      toTokenActivity,
     ),
     true,
   )
 }
 
-export const toTokenHistoryUpdates = (
+export const toTokenHistory = (
   apiTokenHistoryResponse: Readonly<DullahanApiTokenHistoryResponse>,
 ) => {
   if (!TokenHistoryResponseSchema.safeParse(apiTokenHistoryResponse).success)
diff --git a/packages/portfolio/src/adapters/token-activity.mocks.ts b/packages/portfolio/src/adapters/token-activity.mocks.ts
index 10c8d5e2ce..ac5e72d044 100644
--- a/packages/portfolio/src/adapters/token-activity.mocks.ts
+++ b/packages/portfolio/src/adapters/token-activity.mocks.ts
@@ -2,7 +2,7 @@ import {Api, Portfolio} from '@yoroi/types'
 import {freeze} from 'immer'
 import {BigNumber} from 'bignumber.js'
 import {tokenInfoMocks} from './token-info.mocks'
-import {duallahanTokenActivityUpdatesMocks} from './dullahan-api/token-activity.mocks'
+import {duallahanTokenActivityMocks} from './dullahan-api/token-activity.mocks'
 
 const primaryETH: Portfolio.Token.Activity = {
   price: {
@@ -58,16 +58,14 @@ const apiResponseSuccessDataOnly = {
 const apiResponseTokenActivity: Readonly<
   Record<
     'success' | 'error',
-    Api.Response<
-      typeof duallahanTokenActivityUpdatesMocks.api.responseSuccessDataOnly
-    >
+    Api.Response<typeof duallahanTokenActivityMocks.api.responseSuccessDataOnly>
   >
 > = {
   success: {
     tag: 'right',
     value: {
       status: 200,
-      data: duallahanTokenActivityUpdatesMocks.api.responseSuccessDataOnly,
+      data: duallahanTokenActivityMocks.api.responseSuccessDataOnly,
     },
   },
   error: {