6 files changed, 11 insertions, 11 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index ddad1a61..cdc332ab 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -44,9 +44,9 @@ library
                      , Network.BitTorrent.Tracker.Protocol
                      , Network.BitTorrent.Tracker.Scrape
 
-                     , Network.BitTorrent.PeerWire
-                     , Network.BitTorrent.PeerWire.Selection
-                     , Network.BitTorrent.PeerWire.Protocol
+                     , Network.BitTorrent.Exchange
+                     , Network.BitTorrent.Exchange.Selection
+                     , Network.BitTorrent.Exchange.Protocol
 
   other-modules:
 
diff --git a/src/Network/BitTorrent.hs b/src/Network/BitTorrent.hs
index 3d2406a8..51ba6aac 100644
--- a/src/Network/BitTorrent.hs
+++ b/src/Network/BitTorrent.hs
@@ -9,5 +9,5 @@ module Network.BitTorrent (module BT) where
 
 import Network.BitTorrent.Extension as BT
 import Network.BitTorrent.Peer as BT
-import Network.BitTorrent.PeerWire as BT
+import Network.BitTorrent.Exchange as BT
 import Network.BitTorrent.Tracker as BT
diff --git a/src/Network/BitTorrent/Exchange.hs b/src/Network/BitTorrent/Exchange.hs
index 08e3f388..d75fdf96 100644
--- a/src/Network/BitTorrent/Exchange.hs
+++ b/src/Network/BitTorrent/Exchange.hs
@@ -6,10 +6,10 @@
 --   Portability :  portable
 --
 {-# LANGUAGE DoAndIfThenElse #-}
-module Network.BitTorrent.PeerWire (module PW) where
+module Network.BitTorrent.Exchange (module PW) where
 
-import Network.BitTorrent.PeerWire.Selection as PW
-import Network.BitTorrent.PeerWire.Protocol as PW
+import Network.BitTorrent.Exchange.Selection as PW
+import Network.BitTorrent.Exchange.Protocol as PW
 
 {-
 
diff --git a/src/Network/BitTorrent/Exchange/Protocol.hs b/src/Network/BitTorrent/Exchange/Protocol.hs
index cab54ef5..8cfcc79d 100644
--- a/src/Network/BitTorrent/Exchange/Protocol.hs
+++ b/src/Network/BitTorrent/Exchange/Protocol.hs
@@ -12,7 +12,7 @@
 --
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards #-}
-module Network.BitTorrent.PeerWire.Protocol
+module Network.BitTorrent.Exchange.Protocol
        ( -- * Inital handshake
          Handshake(..), ppHandshake
        , handshake , handshakeCaps
diff --git a/src/Network/BitTorrent/Exchange/Selection.hs b/src/Network/BitTorrent/Exchange/Selection.hs
index db9e04f4..ef47876a 100644
--- a/src/Network/BitTorrent/Exchange/Selection.hs
+++ b/src/Network/BitTorrent/Exchange/Selection.hs
@@ -21,7 +21,7 @@
 --   Note that BitTorrent applies the strict priority policy for
 --   /subpiece/ or /blocks/ selection.
 --
-module Network.BitTorrent.PeerWire.Selection
+module Network.BitTorrent.Exchange.Selection
        ( Selector
 
        -- * Construction
@@ -34,7 +34,7 @@ module Network.BitTorrent.PeerWire.Selection
 
 import Data.Bitfield
 import Data.Ratio
-import Network.BitTorrent.PeerWire.Protocol
+import Network.BitTorrent.Exchange.Protocol
 
 
 type Selector =  Bitfield      -- ^ Indices of client /have/ pieces.
diff --git a/src/Network/BitTorrent/Exchange/Status.hs b/src/Network/BitTorrent/Exchange/Status.hs
index 806ba77d..353ef14d 100644
--- a/src/Network/BitTorrent/Exchange/Status.hs
+++ b/src/Network/BitTorrent/Exchange/Status.hs
@@ -5,7 +5,7 @@
 --   Stability   :  experimental
 --   Portability :  portable
 --
-module Network.BitTorrent.Peer.Status
+module Network.BitTorrent.Exchange.Status
        ( PeerStatus(..)
        , setChoking, setInterested
        , initPeerStatus