diff --git a/cabal.project b/cabal.project
index 02adf11e..112546e6 100644
--- a/cabal.project
+++ b/cabal.project
@@ -1,7 +1,7 @@
 packages:
   servant/
   servant-client/
-  freer-servant-client/
+  servant-freer-client/
   servant-docs/
   servant-foreign/
   servant-server/
diff --git a/freer-servant-client/CHANGELOG.md b/servant-freer-client/CHANGELOG.md
similarity index 100%
rename from freer-servant-client/CHANGELOG.md
rename to servant-freer-client/CHANGELOG.md
diff --git a/freer-servant-client/LICENSE b/servant-freer-client/LICENSE
similarity index 100%
rename from freer-servant-client/LICENSE
rename to servant-freer-client/LICENSE
diff --git a/freer-servant-client/README.md b/servant-freer-client/README.md
similarity index 100%
rename from freer-servant-client/README.md
rename to servant-freer-client/README.md
diff --git a/freer-servant-client/Setup.hs b/servant-freer-client/Setup.hs
similarity index 100%
rename from freer-servant-client/Setup.hs
rename to servant-freer-client/Setup.hs
diff --git a/freer-servant-client/freer-servant-client.cabal b/servant-freer-client/servant-freer-client.cabal
similarity index 98%
rename from freer-servant-client/freer-servant-client.cabal
rename to servant-freer-client/servant-freer-client.cabal
index 7e7d940d..deb749a8 100644
--- a/freer-servant-client/freer-servant-client.cabal
+++ b/servant-freer-client/servant-freer-client.cabal
@@ -1,4 +1,4 @@
-name:                freer-servant-client
+name:                servant-freer-client
 version:             0.1
 synopsis: automatical derivation of querying functions for servant webservices
 description:
diff --git a/freer-servant-client/sidraval@Sids-MacBook-Pro.local.13778 b/servant-freer-client/sidraval@Sids-MacBook-Pro.local.13778
similarity index 100%
rename from freer-servant-client/sidraval@Sids-MacBook-Pro.local.13778
rename to servant-freer-client/sidraval@Sids-MacBook-Pro.local.13778
diff --git a/freer-servant-client/src/Servant/FreerClient.hs b/servant-freer-client/src/Servant/FreerClient.hs
similarity index 100%
rename from freer-servant-client/src/Servant/FreerClient.hs
rename to servant-freer-client/src/Servant/FreerClient.hs
diff --git a/freer-servant-client/test/Spec.hs b/servant-freer-client/test/Spec.hs
similarity index 100%
rename from freer-servant-client/test/Spec.hs
rename to servant-freer-client/test/Spec.hs
diff --git a/stack-ghc-7.10.3.yaml b/stack-ghc-7.10.3.yaml
index fb0f5aaf..fb18aac7 100644
--- a/stack-ghc-7.10.3.yaml
+++ b/stack-ghc-7.10.3.yaml
@@ -2,7 +2,6 @@ flags: {}
 packages:
 - servant/
 - servant-client/
-- freer-servant-client/
 - servant-docs/
 - servant-foreign/
 - servant-server/
diff --git a/stack-ghc-7.8.4.yaml b/stack-ghc-7.8.4.yaml
index 173c241a..01bb6420 100644
--- a/stack-ghc-7.8.4.yaml
+++ b/stack-ghc-7.8.4.yaml
@@ -2,7 +2,6 @@ flags: {}
 packages:
 - servant/
 - servant-client/
-- freer-servant-client/
 - servant-docs/
 - servant-foreign/
 - servant-server/
diff --git a/stack-ghc-8.2.1.yaml b/stack-ghc-8.2.1.yaml
index 77e69cd3..0bd29385 100644
--- a/stack-ghc-8.2.1.yaml
+++ b/stack-ghc-8.2.1.yaml
@@ -1,7 +1,7 @@
 resolver: ghc-8.2.0.20170507
 packages:
 - servant-client/
-- freer-servant-client/
+- servant-freer-client/
 - servant-docs/
 - servant-foreign/
 - servant-server/
diff --git a/stack.yaml b/stack.yaml
index f1e104be..e6ee3380 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -2,7 +2,7 @@ resolver: nightly-2017-04-01
 packages:
 - servant/
 - servant-client/
-- freer-servant-client/
+- servant-freer-client/
 - servant-docs/
 - servant-foreign/
 - servant-server/