4 files changed, 34 insertions, 26 deletions

diff --git a/src/Network/BitTorrent.hs b/src/Network/BitTorrent.hs
index ce02322f..a328bb5e 100644
--- a/src/Network/BitTorrent.hs
+++ b/src/Network/BitTorrent.hs
@@ -37,7 +37,9 @@ module Network.BitTorrent
 
          -- ** Handle
        , Handle
-       , topic
+       , handleTopic
+       , handleTrackers
+
        , TorrentSource(openHandle)
        , closeHandle
        , getHandle
diff --git a/src/Network/BitTorrent/Client.hs b/src/Network/BitTorrent/Client.hs
index 2ab61ae0..0eeb6ecd 100644
--- a/src/Network/BitTorrent/Client.hs
+++ b/src/Network/BitTorrent/Client.hs
@@ -28,12 +28,18 @@ module Network.BitTorrent.Client
 
          -- * Handle
        , Handle
-       , topic
+       , handleTopic
+       , handleTrackers
+
+         -- ** Construction
        , TorrentSource (..)
        , closeHandle
+
+         -- ** Query
        , getHandle
        , getIndex
 
+         -- ** Management
        , start
        , pause
        , stop
@@ -93,7 +99,7 @@ connHandler tmap ih = do
   m <- readMVar tmap
   case HM.lookup ih m of
     Nothing            -> error "torrent not found"
-    Just (Handle {..}) -> return exchange
+    Just (Handle {..}) -> return handleExchange
 
 initClient :: Options -> LogFun -> ResIO Client
 initClient opts @ Options {..} logFun = do
diff --git a/src/Network/BitTorrent/Client/Handle.hs b/src/Network/BitTorrent/Client/Handle.hs
index a1fe7b9e..258af3fb 100644
--- a/src/Network/BitTorrent/Client/Handle.hs
+++ b/src/Network/BitTorrent/Client/Handle.hs
@@ -82,10 +82,10 @@ openTorrent rootPath t @ Torrent {..} = do
     eses <- liftIO $ Exchange.newSession clientLogger (externalAddr c)
                        rootPath tInfoDict
     return $ Handle
-      { topic    = ih
-      , private  = idPrivate tInfoDict
-      , trackers = tses
-      , exchange = eses
+      { handleTopic    = ih
+      , handlePrivate  = idPrivate tInfoDict
+      , handleTrackers = tses
+      , handleExchange = eses
       }
 
 -- | Use 'nullMagnet' to open handle from 'InfoHash'.
@@ -97,10 +97,10 @@ openMagnet rootPath uri @ Magnet {..} = do
     eses <- liftIO $ Exchange.newSession clientLogger (externalAddr c)
                      rootPath (error "openMagnet" exactTopic)
     return $ Handle
-      { topic    = exactTopic
-      , private  = False
-      , trackers = tses
-      , exchange = eses
+      { handleTopic    = exactTopic
+      , handlePrivate  = False
+      , handleTrackers = tses
+      , handleExchange = eses
       }
 
 -- | Stop torrent and destroy all sessions. You don't need to close
@@ -109,10 +109,10 @@ openMagnet rootPath uri @ Magnet {..} = do
 -- may block.
 closeHandle :: Handle -> BitTorrent ()
 closeHandle h @ Handle {..} = do
-  freeHandle topic $ do
+  freeHandle handleTopic $ do
     stop h
-    liftIO $ Exchange.closeSession exchange
-    liftIO $ Tracker.closeSession trackers
+    liftIO $ Exchange.closeSession handleExchange
+    liftIO $ Tracker.closeSession handleTrackers
 
 {-----------------------------------------------------------------------
 --  Control
@@ -125,14 +125,14 @@ closeHandle h @ Handle {..} = do
 start :: Handle -> BitTorrent ()
 start Handle {..} = do
   Client {..} <- getClient
-  liftIO $ Tracker.notify trackerManager trackers Tracker.Started
-  unless private $ do
-    liftDHT $ DHT.insert topic (error "start")
+  liftIO $ Tracker.notify trackerManager handleTrackers Tracker.Started
+  unless handlePrivate $ do
+    liftDHT $ DHT.insert handleTopic (error "start")
   liftIO $ do
-    peers <- askPeers trackerManager trackers
+    peers <- askPeers trackerManager handleTrackers
     print $ "got: " ++ show (L.length peers) ++ " peers"
     forM_ peers $ \ peer -> do
-      Exchange.connect peer exchange
+      Exchange.connect peer handleExchange
 
 -- | Stop downloading this torrent.
 pause :: Handle -> BitTorrent ()
@@ -142,9 +142,9 @@ pause _ = return ()
 stop :: Handle -> BitTorrent ()
 stop Handle {..} = do
   Client {..} <- getClient
-  unless private $ do
-    liftDHT $ DHT.delete topic (error "stop")
-  liftIO  $ Tracker.notify trackerManager trackers Tracker.Stopped
+  unless handlePrivate $ do
+    liftDHT $ DHT.delete handleTopic (error "stop")
+  liftIO  $ Tracker.notify trackerManager handleTrackers Tracker.Stopped
 
 {-----------------------------------------------------------------------
 --  Query
diff --git a/src/Network/BitTorrent/Client/Types.hs b/src/Network/BitTorrent/Client/Types.hs
index 31ebca2d..3e62f0fa 100644
--- a/src/Network/BitTorrent/Client/Types.hs
+++ b/src/Network/BitTorrent/Client/Types.hs
@@ -32,10 +32,10 @@ import Network.BitTorrent.Exchange as Exchange
 import Network.BitTorrent.Tracker  as Tracker
 
 data Handle = Handle
-  { topic    :: !InfoHash
-  , private  :: !Bool
-  , trackers :: !Tracker.Session
-  , exchange :: !Exchange.Session
+  { handleTopic    :: !InfoHash
+  , handlePrivate  :: !Bool
+  , handleTrackers :: !Tracker.Session
+  , handleExchange :: !Exchange.Session
   }
 
 data Client = Client