diff --git a/wim/mount-wim.cmd b/wim/mount-image.cmd
similarity index 96%
rename from wim/mount-wim.cmd
rename to wim/mount-image.cmd
index 5e84195..c96ad3e 100644
--- a/wim/mount-wim.cmd
+++ b/wim/mount-image.cmd
@@ -1,10 +1,10 @@
-@echo off
-set SOURCES=c:\TEMP\W10\sources
-set MNT=c:\TEMP\WIM
-
-echo creating wim mountpoint ...
-mkdir %MNT% 1>nul 2>nul
-
-echo mounting install.wim to %MNT% ...
-dism /Mount-Wim /WimFile:%SOURCES%\install.wim /Name:"Windows 10 Pro" /MountDir:%MNT%
-
+@echo off
+set SOURCES=c:\TEMP\W10\sources
+set MNT=c:\TEMP\WIM
+
+echo creating wim mountpoint ...
+mkdir %MNT% 1>nul 2>nul
+
+echo mounting install.wim to %MNT% ...
+dism /Mount-Wim /WimFile:%SOURCES%\install.wim /Name:"Windows 10 Pro" /MountDir:%MNT%
+
diff --git a/wim/remove-apps.cmd b/wim/remove-apps.cmd
index c3e350d..407c48d 100644
--- a/wim/remove-apps.cmd
+++ b/wim/remove-apps.cmd
@@ -44,6 +44,8 @@ dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.XboxSpee
 dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.YourPhone_2019.430.2026.0_neutral_~_8wekyb3d8bbwe
 dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.ZuneMusic_2019.19071.19011.0_neutral_~_8wekyb3d8bbwe
 dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.ZuneVideo_2019.19071.19011.0_neutral_~_8wekyb3d8bbwe
+dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.StorePurchaseApp_11811.1001.1813.0_neutral_~_8wekyb3d8bbwe
+dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.WindowsStore_11910.1002.513.0_neutral_~_8wekyb3d8bbwe
 
 @echo off
 
diff --git a/wim/remove-packages.cmd b/wim/remove-packages.cmd
index 809e04e..b5a8d36 100644
--- a/wim/remove-packages.cmd
+++ b/wim/remove-packages.cmd
@@ -165,8 +165,6 @@ for %%P in (
   Microsoft-Windows-WPD-UltimatePortableDeviceFeature-Feature
   Microsoft-Windows-Xps
   Microsoft-Xbox
-  microsoft-onecore-applicationmodel
-  Microsoft-OneCore-ApplicationModel
   Microsoft-OneCore-IsolatedUserMode
   Microsoft-OneCore-Multimedia-CastingCommon
   Microsoft-OneCore-Multimedia-CastingReceiver
diff --git a/wim/umount-wim.cmd b/wim/umount.image.cmd
similarity index 95%
rename from wim/umount-wim.cmd
rename to wim/umount.image.cmd
index cb1608a..1c2ab2b 100644
--- a/wim/umount-wim.cmd
+++ b/wim/umount.image.cmd
@@ -1,10 +1,10 @@
-@echo off
-set SOURCES=c:\TEMP\W10\sources
-set MNT=c:\TEMP\WIM
-
-echo unmounting wim and discarding changes ...
-dism /Unmount-Wim /MountDir:%MNT% /Discard
-
-echo cleaning up ...
-dism /Cleanup-Wim 
-
+@echo off
+set SOURCES=c:\TEMP\W10\sources
+set MNT=c:\TEMP\WIM
+
+echo unmounting wim and discarding changes ...
+dism /Unmount-Wim /MountDir:%MNT% /Discard
+
+echo cleaning up ...
+dism /Cleanup-Wim 
+