diff --git a/limiter.go b/limiter.go
index c48452541407ab92ee91e7928c238303273a608c..7959c06949fa19acf9ac989c90f540237e51cf7f 100644
--- a/limiter.go
+++ b/limiter.go
@@ -59,7 +59,7 @@ type isFdConsumingFnc func(ma.Multiaddr) bool
 
 func newDialLimiter(df dialfunc, fdFnc isFdConsumingFnc) *dialLimiter {
 	fd := ConcurrentFdDials
-	if env := os.Getenv("LIBP2P_SWARM_FD_LIMIT"); env != "" {
+	if env := os.Getenv("P2P_SWARM_FD_LIMIT"); env != "" {
 		if n, err := strconv.ParseInt(env, 10, 32); err == nil {
 			fd = int(n)
 		}
diff --git a/swarm.go b/swarm.go
index 4c6c88fe1e7736ca2762c131002595bdb063d9ba..f00fc2992cbaddfe967be89c9eb430a3854aba52 100644
--- a/swarm.go
+++ b/swarm.go
@@ -99,7 +99,7 @@ type Swarm struct {
 
 // NewSwarm constructs a Swarm.
 //
-// NOTE: go-libp2p will be moving to dependency injection soon. The variadic
+// NOTE: go-p2p will be moving to dependency injection soon. The variadic
 // `extra` interface{} parameter facilitates the future migration. Supported
 // elements are:
 //  - connmgr.ConnectionGater
diff --git a/swarm_dial.go b/swarm_dial.go
index 398ad13396ccbf6cd9d45387e805ad6e149188bc..37fd27d528360060cca8e8ed7bd09e541aef7c6b 100644
--- a/swarm_dial.go
+++ b/swarm_dial.go
@@ -719,7 +719,7 @@ func (s *Swarm) dialAddr(ctx context.Context, p peer.ID, addr ma.Multiaddr) (tra
 	return connC, nil
 }
 
-// TODO We should have a `IsFdConsuming() bool` method on the `Transport` interface in go-libp2p-core/transport.
+// TODO We should have a `IsFdConsuming() bool` method on the `Transport` interface in go-p2p-core/transport.
 // This function checks if any of the transport protocols in the address requires a file descriptor.
 // For now:
 // A Non-circuit address which has the TCP/UNIX protocol is deemed FD consuming.
diff --git a/swarm_net_test.go b/swarm_net_test.go
index ebb4a0c605d16bffb9e558949cc35bc9be669076..eef653415a57ba4d793cd3cca4b1dd943d553564 100644
--- a/swarm_net_test.go
+++ b/swarm_net_test.go
@@ -109,7 +109,7 @@ func TestNetworkOpenStream(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	testString := "hello ipfs"
+	testString := "hello dms3"
 
 	nets := make([]network.Network, 4)
 	for i := 0; i < 4; i++ {
diff --git a/swarm_stream.go b/swarm_stream.go
index b32b050f649de9bf83e42c44b8c9841c84f36643..c22720d813a76b527f39c282823af0c1d341bd5c 100644
--- a/swarm_stream.go
+++ b/swarm_stream.go
@@ -11,7 +11,7 @@ import (
 	"gitlab.dms3.io/p2p/go-p2p-core/protocol"
 )
 
-// Validate Stream conforms to the go-libp2p-net Stream interface
+// Validate Stream conforms to the go-p2p-net Stream interface
 var _ network.Stream = &Stream{}
 
 // Stream is the stream type used by swarm. In general, you won't use this type
diff --git a/swarm_test.go b/swarm_test.go
index 0107c4f551db2bde61aed433997cd905cf78fa52..06b7d99b868a29ec2487f2309cfbcbe2f768cfdc 100644
--- a/swarm_test.go
+++ b/swarm_test.go
@@ -31,7 +31,7 @@ func EchoStreamHandler(stream network.Stream) {
 	go func() {
 		defer stream.Close()
 
-		// pull out the ipfs conn
+		// pull out the dms3 conn
 		c := stream.Conn()
 		log.Infof("%s ponging to %s", c.LocalPeer(), c.RemotePeer())
 
diff --git a/swarm_transport.go b/swarm_transport.go
index b5ab2bd93f6e82ae5636c3c753a19e88c7e38ce3..d5a3f0d41b1165aa7957dbd204c3048a3ffb22ac 100644
--- a/swarm_transport.go
+++ b/swarm_transport.go
@@ -73,7 +73,7 @@ func (s *Swarm) TransportForListening(a ma.Multiaddr) transport.Transport {
 
 // AddTransport adds a transport to this swarm.
 //
-// Satisfies the Network interface from go-libp2p-transport.
+// Satisfies the Network interface from go-p2p-transport.
 func (s *Swarm) AddTransport(t transport.Transport) error {
 	protocols := t.Protocols()