diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetServerCodegen.java
similarity index 99%
rename from modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java
rename to modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetServerCodegen.java
index 93e8406e49f5..06aa082be508 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetServerCodegen.java
@@ -41,7 +41,7 @@
 
 import static java.util.UUID.randomUUID;
 
-public class AspNetCoreServerCodegen extends AbstractCSharpCodegen {
+public class AspNetServerCodegen extends AbstractCSharpCodegen {
 
     public static final String USE_SWASHBUCKLE = "useSwashbuckle";
     public static final String MODEL_POCOMODE = "pocoModels";
@@ -70,7 +70,7 @@ public class AspNetCoreServerCodegen extends AbstractCSharpCodegen {
     private String packageGuid = "{" + randomUUID().toString().toUpperCase(Locale.ROOT) + "}";
     private String userSecretsGuid = randomUUID().toString();
 
-    protected final Logger LOGGER = LoggerFactory.getLogger(AspNetCoreServerCodegen.class);
+    protected final Logger LOGGER = LoggerFactory.getLogger(AspNetServerCodegen.class);
 
     private boolean useSwashbuckle = true;
     private boolean pocoModels = false;
@@ -94,7 +94,7 @@ public class AspNetCoreServerCodegen extends AbstractCSharpCodegen {
     private boolean useDefaultRouting = true;
     private String newtonsoftVersion = "3.0.0";
 
-    public AspNetCoreServerCodegen() {
+    public AspNetServerCodegen() {
         super();
 
         // TODO: AspnetCore community review
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
similarity index 99%
rename from modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java
rename to modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
index 78c900a5c35a..e591adb604bf 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
@@ -47,7 +47,7 @@
 import static org.openapitools.codegen.utils.StringUtils.underscore;
 
 @SuppressWarnings("Duplicates")
-public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen {
+public class CSharpClientCodegen extends AbstractCSharpCodegen {
     protected String apiName = "Api";
 
     // Defines the sdk option for targeted frameworks, which differs from targetFramework and targetFrameworkNuget
@@ -79,7 +79,7 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen {
     protected static final String NET_70_OR_LATER = "net70OrLater";
 
     @SuppressWarnings("hiding")
-    private final Logger LOGGER = LoggerFactory.getLogger(CSharpNetCoreClientCodegen.class);
+    private final Logger LOGGER = LoggerFactory.getLogger(CSharpClientCodegen.class);
     private static final List<FrameworkStrategy> frameworkStrategies = Arrays.asList(
             FrameworkStrategy.NETSTANDARD_1_3,
             FrameworkStrategy.NETSTANDARD_1_4,
@@ -126,7 +126,7 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen {
     protected boolean needsCustomHttpMethod = false;
     protected boolean needsUriBuilder = false;
 
-    public CSharpNetCoreClientCodegen() {
+    public CSharpClientCodegen() {
         super();
 
         modifyFeatureSet(features -> features
@@ -1311,7 +1311,7 @@ private void syncStringProperty(final Map<String, Object> additionalProperties,
     @SuppressWarnings("Duplicates")
     private static abstract class FrameworkStrategy {
 
-        private final Logger LOGGER = LoggerFactory.getLogger(CSharpNetCoreClientCodegen.class);
+        private final Logger LOGGER = LoggerFactory.getLogger(CSharpClientCodegen.class);
 
         static FrameworkStrategy NETSTANDARD_1_3 = new FrameworkStrategy("netstandard1.3", ".NET Standard 1.3", "net7.0") {
         };
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CsharpNetcoreFunctionsServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpFunctionsServerCodegen.java
similarity index 99%
rename from modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CsharpNetcoreFunctionsServerCodegen.java
rename to modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpFunctionsServerCodegen.java
index a085bcc5e304..3be569bfc974 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CsharpNetcoreFunctionsServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpFunctionsServerCodegen.java
@@ -40,7 +40,7 @@
 
 import static java.util.UUID.randomUUID;
 
-public class CsharpNetcoreFunctionsServerCodegen extends AbstractCSharpCodegen {
+public class CSharpFunctionsServerCodegen extends AbstractCSharpCodegen {
 
     public static final String NET_CORE_VERSION = "netCoreVersion";
     public static final String AZURE_FUNCTIONS_VERSION = "azureFunctionsVersion";
@@ -61,7 +61,7 @@ public class CsharpNetcoreFunctionsServerCodegen extends AbstractCSharpCodegen {
     private String packageGuid = "{" + randomUUID().toString().toUpperCase(Locale.ROOT) + "}";
     private String userSecretsGuid = randomUUID().toString();
 
-    protected final Logger LOGGER = LoggerFactory.getLogger(AspNetCoreServerCodegen.class);
+    protected final Logger LOGGER = LoggerFactory.getLogger(AspNetServerCodegen.class);
 
     protected int serverPort = 8080;
     protected String serverHost = "0.0.0.0";
@@ -80,7 +80,7 @@ public class CsharpNetcoreFunctionsServerCodegen extends AbstractCSharpCodegen {
     private boolean useNewtonsoft = true;
     private String newtonsoftVersion = "3.0.0";
 
-    public CsharpNetcoreFunctionsServerCodegen() {
+    public CSharpFunctionsServerCodegen() {
         super();
 
         // TODO: AspnetCore community review
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreReducedClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpReducedClientCodegen.java
similarity index 99%
rename from modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreReducedClientCodegen.java
rename to modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpReducedClientCodegen.java
index bff3d3c90087..2fb7a760655a 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreReducedClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpReducedClientCodegen.java
@@ -42,7 +42,7 @@
 import static org.openapitools.codegen.utils.StringUtils.underscore;
 
 @SuppressWarnings("Duplicates")
-public class CSharpNetCoreReducedClientCodegen extends AbstractCSharpCodegen {
+public class CSharpReducedClientCodegen extends AbstractCSharpCodegen {
     // Defines the sdk option for targeted frameworks, which differs from targetFramework and targetFrameworkNuget
     protected static final String MCS_NET_VERSION_KEY = "x-mcs-sdk";
     protected static final String SUPPORTS_UWP = "supportsUWP";
@@ -60,7 +60,7 @@ public class CSharpNetCoreReducedClientCodegen extends AbstractCSharpCodegen {
     protected static final String TARGET_FRAMEWORK_VERSION = "targetFrameworkVersion";
 
     @SuppressWarnings("hiding")
-    private final Logger LOGGER = LoggerFactory.getLogger(CSharpNetCoreReducedClientCodegen.class);
+    private final Logger LOGGER = LoggerFactory.getLogger(CSharpReducedClientCodegen.class);
     private static final List<FrameworkStrategy> frameworkStrategies = Arrays.asList(
             FrameworkStrategy.NETSTANDARD_1_3,
             FrameworkStrategy.NETSTANDARD_1_4,
@@ -105,7 +105,7 @@ public class CSharpNetCoreReducedClientCodegen extends AbstractCSharpCodegen {
     protected boolean needsCustomHttpMethod = false;
     protected boolean needsUriBuilder = false;
 
-    public CSharpNetCoreReducedClientCodegen() {
+    public CSharpReducedClientCodegen() {
         super();
 
         modifyFeatureSet(features -> features
@@ -971,7 +971,7 @@ private void syncStringProperty(final Map<String, Object> additionalProperties,
     @SuppressWarnings("Duplicates")
     private static abstract class FrameworkStrategy {
 
-        private final Logger LOGGER = LoggerFactory.getLogger(CSharpNetCoreReducedClientCodegen.class);
+        private final Logger LOGGER = LoggerFactory.getLogger(CSharpReducedClientCodegen.class);
 
         static FrameworkStrategy NETSTANDARD_1_3 = new FrameworkStrategy("netstandard1.3", ".NET Standard 1.3 compatible", "netcoreapp2.0") {
         };
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 ef5cea24b424..70a9b14b2446 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
@@ -4,7 +4,7 @@ org.openapitools.codegen.languages.AndroidClientCodegen
 org.openapitools.codegen.languages.Apache2ConfigCodegen
 org.openapitools.codegen.languages.ApexClientCodegen
 org.openapitools.codegen.languages.AsciidocDocumentationCodegen
-org.openapitools.codegen.languages.AspNetCoreServerCodegen
+org.openapitools.codegen.languages.AspNetServerCodegen
 org.openapitools.codegen.languages.AvroSchemaCodegen
 org.openapitools.codegen.languages.BashClientCodegen
 org.openapitools.codegen.languages.CrystalClientCodegen
@@ -20,8 +20,8 @@ org.openapitools.codegen.languages.CppRestSdkClientCodegen
 org.openapitools.codegen.languages.CppTinyClientCodegen
 org.openapitools.codegen.languages.CppTizenClientCodegen
 org.openapitools.codegen.languages.CppUE4ClientCodegen
-org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
-org.openapitools.codegen.languages.CsharpNetcoreFunctionsServerCodegen
+org.openapitools.codegen.languages.CSharpClientCodegen
+org.openapitools.codegen.languages.CSharpFunctionsServerCodegen
 org.openapitools.codegen.languages.DartClientCodegen
 org.openapitools.codegen.languages.DartDioClientCodegen
 org.openapitools.codegen.languages.EiffelClientCodegen
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpNetCoreClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpClientCodegenTest.java
similarity index 92%
rename from modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpNetCoreClientCodegenTest.java
rename to modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpClientCodegenTest.java
index 2f865064b7ff..f4753a79b155 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpNetCoreClientCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpClientCodegenTest.java
@@ -21,16 +21,16 @@
 import org.openapitools.codegen.CodegenModel;
 import org.openapitools.codegen.CodegenProperty;
 import org.openapitools.codegen.TestUtils;
-import org.openapitools.codegen.languages.CSharpNetCoreClientCodegen;
+import org.openapitools.codegen.languages.CSharpClientCodegen;
 import org.openapitools.codegen.languages.JavaClientCodegen;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-public class CSharpNetCoreClientCodegenTest {
+public class CSharpClientCodegenTest {
 
     @Test
     public void testToEnumVarName() throws Exception {
-        final CSharpNetCoreClientCodegen codegen = new CSharpNetCoreClientCodegen();
+        final CSharpClientCodegen codegen = new CSharpClientCodegen();
         codegen.processOpts();
 
         Assert.assertEquals(codegen.toEnumVarName("FooBar", "string"), "FooBar");
@@ -48,7 +48,7 @@ public void testToEnumVarName() throws Exception {
     public void testUnsigned() {
         // test unsigned integer/long
         final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/unsigned-test.yaml");
-        CSharpNetCoreClientCodegen codegen = new CSharpNetCoreClientCodegen();
+        CSharpClientCodegen codegen = new CSharpClientCodegen();
 
         Schema test1 = openAPI.getComponents().getSchemas().get("format_test");
         codegen.setOpenAPI(openAPI);
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpNetCoreClientDeepObjectTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpClientDeepObjectTest.java
similarity index 92%
rename from modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpNetCoreClientDeepObjectTest.java
rename to modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpClientDeepObjectTest.java
index 65f0c59e8417..55b9ad846ae5 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpNetCoreClientDeepObjectTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpClientDeepObjectTest.java
@@ -22,7 +22,7 @@
 import org.openapitools.codegen.ClientOptInput;
 import org.openapitools.codegen.CodegenConstants;
 import org.openapitools.codegen.DefaultGenerator;
-import org.openapitools.codegen.languages.CSharpNetCoreClientCodegen;
+import org.openapitools.codegen.languages.CSharpClientCodegen;
 import org.testng.annotations.Test;
 
 import java.io.File;
@@ -32,7 +32,7 @@
 
 import static org.openapitools.codegen.TestUtils.assertFileContains;
 
-public class CSharpNetCoreClientDeepObjectTest {
+public class CSharpClientDeepObjectTest {
 
     @Test
     public void deepObject() throws IOException {
@@ -43,7 +43,7 @@ public void deepObject() throws IOException {
         OpenAPI openAPI = new OpenAPIParser()
                 .readLocation("src/test/resources/3_0/deepobject.yaml", null, new ParseOptions()).getOpenAPI();
 
-        CSharpNetCoreClientCodegen codegen = new CSharpNetCoreClientCodegen();
+        CSharpClientCodegen codegen = new CSharpClientCodegen();
         codegen.setOutputDir(output.getAbsolutePath());
 
         ClientOptInput input = new ClientOptInput();
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CsharpModelEnumTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpModelEnumTest.java
similarity index 92%
rename from modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CsharpModelEnumTest.java
rename to modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpModelEnumTest.java
index 23440f4105ee..718857168182 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CsharpModelEnumTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpModelEnumTest.java
@@ -24,8 +24,8 @@
 import org.openapitools.codegen.CodegenProperty;
 import org.openapitools.codegen.DefaultCodegen;
 import org.openapitools.codegen.TestUtils;
-import org.openapitools.codegen.languages.AspNetCoreServerCodegen;
-import org.openapitools.codegen.languages.CSharpNetCoreClientCodegen;
+import org.openapitools.codegen.languages.AspNetServerCodegen;
+import org.openapitools.codegen.languages.CSharpClientCodegen;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -33,7 +33,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class CsharpModelEnumTest {
+public class CSharpModelEnumTest {
     // TODO there's no parent/child method in ComposeSchema so we will need to revise the code
     // before we can re-enable the test case below
     @Test(description = "not override identical parent enums", enabled = false)
@@ -69,7 +69,7 @@ public void overrideEnumTest() {
                 .child(subModel)
                 .interfaces(new ArrayList<RefModel>());
                 */
-        final DefaultCodegen codegen = new CSharpNetCoreClientCodegen();
+        final DefaultCodegen codegen = new CSharpClientCodegen();
         final Map<String, Schema> allModels = new HashMap<>();
         allModels.put("ParentModel", parentModel);
         allModels.put("SubModel", subModel);
@@ -95,7 +95,7 @@ public void overrideEnumTest() {
 
     @Test(description = "use custom suffixes for enums")
     public void useCustomEnumSuffixes() {
-        final AspNetCoreServerCodegen codegen = new AspNetCoreServerCodegen();
+        final AspNetServerCodegen codegen = new AspNetServerCodegen();
         codegen.setEnumNameSuffix("EnumName");
         codegen.setEnumValueSuffix("EnumValue");
 
@@ -114,7 +114,7 @@ public void useCustomEnumSuffixes() {
 
     @Test(description = "use default suffixes for enums")
     public void useDefaultEnumSuffixes() {
-        final AspNetCoreServerCodegen codegen = new AspNetCoreServerCodegen();
+        final AspNetServerCodegen codegen = new AspNetServerCodegen();
 
         OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/petstore.yaml");
         codegen.setOpenAPI(openAPI);
@@ -131,7 +131,7 @@ public void useDefaultEnumSuffixes() {
 
     @Test(description = "support empty suffixes for enums")
     public void useEmptyEnumSuffixes() {
-        final AspNetCoreServerCodegen codegen = new AspNetCoreServerCodegen();
+        final AspNetServerCodegen codegen = new AspNetServerCodegen();
         codegen.setEnumNameSuffix("");
         codegen.setEnumValueSuffix("");
 
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpModelTest.java
index 416686e765ba..0e3eab1e2d33 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpModelTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpModelTest.java
@@ -27,8 +27,8 @@
 import org.openapitools.codegen.DefaultCodegen;
 import org.openapitools.codegen.TestUtils;
 import org.openapitools.codegen.languages.AbstractCSharpCodegen;
-import org.openapitools.codegen.languages.AspNetCoreServerCodegen;
-import org.openapitools.codegen.languages.CSharpNetCoreClientCodegen;
+import org.openapitools.codegen.languages.AspNetServerCodegen;
+import org.openapitools.codegen.languages.CSharpClientCodegen;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -38,16 +38,16 @@ public class CSharpModelTest {
     @Test
     public void assertOuterEnumIsString() {
         // this issue has not been found yet in version 2
-        // Assert.assertEquals(outerEnumVarsIsString(new AspNetCoreServerCodegen(), 2, false), true);
-        // Assert.assertEquals(outerEnumVarsIsString(new AspNetCoreServerCodegen(), 2, true), true);
-        Assert.assertEquals(outerEnumVarsIsString(new AspNetCoreServerCodegen(), 3, false), true);
-        Assert.assertEquals(outerEnumVarsIsString(new AspNetCoreServerCodegen(), 3, true), true);
+        // Assert.assertEquals(outerEnumVarsIsString(new AspNetServerCodegen(), 2, false), true);
+        // Assert.assertEquals(outerEnumVarsIsString(new AspNetServerCodegen(), 2, true), true);
+        Assert.assertEquals(outerEnumVarsIsString(new AspNetServerCodegen(), 3, false), true);
+        Assert.assertEquals(outerEnumVarsIsString(new AspNetServerCodegen(), 3, true), true);
 
         // this issue has not been found yet in version 2
-        // Assert.assertEquals(outerEnumVarsIsString(new CSharpNetCoreClientCodegen(), 2, false), true);
-        // Assert.assertEquals(outerEnumVarsIsString(new CSharpNetCoreClientCodegen(), 2, true), true);
-        Assert.assertEquals(outerEnumVarsIsString(new CSharpNetCoreClientCodegen(), 3, false), true);
-        Assert.assertEquals(outerEnumVarsIsString(new CSharpNetCoreClientCodegen(), 3, true), true);
+        // Assert.assertEquals(outerEnumVarsIsString(new CSharpClientCodegen(), 2, false), true);
+        // Assert.assertEquals(outerEnumVarsIsString(new CSharpClientCodegen(), 2, true), true);
+        Assert.assertEquals(outerEnumVarsIsString(new CSharpClientCodegen(), 3, false), true);
+        Assert.assertEquals(outerEnumVarsIsString(new CSharpClientCodegen(), 3, true), true);
     }
 
     public boolean outerEnumVarsIsString(final AbstractCSharpCodegen codegen, final int openApiVersion, final Boolean nullableReferenceTypes){
@@ -65,7 +65,7 @@ public boolean outerEnumVarsIsString(final AbstractCSharpCodegen codegen, final
     public void arrayPropertyTest() {
         final Schema schema = getArrayTestSchema();
 
-        final DefaultCodegen codegen = new CSharpNetCoreClientCodegen();
+        final DefaultCodegen codegen = new CSharpClientCodegen();
         OpenAPI openAPI = TestUtils.createOpenAPIWithOneSchema("sample", schema);
         codegen.setOpenAPI(openAPI);
         final CodegenModel generated = codegen.fromModel("sample", schema);
@@ -92,7 +92,7 @@ public void arrayPropertyTest() {
     public void arrayPropertyCollectionOptionTest() {
         final Schema schema = getArrayTestSchema();
 
-        final CSharpNetCoreClientCodegen codegen = new CSharpNetCoreClientCodegen();
+        final CSharpClientCodegen codegen = new CSharpClientCodegen();
         codegen.setUseCollection(true);
 
         OpenAPI openAPI = TestUtils.createOpenAPIWithOneSchema("sample", schema);
@@ -117,7 +117,7 @@ public void arrayPropertyCollectionOptionTest() {
     public void arrayPropertyICollectionOptionTest() {
         final Schema schema = getArrayTestSchema();
 
-        final CSharpNetCoreClientCodegen codegen = new CSharpNetCoreClientCodegen();
+        final CSharpClientCodegen codegen = new CSharpClientCodegen();
         codegen.setUseCollection(true);
         codegen.setReturnICollection(true);
 
@@ -158,7 +158,7 @@ public void simpleModelTest() {
                 .addProperties("createdAt", new DateTimeSchema())
                 .addRequiredItem("id")
                 .addRequiredItem("name");
-        final DefaultCodegen codegen = new CSharpNetCoreClientCodegen();
+        final DefaultCodegen codegen = new CSharpClientCodegen();
         OpenAPI openAPI = TestUtils.createOpenAPIWithOneSchema("sample", model);
         codegen.setOpenAPI(openAPI);
         final CodegenModel cm = codegen.fromModel("sample", model);
@@ -204,7 +204,7 @@ public void nonNullablePropertyTest() {
                         .items(new StringSchema()))
                 .addProperties("name", new StringSchema().nullable(true))
                 .addRequiredItem("id");
-        final DefaultCodegen codegen = new CSharpNetCoreClientCodegen();
+        final DefaultCodegen codegen = new CSharpClientCodegen();
         OpenAPI openAPI = TestUtils.createOpenAPIWithOneSchema("sample", model);
         codegen.setOpenAPI(openAPI);
         final CodegenModel cm = codegen.fromModel("sample", model);
@@ -253,7 +253,7 @@ public void nullablePropertyTest() {
                         .items(new StringSchema()))
                 .addProperties("name", new StringSchema().nullable(true))
                 .addRequiredItem("id");
-        final DefaultCodegen codegen = new CSharpNetCoreClientCodegen();
+        final DefaultCodegen codegen = new CSharpClientCodegen();
         OpenAPI openAPI = TestUtils.createOpenAPIWithOneSchema("sample", model);
         codegen.setOpenAPI(openAPI);
         final CodegenModel cm = codegen.fromModel("sample", model);
@@ -303,7 +303,7 @@ public void nullablePropertyWithoutNullableReferenceTypesTest() {
                 .addProperties("name", new StringSchema().nullable(true))
                 .addProperties("subObject",  new Schema().addProperties("name", new StringSchema()).nullable(true))
                 .addRequiredItem("id");
-        final DefaultCodegen codegen = new AspNetCoreServerCodegen();
+        final DefaultCodegen codegen = new AspNetServerCodegen();
         OpenAPI openAPI = TestUtils.createOpenAPIWithOneSchema("sample", model);
         codegen.setOpenAPI(openAPI);
         final CodegenModel cm = codegen.fromModel("sample", model);
@@ -362,7 +362,7 @@ public void nullablePropertyWithNullableReferenceTypesTest() {
                 .addProperties("name", new StringSchema().nullable(true))
                 .addProperties("subObject",  new Schema().addProperties("name", new StringSchema()).nullable(true))
                 .addRequiredItem("id");
-        final DefaultCodegen codegen = new AspNetCoreServerCodegen();
+        final DefaultCodegen codegen = new AspNetServerCodegen();
         codegen.additionalProperties().put(CodegenConstants.NULLABLE_REFERENCE_TYPES, true);
         codegen.processOpts();
         OpenAPI openAPI = TestUtils.createOpenAPIWithOneSchema("sample", model);
@@ -421,7 +421,7 @@ public void listPropertyTest() {
                 .addProperties("urls", new ArraySchema()
                         .items(new StringSchema()))
                 .addRequiredItem("id");
-        final DefaultCodegen codegen = new CSharpNetCoreClientCodegen();
+        final DefaultCodegen codegen = new CSharpClientCodegen();
         OpenAPI openAPI = TestUtils.createOpenAPIWithOneSchema("sample", model);
         codegen.setOpenAPI(openAPI);
         final CodegenModel cm = codegen.fromModel("sample", model);
@@ -459,7 +459,7 @@ public void mapPropertyTest() {
                 .addProperties("translations", new MapSchema()
                         .additionalProperties(new StringSchema()))
                 .addRequiredItem("id");
-        final DefaultCodegen codegen = new CSharpNetCoreClientCodegen();
+        final DefaultCodegen codegen = new CSharpClientCodegen();
         OpenAPI openAPI = TestUtils.createOpenAPIWithOneSchema("sample", schema);
         codegen.setOpenAPI(openAPI);
         final CodegenModel cm = codegen.fromModel("sample", schema);
@@ -485,7 +485,7 @@ public void complexPropertyTest() {
         final Schema schema = new Schema()
                 .description("a sample model")
                 .addProperties("children", new Schema().$ref("#/components/schemas/Children"));
-        final DefaultCodegen codegen = new CSharpNetCoreClientCodegen();
+        final DefaultCodegen codegen = new CSharpClientCodegen();
         OpenAPI openAPI = TestUtils.createOpenAPIWithOneSchema("sample", schema);
         codegen.setOpenAPI(openAPI);
         final CodegenModel cm = codegen.fromModel("sample", schema);
@@ -510,7 +510,7 @@ public void complexListPropertyTest() {
                 .description("a sample model")
                 .addProperties("children", new ArraySchema()
                         .items(new Schema().$ref("#/components/schemas/Children")));
-        final DefaultCodegen codegen = new CSharpNetCoreClientCodegen();
+        final DefaultCodegen codegen = new CSharpClientCodegen();
         codegen.setOpenAPI(openAPI);
         final CodegenModel cm = codegen.fromModel("sample", schema);
 
@@ -536,7 +536,7 @@ public void complexMapPropertyTest() {
                 .description("a sample model")
                 .addProperties("children", new MapSchema()
                         .additionalProperties(new Schema().$ref("#/components/schemas/Children")));
-        final DefaultCodegen codegen = new CSharpNetCoreClientCodegen();
+        final DefaultCodegen codegen = new CSharpClientCodegen();
         OpenAPI openAPI = TestUtils.createOpenAPIWithOneSchema("sample", schema);
         codegen.setOpenAPI(openAPI);
         final CodegenModel cm = codegen.fromModel("sample", schema);
@@ -563,7 +563,7 @@ public void arrayModelTest() {
         final Schema schema = new ArraySchema()
                 .items(new Schema().$ref("#/components/schemas/Children"))
                 .description("an array model");
-        final DefaultCodegen codegen = new CSharpNetCoreClientCodegen();
+        final DefaultCodegen codegen = new CSharpClientCodegen();
         OpenAPI openAPI = TestUtils.createOpenAPIWithOneSchema("sample", schema);
         codegen.setOpenAPI(openAPI);
         final CodegenModel cm = codegen.fromModel("sample", schema);
@@ -582,7 +582,7 @@ public void mapModelTest() {
         final Schema schema = new Schema()
                 .description("a map model")
                 .additionalProperties(new Schema().$ref("#/components/schemas/Children"));
-        final DefaultCodegen codegen = new CSharpNetCoreClientCodegen();
+        final DefaultCodegen codegen = new CSharpClientCodegen();
         OpenAPI openAPI = TestUtils.createOpenAPIWithOneSchema("sample", schema);
         codegen.setOpenAPI(openAPI);
         final CodegenModel cm = codegen.fromModel("sample", schema);
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpOperationTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpOperationTest.java
index a0d6fc0822b2..06b7072f7e53 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpOperationTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpOperationTest.java
@@ -23,8 +23,8 @@
 import org.openapitools.codegen.CodegenOperation;
 import org.openapitools.codegen.TestUtils;
 import org.openapitools.codegen.languages.AbstractCSharpCodegen;
-import org.openapitools.codegen.languages.AspNetCoreServerCodegen;
-import org.openapitools.codegen.languages.CSharpNetCoreClientCodegen;
+import org.openapitools.codegen.languages.AspNetServerCodegen;
+import org.openapitools.codegen.languages.CSharpClientCodegen;
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.*;
@@ -33,15 +33,15 @@ public class CSharpOperationTest {
 
     @Test
     public void assertMethodOptionalParameterDataType() {
-        assertEquals(getOperationOptionalParameterDataType(new AspNetCoreServerCodegen(), 2, false), "System.IO.Stream");
-        assertEquals(getOperationOptionalParameterDataType(new AspNetCoreServerCodegen(), 2, true), "System.IO.Stream?");
-        assertEquals(getOperationOptionalParameterDataType(new AspNetCoreServerCodegen(), 3, false), "System.IO.Stream");
-        assertEquals(getOperationOptionalParameterDataType(new AspNetCoreServerCodegen(), 3, true), "System.IO.Stream?");
-
-        assertEquals(getOperationOptionalParameterDataType(new CSharpNetCoreClientCodegen(), 2, false), "System.IO.Stream");
-        assertEquals(getOperationOptionalParameterDataType(new CSharpNetCoreClientCodegen(), 2, true), "System.IO.Stream?");
-        assertEquals(getOperationOptionalParameterDataType(new CSharpNetCoreClientCodegen(), 3, false), "System.IO.Stream");
-        assertEquals(getOperationOptionalParameterDataType(new CSharpNetCoreClientCodegen(), 3, true), "System.IO.Stream?");
+        assertEquals(getOperationOptionalParameterDataType(new AspNetServerCodegen(), 2, false), "System.IO.Stream");
+        assertEquals(getOperationOptionalParameterDataType(new AspNetServerCodegen(), 2, true), "System.IO.Stream?");
+        assertEquals(getOperationOptionalParameterDataType(new AspNetServerCodegen(), 3, false), "System.IO.Stream");
+        assertEquals(getOperationOptionalParameterDataType(new AspNetServerCodegen(), 3, true), "System.IO.Stream?");
+
+        assertEquals(getOperationOptionalParameterDataType(new CSharpClientCodegen(), 2, false), "System.IO.Stream");
+        assertEquals(getOperationOptionalParameterDataType(new CSharpClientCodegen(), 2, true), "System.IO.Stream?");
+        assertEquals(getOperationOptionalParameterDataType(new CSharpClientCodegen(), 3, false), "System.IO.Stream");
+        assertEquals(getOperationOptionalParameterDataType(new CSharpClientCodegen(), 3, true), "System.IO.Stream?");
     }
 
     public String getOperationOptionalParameterDataType(final AbstractCSharpCodegen codegen, final int openApiVersion, final Boolean nullableReferenceTypes){
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcorefunctions/CsharpNetcoreFunctionsServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcorefunctions/CSharpFunctionsServerCodegenTest.java
similarity index 86%
rename from modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcorefunctions/CsharpNetcoreFunctionsServerCodegenTest.java
rename to modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcorefunctions/CSharpFunctionsServerCodegenTest.java
index 5de0e9c45b00..ccdf1bb59c0f 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcorefunctions/CsharpNetcoreFunctionsServerCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcorefunctions/CSharpFunctionsServerCodegenTest.java
@@ -16,15 +16,15 @@
 
 package org.openapitools.codegen.csharpnetcorefunctions;
 
-import org.openapitools.codegen.languages.CsharpNetcoreFunctionsServerCodegen;
+import org.openapitools.codegen.languages.CSharpFunctionsServerCodegen;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-public class CsharpNetcoreFunctionsServerCodegenTest {
+public class CSharpFunctionsServerCodegenTest {
 
     @Test
     public void testToEnumVarName() throws Exception {
-        final CsharpNetcoreFunctionsServerCodegen codegen = new CsharpNetcoreFunctionsServerCodegen();
+        final CSharpFunctionsServerCodegen codegen = new CSharpFunctionsServerCodegen();
         codegen.processOpts();
 
         Assert.assertEquals(codegen.toEnumVarName("FooBar", "string"), "FooBarEnum");
diff --git a/samples/client/others/csharp-netcore-complex-files/README.md b/samples/client/others/csharp-netcore-complex-files/README.md
index 9b1348a8623b..990ea67bc484 100644
--- a/samples/client/others/csharp-netcore-complex-files/README.md
+++ b/samples/client/others/csharp-netcore-complex-files/README.md
@@ -6,7 +6,7 @@ This C# SDK is automatically generated by the [OpenAPI Generator](https://openap
 
 - API version: 1.0.0
 - SDK version: 1.0.0
-- Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
+- Build package: org.openapitools.codegen.languages.CSharpClientCodegen
 
 <a id="frameworks-supported"></a>
 ## Frameworks supported
diff --git a/samples/client/petstore/csharp-netcore-functions/generatedSrc/README.md b/samples/client/petstore/csharp-netcore-functions/generatedSrc/README.md
index a531ad1e6029..608b2a54e992 100644
--- a/samples/client/petstore/csharp-netcore-functions/generatedSrc/README.md
+++ b/samples/client/petstore/csharp-netcore-functions/generatedSrc/README.md
@@ -6,7 +6,7 @@ This C# SDK is automatically generated by the [OpenAPI Generator](https://openap
 
 - API version: 1.0.0
 - SDK version: 1.0.0
-- Build package: org.openapitools.codegen.languages.CsharpNetcoreFunctionsServerCodegen
+- Build package: org.openapitools.codegen.languages.CSharpFunctionsServerCodegen
 
 <a name="frameworks-supported"></a>
 ## Frameworks supported
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/README.md
index 3ff5a01c33c6..98d5c5197938 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/README.md
@@ -6,7 +6,7 @@ This C# SDK is automatically generated by the [OpenAPI Generator](https://openap
 
 - API version: 1.0.0
 - SDK version: 1.0.0
-- Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
+- Build package: org.openapitools.codegen.languages.CSharpClientCodegen
 
 <a id="frameworks-supported"></a>
 ## Frameworks supported
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/README.md
index bb5bc53db0b3..49b8afa1a855 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/README.md
@@ -198,7 +198,7 @@ Authentication schemes defined for the API:
 
 ## Build
 - SDK version: 1.0.0
-- Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
+- Build package: org.openapitools.codegen.languages.CSharpClientCodegen
 
 ## Api Information
 - appName: OpenAPI Petstore
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/README.md
index 5b670bc136da..79e8317df13f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/README.md
@@ -198,7 +198,7 @@ Authentication schemes defined for the API:
 
 ## Build
 - SDK version: 1.0.0
-- Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
+- Build package: org.openapitools.codegen.languages.CSharpClientCodegen
 
 ## Api Information
 - appName: OpenAPI Petstore
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/README.md
index c96a82087935..d8a815447fd3 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/README.md
@@ -117,7 +117,7 @@ Endpoints do not require authorization.
 
 ## Build
 - SDK version: 1.0.0
-- Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
+- Build package: org.openapitools.codegen.languages.CSharpClientCodegen
 
 ## Api Information
 - appName: Example
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/README.md
index 2c0690df8871..5d912b20e11f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/README.md
@@ -117,7 +117,7 @@ Endpoints do not require authorization.
 
 ## Build
 - SDK version: 1.0.0
-- Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
+- Build package: org.openapitools.codegen.languages.CSharpClientCodegen
 
 ## Api Information
 - appName: fruity
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/README.md
index 2c0690df8871..5d912b20e11f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/README.md
@@ -117,7 +117,7 @@ Endpoints do not require authorization.
 
 ## Build
 - SDK version: 1.0.0
-- Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
+- Build package: org.openapitools.codegen.languages.CSharpClientCodegen
 
 ## Api Information
 - appName: fruity
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/README.md
index 43f996d8f0cf..12b76fb074a8 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/README.md
@@ -198,7 +198,7 @@ Authentication schemes defined for the API:
 
 ## Build
 - SDK version: 1.0.0
-- Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
+- Build package: org.openapitools.codegen.languages.CSharpClientCodegen
 
 ## Api Information
 - appName: OpenAPI Petstore
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/README.md
index 32b645c00de4..aae6c0fa54bc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/README.md
@@ -6,7 +6,7 @@ This C# SDK is automatically generated by the [OpenAPI Generator](https://openap
 
 - API version: 1.0.0
 - SDK version: 1.0.0
-- Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
+- Build package: org.openapitools.codegen.languages.CSharpClientCodegen
 
 <a id="frameworks-supported"></a>
 ## Frameworks supported
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md
index 27a659f5354a..3db41e724cca 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md
@@ -6,7 +6,7 @@ This C# SDK is automatically generated by the [OpenAPI Generator](https://openap
 
 - API version: 1.0.0
 - SDK version: 1.0.0
-- Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
+- Build package: org.openapitools.codegen.languages.CSharpClientCodegen
 
 <a id="frameworks-supported"></a>
 ## Frameworks supported
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/README.md
index 27a659f5354a..3db41e724cca 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/README.md
@@ -6,7 +6,7 @@ This C# SDK is automatically generated by the [OpenAPI Generator](https://openap
 
 - API version: 1.0.0
 - SDK version: 1.0.0
-- Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
+- Build package: org.openapitools.codegen.languages.CSharpClientCodegen
 
 <a id="frameworks-supported"></a>
 ## Frameworks supported
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/README.md
index 27a659f5354a..3db41e724cca 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/README.md
@@ -6,7 +6,7 @@ This C# SDK is automatically generated by the [OpenAPI Generator](https://openap
 
 - API version: 1.0.0
 - SDK version: 1.0.0
-- Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
+- Build package: org.openapitools.codegen.languages.CSharpClientCodegen
 
 <a id="frameworks-supported"></a>
 ## Frameworks supported
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md
index c984050be4e4..136078e81b54 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md
@@ -6,7 +6,7 @@ This C# SDK is automatically generated by the [OpenAPI Generator](https://openap
 
 - API version: 1.0.0
 - SDK version: 1.0.0
-- Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
+- Build package: org.openapitools.codegen.languages.CSharpClientCodegen
 
 <a id="version-support"></a>
 ## Version support
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md
index 3ff5a01c33c6..98d5c5197938 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md
@@ -6,7 +6,7 @@ This C# SDK is automatically generated by the [OpenAPI Generator](https://openap
 
 - API version: 1.0.0
 - SDK version: 1.0.0
-- Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
+- Build package: org.openapitools.codegen.languages.CSharpClientCodegen
 
 <a id="frameworks-supported"></a>
 ## Frameworks supported
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md
index 27a659f5354a..3db41e724cca 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md
@@ -6,7 +6,7 @@ This C# SDK is automatically generated by the [OpenAPI Generator](https://openap
 
 - API version: 1.0.0
 - SDK version: 1.0.0
-- Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
+- Build package: org.openapitools.codegen.languages.CSharpClientCodegen
 
 <a id="frameworks-supported"></a>
 ## Frameworks supported
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/README.md
index cb95cb9b2fe5..f6bd68c1d226 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/README.md
@@ -6,7 +6,7 @@ This C# SDK is automatically generated by the [OpenAPI Generator](https://openap
 
 - API version: 1.0.0
 - SDK version: 1.0.0
-- Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
+- Build package: org.openapitools.codegen.languages.CSharpClientCodegen
 
 <a id="frameworks-supported"></a>
 ## Frameworks supported