diff --git a/bin/windows/typescript-angular2-interfaces.bat b/bin/windows/typescript-angular-v2-interfaces.bat
similarity index 71%
rename from bin/windows/typescript-angular2-interfaces.bat
rename to bin/windows/typescript-angular-v2-interfaces.bat
index 6185232b704..c25d9c61e75 100644
--- a/bin/windows/typescript-angular2-interfaces.bat
+++ b/bin/windows/typescript-angular-v2-interfaces.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.yaml -c bin\typescript-petstore-npm.json -l typescript-angular -o samples\client\petstore\typescript-angular2\with-interfaces -D withInterfaces=true --additional-properties ngVersion=2
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -c bin\typescript-petstore-npm.json -l typescript-angular -o samples\client\petstore\typescript-angular-v2\with-interfaces -D withInterfaces=true --additional-properties ngVersion=2
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/typescript-angular4-with-npm.bat b/bin/windows/typescript-angular-v2-with-npm.bat
similarity index 77%
rename from bin/windows/typescript-angular4-with-npm.bat
rename to bin/windows/typescript-angular-v2-with-npm.bat
index f91d22dca41..a1d5b2330a0 100644
--- a/bin/windows/typescript-angular4-with-npm.bat
+++ b/bin/windows/typescript-angular-v2-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.yaml -c bin\typescript-petstore-npm.json -l typescript-angular -o samples\client\petstore\typescript-angular2\npm --additional-properties ngVersion=4
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -c bin\typescript-petstore-npm.json -l typescript-angular -o samples\client\petstore\typescript-angular-v2\npm --additional-properties ngVersion=2
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/typescript-angular2.bat b/bin/windows/typescript-angular-v2.bat
similarity index 83%
rename from bin/windows/typescript-angular2.bat
rename to bin/windows/typescript-angular-v2.bat
index b94528ba6d5..ec9da16154f 100755
--- a/bin/windows/typescript-angular2.bat
+++ b/bin/windows/typescript-angular-v2.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.yaml -l typescript-angular -o samples\client\petstore\typescript-angular2\default --additional-properties ngVersion=2
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l typescript-angular -o samples\client\petstore\typescript-angular-v2\default --additional-properties ngVersion=2
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/typescript-angular2-with-npm.bat b/bin/windows/typescript-angular-v4-with-npm.bat
similarity index 77%
rename from bin/windows/typescript-angular2-with-npm.bat
rename to bin/windows/typescript-angular-v4-with-npm.bat
index 0125441fac3..f89de17373d 100644
--- a/bin/windows/typescript-angular2-with-npm.bat
+++ b/bin/windows/typescript-angular-v4-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.yaml -c bin\typescript-petstore-npm.json -l typescript-angular -o samples\client\petstore\typescript-angular2\npm --additional-properties ngVersion=2
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -c bin\typescript-petstore-npm.json -l typescript-angular -o samples\client\petstore\typescript-angular-v4\npm --additional-properties ngVersion=4
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/typescript-angular2-petstore-all.bat b/bin/windows/typescript-angular2-petstore-all.bat
index 3378de085de..3d1a5179255 100755
--- a/bin/windows/typescript-angular2-petstore-all.bat
+++ b/bin/windows/typescript-angular2-petstore-all.bat
@@ -1,3 +1,3 @@
-call .\bin\windows\typescript-angular2-with-npm.bat
-call .\bin\windows\typescript-angular2-interfaces.bat
-call .\bin\windows\typescript-angular2.bat
+call .\bin\windows\typescript-angular-v2-with-npm.bat
+call .\bin\windows\typescript-angular-v2-interfaces.bat
+call .\bin\windows\typescript-angular-v2.bat
diff --git a/bin/windows/typescript-angular.bat b/bin/windows/typescript-angularjs.bat
similarity index 93%
rename from bin/windows/typescript-angular.bat
rename to bin/windows/typescript-angularjs.bat
index 9a3215c6c79..b33a07f367a 100755
--- a/bin/windows/typescript-angular.bat
+++ b/bin/windows/typescript-angularjs.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.yaml -l typescript-angularjs -o samples\client\petstore\typescript-angular
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l typescript-angularjs -o samples\client\petstore\typescript-angularjs
 
 java %JAVA_OPTS% -jar %executable% %ags%