diff --git a/core/commands/p2p.go b/core/commands/p2p.go
index c84c8e3bc7a6..afd6c03bd495 100644
--- a/core/commands/p2p.go
+++ b/core/commands/p2p.go
@@ -87,8 +87,8 @@ Forward connections made to <listen-address> to <target-address>.
 connections and/or handlers. It must be prefixed with '` + P2PProtoPrefix + `'.
 
 Example:
-  ipfs p2p forward ` + P2PProtoPrefix + `myproto /ip4/127.0.0.1/tcp/4567 /ipfs/QmPeer
-    - Forward connections to 127.0.0.1:4567 to '` + P2PProtoPrefix + `myproto' service on /ipfs/QmPeer
+  ipfs p2p forward ` + P2PProtoPrefix + `myproto /ip4/127.0.0.1/tcp/4567 /p2p/QmPeer
+    - Forward connections to 127.0.0.1:4567 to '` + P2PProtoPrefix + `myproto' service on /p2p/QmPeer
 
 `,
 	},
diff --git a/core/commands/swarm.go b/core/commands/swarm.go
index db9122f3d7af..aae25b6b2d91 100644
--- a/core/commands/swarm.go
+++ b/core/commands/swarm.go
@@ -354,7 +354,7 @@ var swarmConnectCmd = &cmds.Command{
 
 The address format is an IPFS multiaddr:
 
-ipfs swarm connect /ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ
+ipfs swarm connect /ip4/104.131.131.82/tcp/4001/p2p/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ
 `,
 	},
 	Arguments: []cmds.Argument{
@@ -399,7 +399,7 @@ var swarmDisconnectCmd = &cmds.Command{
 'ipfs swarm disconnect' closes a connection to a peer address. The address
 format is an IPFS multiaddr:
 
-ipfs swarm disconnect /ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ
+ipfs swarm disconnect /ip4/104.131.131.82/tcp/4001/p2p/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ
 
 The disconnect is not permanent; if ipfs needs to talk to that address later,
 it will reconnect.
diff --git a/docs/experimental-features.md b/docs/experimental-features.md
index 788ff5f033fc..0c24bc8d65cb 100644
--- a/docs/experimental-features.md
+++ b/docs/experimental-features.md
@@ -229,7 +229,7 @@ ipfs bootstrap add <multiaddr>
 
 For example:
 ```
-ipfs bootstrap add /ip4/104.236.76.40/tcp/4001/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64
+ipfs bootstrap add /ip4/104.236.76.40/tcp/4001/p2p/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64
 ```
 
 Bootstrap nodes are no different from all other nodes in the network apart from
diff --git a/docs/file-transfer.md b/docs/file-transfer.md
index 39cc63809b28..247993489ff0 100644
--- a/docs/file-transfer.md
+++ b/docs/file-transfer.md
@@ -45,8 +45,8 @@ addresses (like the example below), then your nodes are online.
         "ID": "QmTNwsFkLAed15kQEC1ZJWPfoNbBQnMFojfJKQ9sZj1dk8",
         "PublicKey": "CAASpgIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZb6znj3LQZKP1+X81exf+vbnqNCMtHjZ5RKTCm7Fytnfe+AI1fhs9YbZdkgFkM1HLxmIOLQj2bMXPIGxUM+EnewN8tWurx4B3+lR/LWNwNYcCFL+jF2ltc6SE6BC8kMLEZd4zidOLPZ8lIRpd0x3qmsjhGefuRwrKeKlR4tQ3C76ziOms47uLdiVVkl5LyJ5+mn4rXOjNKt/oy2O4m1St7X7/yNt8qQgYsPfe/hCOywxCEIHEkqmil+vn7bu4RpAtsUzCcBDoLUIWuU3i6qfytD05hP8Clo+at+l//ctjMxylf3IQ5qyP+yfvazk+WHcsB0tWueEmiU5P2nfUUIR3AgMBAAE=",
         "Addresses": [
-                "/ip4/127.0.0.1/tcp/4001/ipfs/QmTNwsFkLAed15kQEC1ZJWPfoNbBQnMFojfJKQ9sZj1dk8",
-                "/ip4/192.168.2.131/tcp/4001/ipfs/QmTNwsFkLAed15kQEC1ZJWPfoNbBQnMFojfJKQ9sZj1dk8",
+                "/ip4/127.0.0.1/tcp/4001/p2p/QmTNwsFkLAed15kQEC1ZJWPfoNbBQnMFojfJKQ9sZj1dk8",
+                "/ip4/192.168.2.131/tcp/4001/p2p/QmTNwsFkLAed15kQEC1ZJWPfoNbBQnMFojfJKQ9sZj1dk8",
         ],
         "AgentVersion": "go-ipfs/0.4.11-dev/",
         "ProtocolVersion": "ipfs/0.1.0"
diff --git a/docs/transports.md b/docs/transports.md
index 39ce127db03a..f70fff6d7ba3 100644
--- a/docs/transports.md
+++ b/docs/transports.md
@@ -1,6 +1,6 @@
 ## /ws and /wss -- websockets
 
-If you want browsers to connect to e.g. `/dns4/example.com/tcp/443/wss/ipfs/QmFoo`
+If you want browsers to connect to e.g. `/dns4/example.com/tcp/443/wss/p2p/QmFoo`
 
 - [ ] An SSL cert matching the `/dns4` or `/dns6` name
 - [ ] go-ipfs listening on `/ip4/127.0.0.1/tcp/8081/ws`
diff --git a/test/3nodetest/client/run.sh b/test/3nodetest/client/run.sh
index 7a34d7bbc0b0..f3bb966e8492 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 325ae3c3c6c0..46bd1d32ad24 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
diff --git a/test/sharness/t0120-bootstrap.sh b/test/sharness/t0120-bootstrap.sh
index 2314a02a2abb..883e29a8be69 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 e7c7d0105b68..8de23a21676f 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 a5c1dadda7db..649cb380f540 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 eaeed65b66f8..6aedf996dad9 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 4f480ebef64c..28fa50950eeb 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,13 +54,13 @@ test_expect_success 'output looks good' '
 
 test_expect_success 'peers for A look good' '
   ipfsi 0 swarm peers | grep p2p-circuit > peers_out &&
-  echo "/ipfs/$PEERID_1/p2p-circuit/ipfs/$PEERID_2" > peers_exp &&
+  echo "/p2p/$PEERID_1/p2p-circuit/p2p/$PEERID_2" > peers_exp &&
   test_cmp peers_exp peers_out
 '
 
 test_expect_success 'peers for B look good' '
   ipfsi 2 swarm peers | grep p2p-circuit > peers_out &&
-  echo "/ipfs/$PEERID_1/p2p-circuit/ipfs/$PEERID_0" > peers_exp &&
+  echo "/p2p/$PEERID_1/p2p-circuit/p2p/$PEERID_0" > peers_exp &&
   test_cmp peers_exp peers_out
 '