diff --git a/addrbook.go b/addrbook.go
index d2e4d48e..2bbae64f 100644
--- a/addrbook.go
+++ b/addrbook.go
@@ -75,7 +75,7 @@ const (
 
 /* AddrBook - concurrency safe peer address manager */
 type AddrBook struct {
-	QuitService
+	BaseService
 
 	mtx               sync.Mutex
 	filePath          string
@@ -106,7 +106,7 @@ func NewAddrBook(filePath string, routabilityStrict bool) *AddrBook {
 		routabilityStrict: routabilityStrict,
 	}
 	am.init()
-	am.QuitService = *NewQuitService(log, "AddrBook", am)
+	am.BaseService = *NewBaseService(log, "AddrBook", am)
 	return am
 }
 
@@ -126,7 +126,7 @@ func (a *AddrBook) init() {
 }
 
 func (a *AddrBook) OnStart() error {
-	a.QuitService.OnStart()
+	a.BaseService.OnStart()
 	a.loadFromFile(a.filePath)
 	a.wg.Add(1)
 	go a.saveRoutine()
@@ -134,7 +134,7 @@ func (a *AddrBook) OnStart() error {
 }
 
 func (a *AddrBook) OnStop() {
-	a.QuitService.OnStop()
+	a.BaseService.OnStop()
 	a.wg.Wait()
 }
 
diff --git a/switch.go b/switch.go
index 61d26949..bbb73805 100644
--- a/switch.go
+++ b/switch.go
@@ -26,13 +26,13 @@ type Reactor interface {
 //--------------------------------------
 
 type BaseReactor struct {
-	QuitService // Provides Start, Stop, .Quit
+	BaseService // Provides Start, Stop, .Quit
 	Switch      *Switch
 }
 
 func NewBaseReactor(log log15.Logger, name string, impl Reactor) *BaseReactor {
 	return &BaseReactor{
-		QuitService: *NewQuitService(log, name, impl),
+		BaseService: *NewBaseService(log, name, impl),
 		Switch:      nil,
 	}
 }