diff --git a/exchange/bitswap/bitswap_test.go b/exchange/bitswap/bitswap_test.go
index 4ef0838a5..af6cb138c 100644
--- a/exchange/bitswap/bitswap_test.go
+++ b/exchange/bitswap/bitswap_test.go
@@ -61,7 +61,7 @@ func TestProviderForKeyButNetworkCannotFind(t *testing.T) { // TODO revisit this
 	defer g.Close()
 
 	block := blocks.NewBlock([]byte("block"))
-	pinfo := testutil.RandPeerOrFatal(t)
+	pinfo := testutil.RandIdentityOrFatal(t)
 	rs.Client(pinfo).Provide(context.Background(), block.Key()) // but not on network
 
 	solo := g.Next()
diff --git a/exchange/bitswap/testnet/interface.go b/exchange/bitswap/testnet/interface.go
index c194d74cb..029ea704e 100644
--- a/exchange/bitswap/testnet/interface.go
+++ b/exchange/bitswap/testnet/interface.go
@@ -7,7 +7,7 @@ import (
 )
 
 type Network interface {
-	Adapter(testutil.Peer) bsnet.BitSwapNetwork
+	Adapter(testutil.Identity) bsnet.BitSwapNetwork
 
 	HasPeer(peer.ID) bool
 }
diff --git a/exchange/bitswap/testnet/network_test.go b/exchange/bitswap/testnet/network_test.go
index 08f4ff500..6f6275896 100644
--- a/exchange/bitswap/testnet/network_test.go
+++ b/exchange/bitswap/testnet/network_test.go
@@ -17,11 +17,11 @@ import (
 func TestSendRequestToCooperativePeer(t *testing.T) {
 	net := VirtualNetwork(mockrouting.NewServer(), delay.Fixed(0))
 
-	recipientPeer := testutil.RandPeerOrFatal(t)
+	recipientPeer := testutil.RandIdentityOrFatal(t)
 
 	t.Log("Get two network adapters")
 
-	initiator := net.Adapter(testutil.RandPeerOrFatal(t))
+	initiator := net.Adapter(testutil.RandIdentityOrFatal(t))
 	recipient := net.Adapter(recipientPeer)
 
 	expectedStr := "response from recipient"
@@ -67,8 +67,8 @@ func TestSendRequestToCooperativePeer(t *testing.T) {
 
 func TestSendMessageAsyncButWaitForResponse(t *testing.T) {
 	net := VirtualNetwork(mockrouting.NewServer(), delay.Fixed(0))
-	responderPeer := testutil.RandPeerOrFatal(t)
-	waiter := net.Adapter(testutil.RandPeerOrFatal(t))
+	responderPeer := testutil.RandIdentityOrFatal(t)
+	waiter := net.Adapter(testutil.RandIdentityOrFatal(t))
 	responder := net.Adapter(responderPeer)
 
 	var wg sync.WaitGroup
diff --git a/exchange/bitswap/testnet/peernet.go b/exchange/bitswap/testnet/peernet.go
index 4db254560..905d78a6a 100644
--- a/exchange/bitswap/testnet/peernet.go
+++ b/exchange/bitswap/testnet/peernet.go
@@ -19,7 +19,7 @@ func StreamNet(ctx context.Context, net mockpeernet.Mocknet, rs mockrouting.Serv
 	return &peernet{net, rs}, nil
 }
 
-func (pn *peernet) Adapter(p testutil.Peer) bsnet.BitSwapNetwork {
+func (pn *peernet) Adapter(p testutil.Identity) bsnet.BitSwapNetwork {
 	client, err := pn.Mocknet.AddPeer(p.PrivateKey(), p.Address())
 	if err != nil {
 		panic(err.Error())
diff --git a/exchange/bitswap/testnet/virtual.go b/exchange/bitswap/testnet/virtual.go
index 5811db3bb..887d29bee 100644
--- a/exchange/bitswap/testnet/virtual.go
+++ b/exchange/bitswap/testnet/virtual.go
@@ -29,7 +29,7 @@ type network struct {
 	delay         delay.D
 }
 
-func (n *network) Adapter(p testutil.Peer) bsnet.BitSwapNetwork {
+func (n *network) Adapter(p testutil.Identity) bsnet.BitSwapNetwork {
 	client := &networkClient{
 		local:   p.ID(),
 		network: n,
diff --git a/exchange/bitswap/testutils.go b/exchange/bitswap/testutils.go
index 9ad3cf312..0d1aa4fec 100644
--- a/exchange/bitswap/testutils.go
+++ b/exchange/bitswap/testutils.go
@@ -41,7 +41,7 @@ func (g *SessionGenerator) Close() error {
 
 func (g *SessionGenerator) Next() Instance {
 	g.seq++
-	p, err := testutil.RandPeer()
+	p, err := testutil.RandIdentity()
 	if err != nil {
 		panic("FIXME") // TODO change signature
 	}
@@ -78,7 +78,7 @@ func (i *Instance) SetBlockstoreLatency(t time.Duration) time.Duration {
 // NB: It's easy make mistakes by providing the same peer ID to two different
 // sessions. To safeguard, use the SessionGenerator to generate sessions. It's
 // just a much better idea.
-func session(ctx context.Context, net tn.Network, p testutil.Peer) Instance {
+func session(ctx context.Context, net tn.Network, p testutil.Identity) Instance {
 	bsdelay := delay.Fixed(0)
 	const kWriteCacheElems = 100
 
diff --git a/namesys/resolve_test.go b/namesys/resolve_test.go
index 74fb08982..84e4f1cb6 100644
--- a/namesys/resolve_test.go
+++ b/namesys/resolve_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func TestRoutingResolve(t *testing.T) {
-	d := mockrouting.NewServer().Client(testutil.RandPeerOrFatal(t))
+	d := mockrouting.NewServer().Client(testutil.RandIdentityOrFatal(t))
 
 	resolver := NewRoutingResolver(d)
 	publisher := NewRoutingPublisher(d)
diff --git a/routing/mock/centralized_client.go b/routing/mock/centralized_client.go
index 0ba4be538..6b5a455a7 100644
--- a/routing/mock/centralized_client.go
+++ b/routing/mock/centralized_client.go
@@ -17,7 +17,7 @@ var log = u.Logger("mockrouter")
 type client struct {
 	datastore ds.Datastore
 	server    server
-	peer      testutil.Peer
+	peer      testutil.Identity
 }
 
 // FIXME(brian): is this method meant to simulate putting a value into the network?
diff --git a/routing/mock/centralized_server.go b/routing/mock/centralized_server.go
index 10f81eb2c..030227b1b 100644
--- a/routing/mock/centralized_server.go
+++ b/routing/mock/centralized_server.go
@@ -73,11 +73,11 @@ func (rs *s) Providers(k u.Key) []peer.PeerInfo {
 	return ret
 }
 
-func (rs *s) Client(p testutil.Peer) Client {
+func (rs *s) Client(p testutil.Identity) Client {
 	return rs.ClientWithDatastore(context.Background(), p, ds.NewMapDatastore())
 }
 
-func (rs *s) ClientWithDatastore(_ context.Context, p testutil.Peer, datastore ds.Datastore) Client {
+func (rs *s) ClientWithDatastore(_ context.Context, p testutil.Identity, datastore ds.Datastore) Client {
 	return &client{
 		peer:      p,
 		datastore: ds.NewMapDatastore(),
diff --git a/routing/mock/centralized_test.go b/routing/mock/centralized_test.go
index bda7ac004..dcaf165b1 100644
--- a/routing/mock/centralized_test.go
+++ b/routing/mock/centralized_test.go
@@ -13,7 +13,7 @@ import (
 
 func TestKeyNotFound(t *testing.T) {
 
-	var pi = testutil.RandPeerOrFatal(t)
+	var pi = testutil.RandIdentityOrFatal(t)
 	var key = u.Key("mock key")
 	var ctx = context.Background()
 
@@ -26,7 +26,7 @@ func TestKeyNotFound(t *testing.T) {
 }
 
 func TestClientFindProviders(t *testing.T) {
-	pi := testutil.RandPeerOrFatal(t)
+	pi := testutil.RandIdentityOrFatal(t)
 	rs := NewServer()
 	client := rs.Client(pi)
 
@@ -57,7 +57,7 @@ func TestClientOverMax(t *testing.T) {
 	k := u.Key("hello")
 	numProvidersForHelloKey := 100
 	for i := 0; i < numProvidersForHelloKey; i++ {
-		pi := testutil.RandPeerOrFatal(t)
+		pi := testutil.RandIdentityOrFatal(t)
 		err := rs.Client(pi).Provide(context.Background(), k)
 		if err != nil {
 			t.Fatal(err)
@@ -65,7 +65,7 @@ func TestClientOverMax(t *testing.T) {
 	}
 
 	max := 10
-	pi := testutil.RandPeerOrFatal(t)
+	pi := testutil.RandIdentityOrFatal(t)
 	client := rs.Client(pi)
 
 	providersFromClient := client.FindProvidersAsync(context.Background(), k, max)
@@ -100,7 +100,7 @@ func TestCanceledContext(t *testing.T) {
 			default:
 			}
 
-			pi, err := testutil.RandPeer()
+			pi, err := testutil.RandIdentity()
 			if err != nil {
 				t.Error(err)
 			}
@@ -112,7 +112,7 @@ func TestCanceledContext(t *testing.T) {
 		}
 	}()
 
-	local := testutil.RandPeerOrFatal(t)
+	local := testutil.RandIdentityOrFatal(t)
 	client := rs.Client(local)
 
 	t.Log("warning: max is finite so this test is non-deterministic")
@@ -138,7 +138,7 @@ func TestCanceledContext(t *testing.T) {
 
 func TestValidAfter(t *testing.T) {
 
-	pi := testutil.RandPeerOrFatal(t)
+	pi := testutil.RandIdentityOrFatal(t)
 	var key = u.Key("mock key")
 	var ctx = context.Background()
 	conf := DelayConfig{
diff --git a/routing/mock/dht.go b/routing/mock/dht.go
index dc3dccdfa..1dfa415e0 100644
--- a/routing/mock/dht.go
+++ b/routing/mock/dht.go
@@ -19,11 +19,11 @@ func NewDHTNetwork(mn mocknet.Mocknet) Server {
 	}
 }
 
-func (rs *mocknetserver) Client(p testutil.Peer) Client {
+func (rs *mocknetserver) Client(p testutil.Identity) Client {
 	return rs.ClientWithDatastore(context.TODO(), p, ds.NewMapDatastore())
 }
 
-func (rs *mocknetserver) ClientWithDatastore(ctx context.Context, p testutil.Peer, ds ds.Datastore) Client {
+func (rs *mocknetserver) ClientWithDatastore(ctx context.Context, p testutil.Identity, ds ds.Datastore) Client {
 
 	// FIXME AddPeer doesn't appear to be idempotent
 
diff --git a/routing/mock/interface.go b/routing/mock/interface.go
index 3ff1ca059..0bb54f365 100644
--- a/routing/mock/interface.go
+++ b/routing/mock/interface.go
@@ -16,8 +16,8 @@ import (
 
 // Server provides mockrouting Clients
 type Server interface {
-	Client(p testutil.Peer) Client
-	ClientWithDatastore(context.Context, testutil.Peer, ds.Datastore) Client
+	Client(p testutil.Identity) Client
+	ClientWithDatastore(context.Context, testutil.Identity, ds.Datastore) Client
 }
 
 // Client implements IpfsRouting
diff --git a/util/testutil/peer.go b/util/testutil/identity.go
similarity index 56%
rename from util/testutil/peer.go
rename to util/testutil/identity.go
index 82249f92b..d266b8df8 100644
--- a/util/testutil/peer.go
+++ b/util/testutil/identity.go
@@ -8,46 +8,46 @@ import (
 	peer "github.com/jbenet/go-ipfs/peer"
 )
 
-type Peer interface {
+type Identity interface {
 	Address() ma.Multiaddr
 	ID() peer.ID
 	PrivateKey() ci.PrivKey
 	PublicKey() ci.PubKey
 }
 
-func RandPeer() (Peer, error) {
+func RandIdentity() (Identity, error) {
 	p, err := RandPeerNetParams()
 	if err != nil {
 		return nil, err
 	}
-	return &testpeer{*p}, nil
+	return &identity{*p}, nil
 }
 
-func RandPeerOrFatal(t *testing.T) Peer {
+func RandIdentityOrFatal(t *testing.T) Identity {
 	p, err := RandPeerNetParams()
 	if err != nil {
 		t.Fatal(err)
 	}
-	return &testpeer{*p}
+	return &identity{*p}
 }
 
-// peer is a temporary shim to delay binding of PeerNetParams.
-type testpeer struct {
+// identity is a temporary shim to delay binding of PeerNetParams.
+type identity struct {
 	PeerNetParams
 }
 
-func (p *testpeer) ID() peer.ID {
+func (p *identity) ID() peer.ID {
 	return p.PeerNetParams.ID
 }
 
-func (p *testpeer) Address() ma.Multiaddr {
+func (p *identity) Address() ma.Multiaddr {
 	return p.Addr
 }
 
-func (p *testpeer) PrivateKey() ci.PrivKey {
+func (p *identity) PrivateKey() ci.PrivKey {
 	return p.PrivKey
 }
 
-func (p *testpeer) PublicKey() ci.PubKey {
+func (p *identity) PublicKey() ci.PubKey {
 	return p.PubKey
 }