diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJAXRSCXFCDIServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJAXRSCXFCDIServerCodegen.java
index 6dcf3f5807..cdf83061d2 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJAXRSCXFCDIServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJAXRSCXFCDIServerCodegen.java
@@ -6,53 +6,46 @@ import io.swagger.codegen.CodegenProperty;
 
 import java.io.File;
 
-public class JavaJAXRSCXFCDIServerCodegen extends JavaJAXRSSpecServerCodegen
-{
-	public JavaJAXRSCXFCDIServerCodegen()
-	{
-		artifactId = "swagger-jaxrs-cxf-cdi-server";
+public class JavaJAXRSCXFCDIServerCodegen extends JavaJAXRSSpecServerCodegen {
+    public JavaJAXRSCXFCDIServerCodegen() {
+        outputFolder = "generated-code/JavaJaxRS-CXF-CDI";
+        artifactId = "swagger-jaxrs-cxf-cdi-server";
+        sourceFolder = "src" + File.separator + "gen" + File.separator + "java";
 
-		sourceFolder = "src" + File.separator + "gen" + File.separator + "java";
+        // Three API templates to support CDI injection
+        apiTemplateFiles.put("apiService.mustache", ".java");
+        apiTemplateFiles.put("apiServiceImpl.mustache", ".java");
 
-		// Three API templates to support CDI injection
-		apiTemplateFiles.put("apiService.mustache", ".java");
-	  apiTemplateFiles.put("apiServiceImpl.mustache", ".java");
+        // Use standard types
+        typeMapping.put("DateTime", "java.util.Date");
 
-		// Use standard types
-		typeMapping.put("DateTime", "java.util.Date");
+        // Updated template directory
+        embeddedTemplateDir = templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "cxf-cdi";
+    }
 
-		// Updated template directory
-	  embeddedTemplateDir = templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "cxf-cdi";
-	}
+    @Override
+    public String getName() {
+        return "jaxrs-cxf-cdi";
+    }
 
-	@Override
-	public String getName()
-	{
-		return "jaxrs-cxf-cdi";
-	}
+    @Override
+    public void processOpts() {
+        super.processOpts();
+        supportingFiles.clear(); // Don't need extra files provided by AbstractJAX-RS & Java Codegen
+        writeOptional(outputFolder, new SupportingFile("pom.mustache", "", "pom.xml"));
+    }
 
-	@Override
-	public void processOpts()
-	{
-		super.processOpts();
+    @Override
+    public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
+        super.postProcessModelProperty(model, property);
 
-		supportingFiles.clear(); // Don't need extra files provided by AbstractJAX-RS & Java Codegen
+        // Reinstate JsonProperty
+        model.imports.add("JsonProperty");
+    }
 
-		writeOptional(outputFolder, new SupportingFile("pom.mustache", "", "pom.xml"));
-	}
-
-	@Override
-	public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
-		super.postProcessModelProperty(model, property);
-
-		// Reinstate JsonProperty
-		model.imports.add("JsonProperty");
-	}
-
-	@Override
-	public String getHelp()
-	{
-		return "Generates a Java JAXRS Server according to JAXRS 2.0 specification, assuming an Apache CXF runtime and a Java EE runtime with CDI enabled.";
-	}
+    @Override
+    public String getHelp() {
+        return "Generates a Java JAXRS Server according to JAXRS 2.0 specification, assuming an Apache CXF runtime and a Java EE runtime with CDI enabled.";
+    }
 
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaMSF4JServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaMSF4JServerCodegen.java
index 09f5276afc..459a8cee29 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaMSF4JServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaMSF4JServerCodegen.java
@@ -18,7 +18,7 @@ public class JavaMSF4JServerCodegen extends AbstractJavaJAXRSServerCodegen {
 
     public JavaMSF4JServerCodegen() {
         super();
-        outputFolder = "generated-code/JavaJaxRS-Jersey";
+        outputFolder = "generated-code/JavaJaxRS-MSF4J";
         apiTemplateFiles.put("apiService.mustache", ".java");
         apiTemplateFiles.put("apiServiceImpl.mustache", ".java");
         apiTemplateFiles.put("apiServiceFactory.mustache", ".java");
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaResteasyServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaResteasyServerCodegen.java
index 7d026403a0..d2a462c1e2 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaResteasyServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaResteasyServerCodegen.java
@@ -16,7 +16,7 @@ public class JavaResteasyServerCodegen extends AbstractJavaJAXRSServerCodegen {
 
         artifactId = "swagger-jaxrs-resteasy-server";
 
-        outputFolder = "generated-code/javaJaxRS";
+        outputFolder = "generated-code/JavaJaxRS-Resteasy";
         apiTemplateFiles.put("apiService.mustache", ".java");
         apiTemplateFiles.put("apiServiceImpl.mustache", ".java");
         apiTemplateFiles.put("apiServiceFactory.mustache", ".java");