diff --git a/qrpc.cabal b/quasar-network.cabal
similarity index 92%
rename from qrpc.cabal
rename to quasar-network.cabal
index 32ccff7426e4bb157ff60542210a66874a1a3fb6..86cad12cd2f9ea3cbebf57140cea39a748e248f8 100644
--- a/qrpc.cabal
+++ b/quasar-network.cabal
@@ -79,10 +79,10 @@ common shared-executable-properties
 library
   import: shared-properties
   exposed-modules:
-    Network.Rpc
-    Network.Rpc.Connection
-    Network.Rpc.Multiplexer
-    Network.Rpc.SocketLocation
+    Quasar.Network
+    Quasar.Network.Connection
+    Quasar.Network.Multiplexer
+    Quasar.Network.SocketLocation
   hs-source-dirs:
     src
 
@@ -95,7 +95,7 @@ test-suite quasar-network-test
     QuickCheck
   main-is: Spec.hs
   other-modules:
-    Network.RpcSpec
-    Network.Rpc.MultiplexerSpec
+    Quasar.NetworkSpec
+    Quasar.Network.MultiplexerSpec
   hs-source-dirs:
     test
diff --git a/src/Network/Rpc.hs b/src/Quasar/Network.hs
similarity index 99%
rename from src/Network/Rpc.hs
rename to src/Quasar/Network.hs
index 2348be59a41beeea6ddf09670b462f8fe827ae28..64ca1aa619e0b39b3d41610080c34f8150313862 100644
--- a/src/Network/Rpc.hs
+++ b/src/Quasar/Network.hs
@@ -1,4 +1,4 @@
-module Network.Rpc where
+module Quasar.Network where
 
 import Control.Applicative (liftA2)
 import Control.Concurrent (forkFinally)
@@ -16,8 +16,8 @@ import Data.Maybe (isNothing)
 import GHC.Generics
 import Language.Haskell.TH hiding (interruptible)
 import Language.Haskell.TH.Syntax
-import Network.Rpc.Multiplexer
-import Network.Rpc.Connection
+import Quasar.Network.Multiplexer
+import Quasar.Network.Connection
 import qualified Network.Socket as Socket
 import Prelude
 import System.Posix.Files (getFileStatus, isSocket, fileExist, removeLink)
diff --git a/src/Network/Rpc/Connection.hs b/src/Quasar/Network/Connection.hs
similarity index 99%
rename from src/Network/Rpc/Connection.hs
rename to src/Quasar/Network/Connection.hs
index 8c728fb733eca30f98d7cf3e2ea7638899bffea2..666a84e0a48eb47606e30a22cb8a4f781aeeb171 100644
--- a/src/Network/Rpc/Connection.hs
+++ b/src/Quasar/Network/Connection.hs
@@ -1,4 +1,4 @@
-module Network.Rpc.Connection where
+module Quasar.Network.Connection where
 
 import Control.Concurrent (threadDelay)
 import Control.Concurrent.Async (Async, async, cancel, link, waitCatch, withAsync)
diff --git a/src/Network/Rpc/Multiplexer.hs b/src/Quasar/Network/Multiplexer.hs
similarity index 99%
rename from src/Network/Rpc/Multiplexer.hs
rename to src/Quasar/Network/Multiplexer.hs
index b83261eebc91a11ead228d7e159eb49b486f2a57..13ed48eafad01832c295f0de7f3b7e60dc91c56b 100644
--- a/src/Network/Rpc/Multiplexer.hs
+++ b/src/Quasar/Network/Multiplexer.hs
@@ -1,4 +1,4 @@
-module Network.Rpc.Multiplexer (
+module Quasar.Network.Multiplexer (
   ChannelId,
   MessageId,
   MessageLength,
@@ -38,7 +38,7 @@ import qualified Data.ByteString.Lazy as BSL
 import qualified Data.HashMap.Strict as HM
 import Data.Tuple (swap)
 import Data.Word
-import Network.Rpc.Connection
+import Quasar.Network.Connection
 import Prelude
 import GHC.Generics
 import System.IO (hPutStrLn, stderr)
diff --git a/src/Network/Rpc/SocketLocation.hs b/src/Quasar/Network/SocketLocation.hs
similarity index 96%
rename from src/Network/Rpc/SocketLocation.hs
rename to src/Quasar/Network/SocketLocation.hs
index 5585874466a26e5f5269552aa06ed22eb02437ea..f8ed7f1b37a812f2c9e39f43be62dc3e593e4890 100644
--- a/src/Network/Rpc/SocketLocation.hs
+++ b/src/Quasar/Network/SocketLocation.hs
@@ -1,4 +1,4 @@
-module Network.Rpc.SocketLocation where
+module Quasar.Network.SocketLocation where
 
 import Control.Exception (handle)
 import Prelude
diff --git a/test/Network/Rpc/MultiplexerSpec.hs b/test/Quasar/Network/MultiplexerSpec.hs
similarity index 97%
rename from test/Network/Rpc/MultiplexerSpec.hs
rename to test/Quasar/Network/MultiplexerSpec.hs
index 71664ed70a5f28fe58a772feb0b347528cf96306..88998eb346989a86691f6d6a126e0eea1a481a4f 100644
--- a/test/Network/Rpc/MultiplexerSpec.hs
+++ b/test/Quasar/Network/MultiplexerSpec.hs
@@ -1,4 +1,4 @@
-module Network.Rpc.MultiplexerSpec where
+module Quasar.Network.MultiplexerSpec where
 
 import Control.Concurrent (threadDelay)
 import Control.Concurrent.Async (concurrently_)
@@ -7,8 +7,8 @@ import Control.Exception (bracket, mask_)
 import Control.Monad (forever, void, unless)
 import qualified Data.ByteString.Lazy as BSL
 import Prelude
-import Network.Rpc.Multiplexer
-import Network.Rpc.Connection
+import Quasar.Network.Multiplexer
+import Quasar.Network.Connection
 import Network.Socket
 import Test.Hspec
 
diff --git a/test/Network/RpcSpec.hs b/test/Quasar/NetworkSpec.hs
similarity index 98%
rename from test/Network/RpcSpec.hs
rename to test/Quasar/NetworkSpec.hs
index c2b8065d35a4ee28dde64fb5988eaf63e1a63bd5..77e158b55a2e82d05d6e3abe61bc84f39beb2ff8 100644
--- a/test/Network/RpcSpec.hs
+++ b/test/Quasar/NetworkSpec.hs
@@ -8,12 +8,12 @@
 -- Print generated rpc code during build
 {-# OPTIONS_GHC -ddump-splices #-}
 
-module Network.RpcSpec where
+module Quasar.NetworkSpec where
 
 import Control.Concurrent.MVar
 import Control.Monad.IO.Class (liftIO)
 import Prelude
-import Network.Rpc
+import Quasar.Network
 import Test.Hspec
 import Test.QuickCheck
 import Test.QuickCheck.Monadic