diff --git a/cli/index.js b/cli/index.js
index 2be6f803..2191f90a 100755
--- a/cli/index.js
+++ b/cli/index.js
@@ -78,7 +78,7 @@ RainbowConfig.declareOption(
 RainbowConfig.declareOption(
   'near-client-account',
   'The account of the Near Client contract that can be used to accept ETH headers.',
-  'rainbow_bridge_eth_on_near_client'
+  'eth_on_near_client.node0'
 )
 RainbowConfig.declareOption(
   'near-client-sk',
@@ -125,7 +125,7 @@ RainbowConfig.declareOption(
 RainbowConfig.declareOption(
   'near-prover-account',
   'The account of the Near Prover contract that can be used to accept ETH headers.',
-  'rainbow_bridge_eth_on_near_prover'
+  'eth_on_near_prover.node0'
 )
 RainbowConfig.declareOption(
   'near-prover-sk',
diff --git a/testing/ci/e2e.sh b/testing/ci/e2e.sh
index 82d50fa9..1820f46b 100755
--- a/testing/ci/e2e.sh
+++ b/testing/ci/e2e.sh
@@ -54,10 +54,10 @@ sleep 5
 yarn run pm2 list
 node index.js TESTING transfer-eth-erc20-to-near --amount 1000 \
 --eth-sender-sk 0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501200 \
---near-receiver-account rainbow_bridge_eth_on_near_prover --near-master-account rainbow_bridge_eth_on_near_prover \
+--near-receiver-account eth_on_near_prover.node0 --near-master-account eth_on_near_prover.node0 \
 2>&1 | tee -a /tmp/eth2neartransfer.out
-grep "Balance of rainbow_bridge_eth_on_near_prover after the transfer is 1000" /tmp/eth2neartransfer.out
-node index.js TESTING transfer-eth-erc20-from-near --amount 1 --near-sender-account rainbow_bridge_eth_on_near_prover \
+grep "Balance of eth_on_near_prover.node0 after the transfer is 1000" /tmp/eth2neartransfer.out
+node index.js TESTING transfer-eth-erc20-from-near --amount 1 --near-sender-account eth_on_near_prover.node0 \
 --near-sender-sk ed25519:3D4YudUQRE39Lc4JHghuB5WM8kbgDDa34mnrEP5DdTApVH81af7e2dWgNPEaiQfdJnZq1CNPp5im4Rg5b733oiMP \
 --eth-receiver-address 0xEC8bE1A5630364292E56D01129E8ee8A9578d7D8 \
 2>&1 | tee -a /tmp/near2ethtransfer.out
diff --git a/testing/ci/e2e_deploy_contract.sh b/testing/ci/e2e_deploy_contract.sh
index 71da4ec6..b2b3630c 100755
--- a/testing/ci/e2e_deploy_contract.sh
+++ b/testing/ci/e2e_deploy_contract.sh
@@ -60,10 +60,10 @@ yarn run pm2 list
 
 node index.js TESTING transfer-eth-erc20-to-near --token-name myerc20 --amount 1000 \
 --eth-sender-sk 0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501200 \
---near-receiver-account rainbow_bridge_eth_on_near_prover --near-master-account rainbow_bridge_eth_on_near_prover \
+--near-receiver-account eth_on_near_prover.node0 --near-master-account eth_on_near_prover.node0 \
 2>&1 | tee -a /tmp/eth2neartransfer.out
-grep "Balance of rainbow_bridge_eth_on_near_prover after the transfer is 1000" /tmp/eth2neartransfer.out
-node index.js TESTING transfer-eth-erc20-from-near --token-name myerc20 --amount 1 --near-sender-account rainbow_bridge_eth_on_near_prover \
+grep "Balance of eth_on_near_prover.node0 after the transfer is 1000" /tmp/eth2neartransfer.out
+node index.js TESTING transfer-eth-erc20-from-near --token-name myerc20 --amount 1 --near-sender-account eth_on_near_prover.node0 \
 --near-sender-sk ed25519:3D4YudUQRE39Lc4JHghuB5WM8kbgDDa34mnrEP5DdTApVH81af7e2dWgNPEaiQfdJnZq1CNPp5im4Rg5b733oiMP \
 --eth-receiver-address 0xEC8bE1A5630364292E56D01129E8ee8A9578d7D8 \
 2>&1 | tee -a /tmp/near2ethtransfer.out
diff --git a/testing/ci/test_challenge.sh b/testing/ci/test_challenge.sh
index 7b6d9c29..d8fce7c1 100755
--- a/testing/ci/test_challenge.sh
+++ b/testing/ci/test_challenge.sh
@@ -62,10 +62,10 @@ node index.js start near2eth-relay --near2eth-relay-min-delay 1 --near2eth-relay
 
 node index.js TESTING transfer-eth-erc20-to-near --amount 1000 \
 --eth-sender-sk 0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501200 \
---near-receiver-account rainbow_bridge_eth_on_near_prover --near-master-account rainbow_bridge_eth_on_near_prover \
+--near-receiver-account eth_on_near_prover.node0 --near-master-account eth_on_near_prover.node0 \
 2>&1 | tee -a /tmp/eth2neartransfer.out
-grep "Balance of rainbow_bridge_eth_on_near_prover after the transfer is 1000" /tmp/eth2neartransfer.out
-node index.js TESTING transfer-eth-erc20-from-near --amount 1 --near-sender-account rainbow_bridge_eth_on_near_prover \
+grep "Balance of eth_on_near_prover.node0 after the transfer is 1000" /tmp/eth2neartransfer.out
+node index.js TESTING transfer-eth-erc20-from-near --amount 1 --near-sender-account eth_on_near_prover.node0 \
 --near-sender-sk ed25519:3D4YudUQRE39Lc4JHghuB5WM8kbgDDa34mnrEP5DdTApVH81af7e2dWgNPEaiQfdJnZq1CNPp5im4Rg5b733oiMP \
 --eth-receiver-address 0xEC8bE1A5630364292E56D01129E8ee8A9578d7D8 \
 2>&1 | tee -a /tmp/near2ethtransfer.out
diff --git a/testing/ci/test_ethrelay_catchup.sh b/testing/ci/test_ethrelay_catchup.sh
index 92384af0..4ebf2a13 100755
--- a/testing/ci/test_ethrelay_catchup.sh
+++ b/testing/ci/test_ethrelay_catchup.sh
@@ -55,10 +55,10 @@ sleep 5
 yarn run pm2 list
 node index.js TESTING transfer-eth-erc20-to-near --amount 1000 \
 --eth-sender-sk 0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501200 \
---near-receiver-account rainbow_bridge_eth_on_near_prover --near-master-account rainbow_bridge_eth_on_near_prover \
+--near-receiver-account eth_on_near_prover.node0 --near-master-account eth_on_near_prover.node0 \
 2>&1 | tee -a /tmp/eth2neartransfer.out
-grep "Balance of rainbow_bridge_eth_on_near_prover after the transfer is 1000" /tmp/eth2neartransfer.out
-node index.js TESTING transfer-eth-erc20-from-near --amount 1 --near-sender-account rainbow_bridge_eth_on_near_prover \
+grep "Balance of eth_on_near_prover.node0 after the transfer is 1000" /tmp/eth2neartransfer.out
+node index.js TESTING transfer-eth-erc20-from-near --amount 1 --near-sender-account eth_on_near_prover.node0 \
 --near-sender-sk ed25519:3D4YudUQRE39Lc4JHghuB5WM8kbgDDa34mnrEP5DdTApVH81af7e2dWgNPEaiQfdJnZq1CNPp5im4Rg5b733oiMP \
 --eth-receiver-address 0xEC8bE1A5630364292E56D01129E8ee8A9578d7D8 \
 2>&1 | tee -a /tmp/near2ethtransfer.out
diff --git a/testing/ci/test_npm_package.sh b/testing/ci/test_npm_package.sh
index 6a2a6d23..06badd45 100755
--- a/testing/ci/test_npm_package.sh
+++ b/testing/ci/test_npm_package.sh
@@ -62,10 +62,10 @@ sleep 5
 yarn pm2 list
 rainbow TESTING transfer-eth-erc20-to-near --amount 1000 \
 --eth-sender-sk 0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501200 \
---near-receiver-account rainbow_bridge_eth_on_near_prover --near-master-account rainbow_bridge_eth_on_near_prover \
+--near-receiver-account eth_on_near_prover.node0 --near-master-account eth_on_near_prover.node0 \
 2>&1 | tee -a /tmp/eth2neartransfer.out
-grep "Balance of rainbow_bridge_eth_on_near_prover after the transfer is 1000" /tmp/eth2neartransfer.out
-rainbow TESTING transfer-eth-erc20-from-near --amount 1 --near-sender-account rainbow_bridge_eth_on_near_prover \
+grep "Balance of eth_on_near_prover.node0 after the transfer is 1000" /tmp/eth2neartransfer.out
+rainbow TESTING transfer-eth-erc20-from-near --amount 1 --near-sender-account eth_on_near_prover.node0 \
 --near-sender-sk ed25519:3D4YudUQRE39Lc4JHghuB5WM8kbgDDa34mnrEP5DdTApVH81af7e2dWgNPEaiQfdJnZq1CNPp5im4Rg5b733oiMP \
 --eth-receiver-address 0xEC8bE1A5630364292E56D01129E8ee8A9578d7D8 \
 2>&1 | tee -a /tmp/near2ethtransfer.out