diff --git a/Tools/bsptools/APLx64/convert.cmd b/Tools/bsptools/APLx64/convert.cmd
index 67ec6ced..803fdf6d 100644
--- a/Tools/bsptools/APLx64/convert.cmd
+++ b/Tools/bsptools/APLx64/convert.cmd
@@ -19,6 +19,23 @@ if [%BSP_ARCH%] neq [amd64] (
 )
 
 set DST_DIR=%BSPSRC_DIR%\APLx64
+pushd
+cd /D %DST_DIR%
+del /s /q *.wm.xml >nul 2>nul
+dir *.inf /b /s > %DST_DIR%\inflist.txt
+
+for /f "delims=" %%i in (%DST_DIR%\inflist.txt) do (
+    cd %%~pi
+    for %%A in (.) do ( set FILENAME=%%~nxA)
+    move !FILENAME!.pkg.xml !FILENAME!._pkg.xml >nul 2>nul
+    echo Processing %%~nxi 
+    call inf2pkg.cmd %%i !FILENAME! Intel
+)
+
+popd
+del %DST_DIR%\inflist.txt
+
+call convertpkg %DST_DIR%
 
 echo Fixing the BSPFM.xml file 
 powershell -Command "(gc %DST_DIR%\Packages\APLx64FM.XML) -replace 'Intel.APL64.OEM', '%%OEM_NAME%%.APL64.OEM' -replace 'Intel.APL64.Device', '%%OEM_NAME%%.APL64.Device' -replace 'FeatureIdentifierPackage=\"true\"', '' | Out-File %DST_DIR%\Packages\APLx64FM.xml -Encoding utf8"
diff --git a/Tools/bsptools/APLx86/convert.cmd b/Tools/bsptools/APLx86/convert.cmd
index f40c6123..3f1b16f1 100644
--- a/Tools/bsptools/APLx86/convert.cmd
+++ b/Tools/bsptools/APLx86/convert.cmd
@@ -19,6 +19,23 @@ if [%BSP_ARCH%] neq [x86] (
 )
 
 set DST_DIR=%BSPSRC_DIR%\APLx86
+pushd
+cd /D %DST_DIR%
+del /s /q *.wm.xml >nul 2>nul
+dir *.inf /b /s > %DST_DIR%\inflist.txt
+
+for /f "delims=" %%i in (%DST_DIR%\inflist.txt) do (
+    cd %%~pi
+    for %%A in (.) do ( set FILENAME=%%~nxA)
+    move !FILENAME!.pkg.xml !FILENAME!._pkg.xml >nul 2>nul
+    echo Processing %%~nxi 
+    call inf2pkg.cmd %%i !FILENAME! Intel
+)
+
+popd
+del %DST_DIR%\inflist.txt
+
+call convertpkg %DST_DIR%
 
 echo Fixing the BSPFM.xml file 
 powershell -Command "(gc %DST_DIR%\Packages\APLx86FM.XML) -replace 'Intel.APL.OEM', '%%OEM_NAME%%.APL.OEM' -replace 'Intel.APL.Device', '%%OEM_NAME%%.APL.Device' -replace 'FeatureIdentifierPackage=\"true\"', '' | Out-File %DST_DIR%\Packages\APLx86FM.xml -Encoding utf8"
diff --git a/Tools/bsptools/BSWx64/convert.cmd b/Tools/bsptools/BSWx64/convert.cmd
index b2775ad2..724c0350 100644
--- a/Tools/bsptools/BSWx64/convert.cmd
+++ b/Tools/bsptools/BSWx64/convert.cmd
@@ -35,6 +35,8 @@ for /f "delims=" %%i in (%DST_DIR%\inflist.txt) do (
 popd
 del %DST_DIR%\inflist.txt
 
+call convertpkg %DST_DIR%
+
 echo Fixing the BSPFM.xml file 
 powershell -Command "(gc %DST_DIR%\Packages\BSWx64FM.XML) -replace 'Intel.BSW64.OEM', '%%OEM_NAME%%.BSW64.OEM' -replace 'Intel.BSW64.Device', '%%OEM_NAME%%.BSW64.Device' -replace 'FeatureIdentifierPackage=\"true\"', '' | Out-File %DST_DIR%\Packages\BSWx64FM.xml -Encoding utf8"
 echo Fixing the TestOEMInput.xml file
diff --git a/Tools/bsptools/BSWx86/convert.cmd b/Tools/bsptools/BSWx86/convert.cmd
index d2f3e3c6..a869991e 100644
--- a/Tools/bsptools/BSWx86/convert.cmd
+++ b/Tools/bsptools/BSWx86/convert.cmd
@@ -35,6 +35,8 @@ for /f "delims=" %%i in (%DST_DIR%\inflist.txt) do (
 popd
 del %DST_DIR%\inflist.txt
 
+call convertpkg %DST_DIR%
+
 echo Fixing the BSPFM.xml file 
 powershell -Command "(gc %DST_DIR%\Packages\BSWx86FM.XML) -replace 'Intel.BSW.OEM', '%%OEM_NAME%%.BSW.OEM' -replace 'Intel.BSW.Device', '%%OEM_NAME%%.BSW.Device' -replace 'FeatureIdentifierPackage=\"true\"', '' | Out-File %DST_DIR%\Packages\BSWx86FM.xml -Encoding utf8"
 echo Fixing the TestOEMInput.xml file