diff --git a/bin/java-msf4j-petstore-server.sh b/bin/java-msf4j-petstore-server.sh
index 9660c71af47..8df820296c2 100755
--- a/bin/java-msf4j-petstore-server.sh
+++ b/bin/java-msf4j-petstore-server.sh
@@ -27,7 +27,7 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/MSF4J -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java-msf4j -o samples/server/petstore/java-msf4j/ -DhideGenerationTimestamp=true --additional-properties artifactId=java-msf4j-server $@"
+ags="generate -t modules/openapi-generator/src/main/resources/java-msf4j-server -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java-msf4j -o samples/server/petstore/java-msf4j/ -DhideGenerationTimestamp=true --additional-properties artifactId=java-msf4j-server $@"
 
 echo "Removing files and folders under samples/server/petstore/java-msf4j/src/main"
 rm -rf samples/server/petstore/java-msf4j/src/main
diff --git a/bin/java-undertow-petstore-server.sh b/bin/java-undertow-petstore-server.sh
index 8138c5e7a4e..957d7592523 100755
--- a/bin/java-undertow-petstore-server.sh
+++ b/bin/java-undertow-petstore-server.sh
@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/undertow -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g java-undertow-server -o samples/server/petstore/undertow --additional-properties hideGenerationTimestamp=true $@"
+ags="generate -t modules/openapi-generator/src/main/resources/java-undertow-server -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g java-undertow-server -o samples/server/petstore/java-undertow --additional-properties hideGenerationTimestamp=true $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/openapi3/finch-petstore-server.sh b/bin/openapi3/finch-petstore-server.sh
index 44076a85e75..f6b4a46a42b 100755
--- a/bin/openapi3/finch-petstore-server.sh
+++ b/bin/openapi3/finch-petstore-server.sh
@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate $@ -t modules/openapi-generator/src/main/resources/finch -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g scala-finch -o samples/server/petstore/finch"
+ags="generate $@ -t modules/openapi-generator/src/main/resources/scala-finch -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g scala-finch -o samples/server/petstore/scala-finch"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/openapi3/php-ze-ph-petstore-server.sh b/bin/openapi3/php-ze-ph-petstore-server.sh
index 569d7c91b92..c37137cd819 100644
--- a/bin/openapi3/php-ze-ph-petstore-server.sh
+++ b/bin/openapi3/php-ze-ph-petstore-server.sh
@@ -27,7 +27,7 @@ fi
 
 input=modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
 out_folder=samples/server/openapi3/petstore/php-ze-ph
-resources=modules/openapi-generator/src/main/resources/ze-ph
+resources=modules/openapi-generator/src/main/resources/php-ze-ph
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
diff --git a/bin/php-ze-ph-petstore-server.sh b/bin/php-ze-ph-petstore-server.sh
index bee84380b0d..371e65fe46f 100755
--- a/bin/php-ze-ph-petstore-server.sh
+++ b/bin/php-ze-ph-petstore-server.sh
@@ -27,7 +27,7 @@ fi
 
 input=modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 out_folder=samples/server/petstore/php-ze-ph
