diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java
index d209caad2e..80bde50c8f 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java
@@ -289,12 +289,12 @@ public class CppRestSdkClientCodegen extends AbstractCppCodegen {
 
     @Override
     public String toModelFilename(String name) {
-        return sanitizeName(toModelName(name));
+        return toModelName(name);
     }
 
     @Override
     public String toApiFilename(String name) {
-        return sanitizeName(toModelName(name) + "Api");
+        return toApiName(name);
     }
 
     /**
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java
index e8cbe52730..f9b4a600b6 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java
@@ -193,12 +193,12 @@ public class CppRestbedServerCodegen extends AbstractCppCodegen {
 
     @Override
     public String toModelFilename(String name) {
-        return camelize(name);
+        return toModelName(name);
     }
 
     @Override
     public String toApiFilename(String name) {
-        return camelize(name) + "Api";
+        return toApiName(name);
     }
 
     @SuppressWarnings("unchecked")
diff --git a/samples/client/petstore/cpp-restsdk/ApiClient.h b/samples/client/petstore/cpp-restsdk/ApiClient.h
index a636b1d3cb..2e34724d59 100644
--- a/samples/client/petstore/cpp-restsdk/ApiClient.h
+++ b/samples/client/petstore/cpp-restsdk/ApiClient.h
@@ -28,6 +28,10 @@
 #include <vector>
 #include <functional>
 
+#if  defined (_WIN32) || defined (_WIN64)
+#undef U
+#endif
+
 #include <cpprest/details/basic_types.h>
 #include <cpprest/http_client.h>
 
diff --git a/samples/client/petstore/cpp-restsdk/api/PetApi.h b/samples/client/petstore/cpp-restsdk/api/PetApi.h
index cbadb969cb..bb7b6f7b19 100644
--- a/samples/client/petstore/cpp-restsdk/api/PetApi.h
+++ b/samples/client/petstore/cpp-restsdk/api/PetApi.h
@@ -27,10 +27,6 @@
 #include <cpprest/details/basic_types.h>
 
 
-#ifdef _WIN32 | _WIN64
-#undef U
-#endif
-
 #include <boost/optional.hpp>
 
 namespace org {
diff --git a/samples/client/petstore/cpp-restsdk/api/StoreApi.h b/samples/client/petstore/cpp-restsdk/api/StoreApi.h
index 8f6a67fe9a..700f788df2 100644
--- a/samples/client/petstore/cpp-restsdk/api/StoreApi.h
+++ b/samples/client/petstore/cpp-restsdk/api/StoreApi.h
@@ -26,10 +26,6 @@
 #include <cpprest/details/basic_types.h>
 
 
-#ifdef _WIN32 | _WIN64
-#undef U
-#endif
-
 #include <boost/optional.hpp>
 
 namespace org {
diff --git a/samples/client/petstore/cpp-restsdk/api/UserApi.h b/samples/client/petstore/cpp-restsdk/api/UserApi.h
index 4f5ce04e20..fc76cfc917 100644
--- a/samples/client/petstore/cpp-restsdk/api/UserApi.h
+++ b/samples/client/petstore/cpp-restsdk/api/UserApi.h
@@ -26,10 +26,6 @@
 #include <cpprest/details/basic_types.h>
 
 
-#ifdef _WIN32 | _WIN64
-#undef U
-#endif
-
 #include <boost/optional.hpp>
 
 namespace org {
diff --git a/samples/server/petstore/cpp-restbed/api/PetApi.cpp b/samples/server/petstore/cpp-restbed/api/PetApi.cpp
index 2545c223e8..0922b3890a 100644
--- a/samples/server/petstore/cpp-restbed/api/PetApi.cpp
+++ b/samples/server/petstore/cpp-restbed/api/PetApi.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/api/PetApi.h b/samples/server/petstore/cpp-restbed/api/PetApi.h
index b4dcc65ae1..e9b654e735 100644
--- a/samples/server/petstore/cpp-restbed/api/PetApi.h
+++ b/samples/server/petstore/cpp-restbed/api/PetApi.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/api/StoreApi.cpp b/samples/server/petstore/cpp-restbed/api/StoreApi.cpp
index 7e044021d2..12c5974f3c 100644
--- a/samples/server/petstore/cpp-restbed/api/StoreApi.cpp
+++ b/samples/server/petstore/cpp-restbed/api/StoreApi.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/api/StoreApi.h b/samples/server/petstore/cpp-restbed/api/StoreApi.h
index 322417638e..469b04643a 100644
--- a/samples/server/petstore/cpp-restbed/api/StoreApi.h
+++ b/samples/server/petstore/cpp-restbed/api/StoreApi.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/api/UserApi.cpp b/samples/server/petstore/cpp-restbed/api/UserApi.cpp
index 3d96d375f0..6b0d309571 100644
--- a/samples/server/petstore/cpp-restbed/api/UserApi.cpp
+++ b/samples/server/petstore/cpp-restbed/api/UserApi.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/api/UserApi.h b/samples/server/petstore/cpp-restbed/api/UserApi.h
index 67739965b4..fcb3dc1dd5 100644
--- a/samples/server/petstore/cpp-restbed/api/UserApi.h
+++ b/samples/server/petstore/cpp-restbed/api/UserApi.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/model/ApiResponse.cpp b/samples/server/petstore/cpp-restbed/model/ApiResponse.cpp
index 00b5c04d03..588b26391a 100644
--- a/samples/server/petstore/cpp-restbed/model/ApiResponse.cpp
+++ b/samples/server/petstore/cpp-restbed/model/ApiResponse.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/model/ApiResponse.h b/samples/server/petstore/cpp-restbed/model/ApiResponse.h
index 0db8875b00..3ea3993ff5 100644
--- a/samples/server/petstore/cpp-restbed/model/ApiResponse.h
+++ b/samples/server/petstore/cpp-restbed/model/ApiResponse.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/model/Category.cpp b/samples/server/petstore/cpp-restbed/model/Category.cpp
index 4812be665e..6dadb6b13a 100644
--- a/samples/server/petstore/cpp-restbed/model/Category.cpp
+++ b/samples/server/petstore/cpp-restbed/model/Category.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/model/Category.h b/samples/server/petstore/cpp-restbed/model/Category.h
index 0af819d6bb..988c7e2abb 100644
--- a/samples/server/petstore/cpp-restbed/model/Category.h
+++ b/samples/server/petstore/cpp-restbed/model/Category.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/model/Order.cpp b/samples/server/petstore/cpp-restbed/model/Order.cpp
index 58b55ca909..5324911689 100644
--- a/samples/server/petstore/cpp-restbed/model/Order.cpp
+++ b/samples/server/petstore/cpp-restbed/model/Order.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/model/Order.h b/samples/server/petstore/cpp-restbed/model/Order.h
index 9094086b35..4a98b0e92c 100644
--- a/samples/server/petstore/cpp-restbed/model/Order.h
+++ b/samples/server/petstore/cpp-restbed/model/Order.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/model/Pet.cpp b/samples/server/petstore/cpp-restbed/model/Pet.cpp
index c4ca4da227..5f3a3cd94d 100644
--- a/samples/server/petstore/cpp-restbed/model/Pet.cpp
+++ b/samples/server/petstore/cpp-restbed/model/Pet.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/model/Pet.h b/samples/server/petstore/cpp-restbed/model/Pet.h
index 10a9a0f02b..201a33113d 100644
--- a/samples/server/petstore/cpp-restbed/model/Pet.h
+++ b/samples/server/petstore/cpp-restbed/model/Pet.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/model/Tag.cpp b/samples/server/petstore/cpp-restbed/model/Tag.cpp
index e7f8372e8f..823bd8cc87 100644
--- a/samples/server/petstore/cpp-restbed/model/Tag.cpp
+++ b/samples/server/petstore/cpp-restbed/model/Tag.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/model/Tag.h b/samples/server/petstore/cpp-restbed/model/Tag.h
index 4969930f60..74efa22c62 100644
--- a/samples/server/petstore/cpp-restbed/model/Tag.h
+++ b/samples/server/petstore/cpp-restbed/model/Tag.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/model/User.cpp b/samples/server/petstore/cpp-restbed/model/User.cpp
index 417f76d557..8df4aed92b 100644
--- a/samples/server/petstore/cpp-restbed/model/User.cpp
+++ b/samples/server/petstore/cpp-restbed/model/User.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/model/User.h b/samples/server/petstore/cpp-restbed/model/User.h
index 462bd2abb0..4d4c040831 100644
--- a/samples/server/petstore/cpp-restbed/model/User.h
+++ b/samples/server/petstore/cpp-restbed/model/User.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */