diff --git a/core/vpn/engine/wireguard.go b/core/vpn/engine/wireguard.go
index 3dbf717..6059634 100644
--- a/core/vpn/engine/wireguard.go
+++ b/core/vpn/engine/wireguard.go
@@ -50,9 +50,12 @@
 	}, nil
 }
 
-func genWireguardConf(privKey types.PrivateKey, port uint16, netMap *types.NetworkMap) *wgcfg.Config {
+func genWireguardConf(privKey types.PrivateKey, port uint16,
+	netMap *types.NetworkMap) *wgcfg.Config {
 	c := &wgcfg.Config{
-		Name:       "foo",
+		// TODO(giolekva): we shoudld probably use hostname and share
+		// it with the controller
+		Name:       "local-node",
 		PrivateKey: wgcfg.PrivateKey(privKey),
 		Addresses: []netaddr.IPPrefix{netaddr.IPPrefix{
 			IP:   netMap.Self.VPNIP,
@@ -93,7 +96,6 @@
 }
 
 func genTailNetMap(privKey types.PrivateKey, port uint16, netMap *types.NetworkMap) *controlclient.NetworkMap {
-	fmt.Println(netMap.Self.IPPort.String())
 	c := &controlclient.NetworkMap{
 		SelfNode: &tailcfg.Node{
 			ID:       0, // TODO(giolekva): maybe IDs should be stored server side.