diff --git a/_examples/boingboing/boingboing.go b/_examples/boingboing/boingboing.go
index a674d81f..8b3e8c7a 100644
--- a/_examples/boingboing/boingboing.go
+++ b/_examples/boingboing/boingboing.go
@@ -41,7 +41,7 @@ import (
 
 	"github.com/netsec-ethz/scion-apps/pkg/appnet"
 	"github.com/netsec-ethz/scion-apps/pkg/appnet/appquic"
-	"github.com/netsec-ethz/scion-apps/pkg/mpsquic"
+	"github.com/netsec-ethz/scion-apps/pkg/nesquic"
 )
 
 const (
@@ -219,11 +219,11 @@ func (c *client) run(remote *snet.UDPAddr, paths []snet.Path) {
 	}
 	var err error
 	if remote.IA == appnet.DefNetwork().IA {
-		// XXX(matzf) mpsquic does not properly handle destination in same AS. Too many places assume
+		// XXX(matzf) nesquic does not properly handle destination in same AS. Too many places assume
 		// an existing path. Easy fallback, use normal appquic.
 		c.qsess, err = appquic.DialAddr(remote, "host:0", tlsConf, quicConf)
 	} else {
-		c.qsess, err = mpsquic.Dial(remote, "host:0", paths, tlsConf, quicConf)
+		c.qsess, err = nesquic.Dial(remote, "host:0", paths, tlsConf, quicConf)
 	}
 	if err != nil {
 		LogFatal("Unable to dial", "err", err)
@@ -336,7 +336,7 @@ type server struct {
 // On any error, the server exits.
 func (s server) run() {
 	// Listen on SCION address
-	qsock, err := mpsquic.ListenPort(
+	qsock, err := nesquic.ListenPort(
 		uint16(*port),
 		&tls.Config{
 			Certificates: appquic.GetDummyTLSCerts(),
diff --git a/pkg/mpsquic/flex_conn.go b/pkg/nesquic/flex_conn.go
similarity index 99%
rename from pkg/mpsquic/flex_conn.go
rename to pkg/nesquic/flex_conn.go
index e8752592..165917bd 100644
--- a/pkg/mpsquic/flex_conn.go
+++ b/pkg/nesquic/flex_conn.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package mpsquic
+package nesquic
 
 import (
 	"net"
diff --git a/pkg/mpsquic/log.go b/pkg/nesquic/log.go
similarity index 95%
rename from pkg/mpsquic/log.go
rename to pkg/nesquic/log.go
index bf686bcf..60e9b9de 100644
--- a/pkg/mpsquic/log.go
+++ b/pkg/nesquic/log.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package mpsquic
+package nesquic
 
 import (
 	"fmt"
@@ -40,7 +40,7 @@ func init() {
 	initLogging(log.Root())
 }
 
-// initLogging initializes logging for the mpsquic library using the passed scionproto (or similar) logger
+// initLogging initializes logging for the nesquic library using the passed scionproto (or similar) logger
 func initLogging(baseLogger log.Logger) {
 	logger = &Logger{}
 	logger.Trace = func(msg string, ctx ...interface{}) { baseLogger.Trace("MSQUIC: "+msg, ctx...) }
@@ -51,7 +51,7 @@ func initLogging(baseLogger log.Logger) {
 	logger.Crit = func(msg string, ctx ...interface{}) { baseLogger.Crit("MSQUIC: "+msg, ctx...) }
 }
 
-// SetBasicLogging sets mpsquic logging to only write to os.Stdout and os.Stderr
+// SetBasicLogging sets nesquic logging to only write to os.Stdout and os.Stderr
 func SetBasicLogging() {
 	if logger != nil {
 		logger.Trace = func(msg string, ctx ...interface{}) { _, _ = fmt.Fprintf(os.Stdout, "%v\t%v", msg, ctx) }
diff --git a/pkg/mpsquic/monitor.go b/pkg/nesquic/monitor.go
similarity index 99%
rename from pkg/mpsquic/monitor.go
rename to pkg/nesquic/monitor.go
index 2ab48f19..2c90f116 100644
--- a/pkg/mpsquic/monitor.go
+++ b/pkg/nesquic/monitor.go
@@ -1,4 +1,4 @@
-package mpsquic
+package nesquic
 
 import (
 	"math/rand"
diff --git a/pkg/mpsquic/mpsquic.go b/pkg/nesquic/nesquic.go
similarity index 99%
rename from pkg/mpsquic/mpsquic.go
rename to pkg/nesquic/nesquic.go
index afe5112d..47e9882d 100644
--- a/pkg/mpsquic/mpsquic.go
+++ b/pkg/nesquic/nesquic.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package mpsquic is a prototype implementation for a QUIC/SCION "socket" with
+// Package nesquic is a prototype implementation for a QUIC/SCION "socket" with
 // automatic, performance aware path choice.
 //
 // The most important design decision/constraint for this package is to make
@@ -41,7 +41,7 @@
 //                The monitor reevaluates the path choice at regular time intervals, or when
 //                the probing observes drastic changes (currently: revocation or timeout for
 //                active path).
-package mpsquic
+package nesquic
 
 import (
 	"context"
diff --git a/pkg/mpsquic/pinger.go b/pkg/nesquic/pinger.go
similarity index 99%
rename from pkg/mpsquic/pinger.go
rename to pkg/nesquic/pinger.go
index a1c9a838..dd455c22 100644
--- a/pkg/mpsquic/pinger.go
+++ b/pkg/nesquic/pinger.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package mpsquic
+package nesquic
 
 import (
 	"context"
diff --git a/pkg/mpsquic/policy.go b/pkg/nesquic/policy.go
similarity index 99%
rename from pkg/mpsquic/policy.go
rename to pkg/nesquic/policy.go
index 6ee1475a..eee136fd 100644
--- a/pkg/mpsquic/policy.go
+++ b/pkg/nesquic/policy.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package mpsquic
+package nesquic
 
 import (
 	"time"
diff --git a/pkg/mpsquic/revocations.go b/pkg/nesquic/revocations.go
similarity index 99%
rename from pkg/mpsquic/revocations.go
rename to pkg/nesquic/revocations.go
index dad4dc85..4e639b31 100644
--- a/pkg/mpsquic/revocations.go
+++ b/pkg/nesquic/revocations.go
@@ -1,4 +1,4 @@
-package mpsquic
+package nesquic
 
 import (
 	"context"
diff --git a/pkg/mpsquic/server.go b/pkg/nesquic/server.go
similarity index 99%
rename from pkg/mpsquic/server.go
rename to pkg/nesquic/server.go
index a14c16e7..011211d1 100644
--- a/pkg/mpsquic/server.go
+++ b/pkg/nesquic/server.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package mpsquic
+package nesquic
 
 import (
 	"crypto/tls"