diff --git a/app/sample.hs b/app/sample.hs
--- a/app/sample.hs
+++ b/app/sample.hs
@@ -16,7 +16,7 @@
 main :: IO ()
 main = do
   url <- head <$> getArgs
-  WS.withClient url $ \conn -> do
+  WS.withConnection url $ \conn -> do
     tid <- forkIO $ forever $ do
       msg <- WS.receiveData conn
       B.putStrLn msg
diff --git a/src/Network/WebSockets/Client.hs b/src/Network/WebSockets/Client.hs
--- a/src/Network/WebSockets/Client.hs
+++ b/src/Network/WebSockets/Client.hs
@@ -6,7 +6,7 @@
 --             is NOT supported.
 
 module Network.WebSockets.Client
-  ( withClient
+  ( withConnection
 
     -- * Re-export from Network.WebSockets
   , WS.Connection
@@ -61,18 +61,18 @@
 --
 --   __NOTE__: Currently, non-TLS connection via an HTTP proxy server
 --             is NOT supported.
-withClient
+withConnection
   :: String -- ^ Endpoint URL (e.g. wss:\/\/example.com\/path).
   -> (WS.Connection -> IO a) -- ^ Action using the 'WS.Connection'
   -> IO a
-withClient url action = do
+withConnection url action = do
   man <- Http.newManager tlsManagerSettings
-  withWsClientFromManager man url action
+  withConnectionFromManager man url action
 
 
-withWsClientFromManager
+withConnectionFromManager
   :: Http.Manager -> String -> (WS.Connection -> IO a) -> IO a
-withWsClientFromManager man rawUrl action = do
+withConnectionFromManager man rawUrl action = do
   (isSecure, host, path) <- parseWsUrl rawUrl
 
   let httpUrl = (if isSecure then "https://" else "http://") ++ host ++ path
diff --git a/wss-client.cabal b/wss-client.cabal
--- a/wss-client.cabal
+++ b/wss-client.cabal
@@ -1,5 +1,5 @@
 name:                wss-client
-version:             0.1.0.1
+version:             0.2.0.0
 synopsis:            A-little-higher-level WebSocket client.
 description:         A-little-higher-level WebSocket client. Based on http-client and http-client-tls.
 homepage:            https://github.com/iij-ii/wss-client