diff --git a/tokio-xmpp/examples/send_message.rs b/tokio-xmpp/examples/send_message.rs
index fd69612e..11349f19 100644
--- a/tokio-xmpp/examples/send_message.rs
+++ b/tokio-xmpp/examples/send_message.rs
@@ -3,7 +3,7 @@ use std::env::args;
 use std::process::exit;
 use std::str::FromStr;
 use tokio;
-use tokio_xmpp::OneshotClient as Client;
+use tokio_xmpp::SimpleClient as Client;
 use xmpp_parsers::message::{Body, Message};
 use xmpp_parsers::Jid;
 
diff --git a/tokio-xmpp/src/client/mod.rs b/tokio-xmpp/src/client/mod.rs
index 277bc4c6..13ed9238 100644
--- a/tokio-xmpp/src/client/mod.rs
+++ b/tokio-xmpp/src/client/mod.rs
@@ -23,7 +23,7 @@ use auth::auth;
 mod bind;
 use bind::bind;
 
-pub mod oneshot_client;
+pub mod simple_client;
 
 pub const NS_XMPP_SASL: &str = "urn:ietf:params:xml:ns:xmpp-sasl";
 pub const NS_XMPP_BIND: &str = "urn:ietf:params:xml:ns:xmpp-bind";
diff --git a/tokio-xmpp/src/client/oneshot_client.rs b/tokio-xmpp/src/client/simple_client.rs
similarity index 99%
rename from tokio-xmpp/src/client/oneshot_client.rs
rename to tokio-xmpp/src/client/simple_client.rs
index c677a3d7..d12ed9ee 100644
--- a/tokio-xmpp/src/client/oneshot_client.rs
+++ b/tokio-xmpp/src/client/simple_client.rs
@@ -16,7 +16,7 @@ use crate::{Error, ProtocolError};
 use super::auth::auth;
 use super::bind::bind;
 
-/// XMPP client connection and state
+/// A simple XMPP client connection
 ///
 /// This implements the `futures` crate's [`Stream`](#impl-Stream) and
 /// [`Sink`](#impl-Sink<Packet>) traits.
diff --git a/tokio-xmpp/src/lib.rs b/tokio-xmpp/src/lib.rs
index b11ff071..bef7a47b 100644
--- a/tokio-xmpp/src/lib.rs
+++ b/tokio-xmpp/src/lib.rs
@@ -12,7 +12,7 @@ pub mod xmpp_stream;
 pub mod stream_features;
 pub use crate::event::Event;
 mod client;
-pub use client::{Client, oneshot_client::Client as OneshotClient};
+pub use client::{Client, simple_client::Client as SimpleClient};
 mod component;
 pub use crate::component::Component;
 mod error;