diff --git a/core/core.go b/core/core.go
index bed95aae6bdecc84c542816476e4eead0f0c8818..423dffe81477bd76de5ac73bdf4767fe9ddef879 100644
--- a/core/core.go
+++ b/core/core.go
@@ -118,7 +118,7 @@ func NewIpfsNode(cfg *config.Config, online bool) (*IpfsNode, error) {
 		// TODO(brian): perform this inside NewDHT factory method
 		dhtService.Handler = route // wire the handler to the service.
 
-		exchangeSession = bitswap.NetMessageSession(ctx, exchangeService, local, d, route)
+		exchangeSession = bitswap.NetMessageSession(ctx, local, exchangeService, route, d)
 
 		// TODO(brian): pass a context to initConnections
 		go initConnections(ctx, cfg, peerstore, route)
diff --git a/exchange/bitswap/bitswap.go b/exchange/bitswap/bitswap.go
index 3bee217dd4a512023e4d4dd72791ae054a51aab0..ce5547d9e5a1a222baf7d51d87c56bd443755afe 100644
--- a/exchange/bitswap/bitswap.go
+++ b/exchange/bitswap/bitswap.go
@@ -20,7 +20,7 @@ import (
 
 // NetMessageSession initializes a BitSwap session that communicates over the
 // provided NetMessage service
-func NetMessageSession(parent context.Context, s bsnet.NetMessageService, p *peer.Peer, d ds.Datastore, directory bsnet.Routing) exchange.Interface {
+func NetMessageSession(parent context.Context, p *peer.Peer, s bsnet.NetMessageService, directory bsnet.Routing, d ds.Datastore) exchange.Interface {
 
 	networkAdapter := bsnet.NetMessageAdapter(s, nil)
 	bs := &bitswap{