diff --git a/Cargo.toml b/Cargo.toml
index edb20e64..fb0cb7d7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,7 +18,7 @@ members = [
     "rw-stream-sink",
     "circular-buffer",
     "varint-rs",
-    "multiplex-rs",
+    "mplex",
     "example",
     "ratelimit"
 ]
diff --git a/example/Cargo.toml b/example/Cargo.toml
index f644df9d..328f6d8b 100644
--- a/example/Cargo.toml
+++ b/example/Cargo.toml
@@ -9,7 +9,7 @@ bytes = "0.4"
 env_logger = "0.5.4"
 futures = "0.1"
 multiaddr = "0.3"
-multiplex = { path = "../multiplex-rs" }
+libp2p-mplex = { path = "../mplex" }
 libp2p-identify = { path = "../identify" }
 libp2p-kad = { path = "../kad" }
 libp2p-floodsub = { path = "../floodsub" }
diff --git a/example/examples/echo-dialer.rs b/example/examples/echo-dialer.rs
index fb4e8854..aaf1cba7 100644
--- a/example/examples/echo-dialer.rs
+++ b/example/examples/echo-dialer.rs
@@ -21,11 +21,11 @@
 extern crate bytes;
 extern crate env_logger;
 extern crate futures;
+extern crate libp2p_mplex as multiplex;
 extern crate libp2p_secio as secio;
 extern crate libp2p_swarm as swarm;
 extern crate libp2p_tcp_transport as tcp;
 extern crate libp2p_websocket as websocket;
-extern crate multiplex;
 extern crate tokio_core;
 extern crate tokio_io;
 
diff --git a/example/examples/echo-server.rs b/example/examples/echo-server.rs
index 4c11f66f..bbed10bf 100644
--- a/example/examples/echo-server.rs
+++ b/example/examples/echo-server.rs
@@ -21,11 +21,11 @@
 extern crate bytes;
 extern crate env_logger;
 extern crate futures;
+extern crate libp2p_mplex as multiplex;
 extern crate libp2p_secio as secio;
 extern crate libp2p_swarm as swarm;
 extern crate libp2p_tcp_transport as tcp;
 extern crate libp2p_websocket as websocket;
-extern crate multiplex;
 extern crate tokio_core;
 extern crate tokio_io;
 
diff --git a/example/examples/floodsub.rs b/example/examples/floodsub.rs
index 54edd4fc..fc0f26d6 100644
--- a/example/examples/floodsub.rs
+++ b/example/examples/floodsub.rs
@@ -22,12 +22,12 @@ extern crate bytes;
 extern crate env_logger;
 extern crate futures;
 extern crate libp2p_floodsub as floodsub;
+extern crate libp2p_mplex as multiplex;
 extern crate libp2p_peerstore as peerstore;
 extern crate libp2p_secio as secio;
 extern crate libp2p_swarm as swarm;
 extern crate libp2p_tcp_transport as tcp;
 extern crate libp2p_websocket as websocket;
-extern crate multiplex;
 extern crate rand;
 extern crate tokio_core;
 extern crate tokio_io;
diff --git a/example/examples/kademlia.rs b/example/examples/kademlia.rs
index 6ed14742..8b324589 100644
--- a/example/examples/kademlia.rs
+++ b/example/examples/kademlia.rs
@@ -25,11 +25,11 @@ extern crate example;
 extern crate futures;
 extern crate libp2p_identify as identify;
 extern crate libp2p_kad as kad;
+extern crate libp2p_mplex as multiplex;
 extern crate libp2p_peerstore as peerstore;
 extern crate libp2p_secio as secio;
 extern crate libp2p_swarm as swarm;
 extern crate libp2p_tcp_transport as tcp;
-extern crate multiplex;
 extern crate tokio_core;
 extern crate tokio_io;
 
diff --git a/example/examples/ping-client.rs b/example/examples/ping-client.rs
index 5e7a5abc..27f89e87 100644
--- a/example/examples/ping-client.rs
+++ b/example/examples/ping-client.rs
@@ -21,11 +21,11 @@
 extern crate bytes;
 extern crate env_logger;
 extern crate futures;
+extern crate libp2p_mplex as multiplex;
 extern crate libp2p_ping as ping;
 extern crate libp2p_secio as secio;
 extern crate libp2p_swarm as swarm;
 extern crate libp2p_tcp_transport as tcp;
-extern crate multiplex;
 extern crate tokio_core;
 extern crate tokio_io;
 
diff --git a/multiplex-rs/Cargo.toml b/mplex/Cargo.toml
similarity index 96%
rename from multiplex-rs/Cargo.toml
rename to mplex/Cargo.toml
index 7afbb8b1..995d4df3 100644
--- a/multiplex-rs/Cargo.toml
+++ b/mplex/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "multiplex"
+name = "libp2p-mplex"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
diff --git a/multiplex-rs/README.md b/mplex/README.md
similarity index 100%
rename from multiplex-rs/README.md
rename to mplex/README.md
diff --git a/multiplex-rs/src/header.rs b/mplex/src/header.rs
similarity index 100%
rename from multiplex-rs/src/header.rs
rename to mplex/src/header.rs
diff --git a/multiplex-rs/src/lib.rs b/mplex/src/lib.rs
similarity index 100%
rename from multiplex-rs/src/lib.rs
rename to mplex/src/lib.rs
diff --git a/multiplex-rs/src/read.rs b/mplex/src/read.rs
similarity index 100%
rename from multiplex-rs/src/read.rs
rename to mplex/src/read.rs
diff --git a/multiplex-rs/src/shared.rs b/mplex/src/shared.rs
similarity index 100%
rename from multiplex-rs/src/shared.rs
rename to mplex/src/shared.rs
diff --git a/multiplex-rs/src/write.rs b/mplex/src/write.rs
similarity index 100%
rename from multiplex-rs/src/write.rs
rename to mplex/src/write.rs
diff --git a/multiplex-rs/tests/two_peers.rs b/mplex/tests/two_peers.rs
similarity index 99%
rename from multiplex-rs/tests/two_peers.rs
rename to mplex/tests/two_peers.rs
index c3e00ba6..e34d9193 100644
--- a/multiplex-rs/tests/two_peers.rs
+++ b/mplex/tests/two_peers.rs
@@ -20,9 +20,9 @@
 
 extern crate bytes;
 extern crate futures;
+extern crate libp2p_mplex as multiplex;
 extern crate libp2p_swarm as swarm;
 extern crate libp2p_tcp_transport as tcp;
-extern crate multiplex;
 extern crate tokio_core;
 extern crate tokio_io;
 
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
index 3221d7de..115bc8d1 100644
--- a/swarm/Cargo.toml
+++ b/swarm/Cargo.toml
@@ -17,5 +17,5 @@ tokio-io = "0.1"
 [dev-dependencies]
 libp2p-ping = { path = "../ping" }
 libp2p-tcp-transport = { path = "../tcp-transport" }
-multiplex = { path = "../multiplex-rs" }
+libp2p-mplex = { path = "../mplex" }
 tokio-core = "0.1"
diff --git a/swarm/tests/multiplex.rs b/swarm/tests/multiplex.rs
index 19c6c58e..c957ef9d 100644
--- a/swarm/tests/multiplex.rs
+++ b/swarm/tests/multiplex.rs
@@ -20,9 +20,9 @@
 
 extern crate bytes;
 extern crate futures;
+extern crate libp2p_mplex as multiplex;
 extern crate libp2p_swarm;
 extern crate libp2p_tcp_transport;
-extern crate multiplex;
 extern crate tokio_core;
 extern crate tokio_io;