diff --git a/swarm/network/stream/delivery.go b/swarm/network/stream/delivery.go
index 4355997fd0..de34f55c9b 100644
--- a/swarm/network/stream/delivery.go
+++ b/swarm/network/stream/delivery.go
@@ -51,7 +51,7 @@ func NewDelivery(overlay network.Overlay, db *storage.DBAPI) *Delivery {
 	return d
 }
 
-// SwarmChunkServer implements OutgoingStreamer
+// SwarmChunkServer implements Server
 type SwarmChunkServer struct {
 	deliveryC  chan []byte
 	batchC     chan []byte
diff --git a/swarm/network/stream/syncer.go b/swarm/network/stream/syncer.go
index eff42b4cd0..9647a5aea1 100644
--- a/swarm/network/stream/syncer.go
+++ b/swarm/network/stream/syncer.go
@@ -33,7 +33,7 @@ const (
 	BatchSize = 128
 )
 
-// SwarmSyncerServer implements an OutgoingStreamer for history syncing on bins
+// SwarmSyncerServer implements an Server for history syncing on bins
 // offered streams:
 // * live request delivery with or without checkback
 // * (live/non-live historical) chunk syncing per proximity bin
@@ -67,7 +67,7 @@ func RegisterSwarmSyncerServer(streamer *Registry, db *storage.DBAPI) {
 		// TODO: make this work for HISTORY too
 		return NewSwarmSyncerServer(false, po, db)
 	})
-	// streamer.RegisterOutgoingStreamer(stream, func(p *Peer) (OutgoingStreamer, error) {
+	// streamer.RegisterServerFunc(stream, func(p *Peer) (Server, error) {
 	// 	return NewOutgoingProvableSwarmSyncer(po, db)
 	// })
 }