diff --git a/Cargo.toml b/Cargo.toml
index 367bcca..41c0671 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,5 +25,5 @@ webpki = "0.18.1"
 tokio = "0.1.6"
 
 [features]
-default = [ "tokio_impl" ]
-tokio_impl = [ "tokio", "bytes", "iovec" ]
+default = [ "tokio-support" ]
+tokio-support = [ "tokio", "bytes", "iovec" ]
diff --git a/examples/client/Cargo.toml b/examples/client/Cargo.toml
index acf13bd..2253096 100644
--- a/examples/client/Cargo.toml
+++ b/examples/client/Cargo.toml
@@ -5,11 +5,9 @@ authors = ["quininer <quininer@live.com>"]
 
 [dependencies]
 webpki = "0.18.1"
-tokio-rustls = { path = "../..", default-features = false, features = [ "tokio" ] }
-
+tokio-rustls = { path = "../.." }
 tokio = "0.1"
-
-clap = "2.26"
+clap = "2"
 webpki-roots = "0.15"
 
 [target.'cfg(unix)'.dependencies]
diff --git a/examples/server/Cargo.toml b/examples/server/Cargo.toml
index 98329ce..170693f 100644
--- a/examples/server/Cargo.toml
+++ b/examples/server/Cargo.toml
@@ -4,9 +4,6 @@ version = "0.1.0"
 authors = ["quininer <quininer@live.com>"]
 
 [dependencies]
-tokio-rustls = { path = "../..", default-features = false, features = [ "tokio" ] }
-
+tokio-rustls = { path = "../.." }
 tokio = { version = "0.1.6" }
-# futures = "0.2.0-beta"
-
-clap = "2.26"
+clap = "2"
diff --git a/src/lib.rs b/src/lib.rs
index afd3cf0..9d910e1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -11,7 +11,7 @@ extern crate iovec;
 
 
 mod common;
-#[cfg(feature = "tokio_impl")] mod tokio_impl;
+#[cfg(feature = "tokio-support")] mod tokio_impl;
 
 use std::io;
 use std::sync::Arc;