diff --git a/bin/scala-lagom-petstore.sh b/bin/scala-lagom-server-petstore.sh
similarity index 82%
rename from bin/scala-lagom-petstore.sh
rename to bin/scala-lagom-server-petstore.sh
index d2e89f26e8c..12abeb043d4 100755
--- a/bin/scala-lagom-petstore.sh
+++ b/bin/scala-lagom-server-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/scala-lagom -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l scala-lagom -o samples/server/petstore/scala-lagom"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/scala-lagom-server -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l scala-lagom-server -o samples/server/petstore/scala-lagom-server"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/windows/scala-lagom-petstore.sh b/bin/windows/scala-lagom-petstore.bat
similarity index 76%
rename from bin/windows/scala-lagom-petstore.sh
rename to bin/windows/scala-lagom-petstore.bat
index 367f53eb824..c2dfed7ae1f 100644
--- a/bin/windows/scala-lagom-petstore.sh
+++ b/bin/windows/scala-lagom-petstore.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l scala-lagom -o samples\server\petstore\scala-lagom
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l scala-lagom-server -o samples\server\petstore\scala-lagom-server
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaLagomServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaLagomServerCodegen.java
index f9b509e95e2..dcf16f399c0 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaLagomServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaLagomServerCodegen.java
@@ -10,15 +10,15 @@ public class ScalaLagomServerCodegen extends AbstractScalaCodegen implements Cod
   private String authScheme = "";
   private boolean authPreemptive=false;
   protected String groupId = "io.swagger";
