9 files changed, 10 insertions, 10 deletions

diff --git a/src/Data/Tox.hs b/src/Data/Tox.hs
index b9df7582..b79e0b9a 100644
--- a/src/Data/Tox.hs
+++ b/src/Data/Tox.hs
@@ -23,8 +23,8 @@ import Data.Serialize
 -- import Network.BitTorrent.Address (NodeInfo(..)) -- Serialize IP
 import GHC.Generics (Generic)
 import Network.Socket
-import Network.RPC
-import qualified Network.RPC as Envelope (NodeId)
+import Network.DatagramServer.Types
+import qualified Network.DatagramServer.Types as Envelope (NodeId)
 import Crypto.PubKey.ECC.Types
 
 type Key32   = Word256 -- 32 byte key
diff --git a/src/Network/BitTorrent/Address.hs b/src/Network/BitTorrent/Address.hs
index f364abbe..05c6504c 100644
--- a/src/Network/BitTorrent/Address.hs
+++ b/src/Network/BitTorrent/Address.hs
@@ -127,7 +127,7 @@ import System.Locale    (defaultTimeLocale)
 #endif
 import System.Entropy
 import Data.Digest.CRC32C
-import Network.RPC as RPC
+import Network.DatagramServer.Types as RPC
 import Network.KRPC.Message (KMessageOf)
 -- import Network.DHT.Mainline
 
diff --git a/src/Network/BitTorrent/DHT/Message.hs b/src/Network/BitTorrent/DHT/Message.hs
index 706d181a..2a2cee35 100644
--- a/src/Network/BitTorrent/DHT/Message.hs
+++ b/src/Network/BitTorrent/DHT/Message.hs
@@ -117,7 +117,7 @@ import Network.BitTorrent.DHT.Token
 import Network.DatagramServer ()
 import Network.DHT.Mainline ()
 #endif
-import Network.RPC hiding (Query,Response)
+import Network.DatagramServer.Types hiding (Query,Response)
 
 {-----------------------------------------------------------------------
 -- envelopes
diff --git a/src/Network/BitTorrent/DHT/Query.hs b/src/Network/BitTorrent/DHT/Query.hs
index 0219adfa..90cdcbee 100644
--- a/src/Network/BitTorrent/DHT/Query.hs
+++ b/src/Network/BitTorrent/DHT/Query.hs
@@ -99,7 +99,7 @@ import Data.ByteString (ByteString)
 import Data.Tox
 #endif
 import Network.BitTorrent.Address hiding (NodeId)
-import Network.RPC as RPC hiding (Query,Response)
+import Network.DatagramServer.Types as RPC hiding (Query,Response)
 
 {-----------------------------------------------------------------------
 --  Handlers
diff --git a/src/Network/BitTorrent/DHT/Routing.hs b/src/Network/BitTorrent/DHT/Routing.hs
index 42728a53..c64678e0 100644
--- a/src/Network/BitTorrent/DHT/Routing.hs
+++ b/src/Network/BitTorrent/DHT/Routing.hs
@@ -315,7 +315,7 @@ split i b = (Bucket ns qs, Bucket ms rs)
     (qs,rs) = runIdentity $ partitionQ bucketQ spanBit $ bktQ b
     {-
     spanBit :: forall (dht :: * -> *) addr u.
-               FiniteBits (Network.RPC.NodeId dht) =>
+               FiniteBits (Network.DatagramServer.Types.NodeId dht) =>
                NodeInfo dht addr u -> Bool
     -}
     spanBit :: NodeInfo dht addr u -> Bool
diff --git a/src/Network/BitTorrent/DHT/Search.hs b/src/Network/BitTorrent/DHT/Search.hs
index 844b4575..c60ae48f 100644
--- a/src/Network/BitTorrent/DHT/Search.hs
+++ b/src/Network/BitTorrent/DHT/Search.hs
@@ -24,7 +24,7 @@ import qualified Data.MinMaxPSQ   as MM
 import qualified Data.Wrapper.PSQ as PSQ
          ;import Data.Wrapper.PSQ (pattern (:->), Binding, PSQ)
 import Network.BitTorrent.Address hiding (NodeId)
-import Network.RPC
+import Network.DatagramServer.Types
 #ifdef VERSION_bencoding
 import Network.DHT.Mainline ()
 import Network.KRPC.Message (KMessageOf)
diff --git a/src/Network/DHT/Mainline.hs b/src/Network/DHT/Mainline.hs
index 2b7db3c7..cf284404 100644
--- a/src/Network/DHT/Mainline.hs
+++ b/src/Network/DHT/Mainline.hs
@@ -25,7 +25,7 @@ import Data.Serialize                  as S
 import Data.String
 import Data.Typeable
 import Network.KRPC.Message            as KRPC
-import Network.RPC as RPC
+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 c083928d..8a803f1d 100644
--- a/src/Network/DatagramServer.hs
+++ b/src/Network/DatagramServer.hs
@@ -134,7 +134,7 @@ import Data.Text as T
 import Data.Text.Encoding as T
 import Data.Tuple
 import Data.Typeable
-import Network.RPC
+import Network.DatagramServer.Types
 import Network.KRPC.Message
 import Network.KRPC.Method hiding (Envelope)
 import qualified Network.KRPC.Method as KRPC (Envelope)
diff --git a/src/Network/RPC.hs b/src/Network/DatagramServer/Types.hs
index 2333766a..ac18e6ce 100644
--- a/src/Network/RPC.hs
+++ b/src/Network/DatagramServer/Types.hs
@@ -11,7 +11,7 @@
 {-# LANGUAGE ScopedTypeVariables    #-}
 {-# LANGUAGE TypeFamilies           #-}
 {-# LANGUAGE StandaloneDeriving     #-}
-module Network.RPC where
+module Network.DatagramServer.Types where
 
 import Control.Applicative
 import qualified Text.ParserCombinators.ReadP as RP