diff --git a/.travis.yml b/.travis.yml
index c5283c04..10026e82 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,4 +11,4 @@ before_script:
 script:
 - cargo test --manifest-path=postgres/Cargo.toml
 - cargo test --manifest-path=postgres/Cargo.toml --features "$(cargo read-manifest --manifest-path=postgres/Cargo.toml | jq -r '.features|keys|map(select(. != "with-security-framework" and . != "with-schannel"))|join(" ")')"
-- cargo test --manifest-path=postgres-tokio/Cargo.toml
+- cargo test --manifest-path=tokio-postgres/Cargo.toml
diff --git a/Cargo.toml b/Cargo.toml
index 9681338d..b425dd89 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,2 +1,2 @@
 [workspace]
-members = ["codegen", "postgres", "postgres-shared", "postgres-tokio"]
+members = ["codegen", "postgres", "postgres-shared", "tokio-postgres"]
diff --git a/postgres-shared/Cargo.toml b/postgres-shared/Cargo.toml
index d02b8489..77d8a95c 100644
--- a/postgres-shared/Cargo.toml
+++ b/postgres-shared/Cargo.toml
@@ -3,7 +3,7 @@ name = "postgres-shared"
 version = "0.1.0"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 license = "MIT"
-description = "Internal crate used by postgres libraries"
+description = "Internal crate used by postgres and postgres-tokio"
 repository = "https://github.com/sfackler/rust-postgres"
 
 [features]
diff --git a/postgres-tokio/Cargo.toml b/tokio-postgres/Cargo.toml
similarity index 97%
rename from postgres-tokio/Cargo.toml
rename to tokio-postgres/Cargo.toml
index 67bc3ef5..65047b0c 100644
--- a/postgres-tokio/Cargo.toml
+++ b/tokio-postgres/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "postgres-tokio"
+name = "tokio-postgres"
 version = "0.1.0"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 license = "MIT"
diff --git a/postgres-tokio/src/error.rs b/tokio-postgres/src/error.rs
similarity index 100%
rename from postgres-tokio/src/error.rs
rename to tokio-postgres/src/error.rs
diff --git a/postgres-tokio/src/lib.rs b/tokio-postgres/src/lib.rs
similarity index 100%
rename from postgres-tokio/src/lib.rs
rename to tokio-postgres/src/lib.rs
diff --git a/postgres-tokio/src/rows.rs b/tokio-postgres/src/rows.rs
similarity index 100%
rename from postgres-tokio/src/rows.rs
rename to tokio-postgres/src/rows.rs
diff --git a/postgres-tokio/src/stmt.rs b/tokio-postgres/src/stmt.rs
similarity index 100%
rename from postgres-tokio/src/stmt.rs
rename to tokio-postgres/src/stmt.rs
diff --git a/postgres-tokio/src/stream.rs b/tokio-postgres/src/stream.rs
similarity index 100%
rename from postgres-tokio/src/stream.rs
rename to tokio-postgres/src/stream.rs
diff --git a/postgres-tokio/src/test.rs b/tokio-postgres/src/test.rs
similarity index 100%
rename from postgres-tokio/src/test.rs
rename to tokio-postgres/src/test.rs
diff --git a/postgres-tokio/src/tls/mod.rs b/tokio-postgres/src/tls/mod.rs
similarity index 100%
rename from postgres-tokio/src/tls/mod.rs
rename to tokio-postgres/src/tls/mod.rs
diff --git a/postgres-tokio/src/tls/openssl.rs b/tokio-postgres/src/tls/openssl.rs
similarity index 100%
rename from postgres-tokio/src/tls/openssl.rs
rename to tokio-postgres/src/tls/openssl.rs
diff --git a/postgres-tokio/src/transaction.rs b/tokio-postgres/src/transaction.rs
similarity index 100%
rename from postgres-tokio/src/transaction.rs
rename to tokio-postgres/src/transaction.rs
diff --git a/postgres-tokio/src/types.rs b/tokio-postgres/src/types.rs
similarity index 100%
rename from postgres-tokio/src/types.rs
rename to tokio-postgres/src/types.rs