-resources=modules/openapi-generator/src/main/resources/ze-ph
+resources=modules/openapi-generator/src/main/resources/php-ze-ph
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
diff --git a/bin/finch-petstore-server.sh b/bin/scala-finch-petstore-server.sh
similarity index 77%
rename from bin/finch-petstore-server.sh
rename to bin/scala-finch-petstore-server.sh
index f346536b265..31d83518089 100755
--- a/bin/finch-petstore-server.sh
+++ b/bin/scala-finch-petstore-server.sh
@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/finch -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g scala-finch -o samples/server/petstore/finch $@"
+ags="generate -t modules/openapi-generator/src/main/resources/scala-finch -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g scala-finch -o samples/server/petstore/scala-finch $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/windows/ze-ph-petstore.bat b/bin/windows/ze-ph-petstore.bat
index eb966aefb7c..da5eacc3639 100644
--- a/bin/windows/ze-ph-petstore.bat
+++ b/bin/windows/ze-ph-petstore.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g php-ze-ph -o samples\server\petstore\ze-ph
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g php-ze-ph -o samples\server\petstore\php-ze-ph
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/docs/templating.md b/docs/templating.md
index 4ec320d8e77..6452a58c6db 100644
--- a/docs/templating.md
+++ b/docs/templating.md
@@ -7,7 +7,7 @@ It's easy to work with templates for codegen!
 
 The generator workflow has [transforming logic](https://github.com/openapitools/openapi-generator/tree/master/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages) as well as templates for each generation of code.
 
-Each generator will create a data structure from the OpenAPI document; OpenAPI 2.0 and OpenAPI 3.x documents are normalized into the same API model within the generator. This model is then applied to the templates.  While generators do not need to perform transformations, it's often necessary in order to add more advanced support for your language or framework. You may need to refer to the generator implementation to understand some of the logic while creating or customizing templates (see [FinchServerCodegen.java](https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FinchServerCodegen.java) for an advanced example).
+Each generator will create a data structure from the OpenAPI document; OpenAPI 2.0 and OpenAPI 3.x documents are normalized into the same API model within the generator. This model is then applied to the templates.  While generators do not need to perform transformations, it's often necessary in order to add more advanced support for your language or framework. You may need to refer to the generator implementation to understand some of the logic while creating or customizing templates (see [ScalaFinchServerCodegen.java](https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java) for an advanced example).
 
 The transform logic needs to implement [CodegenConfig.java](https://github.com/openapitools/openapi-generator/blob/master/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java) and is most easily done by extending [DefaultCodegen.java](https://github.com/openapitools/openapi-generator/blob/master/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java).  Take a look at the various implementations as a guideline while the instructions get more complete.
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMSF4JServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMSF4JServerCodegen.java
index f3559223c8f..b7a16a6178f 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMSF4JServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMSF4JServerCodegen.java
@@ -44,7 +44,7 @@ public class JavaMSF4JServerCodegen extends AbstractJavaJAXRSServerCodegen {
         apiTestTemplateFiles.clear();
         modelDocTemplateFiles.remove("model_doc.mustache");
         apiDocTemplateFiles.remove("api_doc.mustache");
-        embeddedTemplateDir = templateDir = "MSF4J";
+        embeddedTemplateDir = templateDir = "java-msf4j-server";
         CliOption library = new CliOption(CodegenConstants.LIBRARY, CodegenConstants.LIBRARY_DESC);
         supportedLibraries.put(LIBRARY_JERSEY1, "Jersey core 1.x");
         supportedLibraries.put(LIBRARY_JERSEY2, "Jersey core 2.x");
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaUndertowServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaUndertowServerCodegen.java
index f9b18901c2e..ef6b005fb0b 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaUndertowServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaUndertowServerCodegen.java
@@ -40,7 +40,7 @@ public class JavaUndertowServerCodegen extends AbstractJavaCodegen {
     public JavaUndertowServerCodegen() {
         super();
 
-        embeddedTemplateDir = templateDir = "undertow";
+        embeddedTemplateDir = templateDir = "java-undertow-server";
         invokerPackage = "org.openapitools.handler";
         artifactId = "openapi-undertow-server";
         dateLibrary = "legacy"; //TODO: add joda support
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpZendExpressivePathHandlerServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpZendExpressivePathHandlerServerCodegen.java
index d68c59755df..337978615fd 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpZendExpressivePathHandlerServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpZendExpressivePathHandlerServerCodegen.java
@@ -60,7 +60,7 @@ public class PhpZendExpressivePathHandlerServerCodegen extends AbstractPhpCodege
         //no point to use double - http://php.net/manual/en/language.types.float.php , especially because of PHP 7+ float type declaration
         typeMapping.put("double", "float");
 
-        embeddedTemplateDir = templateDir = "ze-ph";
+        embeddedTemplateDir = templateDir = "php-ze-ph";
         invokerPackage = "App";
         srcBasePath = "src" + File.separator + "App";
         apiDirName = "Handler";
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FinchServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java
similarity index 99%
rename from modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FinchServerCodegen.java
rename to modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java
index 5830c194174..197765f56e0 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FinchServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java
@@ -25,7 +25,7 @@ import org.openapitools.codegen.utils.ModelUtils;
 import java.io.File;
 import java.util.*;
 
-public class FinchServerCodegen extends DefaultCodegen implements CodegenConfig {
+public class ScalaFinchServerCodegen extends DefaultCodegen implements CodegenConfig {
     protected String invokerPackage = "org.openapitools.client";
     protected String groupId = "org.openapitools";
     protected String artifactId = "finch-server";
@@ -33,12 +33,12 @@ public class FinchServerCodegen extends DefaultCodegen implements CodegenConfig
     protected String sourceFolder = "src/main/scala";
     protected String packageName = "org.openapitools";
 
-    public FinchServerCodegen() {
+    public ScalaFinchServerCodegen() {
         super();
         outputFolder = "generated-code/finch";
         modelTemplateFiles.put("model.mustache", ".scala");
         apiTemplateFiles.put("api.mustache", ".scala");
-        embeddedTemplateDir = templateDir = "finch";
+        embeddedTemplateDir = templateDir = "scala-finch";
 
         apiPackage = packageName + ".apis";
         modelPackage = packageName + ".models";
diff --git a/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig b/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
index 4eddf1ebea6..3f21ea57ec0 100644
--- a/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
+++ b/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
@@ -27,7 +27,6 @@ org.openapitools.codegen.languages.ErlangClientCodegen
 org.openapitools.codegen.languages.ErlangProperCodegen
 org.openapitools.codegen.languages.ErlangServerCodegen
 org.openapitools.codegen.languages.FlashClientCodegen
-org.openapitools.codegen.languages.FinchServerCodegen
 org.openapitools.codegen.languages.GoClientCodegen
 org.openapitools.codegen.languages.GoServerCodegen
 org.openapitools.codegen.languages.GoGinServerCodegen
@@ -85,6 +84,7 @@ org.openapitools.codegen.languages.RustClientCodegen
 org.openapitools.codegen.languages.RustServerCodegen
 org.openapitools.codegen.languages.ScalatraServerCodegen
 org.openapitools.codegen.languages.ScalaAkkaClientCodegen
+org.openapitools.codegen.languages.ScalaFinchServerCodegen
 org.openapitools.codegen.languages.ScalaHttpClientCodegen
 org.openapitools.codegen.languages.ScalaGatlingCodegen
 org.openapitools.codegen.languages.ScalaLagomServerCodegen
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/ApiException.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/ApiException.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/ApiException.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/ApiException.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/ApiOriginFilter.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/ApiOriginFilter.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/ApiOriginFilter.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/ApiOriginFilter.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/ApiResponseMessage.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/ApiResponseMessage.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/ApiResponseMessage.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/ApiResponseMessage.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/Application.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/Application.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/Application.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/Application.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/JodaDateTimeProvider.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/JodaDateTimeProvider.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/JodaDateTimeProvider.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/JodaDateTimeProvider.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/JodaLocalDateProvider.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/JodaLocalDateProvider.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/JodaLocalDateProvider.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/JodaLocalDateProvider.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/LocalDateProvider.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/LocalDateProvider.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/LocalDateProvider.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/LocalDateProvider.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/NotFoundException.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/NotFoundException.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/NotFoundException.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/NotFoundException.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/OffsetDateTimeProvider.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/OffsetDateTimeProvider.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/OffsetDateTimeProvider.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/OffsetDateTimeProvider.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/README.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/README.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/README.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/README.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/RFC3339DateFormat.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/RFC3339DateFormat.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/RFC3339DateFormat.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/RFC3339DateFormat.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/StringUtil.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/StringUtil.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/StringUtil.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/StringUtil.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/allowableValues.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/allowableValues.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/allowableValues.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/allowableValues.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/api.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/api.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/api.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/api.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/apiService.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/apiService.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/apiService.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/apiService.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/apiServiceFactory.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/apiServiceFactory.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/apiServiceFactory.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/apiServiceFactory.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/apiServiceImpl.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/apiServiceImpl.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/apiServiceImpl.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/apiServiceImpl.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/bodyParams.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/bodyParams.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/bodyParams.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/bodyParams.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/bootstrap.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/bootstrap.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/bootstrap.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/bootstrap.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/enumClass.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/enumClass.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/enumClass.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/enumClass.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/enumOuterClass.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/enumOuterClass.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/enumOuterClass.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/enumOuterClass.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/formParams.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/formParams.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/formParams.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/formParams.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/generatedAnnotation.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/generatedAnnotation.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/generatedAnnotation.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/generatedAnnotation.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/headerParams.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/headerParams.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/headerParams.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/headerParams.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/jacksonJsonProvider.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/jacksonJsonProvider.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/jacksonJsonProvider.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/jacksonJsonProvider.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/model.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/model.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/model.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/model.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/pathParams.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/pathParams.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/pathParams.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/pathParams.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/pojo.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/pojo.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/pojo.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/pojo.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/pom.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/pom.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/pom.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/pom.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/queryParams.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/queryParams.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/queryParams.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/queryParams.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/returnTypes.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/returnTypes.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/returnTypes.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/returnTypes.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/serviceBodyParams.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/serviceBodyParams.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/serviceBodyParams.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/serviceBodyParams.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/serviceFormParams.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/serviceFormParams.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/serviceFormParams.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/serviceFormParams.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/serviceHeaderParams.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/serviceHeaderParams.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/serviceHeaderParams.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/serviceHeaderParams.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/servicePathParams.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/servicePathParams.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/servicePathParams.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/servicePathParams.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/serviceQueryParams.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/serviceQueryParams.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/serviceQueryParams.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/serviceQueryParams.mustache
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/web.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/web.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/MSF4J/web.mustache
rename to modules/openapi-generator/src/main/resources/java-msf4j-server/web.mustache
diff --git a/modules/openapi-generator/src/main/resources/undertow/README.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/README.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/undertow/README.mustache
rename to modules/openapi-generator/src/main/resources/java-undertow-server/README.mustache
diff --git a/modules/openapi-generator/src/main/resources/undertow/bodyParams.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/bodyParams.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/undertow/bodyParams.mustache
rename to modules/openapi-generator/src/main/resources/java-undertow-server/bodyParams.mustache
diff --git a/modules/openapi-generator/src/main/resources/undertow/enumClass.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/enumClass.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/undertow/enumClass.mustache
rename to modules/openapi-generator/src/main/resources/java-undertow-server/enumClass.mustache
diff --git a/modules/openapi-generator/src/main/resources/undertow/enumOuterClass.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/enumOuterClass.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/undertow/enumOuterClass.mustache
rename to modules/openapi-generator/src/main/resources/java-undertow-server/enumOuterClass.mustache
diff --git a/modules/openapi-generator/src/main/resources/undertow/formParams.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/formParams.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/undertow/formParams.mustache
rename to modules/openapi-generator/src/main/resources/java-undertow-server/formParams.mustache
diff --git a/modules/openapi-generator/src/main/resources/undertow/generatedAnnotation.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/generatedAnnotation.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/undertow/generatedAnnotation.mustache
rename to modules/openapi-generator/src/main/resources/java-undertow-server/generatedAnnotation.mustache
diff --git a/modules/openapi-generator/src/main/resources/undertow/handler.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/handler.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/undertow/handler.mustache
rename to modules/openapi-generator/src/main/resources/java-undertow-server/handler.mustache
diff --git a/modules/openapi-generator/src/main/resources/undertow/headerParams.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/headerParams.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/undertow/headerParams.mustache
rename to modules/openapi-generator/src/main/resources/java-undertow-server/headerParams.mustache
diff --git a/modules/openapi-generator/src/main/resources/undertow/inflector.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/inflector.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/undertow/inflector.mustache
rename to modules/openapi-generator/src/main/resources/java-undertow-server/inflector.mustache
diff --git a/modules/openapi-generator/src/main/resources/undertow/model.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/model.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/undertow/model.mustache
rename to modules/openapi-generator/src/main/resources/java-undertow-server/model.mustache
diff --git a/modules/openapi-generator/src/main/resources/undertow/openapi.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/openapi.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/undertow/openapi.mustache
rename to modules/openapi-generator/src/main/resources/java-undertow-server/openapi.mustache
diff --git a/modules/openapi-generator/src/main/resources/undertow/pathParams.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/pathParams.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/undertow/pathParams.mustache
rename to modules/openapi-generator/src/main/resources/java-undertow-server/pathParams.mustache
diff --git a/modules/openapi-generator/src/main/resources/undertow/pojo.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/pojo.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/undertow/pojo.mustache
rename to modules/openapi-generator/src/main/resources/java-undertow-server/pojo.mustache
diff --git a/modules/openapi-generator/src/main/resources/undertow/pom.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/pom.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/undertow/pom.mustache
rename to modules/openapi-generator/src/main/resources/java-undertow-server/pom.mustache
diff --git a/modules/openapi-generator/src/main/resources/undertow/primary.crt b/modules/openapi-generator/src/main/resources/java-undertow-server/primary.crt
similarity index 100%
rename from modules/openapi-generator/src/main/resources/undertow/primary.crt
rename to modules/openapi-generator/src/main/resources/java-undertow-server/primary.crt
diff --git a/modules/openapi-generator/src/main/resources/undertow/queryParams.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/queryParams.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/undertow/queryParams.mustache
rename to modules/openapi-generator/src/main/resources/java-undertow-server/queryParams.mustache
diff --git a/modules/openapi-generator/src/main/resources/undertow/security.json b/modules/openapi-generator/src/main/resources/java-undertow-server/security.json
similarity index 100%
rename from modules/openapi-generator/src/main/resources/undertow/security.json
rename to modules/openapi-generator/src/main/resources/java-undertow-server/security.json
diff --git a/modules/openapi-generator/src/main/resources/undertow/server.json b/modules/openapi-generator/src/main/resources/java-undertow-server/server.json
similarity index 100%
rename from modules/openapi-generator/src/main/resources/undertow/server.json
rename to modules/openapi-generator/src/main/resources/java-undertow-server/server.json
diff --git a/modules/openapi-generator/src/main/resources/undertow/service.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/service.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/undertow/service.mustache
rename to modules/openapi-generator/src/main/resources/java-undertow-server/service.mustache
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/.gitignore b/modules/openapi-generator/src/main/resources/php-ze-ph/.gitignore
similarity index 100%
rename from modules/openapi-generator/src/main/resources/ze-ph/.gitignore
rename to modules/openapi-generator/src/main/resources/php-ze-ph/.gitignore
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/Date.php.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/Date.php.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/ze-ph/Date.php.mustache
rename to modules/openapi-generator/src/main/resources/php-ze-ph/Date.php.mustache
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/DateTime.php.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/DateTime.php.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/ze-ph/DateTime.php.mustache
rename to modules/openapi-generator/src/main/resources/php-ze-ph/DateTime.php.mustache
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/Factory.php.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/Factory.php.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/ze-ph/Factory.php.mustache
rename to modules/openapi-generator/src/main/resources/php-ze-ph/Factory.php.mustache
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/InternalServerError.php.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/InternalServerError.php.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/ze-ph/InternalServerError.php.mustache
rename to modules/openapi-generator/src/main/resources/php-ze-ph/InternalServerError.php.mustache
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/QueryParameter.php.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/QueryParameter.php.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/ze-ph/QueryParameter.php.mustache
rename to modules/openapi-generator/src/main/resources/php-ze-ph/QueryParameter.php.mustache
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/QueryParameterArray.php.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/QueryParameterArray.php.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/ze-ph/QueryParameterArray.php.mustache
rename to modules/openapi-generator/src/main/resources/php-ze-ph/QueryParameterArray.php.mustache
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/QueryParameterArrayType.php.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/QueryParameterArrayType.php.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/ze-ph/QueryParameterArrayType.php.mustache
rename to modules/openapi-generator/src/main/resources/php-ze-ph/QueryParameterArrayType.php.mustache
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/QueryParameterType.php.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/QueryParameterType.php.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/ze-ph/QueryParameterType.php.mustache
rename to modules/openapi-generator/src/main/resources/php-ze-ph/QueryParameterType.php.mustache
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/README.md.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/README.md.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/ze-ph/README.md.mustache
rename to modules/openapi-generator/src/main/resources/php-ze-ph/README.md.mustache
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/Type.php.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/Type.php.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/ze-ph/Type.php.mustache
rename to modules/openapi-generator/src/main/resources/php-ze-ph/Type.php.mustache
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/api.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/api.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/ze-ph/api.mustache
rename to modules/openapi-generator/src/main/resources/php-ze-ph/api.mustache
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/app.yml.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/app.yml.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/ze-ph/app.yml.mustache
rename to modules/openapi-generator/src/main/resources/php-ze-ph/app.yml.mustache
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/composer.json.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/composer.json.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/ze-ph/composer.json.mustache
rename to modules/openapi-generator/src/main/resources/php-ze-ph/composer.json.mustache
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/config.yml b/modules/openapi-generator/src/main/resources/php-ze-ph/config.yml
similarity index 100%
rename from modules/openapi-generator/src/main/resources/ze-ph/config.yml
rename to modules/openapi-generator/src/main/resources/php-ze-ph/config.yml
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/container.php b/modules/openapi-generator/src/main/resources/php-ze-ph/container.php
similarity index 100%
rename from modules/openapi-generator/src/main/resources/ze-ph/container.php
rename to modules/openapi-generator/src/main/resources/php-ze-ph/container.php
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/data_transfer.yml.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/data_transfer.yml.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/ze-ph/data_transfer.yml.mustache
rename to modules/openapi-generator/src/main/resources/php-ze-ph/data_transfer.yml.mustache
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/index.php b/modules/openapi-generator/src/main/resources/php-ze-ph/index.php
similarity index 100%
rename from modules/openapi-generator/src/main/resources/ze-ph/index.php
rename to modules/openapi-generator/src/main/resources/php-ze-ph/index.php
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/model.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/model.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/ze-ph/model.mustache
rename to modules/openapi-generator/src/main/resources/php-ze-ph/model.mustache
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/model_normal_var.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/model_normal_var.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/ze-ph/model_normal_var.mustache
rename to modules/openapi-generator/src/main/resources/php-ze-ph/model_normal_var.mustache
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/model_query_var.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/model_query_var.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/ze-ph/model_query_var.mustache
rename to modules/openapi-generator/src/main/resources/php-ze-ph/model_query_var.mustache
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/path_handler.yml.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/path_handler.yml.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/ze-ph/path_handler.yml.mustache
rename to modules/openapi-generator/src/main/resources/php-ze-ph/path_handler.yml.mustache
diff --git a/modules/openapi-generator/src/main/resources/finch/DataAccessor.mustache b/modules/openapi-generator/src/main/resources/scala-finch/DataAccessor.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/finch/DataAccessor.mustache
rename to modules/openapi-generator/src/main/resources/scala-finch/DataAccessor.mustache
diff --git a/modules/openapi-generator/src/main/resources/finch/JsonUtil.scala b/modules/openapi-generator/src/main/resources/scala-finch/JsonUtil.scala
similarity index 100%
rename from modules/openapi-generator/src/main/resources/finch/JsonUtil.scala
rename to modules/openapi-generator/src/main/resources/scala-finch/JsonUtil.scala
diff --git a/modules/openapi-generator/src/main/resources/finch/README.mustache b/modules/openapi-generator/src/main/resources/scala-finch/README.mustache
similarity index 64%
rename from modules/openapi-generator/src/main/resources/finch/README.mustache
rename to modules/openapi-generator/src/main/resources/scala-finch/README.mustache
index 4a1526522b5..099ac4d904e 100644
--- a/modules/openapi-generator/src/main/resources/finch/README.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-finch/README.mustache
@@ -5,11 +5,8 @@ This server was generated by the [OpenAPI Generator](https://openapi-generator.t
 [OpenAPI-Spec](https://openapis.org) from a remote server, you can easily generate a server stub.  This
 is an example of building a OpenAPI-enabled scalatra server.
 
-This example uses the [finch](http://github.com/finagle/finch/) framework.  To see how to make this your own, look here:
-
-[README](https://github.com/openapitools/openapi-generator/master/samples/server-generator/finch)
-
+This example uses the [finch](http://github.com/finagle/finch/) framework.
 
 ### After generation
 
-Run `scalafix RemoveUnusedImports` to cleanup unused imports.
\ No newline at end of file
+Run `scalafix RemoveUnusedImports` to cleanup unused imports.
diff --git a/modules/openapi-generator/src/main/resources/finch/Server.mustache b/modules/openapi-generator/src/main/resources/scala-finch/Server.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/finch/Server.mustache
rename to modules/openapi-generator/src/main/resources/scala-finch/Server.mustache
diff --git a/modules/openapi-generator/src/main/resources/finch/api.mustache b/modules/openapi-generator/src/main/resources/scala-finch/api.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/finch/api.mustache
rename to modules/openapi-generator/src/main/resources/scala-finch/api.mustache
diff --git a/modules/openapi-generator/src/main/resources/finch/bodyParam.mustache b/modules/openapi-generator/src/main/resources/scala-finch/bodyParam.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/finch/bodyParam.mustache
rename to modules/openapi-generator/src/main/resources/scala-finch/bodyParam.mustache
diff --git a/modules/openapi-generator/src/main/resources/finch/bodyParamOperation.mustache b/modules/openapi-generator/src/main/resources/scala-finch/bodyParamOperation.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/finch/bodyParamOperation.mustache
rename to modules/openapi-generator/src/main/resources/scala-finch/bodyParamOperation.mustache
diff --git a/modules/openapi-generator/src/main/resources/finch/build.sbt b/modules/openapi-generator/src/main/resources/scala-finch/build.sbt
similarity index 100%
rename from modules/openapi-generator/src/main/resources/finch/build.sbt
rename to modules/openapi-generator/src/main/resources/scala-finch/build.sbt
diff --git a/modules/openapi-generator/src/main/resources/finch/endpoint.mustache b/modules/openapi-generator/src/main/resources/scala-finch/endpoint.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/finch/endpoint.mustache
rename to modules/openapi-generator/src/main/resources/scala-finch/endpoint.mustache
diff --git a/modules/openapi-generator/src/main/resources/finch/errors.mustache b/modules/openapi-generator/src/main/resources/scala-finch/errors.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/finch/errors.mustache
rename to modules/openapi-generator/src/main/resources/scala-finch/errors.mustache
diff --git a/modules/openapi-generator/src/main/resources/finch/formParam.mustache b/modules/openapi-generator/src/main/resources/scala-finch/formParam.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/finch/formParam.mustache
rename to modules/openapi-generator/src/main/resources/scala-finch/formParam.mustache
diff --git a/modules/openapi-generator/src/main/resources/finch/formParamMustache.mustache b/modules/openapi-generator/src/main/resources/scala-finch/formParamMustache.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/finch/formParamMustache.mustache
rename to modules/openapi-generator/src/main/resources/scala-finch/formParamMustache.mustache
diff --git a/modules/openapi-generator/src/main/resources/finch/headerParam.mustache b/modules/openapi-generator/src/main/resources/scala-finch/headerParam.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/finch/headerParam.mustache
rename to modules/openapi-generator/src/main/resources/scala-finch/headerParam.mustache
diff --git a/modules/openapi-generator/src/main/resources/finch/headerParamOperation.mustache b/modules/openapi-generator/src/main/resources/scala-finch/headerParamOperation.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/finch/headerParamOperation.mustache
rename to modules/openapi-generator/src/main/resources/scala-finch/headerParamOperation.mustache
diff --git a/modules/openapi-generator/src/main/resources/finch/model.mustache b/modules/openapi-generator/src/main/resources/scala-finch/model.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/finch/model.mustache
rename to modules/openapi-generator/src/main/resources/scala-finch/model.mustache
diff --git a/modules/openapi-generator/src/main/resources/finch/pathParam.mustache b/modules/openapi-generator/src/main/resources/scala-finch/pathParam.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/finch/pathParam.mustache
rename to modules/openapi-generator/src/main/resources/scala-finch/pathParam.mustache
diff --git a/modules/openapi-generator/src/main/resources/finch/project/build.properties b/modules/openapi-generator/src/main/resources/scala-finch/project/build.properties
similarity index 100%
rename from modules/openapi-generator/src/main/resources/finch/project/build.properties
rename to modules/openapi-generator/src/main/resources/scala-finch/project/build.properties
diff --git a/modules/openapi-generator/src/main/resources/finch/project/plugins.sbt b/modules/openapi-generator/src/main/resources/scala-finch/project/plugins.sbt
similarity index 100%
rename from modules/openapi-generator/src/main/resources/finch/project/plugins.sbt
rename to modules/openapi-generator/src/main/resources/scala-finch/project/plugins.sbt
diff --git a/modules/openapi-generator/src/main/resources/finch/queryParam.mustache b/modules/openapi-generator/src/main/resources/scala-finch/queryParam.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/finch/queryParam.mustache
rename to modules/openapi-generator/src/main/resources/scala-finch/queryParam.mustache
diff --git a/modules/openapi-generator/src/main/resources/finch/queryParamOperation.mustache b/modules/openapi-generator/src/main/resources/scala-finch/queryParamOperation.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/finch/queryParamOperation.mustache
rename to modules/openapi-generator/src/main/resources/scala-finch/queryParamOperation.mustache
diff --git a/modules/openapi-generator/src/main/resources/finch/sbt b/modules/openapi-generator/src/main/resources/scala-finch/sbt
old mode 100755
new mode 100644
similarity index 100%
rename from modules/openapi-generator/src/main/resources/finch/sbt
rename to modules/openapi-generator/src/main/resources/scala-finch/sbt
diff --git a/pom.xml b/pom.xml
index cb076add08e..3dfa2d45ad4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -993,7 +993,7 @@
             </modules>
         </profile>
         <profile>
-            <id>java-undertowr</id>
+            <id>java-undertow</id>
             <activation>
                 <property>
                     <name>env</name>
@@ -1001,7 +1001,7 @@
                 </property>
             </activation>
             <modules>
-                <module>samples/server/petstore/undertow</module>
+                <module>samples/server/petstore/java-undertow</module>
             </modules>
         </profile>
         <profile>
@@ -1114,7 +1114,7 @@
                 <module>samples/server/petstore/java-play-framework-fake-endpoints</module>
                 <module>samples/server/petstore/java-play-framework-controller-only</module>
                 <module>samples/server/petstore/java-play-framework-api-package-override</module>
-                <module>samples/server/petstore/undertow</module>
+                <module>samples/server/petstore/java-undertow</module>
                 <module>samples/server/petstore/jaxrs/jersey1</module>
                 <module>samples/server/petstore/jaxrs/jersey1-useTags</module>
                 <!-- move to other CI as the following fails often in CircleCI
@@ -1143,7 +1143,7 @@
                 <module>samples/server/petstore/scala-lagom-server</module>
                 <module>samples/server/petstore/scala-play-server</module>
                 <module>samples/server/petstore/scalatra</module>
-                <module>samples/server/petstore/finch</module>
+                <module>samples/server/petstore/scala-finch</module>
                 <module>samples/server/petstore/kotlin-springboot</module>
             </modules>
         </profile>
@@ -1184,7 +1184,7 @@
                 <module>samples/server/petstore/java-vertx/rx</module>
                 <module>samples/server/petstore/java-vertx/async</module>
                 <module>samples/server/petstore/java-inflector</module>
-                <module>samples/server/petstore/undertow</module>
+                <module>samples/server/petstore/java-undertow</module>
                 <module>samples/server/petstore/jaxrs/jersey1</module>
                 <module>samples/server/petstore/jaxrs/jersey2</module>
                 <module>samples/server/petstore/jaxrs/jersey1-useTags</module>
diff --git a/samples/server/petstore/finch/.openapi-generator-ignore b/samples/server/petstore/java-undertow/.openapi-generator-ignore
similarity index 100%
rename from samples/server/petstore/finch/.openapi-generator-ignore
rename to samples/server/petstore/java-undertow/.openapi-generator-ignore
diff --git a/samples/server/petstore/java-undertow/.openapi-generator/VERSION b/samples/server/petstore/java-undertow/.openapi-generator/VERSION
new file mode 100644
index 00000000000..06b5019af3f
--- /dev/null
+++ b/samples/server/petstore/java-undertow/.openapi-generator/VERSION
@@ -0,0 +1 @@
+4.0.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/undertow/README.md b/samples/server/petstore/java-undertow/README.md
similarity index 100%
rename from samples/server/petstore/undertow/README.md
rename to samples/server/petstore/java-undertow/README.md
diff --git a/samples/server/petstore/undertow/dependency-reduced-pom.xml b/samples/server/petstore/java-undertow/dependency-reduced-pom.xml
similarity index 100%
rename from samples/server/petstore/undertow/dependency-reduced-pom.xml
rename to samples/server/petstore/java-undertow/dependency-reduced-pom.xml
diff --git a/samples/server/petstore/undertow/pom.xml b/samples/server/petstore/java-undertow/pom.xml
similarity index 100%
rename from samples/server/petstore/undertow/pom.xml
rename to samples/server/petstore/java-undertow/pom.xml
diff --git a/samples/server/petstore/undertow/src/main/java/org/openapitools/handler/PathHandlerProvider.java b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerProvider.java
similarity index 100%
rename from samples/server/petstore/undertow/src/main/java/org/openapitools/handler/PathHandlerProvider.java
rename to samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerProvider.java
diff --git a/samples/server/petstore/undertow/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/Category.java
similarity index 100%
rename from samples/server/petstore/undertow/src/main/java/org/openapitools/model/Category.java
rename to samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/Category.java
diff --git a/samples/server/petstore/undertow/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/ModelApiResponse.java
similarity index 100%
rename from samples/server/petstore/undertow/src/main/java/org/openapitools/model/ModelApiResponse.java
rename to samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/ModelApiResponse.java
diff --git a/samples/server/petstore/undertow/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/Order.java
similarity index 100%
rename from samples/server/petstore/undertow/src/main/java/org/openapitools/model/Order.java
rename to samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/Order.java
diff --git a/samples/server/petstore/undertow/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/Pet.java
similarity index 100%
rename from samples/server/petstore/undertow/src/main/java/org/openapitools/model/Pet.java
rename to samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/Pet.java
diff --git a/samples/server/petstore/undertow/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/Tag.java
similarity index 100%
rename from samples/server/petstore/undertow/src/main/java/org/openapitools/model/Tag.java
rename to samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/Tag.java
diff --git a/samples/server/petstore/undertow/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/User.java
similarity index 100%
rename from samples/server/petstore/undertow/src/main/java/org/openapitools/model/User.java
rename to samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/User.java
diff --git a/samples/server/petstore/undertow/src/main/resources/META-INF/services/com.networknt.server.HandlerProvider b/samples/server/petstore/java-undertow/src/main/resources/META-INF/services/com.networknt.server.HandlerProvider
similarity index 100%
rename from samples/server/petstore/undertow/src/main/resources/META-INF/services/com.networknt.server.HandlerProvider
rename to samples/server/petstore/java-undertow/src/main/resources/META-INF/services/com.networknt.server.HandlerProvider
diff --git a/samples/server/petstore/undertow/src/main/resources/config/oauth/primary.crt b/samples/server/petstore/java-undertow/src/main/resources/config/oauth/primary.crt
similarity index 100%
rename from samples/server/petstore/undertow/src/main/resources/config/oauth/primary.crt
rename to samples/server/petstore/java-undertow/src/main/resources/config/oauth/primary.crt
diff --git a/samples/server/petstore/undertow/src/main/resources/config/openapi.json b/samples/server/petstore/java-undertow/src/main/resources/config/openapi.json
similarity index 100%
rename from samples/server/petstore/undertow/src/main/resources/config/openapi.json
rename to samples/server/petstore/java-undertow/src/main/resources/config/openapi.json
diff --git a/samples/server/petstore/undertow/src/main/resources/config/security.json b/samples/server/petstore/java-undertow/src/main/resources/config/security.json
similarity index 100%
rename from samples/server/petstore/undertow/src/main/resources/config/security.json
rename to samples/server/petstore/java-undertow/src/main/resources/config/security.json
diff --git a/samples/server/petstore/undertow/src/main/resources/config/server.json b/samples/server/petstore/java-undertow/src/main/resources/config/server.json
similarity index 100%
rename from samples/server/petstore/undertow/src/main/resources/config/server.json
rename to samples/server/petstore/java-undertow/src/main/resources/config/server.json
diff --git a/samples/server/petstore/undertow/.openapi-generator-ignore b/samples/server/petstore/scala-finch/.openapi-generator-ignore
similarity index 100%
rename from samples/server/petstore/undertow/.openapi-generator-ignore
rename to samples/server/petstore/scala-finch/.openapi-generator-ignore
diff --git a/samples/server/petstore/finch/.openapi-generator/VERSION b/samples/server/petstore/scala-finch/.openapi-generator/VERSION
similarity index 100%
rename from samples/server/petstore/finch/.openapi-generator/VERSION
rename to samples/server/petstore/scala-finch/.openapi-generator/VERSION
diff --git a/samples/server/petstore/finch/README.md b/samples/server/petstore/scala-finch/README.md
similarity index 64%
rename from samples/server/petstore/finch/README.md
rename to samples/server/petstore/scala-finch/README.md
index 4a1526522b5..099ac4d904e 100644
--- a/samples/server/petstore/finch/README.md
+++ b/samples/server/petstore/scala-finch/README.md
@@ -5,11 +5,8 @@ This server was generated by the [OpenAPI Generator](https://openapi-generator.t
 [OpenAPI-Spec](https://openapis.org) from a remote server, you can easily generate a server stub.  This
 is an example of building a OpenAPI-enabled scalatra server.
 
-This example uses the [finch](http://github.com/finagle/finch/) framework.  To see how to make this your own, look here:
-
-[README](https://github.com/openapitools/openapi-generator/master/samples/server-generator/finch)
-
+This example uses the [finch](http://github.com/finagle/finch/) framework.
 
 ### After generation
 
-Run `scalafix RemoveUnusedImports` to cleanup unused imports.
\ No newline at end of file
+Run `scalafix RemoveUnusedImports` to cleanup unused imports.
diff --git a/samples/server/petstore/finch/build.sbt b/samples/server/petstore/scala-finch/build.sbt
similarity index 100%
rename from samples/server/petstore/finch/build.sbt
rename to samples/server/petstore/scala-finch/build.sbt
diff --git a/samples/server/petstore/finch/pom.xml b/samples/server/petstore/scala-finch/pom.xml
similarity index 100%
rename from samples/server/petstore/finch/pom.xml
rename to samples/server/petstore/scala-finch/pom.xml
diff --git a/samples/server/petstore/finch/project/build.properties b/samples/server/petstore/scala-finch/project/build.properties
similarity index 100%
rename from samples/server/petstore/finch/project/build.properties
rename to samples/server/petstore/scala-finch/project/build.properties
diff --git a/samples/server/petstore/finch/project/plugins.sbt b/samples/server/petstore/scala-finch/project/plugins.sbt
similarity index 100%
rename from samples/server/petstore/finch/project/plugins.sbt
rename to samples/server/petstore/scala-finch/project/plugins.sbt
diff --git a/samples/server/petstore/finch/sbt b/samples/server/petstore/scala-finch/sbt
similarity index 100%
rename from samples/server/petstore/finch/sbt
rename to samples/server/petstore/scala-finch/sbt
diff --git a/samples/server/petstore/finch/src/main/scala/DataAccessor.scala b/samples/server/petstore/scala-finch/src/main/scala/DataAccessor.scala
similarity index 100%
rename from samples/server/petstore/finch/src/main/scala/DataAccessor.scala
rename to samples/server/petstore/scala-finch/src/main/scala/DataAccessor.scala
diff --git a/samples/server/petstore/finch/src/main/scala/Server.scala b/samples/server/petstore/scala-finch/src/main/scala/Server.scala
similarity index 100%
rename from samples/server/petstore/finch/src/main/scala/Server.scala
rename to samples/server/petstore/scala-finch/src/main/scala/Server.scala
diff --git a/samples/server/petstore/finch/src/main/scala/endpoint.scala b/samples/server/petstore/scala-finch/src/main/scala/endpoint.scala
similarity index 100%
rename from samples/server/petstore/finch/src/main/scala/endpoint.scala
rename to samples/server/petstore/scala-finch/src/main/scala/endpoint.scala
diff --git a/samples/server/petstore/finch/src/main/scala/errors.scala b/samples/server/petstore/scala-finch/src/main/scala/errors.scala
similarity index 100%
rename from samples/server/petstore/finch/src/main/scala/errors.scala
rename to samples/server/petstore/scala-finch/src/main/scala/errors.scala
diff --git a/samples/server/petstore/finch/src/main/scala/org/openapitools/apis/PetApi.scala b/samples/server/petstore/scala-finch/src/main/scala/org/openapitools/apis/PetApi.scala
similarity index 100%
rename from samples/server/petstore/finch/src/main/scala/org/openapitools/apis/PetApi.scala
rename to samples/server/petstore/scala-finch/src/main/scala/org/openapitools/apis/PetApi.scala
diff --git a/samples/server/petstore/finch/src/main/scala/org/openapitools/apis/StoreApi.scala b/samples/server/petstore/scala-finch/src/main/scala/org/openapitools/apis/StoreApi.scala
similarity index 100%
rename from samples/server/petstore/finch/src/main/scala/org/openapitools/apis/StoreApi.scala
rename to samples/server/petstore/scala-finch/src/main/scala/org/openapitools/apis/StoreApi.scala
diff --git a/samples/server/petstore/finch/src/main/scala/org/openapitools/apis/UserApi.scala b/samples/server/petstore/scala-finch/src/main/scala/org/openapitools/apis/UserApi.scala
similarity index 100%
rename from samples/server/petstore/finch/src/main/scala/org/openapitools/apis/UserApi.scala
rename to samples/server/petstore/scala-finch/src/main/scala/org/openapitools/apis/UserApi.scala
diff --git a/samples/server/petstore/finch/src/main/scala/org/openapitools/models/ApiResponse.scala b/samples/server/petstore/scala-finch/src/main/scala/org/openapitools/models/ApiResponse.scala
similarity index 100%
rename from samples/server/petstore/finch/src/main/scala/org/openapitools/models/ApiResponse.scala
rename to samples/server/petstore/scala-finch/src/main/scala/org/openapitools/models/ApiResponse.scala
diff --git a/samples/server/petstore/finch/src/main/scala/org/openapitools/models/Category.scala b/samples/server/petstore/scala-finch/src/main/scala/org/openapitools/models/Category.scala
similarity index 100%
rename from samples/server/petstore/finch/src/main/scala/org/openapitools/models/Category.scala
rename to samples/server/petstore/scala-finch/src/main/scala/org/openapitools/models/Category.scala
diff --git a/samples/server/petstore/finch/src/main/scala/org/openapitools/models/Order.scala b/samples/server/petstore/scala-finch/src/main/scala/org/openapitools/models/Order.scala
similarity index 100%
rename from samples/server/petstore/finch/src/main/scala/org/openapitools/models/Order.scala
rename to samples/server/petstore/scala-finch/src/main/scala/org/openapitools/models/Order.scala
diff --git a/samples/server/petstore/finch/src/main/scala/org/openapitools/models/Pet.scala b/samples/server/petstore/scala-finch/src/main/scala/org/openapitools/models/Pet.scala
similarity index 100%
rename from samples/server/petstore/finch/src/main/scala/org/openapitools/models/Pet.scala
rename to samples/server/petstore/scala-finch/src/main/scala/org/openapitools/models/Pet.scala
diff --git a/samples/server/petstore/finch/src/main/scala/org/openapitools/models/Tag.scala b/samples/server/petstore/scala-finch/src/main/scala/org/openapitools/models/Tag.scala
similarity index 100%
rename from samples/server/petstore/finch/src/main/scala/org/openapitools/models/Tag.scala
rename to samples/server/petstore/scala-finch/src/main/scala/org/openapitools/models/Tag.scala
diff --git a/samples/server/petstore/finch/src/main/scala/org/openapitools/models/User.scala b/samples/server/petstore/scala-finch/src/main/scala/org/openapitools/models/User.scala
similarity index 100%
rename from samples/server/petstore/finch/src/main/scala/org/openapitools/models/User.scala
rename to samples/server/petstore/scala-finch/src/main/scala/org/openapitools/models/User.scala
diff --git a/samples/server/petstore/undertow/.openapi-generator/VERSION b/samples/server/petstore/undertow/.openapi-generator/VERSION
deleted file mode 100644
index afa63656064..00000000000
--- a/samples/server/petstore/undertow/.openapi-generator/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-4.0.0-SNAPSHOT
\ No newline at end of file