diff --git a/bitswap/bitswap.go b/bitswap/bitswap.go
index 4392304ca..dadf306c9 100644
--- a/bitswap/bitswap.go
+++ b/bitswap/bitswap.go
@@ -64,7 +64,7 @@ type BitSwap struct {
 
 // NewBitSwap creates a new BitSwap instance. It does not check its parameters.
 func NewBitSwap(p *peer.Peer, net swarm.Network, d ds.Datastore, r routing.IpfsRouting) *BitSwap {
-	receiver := receiver{}
+	receiver := tx.Forwarder{}
 	sender := tx.NewBSNetService(context.Background(), &receiver)
 	bs := &BitSwap{
 		peer:      p,
diff --git a/bitswap/receiver.go b/bitswap/transmission/forwarder.go
similarity index 69%
rename from bitswap/receiver.go
rename to bitswap/transmission/forwarder.go
index 564b717e7..ab2fc6a08 100644
--- a/bitswap/receiver.go
+++ b/bitswap/transmission/forwarder.go
@@ -1,21 +1,20 @@
-package bitswap
+package transmission
 
 import (
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 	bsmsg "github.com/jbenet/go-ipfs/bitswap/message"
-	tx "github.com/jbenet/go-ipfs/bitswap/transmission"
 	peer "github.com/jbenet/go-ipfs/peer"
 )
 
-// receiver breaks the circular dependency between bitswap and its sender
+// Forwarder breaks the circular dependency between bitswap and its sender
 // NB: A sender is instantiated with a handler and this sender is then passed
 // as a constructor argument to BitSwap. However, the handler is BitSwap!
 // Hence, this receiver.
-type receiver struct {
-	delegate tx.Receiver
+type Forwarder struct {
+	delegate Receiver
 }
 
-func (r *receiver) ReceiveMessage(
+func (r *Forwarder) ReceiveMessage(
 	ctx context.Context, sender *peer.Peer, incoming bsmsg.BitSwapMessage) (
 	bsmsg.BitSwapMessage, *peer.Peer, error) {
 	if r.delegate == nil {
@@ -24,6 +23,6 @@ func (r *receiver) ReceiveMessage(
 	return r.delegate.ReceiveMessage(ctx, sender, incoming)
 }
 
-func (r *receiver) Delegate(delegate tx.Receiver) {
+func (r *Forwarder) Delegate(delegate Receiver) {
 	r.delegate = delegate
 }
diff --git a/bitswap/receiver_test.go b/bitswap/transmission/forwarder_test.go
similarity index 59%
rename from bitswap/receiver_test.go
rename to bitswap/transmission/forwarder_test.go
index d15c96ed5..f17ebb147 100644
--- a/bitswap/receiver_test.go
+++ b/bitswap/transmission/forwarder_test.go
@@ -1,4 +1,4 @@
-package bitswap
+package transmission
 
 import (
 	"testing"
@@ -9,6 +9,8 @@ import (
 )
 
 func TestDoesntPanicIfDelegateNotPresent(t *testing.T) {
-	r := receiver{}
-	r.ReceiveMessage(context.Background(), &peer.Peer{}, bsmsg.New())
+	fwdr := Forwarder{}
+	fwdr.ReceiveMessage(context.Background(), &peer.Peer{}, bsmsg.New())
 }
+
+// TODO(brian): func TestForwardsMessageToDelegate(t *testing.T)
diff --git a/bitswap/transmission/interface.go b/bitswap/transmission/interface.go
index 3d0828898..080c9b851 100644
--- a/bitswap/transmission/interface.go
+++ b/bitswap/transmission/interface.go
@@ -1,4 +1,4 @@
-package network
+package transmission
 
 import (
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
diff --git a/bitswap/transmission/service_wrapper.go b/bitswap/transmission/service_wrapper.go
index b28f8f71d..04d3f21f8 100644
--- a/bitswap/transmission/service_wrapper.go
+++ b/bitswap/transmission/service_wrapper.go
@@ -1,4 +1,4 @@
-package network
+package transmission
 
 import (
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"