diff --git a/test/3nodetest/client/run.sh b/test/3nodetest/client/run.sh
index 7a34d7bbc..f3bb966e8 100644
--- a/test/3nodetest/client/run.sh
+++ b/test/3nodetest/client/run.sh
@@ -1,4 +1,4 @@
-ipfs bootstrap add /ip4/$BOOTSTRAP_PORT_4011_TCP_ADDR/tcp/$BOOTSTRAP_PORT_4011_TCP_PORT/ipfs/QmNXuBh8HFsWq68Fid8dMbGNQTh7eG6hV9rr1fQyfmfomE
+ipfs bootstrap add /ip4/$BOOTSTRAP_PORT_4011_TCP_ADDR/tcp/$BOOTSTRAP_PORT_4011_TCP_PORT/p2p/QmNXuBh8HFsWq68Fid8dMbGNQTh7eG6hV9rr1fQyfmfomE
 ipfs bootstrap # list bootstrap nodes for debugging
 
 echo "3nodetest> starting client daemon"
diff --git a/test/3nodetest/server/run.sh b/test/3nodetest/server/run.sh
index 325ae3c3c..dfe586310 100644
--- a/test/3nodetest/server/run.sh
+++ b/test/3nodetest/server/run.sh
@@ -1,5 +1,5 @@
 # must be connected to bootstrap node
-ipfs bootstrap add /ip4/$BOOTSTRAP_PORT_4011_TCP_ADDR/tcp/$BOOTSTRAP_PORT_4011_TCP_PORT/ipfs/QmNXuBh8HFsWq68Fid8dMbGNQTh7eG6hV9rr1fQyfmfomE
+ipfs bootstrap add /ip4/$BOOTSTRAP_PORT_4011_TCP_ADDR/tcp/$BOOTSTRAP_PORT_4011_TCP_PORT/p2p/QmNXuBh8HFsWq68Fid8dMbGNQTh7eG6hV9rr1fQyfmfomE
 ipfs bootstrap # list bootstrap nodes for debugging
 
 # wait for daemon to start/bootstrap
@@ -9,7 +9,7 @@ echo "3nodetest> starting server daemon"
 # run daemon in debug mode to collect profiling data
 ipfs daemon --debug &
 sleep 3
-# TODO instead of bootrapping: ipfs swarm connect /ip4/$BOOTSTRAP_PORT_4011_TCP_ADDR/tcp/$BOOTSTRAP_PORT_4011_TCP_PORT/ipfs/QmNXuBh8HFsWq68Fid8dMbGNQTh7eG6hV9rr1fQyfmfomE
+# TODO instead of bootrapping: ipfs swarm connect /ip4/$BOOTSTRAP_PORT_4011_TCP_ADDR/tcp/$BOOTSTRAP_PORT_4011_TCP_PORT/p2p/QmNXuBh8HFsWq68Fid8dMbGNQTh7eG6hV9rr1fQyfmfomE
 
 # change dir before running add commands so ipfs client profiling data doesn't
 # overwrite the daemon profiling data
