diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RestbedCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RestbedCodegen.java
index 070f4de3ca1..63c1ab387a4 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RestbedCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RestbedCodegen.java
@@ -99,8 +99,6 @@ public class RestbedCodegen extends AbstractCppCodegen {
       addOption(DEFAULT_INCLUDE,
               "The default include statement that should be placed in all headers for including things like the declspec (convention: #include \"Commons.h\" ",
               this.defaultInclude);
-
-      reservedWords = new HashSet<String>();
       
       supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
       supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
diff --git a/samples/server/petstore/restbed/.swagger-codegen/VERSION b/samples/server/petstore/restbed/.swagger-codegen/VERSION
index 7fea99011a6..f9f7450d135 100644
--- a/samples/server/petstore/restbed/.swagger-codegen/VERSION
+++ b/samples/server/petstore/restbed/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.2.3-SNAPSHOT
\ No newline at end of file
+2.3.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/restbed/api/PetApi.cpp b/samples/server/petstore/restbed/api/PetApi.cpp
index 3dc61c1d66b..a681ad1431b 100644
--- a/samples/server/petstore/restbed/api/PetApi.cpp
+++ b/samples/server/petstore/restbed/api/PetApi.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/restbed/api/PetApi.h b/samples/server/petstore/restbed/api/PetApi.h
index c818ca6d2a4..b178f31fac0 100644
--- a/samples/server/petstore/restbed/api/PetApi.h
+++ b/samples/server/petstore/restbed/api/PetApi.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/restbed/api/StoreApi.cpp b/samples/server/petstore/restbed/api/StoreApi.cpp
index 4e44f96bb1a..c3a8545061d 100644
--- a/samples/server/petstore/restbed/api/StoreApi.cpp
+++ b/samples/server/petstore/restbed/api/StoreApi.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/restbed/api/StoreApi.h b/samples/server/petstore/restbed/api/StoreApi.h
index 4fbed3ffb3a..5c7142cfc4f 100644
--- a/samples/server/petstore/restbed/api/StoreApi.h
+++ b/samples/server/petstore/restbed/api/StoreApi.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/restbed/api/UserApi.cpp b/samples/server/petstore/restbed/api/UserApi.cpp
index 558519746a6..19ebcd66c1d 100644
--- a/samples/server/petstore/restbed/api/UserApi.cpp
+++ b/samples/server/petstore/restbed/api/UserApi.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/restbed/api/UserApi.h b/samples/server/petstore/restbed/api/UserApi.h
index 95ab6c5a7a0..4e0205f971d 100644
--- a/samples/server/petstore/restbed/api/UserApi.h
+++ b/samples/server/petstore/restbed/api/UserApi.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/restbed/model/ApiResponse.cpp b/samples/server/petstore/restbed/model/ApiResponse.cpp
index 63b89a4b932..8335db91c2b 100644
--- a/samples/server/petstore/restbed/model/ApiResponse.cpp
+++ b/samples/server/petstore/restbed/model/ApiResponse.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/restbed/model/ApiResponse.h b/samples/server/petstore/restbed/model/ApiResponse.h
index 122621cfb31..40b1d93a8ce 100644
--- a/samples/server/petstore/restbed/model/ApiResponse.h
+++ b/samples/server/petstore/restbed/model/ApiResponse.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/restbed/model/Category.cpp b/samples/server/petstore/restbed/model/Category.cpp
index ff89a04951a..0f3a41858ab 100644
--- a/samples/server/petstore/restbed/model/Category.cpp
+++ b/samples/server/petstore/restbed/model/Category.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/restbed/model/Category.h b/samples/server/petstore/restbed/model/Category.h
index b72d5980184..83fed4a0275 100644
--- a/samples/server/petstore/restbed/model/Category.h
+++ b/samples/server/petstore/restbed/model/Category.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/restbed/model/Order.cpp b/samples/server/petstore/restbed/model/Order.cpp
index 47944f96852..cf34ceb4d1e 100644
--- a/samples/server/petstore/restbed/model/Order.cpp
+++ b/samples/server/petstore/restbed/model/Order.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/restbed/model/Order.h b/samples/server/petstore/restbed/model/Order.h
index e7de9e60b55..88d9d77eee4 100644
--- a/samples/server/petstore/restbed/model/Order.h
+++ b/samples/server/petstore/restbed/model/Order.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/restbed/model/Pet.cpp b/samples/server/petstore/restbed/model/Pet.cpp
index 76d84be4244..e1512ddb698 100644
--- a/samples/server/petstore/restbed/model/Pet.cpp
+++ b/samples/server/petstore/restbed/model/Pet.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/restbed/model/Pet.h b/samples/server/petstore/restbed/model/Pet.h
index 6e55fa78749..c45b9a2bda7 100644
--- a/samples/server/petstore/restbed/model/Pet.h
+++ b/samples/server/petstore/restbed/model/Pet.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/restbed/model/Tag.cpp b/samples/server/petstore/restbed/model/Tag.cpp
index 18c712ddd55..5504323641d 100644
--- a/samples/server/petstore/restbed/model/Tag.cpp
+++ b/samples/server/petstore/restbed/model/Tag.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/restbed/model/Tag.h b/samples/server/petstore/restbed/model/Tag.h
index 34900de06a1..1fd64907e38 100644
--- a/samples/server/petstore/restbed/model/Tag.h
+++ b/samples/server/petstore/restbed/model/Tag.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/restbed/model/User.cpp b/samples/server/petstore/restbed/model/User.cpp
index bf14eea0a8d..e34781c782b 100644
--- a/samples/server/petstore/restbed/model/User.cpp
+++ b/samples/server/petstore/restbed/model/User.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/restbed/model/User.h b/samples/server/petstore/restbed/model/User.h
index 33764f060bb..5a79bba992b 100644
--- a/samples/server/petstore/restbed/model/User.h
+++ b/samples/server/petstore/restbed/model/User.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */