diff --git a/bin/qt5-petstore.sh b/bin/cpp-qt5-petstore.sh
similarity index 93%
rename from bin/qt5-petstore.sh
rename to bin/cpp-qt5-petstore.sh
index a1eb7ccf8dbc..fdca2260d5ec 100755
--- a/bin/qt5-petstore.sh
+++ b/bin/cpp-qt5-petstore.sh
@@ -27,6 +27,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 -t modules/openapi-generator/src/main/resources/qt5cpp -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-qt5 -o samples/client/petstore/qt5cpp $@"
+ags="generate -t modules/openapi-generator/src/main/resources/qt5cpp -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-qt5 -o samples/client/petstore/cpp-qt5 $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/cpprest-petstore.sh b/bin/cpp-restsdk-petstore.sh
similarity index 92%
rename from bin/cpprest-petstore.sh
rename to bin/cpp-restsdk-petstore.sh
index 94e0157acec7..0a33cb36e3e8 100755
--- a/bin/cpprest-petstore.sh
+++ b/bin/cpp-restsdk-petstore.sh
@@ -27,6 +27,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 -t modules/openapi-generator/src/main/resources/cpprest -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-restsdk -o samples/client/petstore/cpprest $@"
+ags="generate -t modules/openapi-generator/src/main/resources/cpprest -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-restsdk -o samples/client/petstore/cpp-restsdk $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/tizen-petstore.sh b/bin/cpp-tizen-petstore.sh
similarity index 93%
rename from bin/tizen-petstore.sh
rename to bin/cpp-tizen-petstore.sh
index d745ef6a0e80..82d9d9cd3ae7 100755
--- a/bin/tizen-petstore.sh
+++ b/bin/cpp-tizen-petstore.sh
@@ -27,6 +27,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 -t modules/openapi-generator/src/main/resources/tizen -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-tizen -o samples/client/petstore/tizen $@"
+ags="generate -t modules/openapi-generator/src/main/resources/tizen -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-tizen -o samples/client/petstore/cpp-tizen $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/openapi3/qt5-petstore.sh b/bin/openapi3/cpp-qt5-petstore.sh
similarity index 93%
rename from bin/openapi3/qt5-petstore.sh
rename to bin/openapi3/cpp-qt5-petstore.sh
index da6445d32e29..d9e1835cc244 100755
--- a/bin/openapi3/qt5-petstore.sh
+++ b/bin/openapi3/cpp-qt5-petstore.sh
@@ -27,6 +27,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 -t modules/openapi-generator/src/main/resources/qt5cpp -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g cpp-qt5 -o samples/client/petstore/qt5cpp $@"
+ags="generate -t modules/openapi-generator/src/main/resources/qt5cpp -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g cpp-qt5 -o samples/client/petstore/cpp-qt5 $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/openapi3/tizen-petstore.sh b/bin/openapi3/cpp-tizen-petstore.sh
similarity index 93%
rename from bin/openapi3/tizen-petstore.sh
rename to bin/openapi3/cpp-tizen-petstore.sh
index d35a8b5845c1..2b1179642af2 100755
--- a/bin/openapi3/tizen-petstore.sh
+++ b/bin/openapi3/cpp-tizen-petstore.sh
@@ -27,6 +27,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 -t modules/openapi-generator/src/main/resources/tizen -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g cpp-tizen -o samples/client/petstore/tizen $@"
+ags="generate -t modules/openapi-generator/src/main/resources/tizen -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g cpp-tizen -o samples/client/petstore/cpp-tizen $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/security/qt5cpp-petstore.sh b/bin/security/cpp-qt5-petstore.sh
similarity index 97%
rename from bin/security/qt5cpp-petstore.sh
rename to bin/security/cpp-qt5-petstore.sh
index 149611a2d458..1a2b5e76a16e 100755
--- a/bin/security/qt5cpp-petstore.sh
+++ b/bin/security/cpp-qt5-petstore.sh
@@ -27,6 +27,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 -t modules/openapi-generator/src/main/resources/qt5cpp -i modules/openapi-generator/src/test/resources/2_0/petstore-security-test.yaml -g cpp-qt5 -o samples/client/petstore-security-test/qt5cpp $@"
+ags="generate -t modules/openapi-generator/src/main/resources/qt5cpp -i modules/openapi-generator/src/test/resources/2_0/petstore-security-test.yaml -g cpp-qt5 -o samples/client/petstore-security-test/cpp-qt5 $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/windows/qt5cpp-petstore.bat b/bin/windows/cpp-qt5-petstore.bat
similarity index 81%
rename from bin/windows/qt5cpp-petstore.bat
rename to bin/windows/cpp-qt5-petstore.bat
index c18be9efe627..997c80ec0950 100755
--- a/bin/windows/qt5cpp-petstore.bat
+++ b/bin/windows/cpp-qt5-petstore.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g cpp-qt5 -o samples\client\petstore\qt5cpp
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g cpp-qt5 -o samples\client\petstore\cpp-qt5
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/cpprest-petstore.bat b/bin/windows/cpp-restsdk-petstore.bat
similarity index 97%
rename from bin/windows/cpprest-petstore.bat
rename to bin/windows/cpp-restsdk-petstore.bat
index d5cd5b5246b8..be6046bc59c6 100755
--- a/bin/windows/cpprest-petstore.bat
+++ b/bin/windows/cpp-restsdk-petstore.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g cpp-restsdk -o samples\client\petstore\cpprest
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g cpp-restsdk -o samples\client\petstore\cpp-restsdk
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/tizen-petstore.bat b/bin/windows/cpp-tizen-petstore.bat
similarity index 80%
rename from bin/windows/tizen-petstore.bat
rename to bin/windows/cpp-tizen-petstore.bat
index b2ac5c3cefa0..969f87e6b1e6 100755
--- a/bin/windows/tizen-petstore.bat
+++ b/bin/windows/cpp-tizen-petstore.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% Xmx1024M
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g cpp-tizen -o samples\client\petstore\tizen
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g cpp-tizen -o samples\client\petstore\cpp-tizen
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java
index b812a815888f..db72abdf88b1 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java
@@ -64,7 +64,7 @@ public class CodegenConfigurator implements Serializable {
         nameMigrationMap.put("scala", new ScalaHttpClientCodegen().getName());
         nameMigrationMap.put("jaxrs", new JavaJerseyServerCodegen().getName());
         nameMigrationMap.put("qt5cpp", new CppQt5ClientCodegen().getName());
-        nameMigrationMap.put("cpprest", new CppRestClientCodegen().getName());
+        nameMigrationMap.put("cpprest", new CppRestSdkClientCodegen().getName());
         nameMigrationMap.put("tizen", new CppTizenClientCodegen().getName());
         nameMigrationMap.put("sinatra", new RubySinatraServerCodegen().getName());
         nameMigrationMap.put("swift", new SwiftClientCodegen().getName());
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java
similarity index 99%
rename from modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestClientCodegen.java
rename to modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java
index fecd5ad78754..d8aed6bd8636 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java
@@ -45,7 +45,7 @@
 import java.util.Map;
 import java.util.Set;
 
-public class CppRestClientCodegen extends AbstractCppCodegen {
+public class CppRestSdkClientCodegen extends AbstractCppCodegen {
 
     public static final String DECLSPEC = "declspec";
     public static final String DEFAULT_INCLUDE = "defaultInclude";
@@ -87,7 +87,7 @@ public String getHelp() {
         return "Generates a C++ API client with C++ REST SDK (https://github.com/Microsoft/cpprestsdk).";
     }
 
-    public CppRestClientCodegen() {
+    public CppRestSdkClientCodegen() {
         super();
 
         apiPackage = "org.openapitools.client.api";
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 9043be5e7e60..85e298d431d1 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
@@ -10,7 +10,7 @@ org.openapitools.codegen.languages.ConfluenceWikiCodegen
 org.openapitools.codegen.languages.CppQt5ClientCodegen
 org.openapitools.codegen.languages.CppPistacheServerCodegen
 org.openapitools.codegen.languages.CppRestbedServerCodegen
-org.openapitools.codegen.languages.CppRestClientCodegen
+org.openapitools.codegen.languages.CppRestSdkClientCodegen
 org.openapitools.codegen.languages.CppTizenClientCodegen
 org.openapitools.codegen.languages.CSharpClientCodegen
 org.openapitools.codegen.languages.CSharpDotNet2ClientCodegen
diff --git a/samples/client/petstore-security-test/qt5cpp/.openapi-generator-ignore b/samples/client/petstore-security-test/cpp-qt5/.openapi-generator-ignore
similarity index 100%
rename from samples/client/petstore-security-test/qt5cpp/.openapi-generator-ignore
rename to samples/client/petstore-security-test/cpp-qt5/.openapi-generator-ignore
diff --git a/samples/client/petstore-security-test/qt5cpp/.openapi-generator/VERSION b/samples/client/petstore-security-test/cpp-qt5/.openapi-generator/VERSION
similarity index 100%
rename from samples/client/petstore-security-test/qt5cpp/.openapi-generator/VERSION
rename to samples/client/petstore-security-test/cpp-qt5/.openapi-generator/VERSION
diff --git a/samples/client/petstore-security-test/qt5cpp/LICENSE b/samples/client/petstore-security-test/cpp-qt5/LICENSE
similarity index 100%
rename from samples/client/petstore-security-test/qt5cpp/LICENSE
rename to samples/client/petstore-security-test/cpp-qt5/LICENSE
diff --git a/samples/client/petstore-security-test/qt5cpp/client/SWGFakeApi.cpp b/samples/client/petstore-security-test/cpp-qt5/client/SWGFakeApi.cpp
similarity index 100%
rename from samples/client/petstore-security-test/qt5cpp/client/SWGFakeApi.cpp
rename to samples/client/petstore-security-test/cpp-qt5/client/SWGFakeApi.cpp
diff --git a/samples/client/petstore-security-test/qt5cpp/client/SWGFakeApi.h b/samples/client/petstore-security-test/cpp-qt5/client/SWGFakeApi.h
similarity index 100%
rename from samples/client/petstore-security-test/qt5cpp/client/SWGFakeApi.h
rename to samples/client/petstore-security-test/cpp-qt5/client/SWGFakeApi.h
diff --git a/samples/client/petstore-security-test/qt5cpp/client/SWGHelpers.cpp b/samples/client/petstore-security-test/cpp-qt5/client/SWGHelpers.cpp
similarity index 100%
rename from samples/client/petstore-security-test/qt5cpp/client/SWGHelpers.cpp
rename to samples/client/petstore-security-test/cpp-qt5/client/SWGHelpers.cpp
diff --git a/samples/client/petstore-security-test/qt5cpp/client/SWGHelpers.h b/samples/client/petstore-security-test/cpp-qt5/client/SWGHelpers.h
similarity index 100%
rename from samples/client/petstore-security-test/qt5cpp/client/SWGHelpers.h
rename to samples/client/petstore-security-test/cpp-qt5/client/SWGHelpers.h
diff --git a/samples/client/petstore-security-test/qt5cpp/client/SWGHttpRequest.cpp b/samples/client/petstore-security-test/cpp-qt5/client/SWGHttpRequest.cpp
similarity index 100%
rename from samples/client/petstore-security-test/qt5cpp/client/SWGHttpRequest.cpp
rename to samples/client/petstore-security-test/cpp-qt5/client/SWGHttpRequest.cpp
diff --git a/samples/client/petstore-security-test/qt5cpp/client/SWGHttpRequest.h b/samples/client/petstore-security-test/cpp-qt5/client/SWGHttpRequest.h
similarity index 100%
rename from samples/client/petstore-security-test/qt5cpp/client/SWGHttpRequest.h
rename to samples/client/petstore-security-test/cpp-qt5/client/SWGHttpRequest.h
diff --git a/samples/client/petstore-security-test/qt5cpp/client/SWGModelFactory.h b/samples/client/petstore-security-test/cpp-qt5/client/SWGModelFactory.h
similarity index 100%
rename from samples/client/petstore-security-test/qt5cpp/client/SWGModelFactory.h
rename to samples/client/petstore-security-test/cpp-qt5/client/SWGModelFactory.h
diff --git a/samples/client/petstore-security-test/qt5cpp/client/SWGObject.h b/samples/client/petstore-security-test/cpp-qt5/client/SWGObject.h
similarity index 100%
rename from samples/client/petstore-security-test/qt5cpp/client/SWGObject.h
rename to samples/client/petstore-security-test/cpp-qt5/client/SWGObject.h
diff --git a/samples/client/petstore-security-test/qt5cpp/client/SWGReturn.cpp b/samples/client/petstore-security-test/cpp-qt5/client/SWGReturn.cpp
similarity index 100%
rename from samples/client/petstore-security-test/qt5cpp/client/SWGReturn.cpp
rename to samples/client/petstore-security-test/cpp-qt5/client/SWGReturn.cpp
diff --git a/samples/client/petstore-security-test/qt5cpp/client/SWGReturn.h b/samples/client/petstore-security-test/cpp-qt5/client/SWGReturn.h
similarity index 100%
rename from samples/client/petstore-security-test/qt5cpp/client/SWGReturn.h
rename to samples/client/petstore-security-test/cpp-qt5/client/SWGReturn.h
diff --git a/samples/client/petstore/cpprest/.openapi-generator-ignore b/samples/client/petstore/cpp-qt5/.openapi-generator-ignore
similarity index 100%
rename from samples/client/petstore/cpprest/.openapi-generator-ignore
rename to samples/client/petstore/cpp-qt5/.openapi-generator-ignore
diff --git a/samples/client/petstore/cpprest/.openapi-generator/VERSION b/samples/client/petstore/cpp-qt5/.openapi-generator/VERSION
similarity index 100%
rename from samples/client/petstore/cpprest/.openapi-generator/VERSION
rename to samples/client/petstore/cpp-qt5/.openapi-generator/VERSION
diff --git a/samples/client/petstore/qt5cpp/PetStore/PetApiTests.cpp b/samples/client/petstore/cpp-qt5/PetStore/PetApiTests.cpp
similarity index 100%
rename from samples/client/petstore/qt5cpp/PetStore/PetApiTests.cpp
rename to samples/client/petstore/cpp-qt5/PetStore/PetApiTests.cpp
diff --git a/samples/client/petstore/qt5cpp/PetStore/PetApiTests.h b/samples/client/petstore/cpp-qt5/PetStore/PetApiTests.h
similarity index 100%
rename from samples/client/petstore/qt5cpp/PetStore/PetApiTests.h
rename to samples/client/petstore/cpp-qt5/PetStore/PetApiTests.h
diff --git a/samples/client/petstore/qt5cpp/PetStore/PetStore.pro b/samples/client/petstore/cpp-qt5/PetStore/PetStore.pro
similarity index 100%
rename from samples/client/petstore/qt5cpp/PetStore/PetStore.pro
rename to samples/client/petstore/cpp-qt5/PetStore/PetStore.pro
diff --git a/samples/client/petstore/qt5cpp/PetStore/main.cpp b/samples/client/petstore/cpp-qt5/PetStore/main.cpp
similarity index 100%
rename from samples/client/petstore/qt5cpp/PetStore/main.cpp
rename to samples/client/petstore/cpp-qt5/PetStore/main.cpp
diff --git a/samples/client/petstore/qt5cpp/client/OAIApiResponse.cpp b/samples/client/petstore/cpp-qt5/client/OAIApiResponse.cpp
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/OAIApiResponse.cpp
rename to samples/client/petstore/cpp-qt5/client/OAIApiResponse.cpp
diff --git a/samples/client/petstore/qt5cpp/client/OAIApiResponse.h b/samples/client/petstore/cpp-qt5/client/OAIApiResponse.h
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/OAIApiResponse.h
rename to samples/client/petstore/cpp-qt5/client/OAIApiResponse.h
diff --git a/samples/client/petstore/qt5cpp/client/OAICategory.cpp b/samples/client/petstore/cpp-qt5/client/OAICategory.cpp
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/OAICategory.cpp
rename to samples/client/petstore/cpp-qt5/client/OAICategory.cpp
diff --git a/samples/client/petstore/qt5cpp/client/OAICategory.h b/samples/client/petstore/cpp-qt5/client/OAICategory.h
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/OAICategory.h
rename to samples/client/petstore/cpp-qt5/client/OAICategory.h
diff --git a/samples/client/petstore/qt5cpp/client/OAIHelpers.cpp b/samples/client/petstore/cpp-qt5/client/OAIHelpers.cpp
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/OAIHelpers.cpp
rename to samples/client/petstore/cpp-qt5/client/OAIHelpers.cpp
diff --git a/samples/client/petstore/qt5cpp/client/OAIHelpers.h b/samples/client/petstore/cpp-qt5/client/OAIHelpers.h
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/OAIHelpers.h
rename to samples/client/petstore/cpp-qt5/client/OAIHelpers.h
diff --git a/samples/client/petstore/qt5cpp/client/OAIHttpRequest.cpp b/samples/client/petstore/cpp-qt5/client/OAIHttpRequest.cpp
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/OAIHttpRequest.cpp
rename to samples/client/petstore/cpp-qt5/client/OAIHttpRequest.cpp
diff --git a/samples/client/petstore/qt5cpp/client/OAIHttpRequest.h b/samples/client/petstore/cpp-qt5/client/OAIHttpRequest.h
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/OAIHttpRequest.h
rename to samples/client/petstore/cpp-qt5/client/OAIHttpRequest.h
diff --git a/samples/client/petstore/qt5cpp/client/OAIModelFactory.h b/samples/client/petstore/cpp-qt5/client/OAIModelFactory.h
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/OAIModelFactory.h
rename to samples/client/petstore/cpp-qt5/client/OAIModelFactory.h
diff --git a/samples/client/petstore/qt5cpp/client/OAIObject.h b/samples/client/petstore/cpp-qt5/client/OAIObject.h
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/OAIObject.h
rename to samples/client/petstore/cpp-qt5/client/OAIObject.h
diff --git a/samples/client/petstore/qt5cpp/client/OAIOrder.cpp b/samples/client/petstore/cpp-qt5/client/OAIOrder.cpp
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/OAIOrder.cpp
rename to samples/client/petstore/cpp-qt5/client/OAIOrder.cpp
diff --git a/samples/client/petstore/qt5cpp/client/OAIOrder.h b/samples/client/petstore/cpp-qt5/client/OAIOrder.h
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/OAIOrder.h
rename to samples/client/petstore/cpp-qt5/client/OAIOrder.h
diff --git a/samples/client/petstore/qt5cpp/client/OAIPet.cpp b/samples/client/petstore/cpp-qt5/client/OAIPet.cpp
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/OAIPet.cpp
rename to samples/client/petstore/cpp-qt5/client/OAIPet.cpp
diff --git a/samples/client/petstore/qt5cpp/client/OAIPet.h b/samples/client/petstore/cpp-qt5/client/OAIPet.h
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/OAIPet.h
rename to samples/client/petstore/cpp-qt5/client/OAIPet.h
diff --git a/samples/client/petstore/qt5cpp/client/OAIPetApi.cpp b/samples/client/petstore/cpp-qt5/client/OAIPetApi.cpp
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/OAIPetApi.cpp
rename to samples/client/petstore/cpp-qt5/client/OAIPetApi.cpp
diff --git a/samples/client/petstore/qt5cpp/client/OAIPetApi.h b/samples/client/petstore/cpp-qt5/client/OAIPetApi.h
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/OAIPetApi.h
rename to samples/client/petstore/cpp-qt5/client/OAIPetApi.h
diff --git a/samples/client/petstore/qt5cpp/client/OAIQObjectWrapper.h b/samples/client/petstore/cpp-qt5/client/OAIQObjectWrapper.h
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/OAIQObjectWrapper.h
rename to samples/client/petstore/cpp-qt5/client/OAIQObjectWrapper.h
diff --git a/samples/client/petstore/qt5cpp/client/OAIStoreApi.cpp b/samples/client/petstore/cpp-qt5/client/OAIStoreApi.cpp
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/OAIStoreApi.cpp
rename to samples/client/petstore/cpp-qt5/client/OAIStoreApi.cpp
diff --git a/samples/client/petstore/qt5cpp/client/OAIStoreApi.h b/samples/client/petstore/cpp-qt5/client/OAIStoreApi.h
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/OAIStoreApi.h
rename to samples/client/petstore/cpp-qt5/client/OAIStoreApi.h
diff --git a/samples/client/petstore/qt5cpp/client/OAITag.cpp b/samples/client/petstore/cpp-qt5/client/OAITag.cpp
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/OAITag.cpp
rename to samples/client/petstore/cpp-qt5/client/OAITag.cpp
diff --git a/samples/client/petstore/qt5cpp/client/OAITag.h b/samples/client/petstore/cpp-qt5/client/OAITag.h
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/OAITag.h
rename to samples/client/petstore/cpp-qt5/client/OAITag.h
diff --git a/samples/client/petstore/qt5cpp/client/OAIUser.cpp b/samples/client/petstore/cpp-qt5/client/OAIUser.cpp
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/OAIUser.cpp
rename to samples/client/petstore/cpp-qt5/client/OAIUser.cpp
diff --git a/samples/client/petstore/qt5cpp/client/OAIUser.h b/samples/client/petstore/cpp-qt5/client/OAIUser.h
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/OAIUser.h
rename to samples/client/petstore/cpp-qt5/client/OAIUser.h
diff --git a/samples/client/petstore/qt5cpp/client/OAIUserApi.cpp b/samples/client/petstore/cpp-qt5/client/OAIUserApi.cpp
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/OAIUserApi.cpp
rename to samples/client/petstore/cpp-qt5/client/OAIUserApi.cpp
diff --git a/samples/client/petstore/qt5cpp/client/OAIUserApi.h b/samples/client/petstore/cpp-qt5/client/OAIUserApi.h
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/OAIUserApi.h
rename to samples/client/petstore/cpp-qt5/client/OAIUserApi.h
diff --git a/samples/client/petstore/qt5cpp/client/client.pri b/samples/client/petstore/cpp-qt5/client/client.pri
similarity index 100%
rename from samples/client/petstore/qt5cpp/client/client.pri
rename to samples/client/petstore/cpp-qt5/client/client.pri
diff --git a/samples/client/petstore/cpprest/.gitignore b/samples/client/petstore/cpp-restsdk/.gitignore
similarity index 100%
rename from samples/client/petstore/cpprest/.gitignore
rename to samples/client/petstore/cpp-restsdk/.gitignore
diff --git a/samples/client/petstore/qt5cpp/.openapi-generator-ignore b/samples/client/petstore/cpp-restsdk/.openapi-generator-ignore
similarity index 100%
rename from samples/client/petstore/qt5cpp/.openapi-generator-ignore
rename to samples/client/petstore/cpp-restsdk/.openapi-generator-ignore
diff --git a/samples/client/petstore/qt5cpp/.openapi-generator/VERSION b/samples/client/petstore/cpp-restsdk/.openapi-generator/VERSION
similarity index 100%
rename from samples/client/petstore/qt5cpp/.openapi-generator/VERSION
rename to samples/client/petstore/cpp-restsdk/.openapi-generator/VERSION
diff --git a/samples/client/petstore/cpprest/ApiClient.cpp b/samples/client/petstore/cpp-restsdk/ApiClient.cpp
similarity index 100%
rename from samples/client/petstore/cpprest/ApiClient.cpp
rename to samples/client/petstore/cpp-restsdk/ApiClient.cpp
diff --git a/samples/client/petstore/cpprest/ApiClient.h b/samples/client/petstore/cpp-restsdk/ApiClient.h
similarity index 100%
rename from samples/client/petstore/cpprest/ApiClient.h
rename to samples/client/petstore/cpp-restsdk/ApiClient.h
diff --git a/samples/client/petstore/cpprest/ApiConfiguration.cpp b/samples/client/petstore/cpp-restsdk/ApiConfiguration.cpp
similarity index 100%
rename from samples/client/petstore/cpprest/ApiConfiguration.cpp
rename to samples/client/petstore/cpp-restsdk/ApiConfiguration.cpp
diff --git a/samples/client/petstore/cpprest/ApiConfiguration.h b/samples/client/petstore/cpp-restsdk/ApiConfiguration.h
similarity index 100%
rename from samples/client/petstore/cpprest/ApiConfiguration.h
rename to samples/client/petstore/cpp-restsdk/ApiConfiguration.h
diff --git a/samples/client/petstore/cpprest/ApiException.cpp b/samples/client/petstore/cpp-restsdk/ApiException.cpp
similarity index 100%
rename from samples/client/petstore/cpprest/ApiException.cpp
rename to samples/client/petstore/cpp-restsdk/ApiException.cpp
diff --git a/samples/client/petstore/cpprest/ApiException.h b/samples/client/petstore/cpp-restsdk/ApiException.h
similarity index 100%
rename from samples/client/petstore/cpprest/ApiException.h
rename to samples/client/petstore/cpp-restsdk/ApiException.h
diff --git a/samples/client/petstore/cpprest/CMakeLists.txt b/samples/client/petstore/cpp-restsdk/CMakeLists.txt
similarity index 100%
rename from samples/client/petstore/cpprest/CMakeLists.txt
rename to samples/client/petstore/cpp-restsdk/CMakeLists.txt
diff --git a/samples/client/petstore/cpprest/HttpContent.cpp b/samples/client/petstore/cpp-restsdk/HttpContent.cpp
similarity index 100%
rename from samples/client/petstore/cpprest/HttpContent.cpp
rename to samples/client/petstore/cpp-restsdk/HttpContent.cpp
diff --git a/samples/client/petstore/cpprest/HttpContent.h b/samples/client/petstore/cpp-restsdk/HttpContent.h
similarity index 100%
rename from samples/client/petstore/cpprest/HttpContent.h
rename to samples/client/petstore/cpp-restsdk/HttpContent.h
diff --git a/samples/client/petstore/cpprest/IHttpBody.h b/samples/client/petstore/cpp-restsdk/IHttpBody.h
similarity index 100%
rename from samples/client/petstore/cpprest/IHttpBody.h
rename to samples/client/petstore/cpp-restsdk/IHttpBody.h
diff --git a/samples/client/petstore/cpprest/JsonBody.cpp b/samples/client/petstore/cpp-restsdk/JsonBody.cpp
similarity index 100%
rename from samples/client/petstore/cpprest/JsonBody.cpp
rename to samples/client/petstore/cpp-restsdk/JsonBody.cpp
diff --git a/samples/client/petstore/cpprest/JsonBody.h b/samples/client/petstore/cpp-restsdk/JsonBody.h
similarity index 100%
rename from samples/client/petstore/cpprest/JsonBody.h
rename to samples/client/petstore/cpp-restsdk/JsonBody.h
diff --git a/samples/client/petstore/cpprest/ModelBase.cpp b/samples/client/petstore/cpp-restsdk/ModelBase.cpp
similarity index 100%
rename from samples/client/petstore/cpprest/ModelBase.cpp
rename to samples/client/petstore/cpp-restsdk/ModelBase.cpp
diff --git a/samples/client/petstore/cpprest/ModelBase.h b/samples/client/petstore/cpp-restsdk/ModelBase.h
similarity index 100%
rename from samples/client/petstore/cpprest/ModelBase.h
rename to samples/client/petstore/cpp-restsdk/ModelBase.h
diff --git a/samples/client/petstore/cpprest/MultipartFormData.cpp b/samples/client/petstore/cpp-restsdk/MultipartFormData.cpp
similarity index 100%
rename from samples/client/petstore/cpprest/MultipartFormData.cpp
rename to samples/client/petstore/cpp-restsdk/MultipartFormData.cpp
diff --git a/samples/client/petstore/cpprest/MultipartFormData.h b/samples/client/petstore/cpp-restsdk/MultipartFormData.h
similarity index 100%
rename from samples/client/petstore/cpprest/MultipartFormData.h
rename to samples/client/petstore/cpp-restsdk/MultipartFormData.h
diff --git a/samples/client/petstore/cpprest/Object.cpp b/samples/client/petstore/cpp-restsdk/Object.cpp
similarity index 100%
rename from samples/client/petstore/cpprest/Object.cpp
rename to samples/client/petstore/cpp-restsdk/Object.cpp
diff --git a/samples/client/petstore/cpprest/Object.h b/samples/client/petstore/cpp-restsdk/Object.h
similarity index 100%
rename from samples/client/petstore/cpprest/Object.h
rename to samples/client/petstore/cpp-restsdk/Object.h
diff --git a/samples/client/petstore/cpprest/api/PetApi.cpp b/samples/client/petstore/cpp-restsdk/api/PetApi.cpp
similarity index 100%
rename from samples/client/petstore/cpprest/api/PetApi.cpp
rename to samples/client/petstore/cpp-restsdk/api/PetApi.cpp
diff --git a/samples/client/petstore/cpprest/api/PetApi.h b/samples/client/petstore/cpp-restsdk/api/PetApi.h
similarity index 100%
rename from samples/client/petstore/cpprest/api/PetApi.h
rename to samples/client/petstore/cpp-restsdk/api/PetApi.h
diff --git a/samples/client/petstore/cpprest/api/StoreApi.cpp b/samples/client/petstore/cpp-restsdk/api/StoreApi.cpp
similarity index 100%
rename from samples/client/petstore/cpprest/api/StoreApi.cpp
rename to samples/client/petstore/cpp-restsdk/api/StoreApi.cpp
diff --git a/samples/client/petstore/cpprest/api/StoreApi.h b/samples/client/petstore/cpp-restsdk/api/StoreApi.h
similarity index 100%
rename from samples/client/petstore/cpprest/api/StoreApi.h
rename to samples/client/petstore/cpp-restsdk/api/StoreApi.h
diff --git a/samples/client/petstore/cpprest/api/UserApi.cpp b/samples/client/petstore/cpp-restsdk/api/UserApi.cpp
similarity index 100%
rename from samples/client/petstore/cpprest/api/UserApi.cpp
rename to samples/client/petstore/cpp-restsdk/api/UserApi.cpp
diff --git a/samples/client/petstore/cpprest/api/UserApi.h b/samples/client/petstore/cpp-restsdk/api/UserApi.h
similarity index 100%
rename from samples/client/petstore/cpprest/api/UserApi.h
rename to samples/client/petstore/cpp-restsdk/api/UserApi.h
diff --git a/samples/client/petstore/cpprest/git_push.sh b/samples/client/petstore/cpp-restsdk/git_push.sh
similarity index 100%
rename from samples/client/petstore/cpprest/git_push.sh
rename to samples/client/petstore/cpp-restsdk/git_push.sh
diff --git a/samples/client/petstore/cpprest/model/ApiResponse.cpp b/samples/client/petstore/cpp-restsdk/model/ApiResponse.cpp
similarity index 100%
rename from samples/client/petstore/cpprest/model/ApiResponse.cpp
rename to samples/client/petstore/cpp-restsdk/model/ApiResponse.cpp
diff --git a/samples/client/petstore/cpprest/model/ApiResponse.h b/samples/client/petstore/cpp-restsdk/model/ApiResponse.h
similarity index 100%
rename from samples/client/petstore/cpprest/model/ApiResponse.h
rename to samples/client/petstore/cpp-restsdk/model/ApiResponse.h
diff --git a/samples/client/petstore/cpprest/model/Category.cpp b/samples/client/petstore/cpp-restsdk/model/Category.cpp
similarity index 100%
rename from samples/client/petstore/cpprest/model/Category.cpp
rename to samples/client/petstore/cpp-restsdk/model/Category.cpp
diff --git a/samples/client/petstore/cpprest/model/Category.h b/samples/client/petstore/cpp-restsdk/model/Category.h
similarity index 100%
rename from samples/client/petstore/cpprest/model/Category.h
rename to samples/client/petstore/cpp-restsdk/model/Category.h
diff --git a/samples/client/petstore/cpprest/model/Order.cpp b/samples/client/petstore/cpp-restsdk/model/Order.cpp
similarity index 100%
rename from samples/client/petstore/cpprest/model/Order.cpp
rename to samples/client/petstore/cpp-restsdk/model/Order.cpp
diff --git a/samples/client/petstore/cpprest/model/Order.h b/samples/client/petstore/cpp-restsdk/model/Order.h
similarity index 100%
rename from samples/client/petstore/cpprest/model/Order.h
rename to samples/client/petstore/cpp-restsdk/model/Order.h
diff --git a/samples/client/petstore/cpprest/model/Pet.cpp b/samples/client/petstore/cpp-restsdk/model/Pet.cpp
similarity index 100%
rename from samples/client/petstore/cpprest/model/Pet.cpp
rename to samples/client/petstore/cpp-restsdk/model/Pet.cpp
diff --git a/samples/client/petstore/cpprest/model/Pet.h b/samples/client/petstore/cpp-restsdk/model/Pet.h
similarity index 100%
rename from samples/client/petstore/cpprest/model/Pet.h
rename to samples/client/petstore/cpp-restsdk/model/Pet.h
diff --git a/samples/client/petstore/cpprest/model/Tag.cpp b/samples/client/petstore/cpp-restsdk/model/Tag.cpp
similarity index 100%
rename from samples/client/petstore/cpprest/model/Tag.cpp
rename to samples/client/petstore/cpp-restsdk/model/Tag.cpp
diff --git a/samples/client/petstore/cpprest/model/Tag.h b/samples/client/petstore/cpp-restsdk/model/Tag.h
similarity index 100%
rename from samples/client/petstore/cpprest/model/Tag.h
rename to samples/client/petstore/cpp-restsdk/model/Tag.h
diff --git a/samples/client/petstore/cpprest/model/User.cpp b/samples/client/petstore/cpp-restsdk/model/User.cpp
similarity index 100%
rename from samples/client/petstore/cpprest/model/User.cpp
rename to samples/client/petstore/cpp-restsdk/model/User.cpp
diff --git a/samples/client/petstore/cpprest/model/User.h b/samples/client/petstore/cpp-restsdk/model/User.h
similarity index 100%
rename from samples/client/petstore/cpprest/model/User.h
rename to samples/client/petstore/cpp-restsdk/model/User.h
diff --git a/samples/client/petstore/tizen/.openapi-generator-ignore b/samples/client/petstore/cpp-tizen/.openapi-generator-ignore
similarity index 100%
rename from samples/client/petstore/tizen/.openapi-generator-ignore
rename to samples/client/petstore/cpp-tizen/.openapi-generator-ignore
diff --git a/samples/client/petstore/tizen/.openapi-generator/VERSION b/samples/client/petstore/cpp-tizen/.openapi-generator/VERSION
similarity index 100%
rename from samples/client/petstore/tizen/.openapi-generator/VERSION
rename to samples/client/petstore/cpp-tizen/.openapi-generator/VERSION
diff --git a/samples/client/petstore/tizen/PetStoreTest/CMakeLists.txt b/samples/client/petstore/cpp-tizen/PetStoreTest/CMakeLists.txt
similarity index 100%
rename from samples/client/petstore/tizen/PetStoreTest/CMakeLists.txt
rename to samples/client/petstore/cpp-tizen/PetStoreTest/CMakeLists.txt
diff --git a/samples/client/petstore/tizen/PetStoreTest/src/PetStoreTest.cpp b/samples/client/petstore/cpp-tizen/PetStoreTest/src/PetStoreTest.cpp
similarity index 100%
rename from samples/client/petstore/tizen/PetStoreTest/src/PetStoreTest.cpp
rename to samples/client/petstore/cpp-tizen/PetStoreTest/src/PetStoreTest.cpp
diff --git a/samples/client/petstore/tizen/PetStoreTest/src/PetStoreTest.h b/samples/client/petstore/cpp-tizen/PetStoreTest/src/PetStoreTest.h
similarity index 100%
rename from samples/client/petstore/tizen/PetStoreTest/src/PetStoreTest.h
rename to samples/client/petstore/cpp-tizen/PetStoreTest/src/PetStoreTest.h
diff --git a/samples/client/petstore/tizen/PetStoreTest/src/main.cpp b/samples/client/petstore/cpp-tizen/PetStoreTest/src/main.cpp
similarity index 100%
rename from samples/client/petstore/tizen/PetStoreTest/src/main.cpp
rename to samples/client/petstore/cpp-tizen/PetStoreTest/src/main.cpp
diff --git a/samples/client/petstore/tizen/doc/Doxyfile b/samples/client/petstore/cpp-tizen/doc/Doxyfile
similarity index 100%
rename from samples/client/petstore/tizen/doc/Doxyfile
rename to samples/client/petstore/cpp-tizen/doc/Doxyfile
diff --git a/samples/client/petstore/tizen/doc/README.md b/samples/client/petstore/cpp-tizen/doc/README.md
similarity index 100%
rename from samples/client/petstore/tizen/doc/README.md
rename to samples/client/petstore/cpp-tizen/doc/README.md
diff --git a/samples/client/petstore/tizen/doc/generateDocumentation.sh b/samples/client/petstore/cpp-tizen/doc/generateDocumentation.sh
similarity index 100%
rename from samples/client/petstore/tizen/doc/generateDocumentation.sh
rename to samples/client/petstore/cpp-tizen/doc/generateDocumentation.sh
diff --git a/samples/client/petstore/tizen/src/ApiResponse.cpp b/samples/client/petstore/cpp-tizen/src/ApiResponse.cpp
similarity index 100%
rename from samples/client/petstore/tizen/src/ApiResponse.cpp
rename to samples/client/petstore/cpp-tizen/src/ApiResponse.cpp
diff --git a/samples/client/petstore/tizen/src/ApiResponse.h b/samples/client/petstore/cpp-tizen/src/ApiResponse.h
similarity index 100%
rename from samples/client/petstore/tizen/src/ApiResponse.h
rename to samples/client/petstore/cpp-tizen/src/ApiResponse.h
diff --git a/samples/client/petstore/tizen/src/Category.cpp b/samples/client/petstore/cpp-tizen/src/Category.cpp
similarity index 100%
rename from samples/client/petstore/tizen/src/Category.cpp
rename to samples/client/petstore/cpp-tizen/src/Category.cpp
diff --git a/samples/client/petstore/tizen/src/Category.h b/samples/client/petstore/cpp-tizen/src/Category.h
similarity index 100%
rename from samples/client/petstore/tizen/src/Category.h
rename to samples/client/petstore/cpp-tizen/src/Category.h
diff --git a/samples/client/petstore/tizen/src/Error.cpp b/samples/client/petstore/cpp-tizen/src/Error.cpp
similarity index 100%
rename from samples/client/petstore/tizen/src/Error.cpp
rename to samples/client/petstore/cpp-tizen/src/Error.cpp
diff --git a/samples/client/petstore/tizen/src/Error.h b/samples/client/petstore/cpp-tizen/src/Error.h
similarity index 100%
rename from samples/client/petstore/tizen/src/Error.h
rename to samples/client/petstore/cpp-tizen/src/Error.h
diff --git a/samples/client/petstore/tizen/src/Helpers.cpp b/samples/client/petstore/cpp-tizen/src/Helpers.cpp
similarity index 100%
rename from samples/client/petstore/tizen/src/Helpers.cpp
rename to samples/client/petstore/cpp-tizen/src/Helpers.cpp
diff --git a/samples/client/petstore/tizen/src/Helpers.h b/samples/client/petstore/cpp-tizen/src/Helpers.h
similarity index 100%
rename from samples/client/petstore/tizen/src/Helpers.h
rename to samples/client/petstore/cpp-tizen/src/Helpers.h
diff --git a/samples/client/petstore/tizen/src/NetClient.cpp b/samples/client/petstore/cpp-tizen/src/NetClient.cpp
similarity index 100%
rename from samples/client/petstore/tizen/src/NetClient.cpp
rename to samples/client/petstore/cpp-tizen/src/NetClient.cpp
diff --git a/samples/client/petstore/tizen/src/NetClient.h b/samples/client/petstore/cpp-tizen/src/NetClient.h
similarity index 100%
rename from samples/client/petstore/tizen/src/NetClient.h
rename to samples/client/petstore/cpp-tizen/src/NetClient.h
diff --git a/samples/client/petstore/tizen/src/Object.h b/samples/client/petstore/cpp-tizen/src/Object.h
similarity index 100%
rename from samples/client/petstore/tizen/src/Object.h
rename to samples/client/petstore/cpp-tizen/src/Object.h
diff --git a/samples/client/petstore/tizen/src/Order.cpp b/samples/client/petstore/cpp-tizen/src/Order.cpp
similarity index 100%
rename from samples/client/petstore/tizen/src/Order.cpp
rename to samples/client/petstore/cpp-tizen/src/Order.cpp
diff --git a/samples/client/petstore/tizen/src/Order.h b/samples/client/petstore/cpp-tizen/src/Order.h
similarity index 100%
rename from samples/client/petstore/tizen/src/Order.h
rename to samples/client/petstore/cpp-tizen/src/Order.h
diff --git a/samples/client/petstore/tizen/src/Pet.cpp b/samples/client/petstore/cpp-tizen/src/Pet.cpp
similarity index 100%
rename from samples/client/petstore/tizen/src/Pet.cpp
rename to samples/client/petstore/cpp-tizen/src/Pet.cpp
diff --git a/samples/client/petstore/tizen/src/Pet.h b/samples/client/petstore/cpp-tizen/src/Pet.h
similarity index 100%
rename from samples/client/petstore/tizen/src/Pet.h
rename to samples/client/petstore/cpp-tizen/src/Pet.h
diff --git a/samples/client/petstore/tizen/src/PetManager.cpp b/samples/client/petstore/cpp-tizen/src/PetManager.cpp
similarity index 100%
rename from samples/client/petstore/tizen/src/PetManager.cpp
rename to samples/client/petstore/cpp-tizen/src/PetManager.cpp
diff --git a/samples/client/petstore/tizen/src/PetManager.h b/samples/client/petstore/cpp-tizen/src/PetManager.h
similarity index 100%
rename from samples/client/petstore/tizen/src/PetManager.h
rename to samples/client/petstore/cpp-tizen/src/PetManager.h
diff --git a/samples/client/petstore/tizen/src/RequestInfo.h b/samples/client/petstore/cpp-tizen/src/RequestInfo.h
similarity index 100%
rename from samples/client/petstore/tizen/src/RequestInfo.h
rename to samples/client/petstore/cpp-tizen/src/RequestInfo.h
diff --git a/samples/client/petstore/tizen/src/StoreManager.cpp b/samples/client/petstore/cpp-tizen/src/StoreManager.cpp
similarity index 100%
rename from samples/client/petstore/tizen/src/StoreManager.cpp
rename to samples/client/petstore/cpp-tizen/src/StoreManager.cpp
diff --git a/samples/client/petstore/tizen/src/StoreManager.h b/samples/client/petstore/cpp-tizen/src/StoreManager.h
similarity index 100%
rename from samples/client/petstore/tizen/src/StoreManager.h
rename to samples/client/petstore/cpp-tizen/src/StoreManager.h
diff --git a/samples/client/petstore/tizen/src/Tag.cpp b/samples/client/petstore/cpp-tizen/src/Tag.cpp
similarity index 100%
rename from samples/client/petstore/tizen/src/Tag.cpp
rename to samples/client/petstore/cpp-tizen/src/Tag.cpp
diff --git a/samples/client/petstore/tizen/src/Tag.h b/samples/client/petstore/cpp-tizen/src/Tag.h
similarity index 100%
rename from samples/client/petstore/tizen/src/Tag.h
rename to samples/client/petstore/cpp-tizen/src/Tag.h
diff --git a/samples/client/petstore/tizen/src/User.cpp b/samples/client/petstore/cpp-tizen/src/User.cpp
similarity index 100%
rename from samples/client/petstore/tizen/src/User.cpp
rename to samples/client/petstore/cpp-tizen/src/User.cpp
diff --git a/samples/client/petstore/tizen/src/User.h b/samples/client/petstore/cpp-tizen/src/User.h
similarity index 100%
rename from samples/client/petstore/tizen/src/User.h
rename to samples/client/petstore/cpp-tizen/src/User.h
diff --git a/samples/client/petstore/tizen/src/UserManager.cpp b/samples/client/petstore/cpp-tizen/src/UserManager.cpp
similarity index 100%
rename from samples/client/petstore/tizen/src/UserManager.cpp
rename to samples/client/petstore/cpp-tizen/src/UserManager.cpp
diff --git a/samples/client/petstore/tizen/src/UserManager.h b/samples/client/petstore/cpp-tizen/src/UserManager.h
similarity index 100%
rename from samples/client/petstore/tizen/src/UserManager.h
rename to samples/client/petstore/cpp-tizen/src/UserManager.h