-  protected String artifactId = "scala-lagom";
+  protected String artifactId = "scala-lagom-server";
   protected String artifactVersion = "1.0.0";
 
   public ScalaLagomServerCodegen() {
     super();
-    outputFolder = "generated-code/scala-lagom";
+    outputFolder = "generated-code/scala-lagom-server";
     modelTemplateFiles.put("model.mustache", ".scala");
     apiTemplateFiles.put("api.mustache", ".scala");
-    embeddedTemplateDir = templateDir = "scala-lagom";
+    embeddedTemplateDir = templateDir = "scala-lagom-server";
     apiPackage = "io.swagger.client.api";
     modelPackage = "io.swagger.client.model";
 
@@ -166,7 +166,7 @@ public class ScalaLagomServerCodegen extends AbstractScalaCodegen implements Cod
 
   @Override
   public String getName() {
-    return "scala-lagom";
+    return "scala-lagom-server";
   }
 
   @Override
diff --git a/modules/swagger-codegen/src/main/resources/scala-lagom/README.mustache b/modules/swagger-codegen/src/main/resources/scala-lagom-server/README.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/scala-lagom/README.mustache
rename to modules/swagger-codegen/src/main/resources/scala-lagom-server/README.mustache
diff --git a/modules/swagger-codegen/src/main/resources/scala-lagom/api.mustache b/modules/swagger-codegen/src/main/resources/scala-lagom-server/api.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/scala-lagom/api.mustache
rename to modules/swagger-codegen/src/main/resources/scala-lagom-server/api.mustache
diff --git a/modules/swagger-codegen/src/main/resources/scala-lagom/build.properties.mustache b/modules/swagger-codegen/src/main/resources/scala-lagom-server/build.properties.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/scala-lagom/build.properties.mustache
rename to modules/swagger-codegen/src/main/resources/scala-lagom-server/build.properties.mustache
diff --git a/modules/swagger-codegen/src/main/resources/scala-lagom/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/scala-lagom-server/build.sbt.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/scala-lagom/build.sbt.mustache
rename to modules/swagger-codegen/src/main/resources/scala-lagom-server/build.sbt.mustache
diff --git a/modules/swagger-codegen/src/main/resources/scala-lagom/gitignore.mustache b/modules/swagger-codegen/src/main/resources/scala-lagom-server/gitignore.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/scala-lagom/gitignore.mustache
rename to modules/swagger-codegen/src/main/resources/scala-lagom-server/gitignore.mustache
diff --git a/modules/swagger-codegen/src/main/resources/scala-lagom/licenseInfo.mustache b/modules/swagger-codegen/src/main/resources/scala-lagom-server/licenseInfo.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/scala-lagom/licenseInfo.mustache
rename to modules/swagger-codegen/src/main/resources/scala-lagom-server/licenseInfo.mustache
diff --git a/modules/swagger-codegen/src/main/resources/scala-lagom/model.mustache b/modules/swagger-codegen/src/main/resources/scala-lagom-server/model.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/scala-lagom/model.mustache
rename to modules/swagger-codegen/src/main/resources/scala-lagom-server/model.mustache
diff --git a/modules/swagger-codegen/src/main/resources/scala-lagom/plugins.sbt.mustache b/modules/swagger-codegen/src/main/resources/scala-lagom-server/plugins.sbt.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/scala-lagom/plugins.sbt.mustache
rename to modules/swagger-codegen/src/main/resources/scala-lagom-server/plugins.sbt.mustache
diff --git a/pom.xml.circleci b/pom.xml.circleci
index 62925071146..ef26365ef55 100644
--- a/pom.xml.circleci
+++ b/pom.xml.circleci
@@ -866,7 +866,7 @@
                 <module>samples/server/petstore/jaxrs-cxf-non-spring-app</module>
                 <module>samples/server/petstore/java-msf4j</module>
                 <module>samples/server/petstore/jaxrs-spec-interface</module>
-                <module>samples/server/petstore/scala-lagom</module>
+                <module>samples/server/petstore/scala-lagom-server</module>
             </modules>
         </profile>
     </profiles>
diff --git a/samples/server/petstore/scala-lagom/.gitignore b/samples/server/petstore/scala-lagom-server/.gitignore
similarity index 100%
rename from samples/server/petstore/scala-lagom/.gitignore
rename to samples/server/petstore/scala-lagom-server/.gitignore
diff --git a/samples/server/petstore/scala-lagom/.swagger-codegen-ignore b/samples/server/petstore/scala-lagom-server/.swagger-codegen-ignore
similarity index 100%
rename from samples/server/petstore/scala-lagom/.swagger-codegen-ignore
rename to samples/server/petstore/scala-lagom-server/.swagger-codegen-ignore
diff --git a/samples/server/petstore/scala-lagom/.swagger-codegen/VERSION b/samples/server/petstore/scala-lagom-server/.swagger-codegen/VERSION
similarity index 100%
rename from samples/server/petstore/scala-lagom/.swagger-codegen/VERSION
rename to samples/server/petstore/scala-lagom-server/.swagger-codegen/VERSION
diff --git a/samples/server/petstore/scala-lagom/README.md b/samples/server/petstore/scala-lagom-server/README.md
similarity index 100%
rename from samples/server/petstore/scala-lagom/README.md
rename to samples/server/petstore/scala-lagom-server/README.md
diff --git a/samples/server/petstore/scala-lagom/build.sbt b/samples/server/petstore/scala-lagom-server/build.sbt
similarity index 86%
rename from samples/server/petstore/scala-lagom/build.sbt
rename to samples/server/petstore/scala-lagom-server/build.sbt
index 16019172ef7..ea9dd5789f0 100644
--- a/samples/server/petstore/scala-lagom/build.sbt
+++ b/samples/server/petstore/scala-lagom-server/build.sbt
@@ -1,6 +1,6 @@
 version       := "1.0.0"
 
-name          := "scala-lagom"
+name          := "scala-lagom-server"
 
 organization  := "io.swagger"
 
diff --git a/samples/server/petstore/scala-lagom/pom.xml b/samples/server/petstore/scala-lagom-server/pom.xml
similarity index 100%
rename from samples/server/petstore/scala-lagom/pom.xml
rename to samples/server/petstore/scala-lagom-server/pom.xml
diff --git a/samples/server/petstore/scala-lagom/project/build.properties b/samples/server/petstore/scala-lagom-server/project/build.properties
similarity index 100%
rename from samples/server/petstore/scala-lagom/project/build.properties
rename to samples/server/petstore/scala-lagom-server/project/build.properties
diff --git a/samples/server/petstore/scala-lagom/project/plugins.sbt b/samples/server/petstore/scala-lagom-server/project/plugins.sbt
similarity index 100%
rename from samples/server/petstore/scala-lagom/project/plugins.sbt
rename to samples/server/petstore/scala-lagom-server/project/plugins.sbt
diff --git a/samples/server/petstore/scala-lagom/sbt_test_jdk8_only.sh b/samples/server/petstore/scala-lagom-server/sbt_test_jdk8_only.sh
similarity index 100%
rename from samples/server/petstore/scala-lagom/sbt_test_jdk8_only.sh
rename to samples/server/petstore/scala-lagom-server/sbt_test_jdk8_only.sh
diff --git a/samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/api/PetApi.scala b/samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/api/PetApi.scala
similarity index 100%
rename from samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/api/PetApi.scala
rename to samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/api/PetApi.scala
diff --git a/samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/api/StoreApi.scala b/samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/api/StoreApi.scala
similarity index 100%
rename from samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/api/StoreApi.scala
rename to samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/api/StoreApi.scala
diff --git a/samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/api/UserApi.scala b/samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/api/UserApi.scala
similarity index 100%
rename from samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/api/UserApi.scala
rename to samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/api/UserApi.scala
diff --git a/samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/model/ApiResponse.scala b/samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/model/ApiResponse.scala
similarity index 100%
rename from samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/model/ApiResponse.scala
rename to samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/model/ApiResponse.scala
diff --git a/samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/model/Category.scala b/samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/model/Category.scala
similarity index 100%
rename from samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/model/Category.scala
rename to samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/model/Category.scala
diff --git a/samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/model/Order.scala b/samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/model/Order.scala
similarity index 100%
rename from samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/model/Order.scala
rename to samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/model/Order.scala
diff --git a/samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/model/Pet.scala b/samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/model/Pet.scala
similarity index 100%
rename from samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/model/Pet.scala
rename to samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/model/Pet.scala
diff --git a/samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/model/Tag.scala b/samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/model/Tag.scala
similarity index 100%
rename from samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/model/Tag.scala
rename to samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/model/Tag.scala
diff --git a/samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/model/User.scala b/samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/model/User.scala
similarity index 100%
rename from samples/server/petstore/scala-lagom/src/main/scala/io/swagger/client/model/User.scala
rename to samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/model/User.scala