diff --git a/CLIENT_DATA/delsub3264.ins b/CLIENT_DATA/delsub3264.ins
index e071146..20e2647 100644
--- a/CLIENT_DATA/delsub3264.ins
+++ b/CLIENT_DATA/delsub3264.ins
@@ -72,10 +72,10 @@ comment "Delete program shortcuts"
 LinkFolder_uninstall
 
 [Winbatch_uninstall_old_32]
-"$UninstallProgramOld32$" /s /u
+"$UninstallProgramOld32$" /x /s
 
 [Winbatch_uninstall_32]
-"$UninstallProgram32$" /s /u
+"$UninstallProgram32$" /x /s
 
 [Files_uninstall_32]
 ; Example for recursively deleting the installation directory (don't forget the trailing backslash):
@@ -83,10 +83,10 @@ LinkFolder_uninstall
 delete -sf "$InstallDir32$\"
 
 [Winbatch_uninstall_old_64]
-"$UninstallProgramOld64$" /s /u
+"$UninstallProgramOld64$" /x /s
 
 [Winbatch_uninstall_64]
-"$UninstallProgram64$" /s /u
+"$UninstallProgram64$" /x /s
 
 [Files_uninstall_64]
 ; Example for recursively deleting the installation directory:
diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins
index 1e52675..d226c72 100644
--- a/CLIENT_DATA/setup3264.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -48,8 +48,8 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; no white space use '-' as a seperator
 Set $MinimumSpace$    = "60 MB"
 ; the path were we find the product after the installation
-Set $InstallDir32$      = "%ProgramFiles32Dir%\Securtiy Essentials"
-Set $InstallDir64$      = "%ProgramFiles64Dir%\Securtiy Essentials"
+Set $InstallDir32$      = "%ProgramFiles32Dir%\Microsoft Security Client"
+Set $InstallDir64$      = "%ProgramFiles64Dir%\Microsoft Security Client"
 ; ----------------------------------------------------------------
 
 Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
diff --git a/CLIENT_DATA/uninstall3264.ins b/CLIENT_DATA/uninstall3264.ins
index ecd2794..783df94 100644
--- a/CLIENT_DATA/uninstall3264.ins
+++ b/CLIENT_DATA/uninstall3264.ins
@@ -44,8 +44,8 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
-Set $InstallDir32$    = "%ProgramFiles32Dir%\Security Essentials"
-Set $InstallDir64$    = "%ProgramFiles64Dir%\Security Essentials"
+Set $InstallDir32$    = "%ProgramFiles32Dir%\Microsoft Security Client"
+Set $InstallDir64$    = "%ProgramFiles64Dir%\Microsoft Security Client"
 ; ----------------------------------------------------------------
 
 Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
diff --git a/builder-product.cfg b/builder-product.cfg
index b7251df..d9c2090 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -32,9 +32,9 @@ ICON_DL_INDEX=0
 
 OPSI_INI_SECTION[0]="X86"
 OPSI_INI_OPTION[0]="UninstallProg32"
-OPSI_INI_VALUE[0]="mseinstall.exe"
+OPSI_INI_VALUE[0]="Setup.exe"
 
 OPSI_INI_SECTION[1]="X86_64"
 OPSI_INI_OPTION[1]="UninstallProg64"
-OPSI_INI_VALUE[1]="mseinstall.exe"
+OPSI_INI_VALUE[1]="Setup.exe"