diff --git a/bin/typescript-angular-petstore.sh b/bin/typescript-angular-petstore.sh
index 32cdba067eb..a0567704ed3 100755
--- a/bin/typescript-angular-petstore.sh
+++ b/bin/typescript-angular-petstore.sh
@@ -26,6 +26,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 -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l typescript-angularjs -o samples/client/petstore/typescript-angular"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l typescript-angularjs -o samples/client/petstore/typescript-angular"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/typescript-node-petstore-all.sh b/bin/typescript-node-petstore-all.sh
index 65f25060725..df9dcb034c4 100755
--- a/bin/typescript-node-petstore-all.sh
+++ b/bin/typescript-node-petstore-all.sh
@@ -28,9 +28,9 @@ fi
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
 
 echo "Typescript node Petstore API client (default setting)"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l typescript-node -o samples/client/petstore/typescript-node/default"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l typescript-node -o samples/client/petstore/typescript-node/default"
 java $JAVA_OPTS -jar $executable $ags
 
 echo "Typescript node Petstore API client with npm setting"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l typescript-node -c bin/typescript-petstore-npm.json -o samples/client/petstore/typescript-node/npm"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l typescript-node -c bin/typescript-petstore-npm.json -o samples/client/petstore/typescript-node/npm"
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/typescript-node-petstore-with-npm.sh b/bin/typescript-node-petstore-with-npm.sh
index e369be758e7..00972be059d 100755
--- a/bin/typescript-node-petstore-with-npm.sh
+++ b/bin/typescript-node-petstore-with-npm.sh
@@ -26,6 +26,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 -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l typescript-node -c bin/typescript-petstore-npm.json -o samples/client/petstore/typescript-node/npm"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l typescript-node -c bin/typescript-petstore-npm.json -o samples/client/petstore/typescript-node/npm"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/typescript-node-petstore.sh b/bin/typescript-node-petstore.sh
index c9d16d96113..f97d4a31657 100755
--- a/bin/typescript-node-petstore.sh
+++ b/bin/typescript-node-petstore.sh
@@ -26,6 +26,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 -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l typescript-node -o samples/client/petstore/typescript-node/default"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l typescript-node -o samples/client/petstore/typescript-node/default"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/windows/typescript-aurelia-petstore.bat b/bin/windows/typescript-aurelia-petstore.bat
new file mode 100644
index 00000000000..06fe370bef1
--- /dev/null
+++ b/bin/windows/typescript-aurelia-petstore.bat
@@ -0,0 +1,10 @@
+set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l typescript-aurelia -o samples\client\petstore\typescript-aurelia\default
+
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/typescript-jquery-with-npm.bat b/bin/windows/typescript-jquery-with-npm.bat
index cc7b1e6e4ff..630042e35db 100644
--- a/bin/windows/typescript-jquery-with-npm.bat
+++ b/bin/windows/typescript-jquery-with-npm.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -c bin\typescript-petstore-npm.json -l typescript-jquery -o samples\client\petstore\typescript-jquery\npm
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -c bin\typescript-petstore-npm.json -l typescript-jquery -o samples\client\petstore\typescript-jquery\npm
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/typescript-jquery.bat b/bin/windows/typescript-jquery.bat
index 71056ef84d9..24d9378ec62 100644
--- a/bin/windows/typescript-jquery.bat
+++ b/bin/windows/typescript-jquery.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l typescript-jquery -o samples\client\petstore\typescript-jquery\default
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l typescript-jquery -o samples\client\petstore\typescript-jquery\default
 
 java %JAVA_OPTS% -jar %executable% %ags%