diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go
index feeb77a090..b96d15a536 100644
--- a/consensus/ethash/consensus.go
+++ b/consensus/ethash/consensus.go
@@ -326,7 +326,7 @@ func CalcDifficulty(config ctypes.ChainConfigurator, time uint64, parent *types.
 		out.Mul(parent_diff_over_dbd(parent), out)
 		out.Add(out, parent.Difficulty)
 
-	} else if config.IsEnabled(config.GetEthashEIP2Transition, next) {
+	} else if config.IsEnabled(config.GetEIP2Transition, next) {
 		// https://github.com/ethereum/EIPs/blob/master/EIPS/eip-2.md
 		// algorithm:
 		// diff = (parent_diff +
diff --git a/core/genesis_alloc_test.go b/core/genesis_alloc_test.go
index 3185f91542..c1d5e63a44 100644
--- a/core/genesis_alloc_test.go
+++ b/core/genesis_alloc_test.go
@@ -137,7 +137,7 @@ func TestSetupGenesis(t *testing.T) {
 			wantHash:   customghash,
 			wantConfig: customg.Config.(*goethereum.ChainConfig),
 			wantErr: &confp.ConfigCompatError{
-				What:         "incompatible fork value: GetEIP7Transition",
+				What:         "incompatible fork value: GetEIP2Transition",
 				StoredConfig: func() *uint64 { b := big.NewInt(2).Uint64(); return &b }(),
 				NewConfig:    func() *uint64 { b := big.NewInt(3).Uint64(); return &b }(),
 				RewindTo:     1,
diff --git a/core/state_transition.go b/core/state_transition.go
index 8fdfe1e546..610716bb55 100644
--- a/core/state_transition.go
+++ b/core/state_transition.go
@@ -230,7 +230,7 @@ func (st *StateTransition) TransitionDb() (*ExecutionResult, error) {
 	}
 	msg := st.msg
 	sender := vm.AccountRef(msg.From())
-	eip2f := st.evm.ChainConfig().IsEnabled(st.evm.ChainConfig().GetEthashEIP2Transition, st.evm.BlockNumber)
+	eip2f := st.evm.ChainConfig().IsEnabled(st.evm.ChainConfig().GetEIP2Transition, st.evm.BlockNumber)
 	eip2028f := st.evm.ChainConfig().IsEnabled(st.evm.ChainConfig().GetEIP2028Transition, st.evm.BlockNumber)
 	contractCreation := msg.To() == nil
 
diff --git a/core/tx_pool.go b/core/tx_pool.go
index 59f30f2d8b..b41e9eda9d 100644
--- a/core/tx_pool.go
+++ b/core/tx_pool.go
@@ -332,7 +332,7 @@ func (pool *TxPool) loop() {
 		// Handle ChainHeadEvent
 		case ev := <-pool.chainHeadCh:
 			if ev.Block != nil {
-				if pool.chainconfig.IsEnabled(pool.chainconfig.GetEthashEIP2Transition, ev.Block.Number()) {
+				if pool.chainconfig.IsEnabled(pool.chainconfig.GetEIP2Transition, ev.Block.Number()) {
 					pool.eip2f = true
 				}
 				if pool.chainconfig.IsEnabled(pool.chainconfig.GetEIP2028Transition, ev.Block.Number()) {
diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go
index 3ebfc44f8f..cf754856fb 100644
--- a/core/types/transaction_signing.go
+++ b/core/types/transaction_signing.go
@@ -44,7 +44,7 @@ func MakeSigner(config ctypes.ChainConfigurator, blockNumber *big.Int) Signer {
 	switch {
 	case config.IsEnabled(config.GetEIP155Transition, blockNumber):
 		signer = NewEIP155Signer(config.GetChainID())
-	case config.IsEnabled(config.GetEthashEIP2Transition, blockNumber):
+	case config.IsEnabled(config.GetEIP2Transition, blockNumber):
 		signer = HomesteadSigner{}
 	default:
 		signer = FrontierSigner{}
diff --git a/core/vm/evm.go b/core/vm/evm.go
index a88fa577e8..a50213e213 100644
--- a/core/vm/evm.go
+++ b/core/vm/evm.go
@@ -422,7 +422,7 @@ func (evm *EVM) create(caller ContractRef, codeAndHash *codeAndHash, gas uint64,
 	// When an error was returned by the EVM or when setting the creation code
 	// above we revert to the snapshot and consume any gas remaining. Additionally
 	// when we're in homestead this also counts for code storage gas errors.
-	if maxCodeSizeExceeded || (err != nil && (evm.ChainConfig().IsEnabled(evm.chainConfig.GetEthashEIP2Transition, evm.BlockNumber) || err != ErrCodeStoreOutOfGas)) {
+	if maxCodeSizeExceeded || (err != nil && (evm.ChainConfig().IsEnabled(evm.chainConfig.GetEIP2Transition, evm.BlockNumber) || err != ErrCodeStoreOutOfGas)) {
 		evm.StateDB.RevertToSnapshot(snapshot)
 		if err != ErrExecutionReverted {
 			contract.UseGas(contract.Gas)
diff --git a/core/vm/instructions.go b/core/vm/instructions.go
index a7bc5779c7..30e31e695b 100644
--- a/core/vm/instructions.go
+++ b/core/vm/instructions.go
@@ -729,7 +729,7 @@ func opCreate(pc *uint64, interpreter *EVMInterpreter, callContext *callCtx) ([]
 	// homestead we must check for CodeStoreOutOfGasError (homestead only
 	// rule) and treat as an error, if the ruleset is frontier we must
 	// ignore this error and pretend the operation was successful.
-	if interpreter.evm.ChainConfig().IsEnabled(interpreter.evm.chainConfig.GetEthashEIP2Transition, interpreter.evm.BlockNumber) && suberr == ErrCodeStoreOutOfGas {
+	if interpreter.evm.ChainConfig().IsEnabled(interpreter.evm.chainConfig.GetEIP2Transition, interpreter.evm.BlockNumber) && suberr == ErrCodeStoreOutOfGas {
 		callContext.stack.push(interpreter.intPool.getZero())
 	} else if suberr != nil && suberr != ErrCodeStoreOutOfGas {
 		callContext.stack.push(interpreter.intPool.getZero())
diff --git a/light/txpool.go b/light/txpool.go
index c8384e5c5c..740fbebc41 100644
--- a/light/txpool.go
+++ b/light/txpool.go
@@ -328,7 +328,7 @@ func (pool *TxPool) setNewHead(head *types.Header) {
 	}
 	m, r := txc.getLists()
 	pool.relay.NewHead(pool.head, m, r)
-	pool.eip2f = pool.config.IsEnabled(pool.config.GetEthashEIP2Transition, head.Number)
+	pool.eip2f = pool.config.IsEnabled(pool.config.GetEIP2Transition, head.Number)
 
 	// Update fork indicator by next pending block number
 	next := new(big.Int).Add(head.Number, big.NewInt(1))
diff --git a/params/types/coregeth/chain_config_configurator.go b/params/types/coregeth/chain_config_configurator.go
index e250e7785c..f8cace3ef7 100644
--- a/params/types/coregeth/chain_config_configurator.go
+++ b/params/types/coregeth/chain_config_configurator.go
@@ -484,11 +484,11 @@ func (c *CoreGethChainConfig) SetEthashHomesteadTransition(n *uint64) error {
 	return nil
 }
 
-func (c *CoreGethChainConfig) GetEthashEIP2Transition() *uint64 {
+func (c *CoreGethChainConfig) GetEIP2Transition() *uint64 {
 	return bigNewU64(c.EIP2FBlock)
 }
 
-func (c *CoreGethChainConfig) SetEthashEIP2Transition(n *uint64) error {
+func (c *CoreGethChainConfig) SetEIP2Transition(n *uint64) error {
 	c.EIP2FBlock = setBig(c.EIP2FBlock, n)
 	return nil
 }
diff --git a/params/types/ctypes/configurator_iface.go b/params/types/ctypes/configurator_iface.go
index eebbe262a8..e3ff71a2b1 100644
--- a/params/types/ctypes/configurator_iface.go
+++ b/params/types/ctypes/configurator_iface.go
@@ -69,8 +69,8 @@ type ProtocolSpecifier interface {
 	// It is a messy EIP, specifying diverse changes, like difficulty, intrinsic gas costs for contract creation,
 	// txpool management, and contract OoG handling.
 	// It is both Ethash-specific and _not_.
-	GetEthashEIP2Transition() *uint64
-	SetEthashEIP2Transition(n *uint64) error
+	GetEIP2Transition() *uint64
+	SetEIP2Transition(n *uint64) error
 
 	GetEIP7Transition() *uint64
 	SetEIP7Transition(n *uint64) error
diff --git a/params/types/genesisT/genesis.go b/params/types/genesisT/genesis.go
index 740db50761..ee5b1096ac 100644
--- a/params/types/genesisT/genesis.go
+++ b/params/types/genesisT/genesis.go
@@ -600,12 +600,12 @@ func (g *Genesis) SetEthashHomesteadTransition(n *uint64) error {
 	return g.Config.SetEthashHomesteadTransition(n)
 }
 
-func (g *Genesis) GetEthashEIP2Transition() *uint64 {
-	return g.Config.GetEthashEIP2Transition()
+func (g *Genesis) GetEIP2Transition() *uint64 {
+	return g.Config.GetEIP2Transition()
 }
 
-func (g *Genesis) SetEthashEIP2Transition(n *uint64) error {
-	return g.Config.SetEthashEIP2Transition(n)
+func (g *Genesis) SetEIP2Transition(n *uint64) error {
+	return g.Config.SetEIP2Transition(n)
 }
 
 func (g *Genesis) GetEthashEIP779Transition() *uint64 {
diff --git a/params/types/goethereum/goethereum_configurator.go b/params/types/goethereum/goethereum_configurator.go
index f5592258f9..2da2b708bb 100644
--- a/params/types/goethereum/goethereum_configurator.go
+++ b/params/types/goethereum/goethereum_configurator.go
@@ -496,11 +496,11 @@ func (c *ChainConfig) SetEthashHomesteadTransition(i *uint64) error {
 	return nil
 }
 
-func (c *ChainConfig) GetEthashEIP2Transition() *uint64 {
+func (c *ChainConfig) GetEIP2Transition() *uint64 {
 	return bigNewU64(c.HomesteadBlock)
 }
 
-func (c *ChainConfig) SetEthashEIP2Transition(i *uint64) error {
+func (c *ChainConfig) SetEIP2Transition(i *uint64) error {
 	c.HomesteadBlock = setBig(c.HomesteadBlock, i)
 	return nil
 }
diff --git a/params/types/multigethv0/multigethv0_chain_config_configurator.go b/params/types/multigethv0/multigethv0_chain_config_configurator.go
index d502ff00d8..6191fa1d6e 100644
--- a/params/types/multigethv0/multigethv0_chain_config_configurator.go
+++ b/params/types/multigethv0/multigethv0_chain_config_configurator.go
@@ -488,11 +488,11 @@ func (c *ChainConfig) SetEthashHomesteadTransition(n *uint64) error {
 	return nil
 }
 
-func (c *ChainConfig) GetEthashEIP2Transition() *uint64 {
+func (c *ChainConfig) GetEIP2Transition() *uint64 {
 	return bigNewU64(bigMax(c.EIP2FBlock, c.HomesteadBlock))
 }
 
-func (c *ChainConfig) SetEthashEIP2Transition(n *uint64) error {
+func (c *ChainConfig) SetEIP2Transition(n *uint64) error {
 	c.EIP2FBlock = setBig(c.EIP2FBlock, n)
 	return nil
 }
diff --git a/params/types/parity/parity_configurator.go b/params/types/parity/parity_configurator.go
index cddfa0beed..acb24e518d 100644
--- a/params/types/parity/parity_configurator.go
+++ b/params/types/parity/parity_configurator.go
@@ -597,11 +597,11 @@ func (spec *ParityChainSpec) SetEthashHomesteadTransition(n *uint64) error {
 	return nil
 }
 
-func (spec *ParityChainSpec) GetEthashEIP2Transition() *uint64 {
+func (spec *ParityChainSpec) GetEIP2Transition() *uint64 {
 	return spec.Engine.Ethash.Params.HomesteadTransition.Uint64P()
 }
 
-func (spec *ParityChainSpec) SetEthashEIP2Transition(n *uint64) error {
+func (spec *ParityChainSpec) SetEIP2Transition(n *uint64) error {
 	spec.Engine.Ethash.Params.HomesteadTransition = new(ParityU64).SetUint64(n)
 	return nil
 }