diff --git a/xeth/miner_agent.go b/xeth/miner_agent.go
index b2e877ed2..b00439ed4 100644
--- a/xeth/miner_agent.go
+++ b/xeth/miner_agent.go
@@ -7,7 +7,7 @@ import (
 	"github.com/ethereum/go-ethereum/miner"
 )
 
-type Agent struct {
+type RemoteAgent struct {
 	work        *types.Block
 	currentWork *types.Block
 
@@ -16,34 +16,34 @@ type Agent struct {
 	returnCh chan<- miner.Work
 }
 
-func NewAgent() *Agent {
-	agent := &Agent{}
+func NewRemoteAgent() *RemoteAgent {
+	agent := &RemoteAgent{}
 	go agent.run()
 
 	return agent
 }
 
-func (a *Agent) Work() chan<- *types.Block {
+func (a *RemoteAgent) Work() chan<- *types.Block {
 	return a.workCh
 }
 
-func (a *Agent) SetWorkCh(returnCh chan<- miner.Work) {
+func (a *RemoteAgent) SetWorkCh(returnCh chan<- miner.Work) {
 	a.returnCh = returnCh
 }
 
-func (a *Agent) Start() {
+func (a *RemoteAgent) Start() {
 	a.quit = make(chan struct{})
 	a.workCh = make(chan *types.Block, 1)
 }
 
-func (a *Agent) Stop() {
+func (a *RemoteAgent) Stop() {
 	close(a.quit)
 	close(a.workCh)
 }
 
-func (a *Agent) GetHashRate() int64 { return 0 }
+func (a *RemoteAgent) GetHashRate() int64 { return 0 }
 
-func (a *Agent) run() {
+func (a *RemoteAgent) run() {
 out:
 	for {
 		select {
@@ -55,7 +55,7 @@ out:
 	}
 }
 
-func (a *Agent) GetWork() [3]string {
+func (a *RemoteAgent) GetWork() [3]string {
 	var res [3]string
 
 	// XXX Wait here until work != nil ?
@@ -69,7 +69,7 @@ func (a *Agent) GetWork() [3]string {
 	return res
 }
 
-func (a *Agent) SubmitWork(nonce uint64, mixDigest, seedHash common.Hash) bool {
+func (a *RemoteAgent) SubmitWork(nonce uint64, mixDigest, seedHash common.Hash) bool {
 	// Return true or false, but does not indicate if the PoW was correct
 
 	// Make sure the external miner was working on the right hash
diff --git a/xeth/xeth.go b/xeth/xeth.go
index fba61230f..5faeeb766 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -102,7 +102,7 @@ type XEth struct {
 	// register map[string][]*interface{} // TODO improve return type
 
 	// Miner agent
-	agent *Agent
+	agent *RemoteAgent
 }
 
 // New creates an XEth that uses the given frontend.
@@ -120,7 +120,7 @@ func New(eth Backend, frontend Frontend) *XEth {
 		frontend:       frontend,
 		logs:           make(map[int]*logFilter),
 		messages:       make(map[int]*whisperFilter),
-		agent:          NewAgent(),
+		agent:          NewRemoteAgent(),
 	}
 	eth.Miner().Register(xeth.agent)
 
@@ -170,7 +170,7 @@ func (self *XEth) stop() {
 func (self *XEth) DefaultGas() *big.Int      { return defaultGas }
 func (self *XEth) DefaultGasPrice() *big.Int { return defaultGasPrice }
 
-func (self *XEth) RemoteMining() *Agent { return self.agent }
+func (self *XEth) RemoteMining() *RemoteAgent { return self.agent }
 
 func (self *XEth) AtStateNum(num int64) *XEth {
 	chain := self.Backend().ChainManager()