diff --git a/peer/cwtch_peer.go b/peer/cwtch_peer.go
index f29510f..c23c7b5 100644
--- a/peer/cwtch_peer.go
+++ b/peer/cwtch_peer.go
@@ -208,7 +208,7 @@ func (cp *CwtchPeer) Listen() error {
 		}
 	})
 
-	cwtchpeer.Init(cp.Profile.OnionPrivateKey, af, new(application.AcceptAllContactManager))
+	cwtchpeer.Init(cp.Profile.Name, cp.Profile.OnionPrivateKey, af, new(application.AcceptAllContactManager))
 	log.Printf("Running cwtch peer on %v", l.Addr().String())
 	cwtchpeer.Run(l)
 	return nil
diff --git a/server/server.go b/server/server.go
index a3d054f..f5de798 100644
--- a/server/server.go
+++ b/server/server.go
@@ -66,7 +66,7 @@ func (s *Server) Run(privateKeyFile string) {
 		}
 	})
 
-	cwtchserver.Init(pk, af, new(application.AcceptAllContactManager))
+	cwtchserver.Init("cwtch server for " + l.Addr().String()[0:16], pk, af, new(application.AcceptAllContactManager))
 	log.Printf("cwtch server running on cwtch:%s", l.Addr().String()[0:16])
 	cwtchserver.Run(l)
 }