diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFCodegen.java
index 2592e0823c3..0f063e485d0 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFCodegen.java
@@ -55,7 +55,7 @@ public class JavaCXFCodegen extends AbstractJavaJAXRSServerCodegen
 	@Override
 	public String getName()
 	{
-		return "cxf";
+		return "jaxrs-cxf";
 	}
 	
 
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJerseyCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJerseyCodegen.java
index f3a7d9ceda5..2e7d30842b8 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJerseyCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJerseyCodegen.java
@@ -52,7 +52,7 @@ public class JavaJerseyCodegen extends AbstractJavaJAXRSServerCodegen
     @Override
     public String getName()
     {
-        return "jaxrs";
+        return "jaxrs"; // TODO should be renamed as "jaxrs-jersey"
     }
 
     @Override