diff --git a/addrbook.go b/addrbook.go
index ea438120..ace0dba4 100644
--- a/addrbook.go
+++ b/addrbook.go
@@ -135,6 +135,9 @@ func (a *AddrBook) OnStart() error {
 
 func (a *AddrBook) OnStop() {
 	a.BaseService.OnStop()
+}
+
+func (a *AddrBook) Wait() {
 	a.wg.Wait()
 }
 
diff --git a/pex_reactor.go b/pex_reactor.go
index b8cb43f8..45c4c96d 100644
--- a/pex_reactor.go
+++ b/pex_reactor.go
@@ -42,14 +42,14 @@ func NewPEXReactor(book *AddrBook) *PEXReactor {
 
 func (pexR *PEXReactor) OnStart() error {
 	pexR.BaseReactor.OnStart()
-	pexR.book.OnStart()
+	pexR.book.Start()
 	go pexR.ensurePeersRoutine()
 	return nil
 }
 
 func (pexR *PEXReactor) OnStop() {
 	pexR.BaseReactor.OnStop()
-	pexR.book.OnStop()
+	pexR.book.Stop()
 }
 
 // Implements Reactor