13 files changed, 17 insertions, 17 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index dee8bbe5..6470f612 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -77,7 +77,7 @@ library
                      , RecordWildCards
   hs-source-dirs:      src
   exposed-modules:     Network.DatagramServer
-                       Network.KRPC.Message
+                       Network.DatagramServer.Mainline
                        Network.KRPC.Method
                        Data.Torrent
                        Data.Digest.CRC32C
@@ -260,7 +260,7 @@ test-suite spec
                        Config
                        Network.KRPCSpec
                        Network.KRPC.MethodSpec
-                       Network.KRPC.MessageSpec
+                       Network.DatagramServer.MainlineSpec
                        Data.TorrentSpec
                        Network.BitTorrent.Client.HandleSpec
                        Network.BitTorrent.CoreSpec
diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 715f8ec1..ab6ea2c1 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -38,7 +38,7 @@ import Network.BitTorrent.DHT.Search
 import Network.BitTorrent.DHT.Query
 import Network.BitTorrent.DHT.Message (FindNode(..),NodeFound(..),GetPeers(..),GotPeers(..))
 import Network.DatagramServer (QueryFailure(..))
-import Network.KRPC.Message (ReflectedIP(..),KMessageOf)
+import Network.DatagramServer.Mainline (ReflectedIP(..),KMessageOf)
 import qualified Network.BitTorrent.DHT.Routing as R
 import Network.BitTorrent.DHT.Session
 import Network.SocketLike
diff --git a/src/Network/BitTorrent/Address.hs b/src/Network/BitTorrent/Address.hs
index 05c6504c..e75066b1 100644
--- a/src/Network/BitTorrent/Address.hs
+++ b/src/Network/BitTorrent/Address.hs
@@ -128,7 +128,7 @@ import System.Locale    (defaultTimeLocale)
 import System.Entropy
 import Data.Digest.CRC32C
 import Network.DatagramServer.Types as RPC
-import Network.KRPC.Message (KMessageOf)
+import Network.DatagramServer.Mainline (KMessageOf)
 -- import Network.DHT.Mainline
 
 -- import Paths_bittorrent (version)
diff --git a/src/Network/BitTorrent/DHT.hs b/src/Network/BitTorrent/DHT.hs
index ab948a2d..169abcfc 100644
--- a/src/Network/BitTorrent/DHT.hs
+++ b/src/Network/BitTorrent/DHT.hs
@@ -71,7 +71,7 @@ import Network.BitTorrent.DHT.Session
 import Network.BitTorrent.DHT.Routing as T hiding (null)
 import qualified Data.Text as Text
 import Data.Monoid
