diff --git a/servmanager/serviceindexer.go b/servmanager/serviceindexer.go
index dc08f4730..7406ee17d 100644
--- a/servmanager/serviceindexer.go
+++ b/servmanager/serviceindexer.go
@@ -41,10 +41,10 @@ func (sI *ServiceIndexer) GetService(srvID string) Service {
 	return sI.srvS[srvID]
 }
 
-// AddService adds a service based on it's id to the index
-func (sI *ServiceIndexer) AddService(srvID string, srv Service) {
+// AddService registers a service in the indexer using its name as key
+func (sI *ServiceIndexer) AddService(s Service) {
 	sI.mux.Lock()
-	sI.srvS[srvID] = srv
+	sI.srvS[s.ServiceName()] = s
 	sI.mux.Unlock()
 }
 
diff --git a/servmanager/servmanager.go b/servmanager/servmanager.go
index e869db5c4..d92c2de98 100644
--- a/servmanager/servmanager.go
+++ b/servmanager/servmanager.go
@@ -76,7 +76,7 @@ func (srvMngr *ServiceManager) StartServices(ctx *context.Context, shtDwn contex
 func (srvMngr *ServiceManager) AddServices(services ...Service) {
 	srvMngr.Lock()
 	for _, srv := range services {
-		srvMngr.serviceIndexer.AddService(srv.ServiceName(), srv)
+		srvMngr.serviceIndexer.AddService(srv)
 		if sAPIData, hasAPIData := serviceAPIData[srv.ServiceName()]; hasAPIData { // Add the internal connections
 			rpcIntChan := make(chan birpc.ClientConnector, 1)
 			srvMngr.connMgr.AddInternalConn(sAPIData[1], sAPIData[0], rpcIntChan)