diff --git a/Cargo.toml b/Cargo.toml
index 37421ba9..cf7f99ca 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,10 +2,10 @@
 members = [
     "codegen",
     "postgres",
+    "postgres-native-tls",
+    "postgres-openssl",
     "postgres-protocol",
     "tokio-postgres",
-    "tokio-postgres-native-tls",
-    "tokio-postgres-openssl",
 ]
 
 [profile.release]
diff --git a/tokio-postgres-native-tls/CHANGELOG.md b/postgres-native-tls/CHANGELOG.md
similarity index 100%
rename from tokio-postgres-native-tls/CHANGELOG.md
rename to postgres-native-tls/CHANGELOG.md
diff --git a/tokio-postgres-native-tls/Cargo.toml b/postgres-native-tls/Cargo.toml
similarity index 95%
rename from tokio-postgres-native-tls/Cargo.toml
rename to postgres-native-tls/Cargo.toml
index ec2b9106..a63fdc42 100644
--- a/tokio-postgres-native-tls/Cargo.toml
+++ b/postgres-native-tls/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "tokio-postgres-native-tls"
+name = "postgres-native-tls"
 version = "0.1.0-rc.1"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
diff --git a/tokio-postgres-native-tls/LICENSE-APACHE b/postgres-native-tls/LICENSE-APACHE
similarity index 100%
rename from tokio-postgres-native-tls/LICENSE-APACHE
rename to postgres-native-tls/LICENSE-APACHE
diff --git a/tokio-postgres-native-tls/LICENSE-MIT b/postgres-native-tls/LICENSE-MIT
similarity index 100%
rename from tokio-postgres-native-tls/LICENSE-MIT
rename to postgres-native-tls/LICENSE-MIT
diff --git a/tokio-postgres-native-tls/src/lib.rs b/postgres-native-tls/src/lib.rs
similarity index 97%
rename from tokio-postgres-native-tls/src/lib.rs
rename to postgres-native-tls/src/lib.rs
index b0fcf4b0..b269594a 100644
--- a/tokio-postgres-native-tls/src/lib.rs
+++ b/postgres-native-tls/src/lib.rs
@@ -4,7 +4,7 @@
 //!
 //! ```no_run
 //! use native_tls::{Certificate, TlsConnector};
-//! use tokio_postgres_native_tls::MakeTlsConnector;
+//! use postgres_native_tls::MakeTlsConnector;
 //! use std::fs;
 //!
 //! # fn main() -> Result<(), Box<std::error::Error>> {
@@ -27,7 +27,7 @@
 //!
 //! ```no_run
 //! use native_tls::{Certificate, TlsConnector};
-//! use tokio_postgres_native_tls::MakeTlsConnector;
+//! use postgres_native_tls::MakeTlsConnector;
 //! use std::fs;
 //!
 //! # fn main() -> Result<(), Box<std::error::Error>> {
diff --git a/tokio-postgres-native-tls/src/test.rs b/postgres-native-tls/src/test.rs
similarity index 100%
rename from tokio-postgres-native-tls/src/test.rs
rename to postgres-native-tls/src/test.rs
diff --git a/tokio-postgres-openssl/CHANGELOG.md b/postgres-openssl/CHANGELOG.md
similarity index 100%
rename from tokio-postgres-openssl/CHANGELOG.md
rename to postgres-openssl/CHANGELOG.md
diff --git a/tokio-postgres-openssl/Cargo.toml b/postgres-openssl/Cargo.toml
similarity index 95%
rename from tokio-postgres-openssl/Cargo.toml
rename to postgres-openssl/Cargo.toml
index 8e1ba075..ca50aa42 100644
--- a/tokio-postgres-openssl/Cargo.toml
+++ b/postgres-openssl/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "tokio-postgres-openssl"
+name = "postgres-openssl"
 version = "0.1.0-rc.1"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 edition = "2018"
diff --git a/tokio-postgres-openssl/LICENSE-APACHE b/postgres-openssl/LICENSE-APACHE
similarity index 100%
rename from tokio-postgres-openssl/LICENSE-APACHE
rename to postgres-openssl/LICENSE-APACHE
diff --git a/tokio-postgres-openssl/LICENSE-MIT b/postgres-openssl/LICENSE-MIT
similarity index 100%
rename from tokio-postgres-openssl/LICENSE-MIT
rename to postgres-openssl/LICENSE-MIT
diff --git a/tokio-postgres-openssl/src/lib.rs b/postgres-openssl/src/lib.rs
similarity index 98%
rename from tokio-postgres-openssl/src/lib.rs
rename to postgres-openssl/src/lib.rs
index 22098741..57486bad 100644
--- a/tokio-postgres-openssl/src/lib.rs
+++ b/postgres-openssl/src/lib.rs
@@ -4,7 +4,7 @@
 //!
 //! ```no_run
 //! use openssl::ssl::{SslConnector, SslMethod};
-//! use tokio_postgres_openssl::MakeTlsConnector;
+//! use postgres_openssl::MakeTlsConnector;
 //!
 //! # fn main() -> Result<(), Box<std::error::Error>> {
 //! let mut builder = SslConnector::builder(SslMethod::tls())?;
@@ -23,7 +23,7 @@
 //!
 //! ```no_run
 //! use openssl::ssl::{SslConnector, SslMethod};
-//! use tokio_postgres_openssl::MakeTlsConnector;
+//! use postgres_openssl::MakeTlsConnector;
 //!
 //! # fn main() -> Result<(), Box<std::error::Error>> {
 //! let mut builder = SslConnector::builder(SslMethod::tls())?;
diff --git a/tokio-postgres-openssl/src/test.rs b/postgres-openssl/src/test.rs
similarity index 100%
rename from tokio-postgres-openssl/src/test.rs
rename to postgres-openssl/src/test.rs
diff --git a/tokio-postgres/src/lib.rs b/tokio-postgres/src/lib.rs
index 78c65331..332c388d 100644
--- a/tokio-postgres/src/lib.rs
+++ b/tokio-postgres/src/lib.rs
@@ -106,8 +106,8 @@
 //!
 //! TLS support is implemented via external libraries. `Client::connect` and `Config::connect` take a TLS implementation
 //! as an argument. The `NoTls` type in this crate can be used when TLS is not required. Otherwise, the
-//! `tokio-postgres-openssl` and `tokio-postgres-native-tls` crates provide implementations backed by the `openssl` and
-//! `native-tls` crates, respectively.
+//! `postgres-openssl` and `postgres-native-tls` crates provide implementations backed by the `openssl` and `native-tls`
+//! crates, respectively.
 #![doc(html_root_url = "https://docs.rs/tokio-postgres/0.4.0-rc.1")]
 #![warn(rust_2018_idioms, clippy::all, missing_docs)]