diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/model_doc.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/model_doc.mustache
index 85f8252ce612..38a2549626e4 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/model_doc.mustache
@@ -1,6 +1,8 @@
 {{#models}}
 {{#model}}
 # {{{packageName}}}.{{modelPackage}}.{{{classname}}}
+{{#description}}{{description}}
+{{/description}}
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ClassModel.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ClassModel.md
index 556b05db2410..0e839549003b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ClassModel.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ClassModel.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ClassModel
+Model for testing model with \"_class\" property
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/File.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/File.md
index acf85a4c001a..205ef3d60ae4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/File.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/File.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.File
+Must be named `File` for test.
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Model200Response.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Model200Response.md
index d155a4debd11..668f456c6902 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Model200Response.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Model200Response.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Model200Response
+Model for testing model name starting with number
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Name.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Name.md
index ee5704947a26..c75e5d034e5a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Name.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Name.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Name
+Model for testing model name same as property name
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Return.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Return.md
index d7266acb7d77..56a0ac3de088 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Return.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Return.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Return
+Model for testing reserved words
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ClassModel.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ClassModel.md
index 556b05db2410..0e839549003b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ClassModel.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ClassModel.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ClassModel
+Model for testing model with \"_class\" property
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/File.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/File.md
index acf85a4c001a..205ef3d60ae4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/File.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/File.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.File
+Must be named `File` for test.
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Model200Response.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Model200Response.md
index d155a4debd11..668f456c6902 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Model200Response.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Model200Response.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Model200Response
+Model for testing model name starting with number
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Name.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Name.md
index ee5704947a26..c75e5d034e5a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Name.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Name.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Name
+Model for testing model name same as property name
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Return.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Return.md
index d7266acb7d77..56a0ac3de088 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Return.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Return.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Return
+Model for testing reserved words
 ## Properties
 
 Name | Type | Description | Notes