diff --git a/bin/csharp-dotnet2-petstore.sh b/bin/csharp-dotnet2-petstore.sh
index eb4a95c76e1..9199f1ae278 100755
--- a/bin/csharp-dotnet2-petstore.sh
+++ b/bin/csharp-dotnet2-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 -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l CsharpDotNet2 -o samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient --additional-properties hideGenerationTimestamp=true"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l csharp-dotnet2 -o samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient --additional-properties hideGenerationTimestamp=true"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/windows/csharp-dotnet2-petstore.bat b/bin/windows/csharp-dotnet2-petstore.bat
index b321637d386..90f5ddf7910 100755
--- a/bin/windows/csharp-dotnet2-petstore.bat
+++ b/bin/windows/csharp-dotnet2-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 CsharpDotNet2 -o samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient --additional-properties hideGenerationTimestamp=true
+set ags=generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l csharp-dotnet2 -o samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient --additional-properties hideGenerationTimestamp=true
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java
index 125b688858f..fe71ba3006b 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java
@@ -26,7 +26,7 @@ public class CsharpDotNet2ClientCodegen extends AbstractCSharpCodegen {
         setApiPackage(packageName + ".Api");
         setModelPackage(packageName + ".Model");
         setClientPackage(packageName + ".Client");
-        setSourceFolder("src" + File.separator + "main" + File.separator + this.getName());
+        setSourceFolder("src" + File.separator + "main" + File.separator + "CsharpDotNet2");
 
         modelDocTemplateFiles.put("model_doc.mustache", ".md");
         apiDocTemplateFiles.put("api_doc.mustache", ".md");
@@ -96,7 +96,7 @@ public class CsharpDotNet2ClientCodegen extends AbstractCSharpCodegen {
 
     @Override
     public String getName() {
-        return "CsharpDotNet2";
+        return "csharp-dotnet2";
     }
 
     @Override
diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/csharp-dotnet2/ApiClient.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/CsharpDotNet2/ApiClient.mustache
rename to modules/swagger-codegen/src/main/resources/csharp-dotnet2/ApiClient.mustache
diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/ApiException.mustache b/modules/swagger-codegen/src/main/resources/csharp-dotnet2/ApiException.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/CsharpDotNet2/ApiException.mustache
rename to modules/swagger-codegen/src/main/resources/csharp-dotnet2/ApiException.mustache
diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/Configuration.mustache b/modules/swagger-codegen/src/main/resources/csharp-dotnet2/Configuration.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/CsharpDotNet2/Configuration.mustache
rename to modules/swagger-codegen/src/main/resources/csharp-dotnet2/Configuration.mustache
diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/README.mustache b/modules/swagger-codegen/src/main/resources/csharp-dotnet2/README.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/CsharpDotNet2/README.mustache
rename to modules/swagger-codegen/src/main/resources/csharp-dotnet2/README.mustache
diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/api.mustache b/modules/swagger-codegen/src/main/resources/csharp-dotnet2/api.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/CsharpDotNet2/api.mustache
rename to modules/swagger-codegen/src/main/resources/csharp-dotnet2/api.mustache
diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/api_doc.mustache b/modules/swagger-codegen/src/main/resources/csharp-dotnet2/api_doc.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/CsharpDotNet2/api_doc.mustache
rename to modules/swagger-codegen/src/main/resources/csharp-dotnet2/api_doc.mustache
diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/compile-mono.sh.mustache b/modules/swagger-codegen/src/main/resources/csharp-dotnet2/compile-mono.sh.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/CsharpDotNet2/compile-mono.sh.mustache
rename to modules/swagger-codegen/src/main/resources/csharp-dotnet2/compile-mono.sh.mustache
diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/model.mustache b/modules/swagger-codegen/src/main/resources/csharp-dotnet2/model.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/CsharpDotNet2/model.mustache
rename to modules/swagger-codegen/src/main/resources/csharp-dotnet2/model.mustache
diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/model_doc.mustache b/modules/swagger-codegen/src/main/resources/csharp-dotnet2/model_doc.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/CsharpDotNet2/model_doc.mustache
rename to modules/swagger-codegen/src/main/resources/csharp-dotnet2/model_doc.mustache
diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/packages.config.mustache b/modules/swagger-codegen/src/main/resources/csharp-dotnet2/packages.config.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/CsharpDotNet2/packages.config.mustache
rename to modules/swagger-codegen/src/main/resources/csharp-dotnet2/packages.config.mustache