PR feedback from @mkalinin

README.md

@@ -50,7 +50,7 @@ Bellatrix protocol upgrade is still actively in development. The exact specifica
 
 ### Sharding
 
-Sharding follows the merge, and is divided into three parts:
+Sharding follows Bellatrix, and is divided into three parts:
 
 * Sharding base functionality - In early engineering phase
   * [Beacon Chain changes](specs/sharding/beacon-chain.md)

presets/minimal/bellatrix.yaml

@@ -1,4 +1,4 @@
-# Minimal preset - The Merge
+# Minimal preset - Bellatrix
 
 # Updated penalty values
 # ---------------------------------------------------------------

specs/phase0/deposit-contract.md

@@ -44,7 +44,7 @@ These configurations are updated for releases and may be out of sync during `dev
 
 ## Staking deposit contract
 
-The initial deployment phases of Ethereum proof-of-stake are implemented without consensus changes to the existing Ethereum proof-of-work chain. A deposit contract at address `DEPOSIT_CONTRACT_ADDRESS` is added to the Ethereum proof-of-work chain defined by the [chain-id](https://eips.ethereum.org/EIPS/eip-155) -- `DEPOSIT_CHAIN_ID` -- and the network-id -- `DEPOSIT_NETWORK_ID` -- for deposits of ETH to the beacon chain. Validator balances will be withdrawable to the execution-layer in a followup fork after the Merge.
+The initial deployment phases of Ethereum proof-of-stake are implemented without consensus changes to the existing Ethereum proof-of-work chain. A deposit contract at address `DEPOSIT_CONTRACT_ADDRESS` is added to the Ethereum proof-of-work chain defined by the [chain-id](https://eips.ethereum.org/EIPS/eip-155) -- `DEPOSIT_CHAIN_ID` -- and the network-id -- `DEPOSIT_NETWORK_ID` -- for deposits of ETH to the beacon chain. Validator balances will be withdrawable to the execution-layer in a followup fork after Bellatrix fork.
 
 _Note_: See [here](https://chainid.network/) for a comprehensive list of public Ethereum chain chain-id's and network-id's.
 
@@ -54,7 +54,7 @@ The deposit contract has a public `deposit` function to make deposits. It takes
 
 #### Deposit amount
 
-The amount of ETH (rounded down to the closest Gwei) sent to the deposit contract is the deposit amount, which must be of size at least `MIN_DEPOSIT_AMOUNT` Gwei. Note that ETH consumed by the deposit contract is no longer usable on the execution-layer until sometime after the Merge.
+The amount of ETH (rounded down to the closest Gwei) sent to the deposit contract is the deposit amount, which must be of size at least `MIN_DEPOSIT_AMOUNT` Gwei. Note that ETH consumed by the deposit contract is no longer usable on the execution-layer until sometime after Bellatrix fork.
 
 #### Withdrawal credentials
 

tests/core/pyspec/eth2spec/test/bellatrix/fork/test_bellatrix_fork_random.py

@@ -23,7 +23,7 @@ from eth2spec.test.helpers.random import randomize_state
 @spec_test
 @with_state
 @with_meta_tags(BELLATRIX_FORK_TEST_META_TAGS)
-def test_merge_fork_random_0(spec, phases, state):
+def test_bellatrix_fork_random_0(spec, phases, state):
     randomize_state(spec, state, rng=Random(1010))
     yield from run_fork_test(phases[BELLATRIX], state)
 
@@ -32,7 +32,7 @@ def test_merge_fork_random_0(spec, phases, state):
 @spec_test
 @with_state
 @with_meta_tags(BELLATRIX_FORK_TEST_META_TAGS)
-def test_merge_fork_random_1(spec, phases, state):
+def test_bellatrix_fork_random_1(spec, phases, state):
     randomize_state(spec, state, rng=Random(2020))
     yield from run_fork_test(phases[BELLATRIX], state)
 
@@ -41,7 +41,7 @@ def test_merge_fork_random_1(spec, phases, state):
 @spec_test
 @with_state
 @with_meta_tags(BELLATRIX_FORK_TEST_META_TAGS)
-def test_merge_fork_random_2(spec, phases, state):
+def test_bellatrix_fork_random_2(spec, phases, state):
     randomize_state(spec, state, rng=Random(3030))
     yield from run_fork_test(phases[BELLATRIX], state)
 
@@ -50,7 +50,7 @@ def test_merge_fork_random_2(spec, phases, state):
 @spec_test
 @with_state
 @with_meta_tags(BELLATRIX_FORK_TEST_META_TAGS)
-def test_merge_fork_random_3(spec, phases, state):
+def test_bellatrix_fork_random_3(spec, phases, state):
     randomize_state(spec, state, rng=Random(4040))
     yield from run_fork_test(phases[BELLATRIX], state)
 
@@ -59,7 +59,7 @@ def test_merge_fork_random_3(spec, phases, state):
 @spec_test
 @with_custom_state(balances_fn=low_balances, threshold_fn=lambda spec: spec.config.EJECTION_BALANCE)
 @with_meta_tags(BELLATRIX_FORK_TEST_META_TAGS)
-def test_merge_fork_random_low_balances(spec, phases, state):
+def test_bellatrix_fork_random_low_balances(spec, phases, state):
     randomize_state(spec, state, rng=Random(5050))
     yield from run_fork_test(phases[BELLATRIX], state)
 
@@ -68,7 +68,7 @@ def test_merge_fork_random_low_balances(spec, phases, state):
 @spec_test
 @with_custom_state(balances_fn=misc_balances, threshold_fn=lambda spec: spec.config.EJECTION_BALANCE)
 @with_meta_tags(BELLATRIX_FORK_TEST_META_TAGS)
-def test_merge_fork_random_misc_balances(spec, phases, state):
+def test_bellatrix_fork_random_misc_balances(spec, phases, state):
     randomize_state(spec, state, rng=Random(6060))
     yield from run_fork_test(phases[BELLATRIX], state)
 
@@ -79,6 +79,6 @@ def test_merge_fork_random_misc_balances(spec, phases, state):
 @spec_test
 @with_custom_state(balances_fn=large_validator_set, threshold_fn=lambda spec: spec.config.EJECTION_BALANCE)
 @with_meta_tags(BELLATRIX_FORK_TEST_META_TAGS)
-def test_merge_fork_random_large_validator_set(spec, phases, state):
+def test_bellatrix_fork_random_large_validator_set(spec, phases, state):
     randomize_state(spec, state, rng=Random(7070))
     yield from run_fork_test(phases[BELLATRIX], state)