diff --git a/test/sharness/lib/iptb-lib.sh b/test/sharness/lib/iptb-lib.sh
index 6ee8fbd8b..dc29ddeb3 100644
--- a/test/sharness/lib/iptb-lib.sh
+++ b/test/sharness/lib/iptb-lib.sh
@@ -14,7 +14,7 @@ ipfsi() {
 check_has_connection() {
   node="$1"
   ipfsi "$node" swarm peers >"swarm_peers_$node" &&
-  grep "ipfs" "swarm_peers_$node" >/dev/null
+  grep "p2p" "swarm_peers_$node" >/dev/null
 }
 
 iptb() {
diff --git a/test/sharness/t0120-bootstrap.sh b/test/sharness/t0120-bootstrap.sh
index 2314a02a2..883e29a8b 100755
--- a/test/sharness/t0120-bootstrap.sh
+++ b/test/sharness/t0120-bootstrap.sh
@@ -5,19 +5,19 @@
 #
 
 # changing the bootstrap peers will require changing it in two places :)
-BP1="/dnsaddr/bootstrap.libp2p.io/ipfs/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN"
-BP2="/dnsaddr/bootstrap.libp2p.io/ipfs/QmQCU2EcMqAqQPR2i9bChDtGNJchTbq5TbXJJ16u19uLTa"
-BP3="/dnsaddr/bootstrap.libp2p.io/ipfs/QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb"
-BP4="/dnsaddr/bootstrap.libp2p.io/ipfs/QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt"
-BP5="/ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ"
-BP6="/ip4/104.236.179.241/tcp/4001/ipfs/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM"
-BP7="/ip4/104.236.76.40/tcp/4001/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64"
-BP8="/ip4/128.199.219.111/tcp/4001/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu"
-BP9="/ip4/178.62.158.247/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd"
-BP10="/ip6/2400:6180:0:d0::151:6001/tcp/4001/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu"
-BP11="/ip6/2604:a880:1:20::203:d001/tcp/4001/ipfs/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM"
-BP12="/ip6/2604:a880:800:10::4a:5001/tcp/4001/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64"
-BP13="/ip6/2a03:b0c0:0:1010::23:1001/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd"
+BP1="/dnsaddr/bootstrap.libp2p.io/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN"
+BP2="/dnsaddr/bootstrap.libp2p.io/p2p/QmQCU2EcMqAqQPR2i9bChDtGNJchTbq5TbXJJ16u19uLTa"
+BP3="/dnsaddr/bootstrap.libp2p.io/p2p/QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb"
+BP4="/dnsaddr/bootstrap.libp2p.io/p2p/QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt"
+BP5="/ip4/104.131.131.82/tcp/4001/p2p/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ"
+BP6="/ip4/104.236.179.241/tcp/4001/p2p/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM"
+BP7="/ip4/104.236.76.40/tcp/4001/p2p/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64"
+BP8="/ip4/128.199.219.111/tcp/4001/p2p/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu"
+BP9="/ip4/178.62.158.247/tcp/4001/p2p/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd"
+BP10="/ip6/2400:6180:0:d0::151:6001/tcp/4001/p2p/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu"
+BP11="/ip6/2604:a880:1:20::203:d001/tcp/4001/p2p/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM"
+BP12="/ip6/2604:a880:800:10::4a:5001/tcp/4001/p2p/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64"
+BP13="/ip6/2a03:b0c0:0:1010::23:1001/tcp/4001/p2p/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd"
 
 test_description="Test ipfs repo operations"
 
diff --git a/test/sharness/t0121-bootstrap-iptb.sh b/test/sharness/t0121-bootstrap-iptb.sh
index e7c7d0105..8de23a216 100755
--- a/test/sharness/t0121-bootstrap-iptb.sh
+++ b/test/sharness/t0121-bootstrap-iptb.sh
@@ -58,7 +58,7 @@ test_expect_success "reset iptb nodes" '
 
 test_expect_success "set bootstrap addrs" '
   bsn_peer_id=$(ipfs id -f "<id>") &&
-  BADDR="/ip4/127.0.0.1/tcp/$SWARM_PORT/ipfs/$bsn_peer_id" &&
+  BADDR="/ip4/127.0.0.1/tcp/$SWARM_PORT/p2p/$bsn_peer_id" &&
   ipfsi 0 bootstrap add $BADDR &&
   ipfsi 1 bootstrap add $BADDR &&
   ipfsi 2 bootstrap add $BADDR &&
diff --git a/test/sharness/t0140-swarm.sh b/test/sharness/t0140-swarm.sh
index a5c1dadda..649cb380f 100755
--- a/test/sharness/t0140-swarm.sh
+++ b/test/sharness/t0140-swarm.sh
@@ -38,7 +38,7 @@ test_expect_success "output looks good" '
   grep PublicKey output
 '
 
-addr="/ip4/127.0.0.1/tcp/9898/ipfs/QmUWKoHbjsqsSMesRC2Zoscs8edyFz6F77auBB1YBBhgpX"
+addr="/ip4/127.0.0.1/tcp/9898/p2p/QmUWKoHbjsqsSMesRC2Zoscs8edyFz6F77auBB1YBBhgpX"
 
 test_expect_success "cant trigger a dial backoff with swarm connect" '
   test_expect_code 1 ipfs swarm connect $addr 2> connect_out
@@ -105,13 +105,13 @@ startup_cluster 2
 
 test_expect_success "disconnect work without specifying a transport address" '
   [ $(ipfsi 0 swarm peers | wc -l) -eq 1 ] &&
-  ipfsi 0 swarm disconnect "/ipfs/$(iptb attr get 1 id)" &&
+  ipfsi 0 swarm disconnect "/p2p/$(iptb attr get 1 id)" &&
   [ $(ipfsi 0 swarm peers | wc -l) -eq 0 ]
 '
 
 test_expect_success "connect work without specifying a transport address" '
   [ $(ipfsi 0 swarm peers | wc -l) -eq 0 ] &&
-  ipfsi 0 swarm connect "/ipfs/$(iptb attr get 1 id)" &&
+  ipfsi 0 swarm connect "/p2p/$(iptb attr get 1 id)" &&
   [ $(ipfsi 0 swarm peers | wc -l) -eq 1 ]
 '
 
diff --git a/test/sharness/t0180-p2p.sh b/test/sharness/t0180-p2p.sh
index 44a4377b6..0aa9d8c42 100755
--- a/test/sharness/t0180-p2p.sh
+++ b/test/sharness/t0180-p2p.sh
@@ -75,12 +75,12 @@ test_server_to_client() {
 
 spawn_sending_server
 
-test_expect_success 'S->C(/ipfs/peerID) Setup client side' '
-  ipfsi 1 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10102 /ipfs/${PEERID_0} 2>&1 > dialer-stdouterr.log
+test_expect_success 'S->C(/p2p/peerID) Setup client side' '
+  ipfsi 1 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10102 /p2p/${PEERID_0} 2>&1 > dialer-stdouterr.log
 '
 
-test_expect_success 'S->C Setup(dnsaddr/addr/ipfs/peerID) client side' '
-  ipfsi 1 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10103 /dnsaddr/bootstrap.libp2p.io/ipfs/${PEERID_0}  2>&1 > dialer-stdouterr.log
+test_expect_success 'S->C Setup(dnsaddr/addr/p2p/peerID) client side' '
+  ipfsi 1 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10103 /dnsaddr/bootstrap.libp2p.io/p2p/${PEERID_0}  2>&1 > dialer-stdouterr.log
 '
 
 test_expect_success 'S->C Setup(dnsaddr/addr) client side' '
@@ -126,7 +126,7 @@ test_expect_success 'C->S Spawn receiving server' '
 '
 
 test_expect_success 'C->S Setup client side' '
-  ipfsi 1 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10102 /ipfs/${PEERID_0} 2>&1 > dialer-stdouterr.log
+  ipfsi 1 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10102 /p2p/${PEERID_0} 2>&1 > dialer-stdouterr.log
 '
 
 test_expect_success 'C->S Connect and receive data' '
@@ -155,7 +155,7 @@ test_expect_success "cannot accept 0 port in 'ipfs p2p listen'" '
 '
 
 test_expect_success "'ipfs p2p forward' accept 0 port" '
-  ipfsi 2 p2p forward /x/p2p-test/0 /ip4/127.0.0.1/tcp/0 /ipfs/$PEERID_0
+  ipfsi 2 p2p forward /x/p2p-test/0 /ip4/127.0.0.1/tcp/0 /p2p/$PEERID_0
 '
 
 test_expect_success "'ipfs p2p ls' output looks good" '
@@ -168,7 +168,7 @@ test_expect_success "'ipfs p2p ls' output looks good" '
 # Listing streams
 
 test_expect_success "'ipfs p2p ls' succeeds" '
-  echo "/x/p2p-test /ipfs/$PEERID_0 /ip4/127.0.0.1/tcp/10101" > expected &&
+  echo "/x/p2p-test /p2p/$PEERID_0 /ip4/127.0.0.1/tcp/10101" > expected &&
   ipfsi 0 p2p ls > actual
 '
 
@@ -190,7 +190,7 @@ check_test_ports
 test_expect_success "Setup: Idle stream" '
   ma-pipe-unidir --listen --pidFile=listener.pid recv /ip4/127.0.0.1/tcp/10101 &
 
-  ipfsi 1 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10102 /ipfs/$PEERID_0 &&
+  ipfsi 1 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10102 /p2p/$PEERID_0 &&
   ma-pipe-unidir --pidFile=client.pid recv /ip4/127.0.0.1/tcp/10102 &
 
   test_wait_for_file 30 100ms listener.pid &&
@@ -199,7 +199,7 @@ test_expect_success "Setup: Idle stream" '
 '
 
 test_expect_success "'ipfs p2p stream ls' succeeds" '
-  echo "3 /x/p2p-test /ipfs/$PEERID_1 /ip4/127.0.0.1/tcp/10101" > expected
+  echo "3 /x/p2p-test /p2p/$PEERID_1 /ip4/127.0.0.1/tcp/10101" > expected
   ipfsi 0 p2p stream ls > actual
 '
 
@@ -232,7 +232,7 @@ test_expect_success "Setup: Idle stream(2)" '
   ma-pipe-unidir --listen --pidFile=listener.pid recv /ip4/127.0.0.1/tcp/10101 &
 
   ipfsi 0 p2p listen /x/p2p-test2 /ip4/127.0.0.1/tcp/10101 2>&1 > listener-stdouterr.log &&
-  ipfsi 1 p2p forward /x/p2p-test2 /ip4/127.0.0.1/tcp/10102 /ipfs/$PEERID_0 2>&1 > dialer-stdouterr.log &&
+  ipfsi 1 p2p forward /x/p2p-test2 /ip4/127.0.0.1/tcp/10102 /p2p/$PEERID_0 2>&1 > dialer-stdouterr.log &&
   ma-pipe-unidir --pidFile=client.pid recv /ip4/127.0.0.1/tcp/10102 &
 
   test_wait_for_file 30 100ms listener.pid &&
@@ -241,7 +241,7 @@ test_expect_success "Setup: Idle stream(2)" '
 '
 
 test_expect_success "'ipfs p2p stream ls' succeeds(2)" '
-  echo "4 /x/p2p-test2 /ipfs/$PEERID_1 /ip4/127.0.0.1/tcp/10101" > expected
+  echo "4 /x/p2p-test2 /p2p/$PEERID_1 /ip4/127.0.0.1/tcp/10101" > expected
   ipfsi 0 p2p stream ls > actual
   test_cmp expected actual
 '
@@ -283,8 +283,8 @@ test_expect_success "'ipfs p2p close' closes by target addr" '
 
 test_expect_success "'ipfs p2p close' closes right listeners" '
   ipfsi 0 p2p listen /x/p2p-test /ip4/127.0.0.1/tcp/10101 &&
-  ipfsi 0 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10101 /ipfs/$PEERID_1 &&
-  echo "/x/p2p-test /ipfs/$PEERID_0 /ip4/127.0.0.1/tcp/10101" > expected &&
+  ipfsi 0 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10101 /p2p/$PEERID_1 &&
+  echo "/x/p2p-test /p2p/$PEERID_0 /ip4/127.0.0.1/tcp/10101" > expected &&
 
   ipfsi 0 p2p close -l /ip4/127.0.0.1/tcp/10101 &&
   ipfsi 0 p2p ls > actual &&
@@ -294,7 +294,7 @@ test_expect_success "'ipfs p2p close' closes right listeners" '
 check_test_ports
 
 test_expect_success "'ipfs p2p close' closes by listen addr" '
-  ipfsi 0 p2p close -l /ipfs/$PEERID_0 &&
+  ipfsi 0 p2p close -l /p2p/$PEERID_0 &&
   ipfsi 0 p2p ls > actual &&
   test_must_be_empty actual
 '
@@ -313,7 +313,7 @@ test_expect_success 'C->S Spawn receiving server' '
 '
 
 test_expect_success 'C->S Setup client side' '
-  ipfsi 1 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10102 /ipfs/${PEERID_0} 2>&1 > dialer-stdouterr.log
+  ipfsi 1 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10102 /p2p/${PEERID_0} 2>&1 > dialer-stdouterr.log
 '
 
 test_expect_success 'C->S Connect and receive data' '
@@ -358,7 +358,7 @@ test_expect_success 'start p2p listener on custom proto' '
 spawn_sending_server
 
 test_expect_success 'S->C Setup client side (custom proto)' '
-  ipfsi 1 p2p forward --allow-custom-protocol /p2p-test /ip4/127.0.0.1/tcp/10102 /ipfs/${PEERID_0} 2>&1 > dialer-stdouterr.log
+  ipfsi 1 p2p forward --allow-custom-protocol /p2p-test /ip4/127.0.0.1/tcp/10102 /p2p/${PEERID_0} 2>&1 > dialer-stdouterr.log
 '
 
 test_server_to_client
diff --git a/test/sharness/t0182-circuit-relay.sh b/test/sharness/t0182-circuit-relay.sh
index f0b846b7c..24e1b8ede 100755
--- a/test/sharness/t0182-circuit-relay.sh
+++ b/test/sharness/t0182-circuit-relay.sh
@@ -44,7 +44,7 @@ test_expect_success 'peer ids' '
 '
 
 test_expect_success 'connect A <-Relay-> B' '
-  ipfsi 0 swarm connect /p2p-circuit/ipfs/$PEERID_2 > peers_out
+  ipfsi 0 swarm connect /p2p-circuit/p2p/$PEERID_2 > peers_out
 '
 
 test_expect_success 'output looks good' '
@@ -54,12 +54,12 @@ test_expect_success 'output looks good' '
 
 test_expect_success 'peers for A look good' '
   ipfsi 0 swarm peers > peers_out &&
-  test_should_contain "/ipfs/$PEERID_1/p2p-circuit/ipfs/$PEERID_2$" peers_out
+  test_should_contain "/p2p/$PEERID_1/p2p-circuit/p2p/$PEERID_2$" peers_out
 '
 
 test_expect_success 'peers for B look good' '
   ipfsi 2 swarm peers > peers_out &&
-  test_should_contain "/ipfs/$PEERID_1/p2p-circuit/ipfs/$PEERID_0$" peers_out
+  test_should_contain "/p2p/$PEERID_1/p2p-circuit/p2p/$PEERID_0$" peers_out
 '
 
 test_expect_success 'add an object in A' '