diff --git a/bin/haskell-petstore.sh b/bin/haskell-servant-petstore.sh
similarity index 83%
rename from bin/haskell-petstore.sh
rename to bin/haskell-servant-petstore.sh
index c604acd7cf..a35f38251c 100755
--- a/bin/haskell-petstore.sh
+++ b/bin/haskell-servant-petstore.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/haskell -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l haskell -o samples/server/petstore/haskell"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/haskell-servant -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l haskell-servant -o samples/server/petstore/haskell-servant"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/modules/swagger-codegen/src/main/resources/haskell/Apis.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/Apis.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/haskell/Apis.mustache
rename to modules/swagger-codegen/src/main/resources/haskell-servant/Apis.mustache
diff --git a/modules/swagger-codegen/src/main/resources/haskell/Client.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/Client.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/haskell/Client.mustache
rename to modules/swagger-codegen/src/main/resources/haskell-servant/Client.mustache
diff --git a/modules/swagger-codegen/src/main/resources/haskell/LICENSE b/modules/swagger-codegen/src/main/resources/haskell-servant/LICENSE
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/haskell/LICENSE
rename to modules/swagger-codegen/src/main/resources/haskell-servant/LICENSE
diff --git a/modules/swagger-codegen/src/main/resources/haskell/README.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/README.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/haskell/README.mustache
rename to modules/swagger-codegen/src/main/resources/haskell-servant/README.mustache
diff --git a/modules/swagger-codegen/src/main/resources/haskell/Server.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/Server.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/haskell/Server.mustache
rename to modules/swagger-codegen/src/main/resources/haskell-servant/Server.mustache
diff --git a/modules/swagger-codegen/src/main/resources/haskell/Setup.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/Setup.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/haskell/Setup.mustache
rename to modules/swagger-codegen/src/main/resources/haskell-servant/Setup.mustache
diff --git a/modules/swagger-codegen/src/main/resources/haskell/Utils.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/Utils.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/haskell/Utils.mustache
rename to modules/swagger-codegen/src/main/resources/haskell-servant/Utils.mustache
diff --git a/modules/swagger-codegen/src/main/resources/haskell/api.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/api.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/haskell/api.mustache
rename to modules/swagger-codegen/src/main/resources/haskell-servant/api.mustache
diff --git a/modules/swagger-codegen/src/main/resources/haskell/haskell-servant-codegen.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/haskell-servant-codegen.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/haskell/haskell-servant-codegen.mustache
rename to modules/swagger-codegen/src/main/resources/haskell-servant/haskell-servant-codegen.mustache
diff --git a/modules/swagger-codegen/src/main/resources/haskell/model.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/model.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/haskell/model.mustache
rename to modules/swagger-codegen/src/main/resources/haskell-servant/model.mustache
diff --git a/modules/swagger-codegen/src/main/resources/haskell/stack.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/stack.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/haskell/stack.mustache
rename to modules/swagger-codegen/src/main/resources/haskell-servant/stack.mustache
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/haskell/HaskellServantOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/haskellservant/HaskellServantOptionsTest.java
similarity index 96%
rename from modules/swagger-codegen/src/test/java/io/swagger/codegen/haskell/HaskellServantOptionsTest.java
rename to modules/swagger-codegen/src/test/java/io/swagger/codegen/haskellservant/HaskellServantOptionsTest.java
index 1806070d8d..d5848e47ca 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/haskell/HaskellServantOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/haskellservant/HaskellServantOptionsTest.java
@@ -1,4 +1,4 @@
-package io.swagger.codegen.haskell;
+package io.swagger.codegen.haskellservant;
 
 import io.swagger.codegen.AbstractOptionsTest;
 import io.swagger.codegen.CodegenConfig;
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/haskell/HaskellTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/haskellservant/HaskellTest.java
similarity index 92%
rename from modules/swagger-codegen/src/test/java/io/swagger/codegen/haskell/HaskellTest.java
rename to modules/swagger-codegen/src/test/java/io/swagger/codegen/haskellservant/HaskellTest.java
index 8800c80b81..e371a4f311 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/haskell/HaskellTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/haskellservant/HaskellTest.java
@@ -1,4 +1,4 @@
-package io.swagger.codegen.haskell;
+package io.swagger.codegen.haskellservant;
 
 import io.swagger.codegen.CodegenModel;
 import io.swagger.codegen.CodegenOperation;
