diff --git a/source/Network/Xmpp.hs b/source/Network/Xmpp.hs
index c57c632..0c4ef44 100644
--- a/source/Network/Xmpp.hs
+++ b/source/Network/Xmpp.hs
@@ -37,6 +37,8 @@ module Network.Xmpp
   , scramSha1
   , plain
   , digestMd5
+  , closeConnection
+  , endSession
   -- * Addressing
   -- | A JID (historically: Jabber ID) is XMPPs native format
   -- for addressing entities in the network. It is somewhat similar to an e-mail
@@ -164,7 +166,7 @@ module Network.Xmpp
                , AuthSaslFailure
                , AuthIllegalCredentials
                , AuthOtherFailure )
-  , SaslHandler(..)
+  , SaslHandler
   ) where
 
 import Network.Xmpp.Concurrent
diff --git a/source/Network/Xmpp/Concurrent/Monad.hs b/source/Network/Xmpp/Concurrent/Monad.hs
index 9a61745..a7e5b19 100644
--- a/source/Network/Xmpp/Concurrent/Monad.hs
+++ b/source/Network/Xmpp/Concurrent/Monad.hs
@@ -82,8 +82,8 @@ runHandler h session = h =<< atomically (readTVar $ eventHandlers session)
 
 
 -- | End the current Xmpp session.
-endContext :: Session -> IO ()
-endContext session =  do -- TODO: This has to be idempotent (is it?)
+endSession :: Session -> IO ()
+endSession session =  do -- TODO: This has to be idempotent (is it?)
     closeConnection session
     stopThreads session