diff --git a/bin/openapi3/pistache-server-petstore.sh b/bin/openapi3/cpp-pistache-server-petstore.sh
similarity index 97%
rename from bin/openapi3/pistache-server-petstore.sh
rename to bin/openapi3/cpp-pistache-server-petstore.sh
index b785bc047fd..5f7dd337691 100755
--- a/bin/openapi3/pistache-server-petstore.sh
+++ b/bin/openapi3/cpp-pistache-server-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 -g cpp-pistache-server -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -o samples/server/petstore/pistache-server $@"
+ags="generate -g cpp-pistache-server -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -o samples/server/petstore/cpp-pistache $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/openapi3/restbed-petstore-server.sh b/bin/openapi3/cpp-restbed-petstore-server.sh
similarity index 98%
rename from bin/openapi3/restbed-petstore-server.sh
rename to bin/openapi3/cpp-restbed-petstore-server.sh
index fd19d7ed676..e86c7a772b6 100755
--- a/bin/openapi3/restbed-petstore-server.sh
+++ b/bin/openapi3/cpp-restbed-petstore-server.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 -g cpp-restbed-server -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -o samples/server/petstore/restbed $@"
+ags="generate -g cpp-restbed-server -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -o samples/server/petstore/cpp-restbed $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/windows/pistache-server-petstore.bat b/bin/windows/cpp-pistache-server-petstore.bat
similarity index 94%
rename from bin/windows/pistache-server-petstore.bat
rename to bin/windows/cpp-pistache-server-petstore.bat
index f1b1b96faa6..3f9e53029b5 100644
--- a/bin/windows/pistache-server-petstore.bat
+++ b/bin/windows/cpp-pistache-server-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-pistache-server -o samples\server\petstore\pistache-server\
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g cpp-pistache-server -o samples\server\petstore\cpp-pistache\
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/restbed-petstore-server.bat b/bin/windows/cpp-restbed-petstore-server.bat
similarity index 95%
rename from bin/windows/restbed-petstore-server.bat
rename to bin/windows/cpp-restbed-petstore-server.bat
index 6ffb881c28f..e3a76db3f91 100644
--- a/bin/windows/restbed-petstore-server.bat
+++ b/bin/windows/cpp-restbed-petstore-server.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-restbed-server -o samples\server\petstore\restbed\
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g cpp-restbed-server -o samples\server\petstore\cpp-restbed\
 
 java %JAVA_OPTS% -jar %executable% %ags%