diff --git a/swarm/api/config.go b/swarm/api/config.go
index 3095e89517..ad16e3be84 100644
--- a/swarm/api/config.go
+++ b/swarm/api/config.go
@@ -88,7 +88,7 @@ func NewConfig(path string, contract common.Address, prvKey *ecdsa.PrivateKey, n
 
 	// if not set in function param, then set default for swarm network, will be overwritten by config file if present
 	if networkId == 0 {
-		self.NetworkId = network.NetworkId
+		self.NetworkId = network.NetworkID
 	}
 
 	if err != nil {
diff --git a/swarm/network/kademlia.go b/swarm/network/kademlia.go
index 2483f58ff1..0205c8404a 100644
--- a/swarm/network/kademlia.go
+++ b/swarm/network/kademlia.go
@@ -345,6 +345,10 @@ func (k *Kademlia) Off(p OverlayConn) {
 func (k *Kademlia) EachConn(base []byte, o int, f func(OverlayConn, int, bool) bool) {
 	k.lock.RLock()
 	defer k.lock.RUnlock()
+	k.eachConn(base, o, f)
+}
+
+func (k *Kademlia) eachConn(base []byte, o int, f func(OverlayConn, int, bool) bool) {
 	if len(base) == 0 {
 		base = k.base
 	}
diff --git a/swarm/swarm.go b/swarm/swarm.go
index 71334ba661..d2b764e600 100644
--- a/swarm/swarm.go
+++ b/swarm/swarm.go
@@ -133,7 +133,7 @@ func NewSwarm(ctx *node.ServiceContext, backend chequebook.Backend, config *api.
 	dpaChunkStore := storage.NewDpaChunkStore(self.lstore, self.storage)
 	log.Debug(fmt.Sprintf("-> Local Access to Swarm"))
 
-		// Swarm Hash Merklised Chunking for Arbitrary-length Document/File storage
+	// Swarm Hash Merklised Chunking for Arbitrary-length Document/File storage
 	self.dpa = storage.NewDPA(dpaChunkStore, self.config.ChunkerParams)
 	log.Debug(fmt.Sprintf("-> Content Store API"))
 
@@ -368,7 +368,7 @@ func NewLocalSwarm(datadir, port string) (self *Swarm, err error) {
 		return
 	}
 
-	config, err := api.NewConfig(datadir, common.Address{}, prvKey, network.NetworkId)
+	config, err := api.NewConfig(datadir, common.Address{}, prvKey, network.NetworkID)
 	if err != nil {
 		return
 	}