diff --git a/multiaddr_test.go b/multiaddr_test.go
index ffac3bb..546e792 100644
--- a/multiaddr_test.go
+++ b/multiaddr_test.go
@@ -509,8 +509,8 @@ func TestRoundTrip(t *testing.T) {
 		"/ip4/127.0.0.1/tcp/123",
 		"/ip4/127.0.0.1/udp/123",
 		"/ip4/127.0.0.1/udp/123/ip6/::",
-		"/ipfs/QmbHVEEepCi7rn7VL7Exxpd2Ci9NNB6ifvqwhsrbRMgQFP",
-		"/ipfs/QmbHVEEepCi7rn7VL7Exxpd2Ci9NNB6ifvqwhsrbRMgQFP/unix/a/b/c",
+		"/p2p/QmbHVEEepCi7rn7VL7Exxpd2Ci9NNB6ifvqwhsrbRMgQFP",
+		"/p2p/QmbHVEEepCi7rn7VL7Exxpd2Ci9NNB6ifvqwhsrbRMgQFP/unix/a/b/c",
 	} {
 		ma, err := NewMultiaddr(s)
 		if err != nil {
@@ -523,7 +523,6 @@ func TestRoundTrip(t *testing.T) {
 	}
 }
 
-// XXX: Change this test when we switch to /p2p by default.
 func TestIPFSvP2P(t *testing.T) {
 	var (
 		p2pAddr  = "/p2p/QmbHVEEepCi7rn7VL7Exxpd2Ci9NNB6ifvqwhsrbRMgQFP"
@@ -535,8 +534,8 @@ func TestIPFSvP2P(t *testing.T) {
 		if err != nil {
 			t.Errorf("error when parsing %q: %s", s, err)
 		}
-		if ma.String() != ipfsAddr {
-			t.Errorf("expected %q, got %q", ipfsAddr, ma.String())
+		if ma.String() != p2pAddr {
+			t.Errorf("expected %q, got %q", p2pAddr, ma.String())
 		}
 	}
 }
diff --git a/protocol.go b/protocol.go
index f9d7036..4be1b4e 100644
--- a/protocol.go
+++ b/protocol.go
@@ -62,19 +62,9 @@ var Protocols = []Protocol{}
 // This will cause any P_P2P multiaddr to print out as /p2p/ instead of /ipfs/.
 // Note that the binary serialization of this multiaddr does not change at any
 // point. This means that this code is not a breaking network change at any point
+//
+// DEPRECATED: this is now the default
 func SwapToP2pMultiaddrs() {
-	for i := range Protocols {
-		if Protocols[i].Code == P_P2P {
-			Protocols[i].Name = "p2p"
-			break
-		}
-	}
-
-	protoP2P.Name = "p2p"
-
-	protocolsByName["ipfs"] = protoP2P
-	protocolsByName["p2p"] = protoP2P
-	protocolsByCode[protoP2P.Code] = protoP2P
 }
 
 func AddProtocol(p Protocol) error {
diff --git a/protocols.go b/protocols.go
index a4e062e..9516937 100644
--- a/protocols.go
+++ b/protocols.go
@@ -177,7 +177,7 @@ var (
 		VCode: CodeToVarint(P_HTTPS),
 	}
 	protoP2P = Protocol{
-		Name:       "ipfs",
+		Name:       "p2p",
 		Code:       P_P2P,
 		VCode:      CodeToVarint(P_P2P),
 		Size:       LengthPrefixedVarSize,