diff --git a/CLIENT_DATA/delsub32.opsiscript b/CLIENT_DATA/delsub32.opsiscript
index 0b80923..954632a 100644
--- a/CLIENT_DATA/delsub32.opsiscript
+++ b/CLIENT_DATA/delsub32.opsiscript
@@ -3,7 +3,7 @@
 ; and published under the Terms of the General Public License.
 ; credits: http://www.opsi.org/en/credits/
 
-Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe"
+Set $UninstallProgram$ = $InstallDir$ + "\" + $UninstallExecutable$
 Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini"
 
 if FileExists($IniFile$)
@@ -16,8 +16,8 @@ else
 endif
 
 if FileExists($IniFile$)
-	Set $UninstallExec$ = GetValueFromInifile($IniFile$,"X86","UninstallExec","XXXXXXXX.exe")
-	Set $UninstallProgramOld$ = $InstallDir$ + $UninstallExec$
+	Set $UninstallExecutable$ = GetValueFromInifile($IniFile$,"X86","UninstallExecutable","XXXXXXXX.exe")
+	Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallExecutable$
 	if FileExists($UninstallProgramOld$)
 		comment "Uninstall program found, starting uninstall"
 		Winbatch_uninstall_old
diff --git a/CLIENT_DATA/setup32.opsiscript b/CLIENT_DATA/setup32.opsiscript
index 0cb3bcb..df504c5 100644
--- a/CLIENT_DATA/setup32.opsiscript
+++ b/CLIENT_DATA/setup32.opsiscript
@@ -7,7 +7,6 @@
 requiredWinstVersion >= "4.11.4.6"
 ScriptErrorMessages=off
 
-DefVar $UninstallExec$
 DefVar $UninstallProgramOld$
 DefVar $IniFile$
 DefVar $IniCfgFile$
diff --git a/CLIENT_DATA/uninstall32.opsiscript b/CLIENT_DATA/uninstall32.opsiscript
index a8f6c36..c804100 100644
--- a/CLIENT_DATA/uninstall32.opsiscript
+++ b/CLIENT_DATA/uninstall32.opsiscript
@@ -7,7 +7,6 @@
 requiredWinstVersion >= "4.11.4.6"
 ScriptErrorMessages=off
 
-DefVar $UninstallExec$
 DefVar $UninstallProgramOld$
 DefVar $IniFile$
 DefVar $IniCfgFile$
diff --git a/builder-product.cfg b/builder-product.cfg
index fbc2795..e4e0c5f 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -33,6 +33,6 @@ WINST_NAME[0]="ProgramExecutable"
 WINST_VALUE[0]="Telegram.exe"
 
 OPSI_INI_SECTION[0]="X86"
-OPSI_INI_OPTION[0]="UninstallProgram"
+OPSI_INI_OPTION[0]="UninstallExecutable"
 OPSI_INI_VALUE[0]="unins000.exe"