diff --git a/samples/server/petstore/haskell/LICENSE b/samples/server/petstore/haskell-servant/LICENSE
similarity index 100%
rename from samples/server/petstore/haskell/LICENSE
rename to samples/server/petstore/haskell-servant/LICENSE
diff --git a/samples/server/petstore/haskell/README.md b/samples/server/petstore/haskell-servant/README.md
similarity index 100%
rename from samples/server/petstore/haskell/README.md
rename to samples/server/petstore/haskell-servant/README.md
diff --git a/samples/server/petstore/haskell/Setup.hs b/samples/server/petstore/haskell-servant/Setup.hs
similarity index 100%
rename from samples/server/petstore/haskell/Setup.hs
rename to samples/server/petstore/haskell-servant/Setup.hs
diff --git a/samples/server/petstore/haskell/client/Main.hs b/samples/server/petstore/haskell-servant/client/Main.hs
similarity index 100%
rename from samples/server/petstore/haskell/client/Main.hs
rename to samples/server/petstore/haskell-servant/client/Main.hs
diff --git a/samples/server/petstore/haskell/haskell-servant-codegen.cabal b/samples/server/petstore/haskell-servant/haskell-servant-codegen.cabal
similarity index 100%
rename from samples/server/petstore/haskell/haskell-servant-codegen.cabal
rename to samples/server/petstore/haskell-servant/haskell-servant-codegen.cabal
diff --git a/samples/server/petstore/haskell/lib/Api/PetApi.hs b/samples/server/petstore/haskell-servant/lib/Api/PetApi.hs
similarity index 100%
rename from samples/server/petstore/haskell/lib/Api/PetApi.hs
rename to samples/server/petstore/haskell-servant/lib/Api/PetApi.hs
diff --git a/samples/server/petstore/haskell/lib/Api/StoreApi.hs b/samples/server/petstore/haskell-servant/lib/Api/StoreApi.hs
similarity index 100%
rename from samples/server/petstore/haskell/lib/Api/StoreApi.hs
rename to samples/server/petstore/haskell-servant/lib/Api/StoreApi.hs
diff --git a/samples/server/petstore/haskell/lib/Api/UserApi.hs b/samples/server/petstore/haskell-servant/lib/Api/UserApi.hs
similarity index 100%
rename from samples/server/petstore/haskell/lib/Api/UserApi.hs
rename to samples/server/petstore/haskell-servant/lib/Api/UserApi.hs
diff --git a/samples/server/petstore/haskell/lib/Apis.hs b/samples/server/petstore/haskell-servant/lib/Apis.hs
similarity index 100%
rename from samples/server/petstore/haskell/lib/Apis.hs
rename to samples/server/petstore/haskell-servant/lib/Apis.hs
diff --git a/samples/server/petstore/haskell/lib/Model/Category.hs b/samples/server/petstore/haskell-servant/lib/Model/Category.hs
similarity index 100%
rename from samples/server/petstore/haskell/lib/Model/Category.hs
rename to samples/server/petstore/haskell-servant/lib/Model/Category.hs
diff --git a/samples/server/petstore/haskell/lib/Model/Order.hs b/samples/server/petstore/haskell-servant/lib/Model/Order.hs
similarity index 100%
rename from samples/server/petstore/haskell/lib/Model/Order.hs
rename to samples/server/petstore/haskell-servant/lib/Model/Order.hs
diff --git a/samples/server/petstore/haskell/lib/Model/Pet.hs b/samples/server/petstore/haskell-servant/lib/Model/Pet.hs
similarity index 100%
rename from samples/server/petstore/haskell/lib/Model/Pet.hs
rename to samples/server/petstore/haskell-servant/lib/Model/Pet.hs
diff --git a/samples/server/petstore/haskell/lib/Model/Tag.hs b/samples/server/petstore/haskell-servant/lib/Model/Tag.hs
similarity index 100%
rename from samples/server/petstore/haskell/lib/Model/Tag.hs
rename to samples/server/petstore/haskell-servant/lib/Model/Tag.hs
diff --git a/samples/server/petstore/haskell/lib/Model/User.hs b/samples/server/petstore/haskell-servant/lib/Model/User.hs
similarity index 100%
rename from samples/server/petstore/haskell/lib/Model/User.hs
rename to samples/server/petstore/haskell-servant/lib/Model/User.hs
diff --git a/samples/server/petstore/haskell/lib/Utils.hs b/samples/server/petstore/haskell-servant/lib/Utils.hs
similarity index 100%
rename from samples/server/petstore/haskell/lib/Utils.hs
rename to samples/server/petstore/haskell-servant/lib/Utils.hs
diff --git a/samples/server/petstore/haskell/server/Main.hs b/samples/server/petstore/haskell-servant/server/Main.hs
similarity index 100%
rename from samples/server/petstore/haskell/server/Main.hs
rename to samples/server/petstore/haskell-servant/server/Main.hs
diff --git a/samples/server/petstore/haskell/stack.yaml b/samples/server/petstore/haskell-servant/stack.yaml
similarity index 100%
rename from samples/server/petstore/haskell/stack.yaml
rename to samples/server/petstore/haskell-servant/stack.yaml