diff --git a/exp/cpu_mining.go b/exp/cpu_mining.go
index 17352bb1dc..ca698c62e4 100644
--- a/exp/cpu_mining.go
+++ b/exp/cpu_mining.go
@@ -28,7 +28,7 @@ import (
 
 const disabledInfo = "Set GO_OPENCL and re-build to enable."
 
-func (s *Ethereum) StartMining(threads int, gpus string) error {
+func (s *Expanse) StartMining(threads int, gpus string) error {
 	eb, err := s.Etherbase()
 	if err != nil {
 		err = fmt.Errorf("Cannot start mining without etherbase address: %v", err)
diff --git a/exp/gasprice.go b/exp/gasprice.go
index 54430445b6..120b0f112c 100644
--- a/exp/gasprice.go
+++ b/exp/gasprice.go
@@ -55,7 +55,7 @@ type GasPriceOracle struct {
 }
 
 // NewGasPriceOracle returns a new oracle.
-func NewGasPriceOracle(eth *Ethereum) *GasPriceOracle {
+func NewGasPriceOracle(exp *Expanse) *GasPriceOracle {
 	minprice := exp.GpoMinGasPrice
 	if minprice == nil {
 		minprice = big.NewInt(gpoDefaultMinGasPrice)
diff --git a/exp/gpu_mining.go b/exp/gpu_mining.go
index 6386f019c6..3aa6b88619 100644
--- a/exp/gpu_mining.go
+++ b/exp/gpu_mining.go
@@ -33,7 +33,7 @@ import (
 	"github.com/expanse-project/go-expanse/miner"
 )
 
-func (s *Ethereum) StartMining(threads int, gpus string) error {
+func (s *Expanse) StartMining(threads int, gpus string) error {
 	eb, err := s.Etherbase()
 	if err != nil {
 		err = fmt.Errorf("Cannot start mining without etherbase address: %v", err)
diff --git a/rpc/api/admin.go b/rpc/api/admin.go
index c88901f653..d1021ce0e9 100644
--- a/rpc/api/admin.go
+++ b/rpc/api/admin.go
@@ -30,7 +30,7 @@ import (
 	"github.com/expanse-project/go-expanse/core"
 	"github.com/expanse-project/go-expanse/core/types"
 	"github.com/expanse-project/go-expanse/crypto"
-	"github.com/expanse-project/go-expanse/eth"
+	"github.com/expanse-project/go-expanse/exp"
 	"github.com/expanse-project/go-expanse/logger/glog"
 	"github.com/expanse-project/go-expanse/rlp"
 	"github.com/expanse-project/go-expanse/rpc/codec"
diff --git a/rpc/api/eth.go b/rpc/api/eth.go
index 7bb1600ff9..1bfb1977f5 100644
--- a/rpc/api/eth.go
+++ b/rpc/api/eth.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/expanse-project/go-expanse/common"
 	"github.com/expanse-project/go-expanse/common/natspec"
-	"github.com/expanse-project/go-expanse/eth"
+	"github.com/expanse-project/go-expanse/exp"
 	"github.com/expanse-project/go-expanse/rpc/codec"
 	"github.com/expanse-project/go-expanse/rpc/shared"
 	"github.com/expanse-project/go-expanse/xeth"
diff --git a/xeth/xeth.go b/xeth/xeth.go
index eed6bcacf3..a085e27d1a 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -35,8 +35,8 @@ import (
 	"github.com/expanse-project/go-expanse/core/types"
 	"github.com/expanse-project/go-expanse/core/vm"
 	"github.com/expanse-project/go-expanse/crypto"
-	"github.com/expanse-project/go-expanse/eth"
-	"github.com/expanse-project/go-expanse/eth/filters"
+	"github.com/expanse-project/go-expanse/exp"
+	"github.com/expanse-project/go-expanse/exp/filters"
 	"github.com/expanse-project/go-expanse/logger"
 	"github.com/expanse-project/go-expanse/logger/glog"
 	"github.com/expanse-project/go-expanse/miner"
@@ -86,7 +86,7 @@ type XEth struct {
 	filterManager *filters.FilterSystem
 }
 
-func NewTest(eth *exp.Expanse, frontend Frontend) *XEth {
+func NewTest(exp *exp.Expanse, frontend Frontend) *XEth {
 	return &XEth{backend: exp, frontend: frontend}
 }