-import Network.KRPC.Message (KMessageOf)
+import Network.DatagramServer.Mainline (KMessageOf)
 
 
 {-----------------------------------------------------------------------
diff --git a/src/Network/BitTorrent/DHT/Message.hs b/src/Network/BitTorrent/DHT/Message.hs
index 2a2cee35..cfe24fc5 100644
--- a/src/Network/BitTorrent/DHT/Message.hs
+++ b/src/Network/BitTorrent/DHT/Message.hs
@@ -108,7 +108,7 @@ import Data.Serialize as S
 import Data.Typeable
 import Network
 import Network.DatagramServer
-import Network.KRPC.Message (KMessageOf)
+import Network.DatagramServer.Mainline (KMessageOf)
 import Data.Maybe
 
 import Data.Torrent (InfoHash)
diff --git a/src/Network/BitTorrent/DHT/Query.hs b/src/Network/BitTorrent/DHT/Query.hs
index 90cdcbee..1c4df267 100644
--- a/src/Network/BitTorrent/DHT/Query.hs
+++ b/src/Network/BitTorrent/DHT/Query.hs
@@ -82,7 +82,7 @@ import Data.Time
 import Data.Time.Clock.POSIX
 
 import Network.DatagramServer as KRPC hiding (Options, def)
-import Network.KRPC.Message (ReflectedIP(..))
+import Network.DatagramServer.Mainline (ReflectedIP(..))
 import Network.DatagramServer (QueryFailure(..))
 import Data.Torrent
 import Network.BitTorrent.DHT.Message
@@ -93,7 +93,7 @@ import qualified Network.BitTorrent.DHT.Search as Search
 #ifdef VERSION_bencoding
 import Data.BEncode (BValue)
 import Network.DHT.Mainline hiding (NodeId)
-import Network.KRPC.Message (KMessageOf)
+import Network.DatagramServer.Mainline (KMessageOf)
 #else
 import Data.ByteString (ByteString)
 import Data.Tox
diff --git a/src/Network/BitTorrent/DHT/Routing.hs b/src/Network/BitTorrent/DHT/Routing.hs
index c64678e0..d147bb94 100644
--- a/src/Network/BitTorrent/DHT/Routing.hs
+++ b/src/Network/BitTorrent/DHT/Routing.hs
@@ -87,7 +87,7 @@ import Data.Torrent
 import Network.BitTorrent.Address
 #ifdef VERSION_bencoding
 import Network.DHT.Mainline ()
-import Network.KRPC.Message (KMessageOf)
+import Network.DatagramServer.Mainline (KMessageOf)
 #else
 import Data.Tox as Tox
 type KMessageOf = Tox.Message
diff --git a/src/Network/BitTorrent/DHT/Search.hs b/src/Network/BitTorrent/DHT/Search.hs
index c60ae48f..7a587644 100644
--- a/src/Network/BitTorrent/DHT/Search.hs
+++ b/src/Network/BitTorrent/DHT/Search.hs
@@ -27,7 +27,7 @@ import Network.BitTorrent.Address hiding (NodeId)
 import Network.DatagramServer.Types
 #ifdef VERSION_bencoding
 import Network.DHT.Mainline ()
-import Network.KRPC.Message (KMessageOf)
+import Network.DatagramServer.Mainline (KMessageOf)
 type Ann = ()
 #else
 import Data.Tox as Tox
diff --git a/src/Network/BitTorrent/DHT/Session.hs b/src/Network/BitTorrent/DHT/Session.hs
index 0800f147..ead4a723 100644
--- a/src/Network/BitTorrent/DHT/Session.hs
+++ b/src/Network/BitTorrent/DHT/Session.hs
@@ -108,7 +108,7 @@ import Network.DatagramServer as KRPC hiding (Options, def)
 import qualified Network.DatagramServer as KRPC (def)
 #ifdef VERSION_bencoding
 import Data.BEncode (BValue)
-import Network.KRPC.Message (KMessageOf)
+import Network.DatagramServer.Mainline (KMessageOf)
 #else
 import Data.Tox as Tox
 #endif
diff --git a/src/Network/DHT/Mainline.hs b/src/Network/DHT/Mainline.hs
index cf284404..7b3d6d55 100644
--- a/src/Network/DHT/Mainline.hs
+++ b/src/Network/DHT/Mainline.hs
@@ -24,7 +24,7 @@ import Data.LargeWord
 import Data.Serialize                  as S
 import Data.String
 import Data.Typeable
-import Network.KRPC.Message            as KRPC
+import Network.DatagramServer.Mainline            as KRPC
 import Network.DatagramServer.Types as RPC
 import Text.PrettyPrint                as PP hiding ((<>))
 import Text.PrettyPrint.HughesPJClass  hiding (($$), (<>))
diff --git a/src/Network/DatagramServer.hs b/src/Network/DatagramServer.hs
index 8a803f1d..d22bc893 100644
--- a/src/Network/DatagramServer.hs
+++ b/src/Network/DatagramServer.hs
@@ -48,7 +48,7 @@
 --
 --   For async 'query' use @async@ package.
 --
---   For protocol details see "Network.KRPC.Message" module.
+--   For protocol details see "Network.DatagramServer.Mainline" module.
 --
 {-# LANGUAGE CPP                    #-}
 {-# LANGUAGE OverloadedStrings      #-}
@@ -95,7 +95,7 @@ module Network.DatagramServer
        ) where
 
 import Data.Default.Class
-import Network.KRPC.Message
+import Network.DatagramServer.Mainline
 import Network.KRPC.Method
 import Network.Socket (SockAddr (..))
 
@@ -135,7 +135,7 @@ import Data.Text.Encoding as T
 import Data.Tuple
 import Data.Typeable
 import Network.DatagramServer.Types
-import Network.KRPC.Message
+import Network.DatagramServer.Mainline
 import Network.KRPC.Method hiding (Envelope)
 import qualified Network.KRPC.Method as KRPC (Envelope)
 import Network.Socket hiding (listen)
diff --git a/src/Network/KRPC/Message.hs b/src/Network/DatagramServer/Mainline.hs
index 2f5f6729..2177d076 100644
--- a/src/Network/KRPC/Message.hs
+++ b/src/Network/DatagramServer/Mainline.hs
@@ -23,7 +23,7 @@
 {-# LANGUAGE MultiParamTypeClasses  #-}
 {-# LANGUAGE OverloadedStrings      #-}
 {-# LANGUAGE TypeSynonymInstances   #-}
-module Network.KRPC.Message
+module Network.DatagramServer.Mainline
        ( -- * Transaction
          TransactionId
 
diff --git a/src/Network/KRPC/Method.hs b/src/Network/KRPC/Method.hs
index ad93cb8b..ea11720c 100644
--- a/src/Network/KRPC/Method.hs
+++ b/src/Network/KRPC/Method.hs
@@ -31,7 +31,7 @@ import Data.Monoid
 import Data.List as L
 import Data.String
 import Data.Typeable
-import Network.KRPC.Message
+import Network.DatagramServer.Mainline
 
 
 -- | Method datatype used to describe method name, parameters and