diff --git a/packages/shared/lib/core/layer-2/actions/getLayer2MetadataForTransfer.ts b/packages/shared/lib/core/layer-2/actions/getLayer2MetadataForTransfer.ts
index bff909237a..e1cbf0e93a 100644
--- a/packages/shared/lib/core/layer-2/actions/getLayer2MetadataForTransfer.ts
+++ b/packages/shared/lib/core/layer-2/actions/getLayer2MetadataForTransfer.ts
@@ -6,6 +6,7 @@ import { newTransactionDetails, NewTransactionType, selectedAccountAssets } from
 import { Converter } from '@core/utils'
 import {
     ACCOUNTS_CONTRACT,
+    Allowance,
     EMPTY_BUFFER,
     EMPTY_BUFFER_BYTE_LENGTH,
     ENDING_SIGNAL_BYTE,
@@ -13,9 +14,8 @@ import {
     EXTERNALLY_OWNED_ACCOUNT_TYPE_ID,
     FORCE_OPEN_ACCOUNT,
     GAS_BUDGET,
-    SET_ALLOWANCE,
     TRANSFER_ALLOWANCE,
-} from '@core/layer-2/constants'
+} from '@core/layer-2'
 
 export function getLayer2MetadataForTransfer(layer2Address: string): string {
     const metadataStream = new WriteStream()
@@ -72,7 +72,7 @@ function encodeAllowance(): Uint8Array {
 
     const transactionDetails = get(newTransactionDetails)
     if (transactionDetails.type === NewTransactionType.TokenTransfer) {
-        allowance.writeUInt8('encodedAllowance', SET_ALLOWANCE)
+        allowance.writeUInt8('encodedAllowance', Allowance.NotSet)
 
         const { asset, surplus, rawAmount } = transactionDetails
         if (asset === get(selectedAccountAssets).baseCoin) {
diff --git a/packages/shared/lib/core/layer-2/constants/accounts-contract.constant.ts b/packages/shared/lib/core/layer-2/constants/accounts-contract.constant.ts
new file mode 100644
index 0000000000..87600ce13b
--- /dev/null
+++ b/packages/shared/lib/core/layer-2/constants/accounts-contract.constant.ts
@@ -0,0 +1,2 @@
+// first 4 bytes of the hash of accounts contract name
+export const ACCOUNTS_CONTRACT = 0x3c4b5e02
diff --git a/packages/shared/lib/core/layer-2/constants/contract-function-hash.constant.ts b/packages/shared/lib/core/layer-2/constants/contract-function-hash.constant.ts
deleted file mode 100644
index 078b0d54eb..0000000000
--- a/packages/shared/lib/core/layer-2/constants/contract-function-hash.constant.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const TRANSFER_ALLOWANCE = 0x23f4e3a1
diff --git a/packages/shared/lib/core/layer-2/constants/empty-buffer.constant.ts b/packages/shared/lib/core/layer-2/constants/empty-buffer.constants.ts
similarity index 100%
rename from packages/shared/lib/core/layer-2/constants/empty-buffer.constant.ts
rename to packages/shared/lib/core/layer-2/constants/empty-buffer.constants.ts
diff --git a/packages/shared/lib/core/layer-2/constants/address-type-id.constant.ts b/packages/shared/lib/core/layer-2/constants/externally-owned-account-type-id.constant.ts
similarity index 100%
rename from packages/shared/lib/core/layer-2/constants/address-type-id.constant.ts
rename to packages/shared/lib/core/layer-2/constants/externally-owned-account-type-id.constant.ts
diff --git a/packages/shared/lib/core/layer-2/constants/sender-contract-hash.constant.ts b/packages/shared/lib/core/layer-2/constants/externally-owned-account.constant.ts
similarity index 100%
rename from packages/shared/lib/core/layer-2/constants/sender-contract-hash.constant.ts
rename to packages/shared/lib/core/layer-2/constants/externally-owned-account.constant.ts
diff --git a/packages/shared/lib/core/layer-2/constants/open-account.constant.ts b/packages/shared/lib/core/layer-2/constants/force-open-account.constant.ts
similarity index 100%
rename from packages/shared/lib/core/layer-2/constants/open-account.constant.ts
rename to packages/shared/lib/core/layer-2/constants/force-open-account.constant.ts
diff --git a/packages/shared/lib/core/layer-2/constants/index.ts b/packages/shared/lib/core/layer-2/constants/index.ts
index 50ec2280cb..0779f987d5 100644
--- a/packages/shared/lib/core/layer-2/constants/index.ts
+++ b/packages/shared/lib/core/layer-2/constants/index.ts
@@ -1,10 +1,9 @@
-export * from './address-type-id.constant'
-export * from './contract-function-hash.constant'
-export * from './empty-buffer.constant'
+export * from './externally-owned-account-type-id.constant'
+export * from './transfer-allowance.constant'
+export * from './empty-buffer.constants'
 export * from './gas-budget.constant'
 export * from './network-address.constant'
-export * from './open-account.constant'
-export * from './sender-contract-hash.constant'
-export * from './set-allowance.constant'
+export * from './force-open-account.constant'
+export * from './externally-owned-account.constant'
 export * from './signal-bytes.constant'
-export * from './target-contract-hash.constant'
+export * from './accounts-contract.constant'
diff --git a/packages/shared/lib/core/layer-2/constants/set-allowance.constant.ts b/packages/shared/lib/core/layer-2/constants/set-allowance.constant.ts
deleted file mode 100644
index 61d714dcee..0000000000
--- a/packages/shared/lib/core/layer-2/constants/set-allowance.constant.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export const SET_ALLOWANCE = 0
-export const NO_ALLOWANCE_SET = 255
diff --git a/packages/shared/lib/core/layer-2/constants/target-contract-hash.constant.ts b/packages/shared/lib/core/layer-2/constants/target-contract-hash.constant.ts
deleted file mode 100644
index 017049c8ca..0000000000
--- a/packages/shared/lib/core/layer-2/constants/target-contract-hash.constant.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const ACCOUNTS_CONTRACT = 0x3c4b5e02
diff --git a/packages/shared/lib/core/layer-2/constants/transfer-allowance.constant.ts b/packages/shared/lib/core/layer-2/constants/transfer-allowance.constant.ts
new file mode 100644
index 0000000000..2102a8a56a
--- /dev/null
+++ b/packages/shared/lib/core/layer-2/constants/transfer-allowance.constant.ts
@@ -0,0 +1,2 @@
+// first 4 bytes of the hash of transferAllowance function with its parameters
+export const TRANSFER_ALLOWANCE = 0x23f4e3a1
diff --git a/packages/shared/lib/core/layer-2/enums/allowance.enum.ts b/packages/shared/lib/core/layer-2/enums/allowance.enum.ts
new file mode 100644
index 0000000000..ae81eb2ee6
--- /dev/null
+++ b/packages/shared/lib/core/layer-2/enums/allowance.enum.ts
@@ -0,0 +1,4 @@
+export enum Allowance {
+    Set = 0,
+    NotSet = 255,
+}
diff --git a/packages/shared/lib/core/layer-2/enums/index.ts b/packages/shared/lib/core/layer-2/enums/index.ts
index 7c71fd8398..af5e819dfe 100644
--- a/packages/shared/lib/core/layer-2/enums/index.ts
+++ b/packages/shared/lib/core/layer-2/enums/index.ts
@@ -1 +1,2 @@
+export * from './allowance.enum'
 export * from './destination-network.enum'