diff --git a/bin/installer/full/sections/extras.iss b/bin/installer/full/sections/extras.iss
index e8ae622..52a62ec 100644
--- a/bin/installer/full/sections/extras.iss
+++ b/bin/installer/full/sections/extras.iss
@@ -4,10 +4,10 @@ Name: "extras\sendto"; Description: "Add toolkit menu to ""Send To"""; Types: fu
 
 [Icons]
 ; x64
-Name: "{userappdata}\Microsoft\Windows\SendTo\{#MyAppName}"; Filename: "{#MyAppBinsFolder}\sendto\sendto_x64.exe"; WorkingDir: "{#MyAppBinsFolder}\sendto\"; IconFilename: "{#MyAppToolsIconsFolder}\toolkit.ico"; Components: "extras\sendto"; Check: Is64BitInstallMode;
+Name: "{userappdata}\Microsoft\Windows\SendTo\{#MyAppNameOriginal}"; Filename: "{#MyAppBinsFolder}\sendto\sendto_x64.exe"; WorkingDir: "{#MyAppBinsFolder}\sendto\"; IconFilename: "{#MyAppToolsIconsFolder}\toolkit.ico"; Components: "extras\sendto"; Check: Is64BitInstallMode;
 
 ; x32
-Name: "{userappdata}\Microsoft\Windows\SendTo\{#MyAppName}"; Filename: "{#MyAppBinsFolder}\sendto\sendto_x86.exe"; WorkingDir: "{#MyAppBinsFolder}\sendto\"; IconFilename: "{#MyAppToolsIconsFolder}\toolkit.ico"; Components: "extras\sendto"; Check: not Is64BitInstallMode;
+Name: "{userappdata}\Microsoft\Windows\SendTo\{#MyAppNameOriginal}"; Filename: "{#MyAppBinsFolder}\sendto\sendto_x86.exe"; WorkingDir: "{#MyAppBinsFolder}\sendto\"; IconFilename: "{#MyAppToolsIconsFolder}\toolkit.ico"; Components: "extras\sendto"; Check: not Is64BitInstallMode;
 
 
 
diff --git a/bin/installer/full/sections/updater.iss b/bin/installer/full/sections/updater.iss
index 7ba8639..1a47193 100644
--- a/bin/installer/full/sections/updater.iss
+++ b/bin/installer/full/sections/updater.iss
@@ -7,8 +7,8 @@ Source: "{#MySrcDir}\bin\updater\*"; DestDir: "{#MyAppBinsFolder}\updater"; Comp
 Source: "{#MySrcDir}\bin\hstart\*"; Destdir: "{#MyAppBinsFolder}\hstart\"; Components: "updater\main"; Flags: ignoreversion recursesubdirs createallsubdirs;
 
 [Icons]
-Name: "{group}\{#MyAppName}\Toolkit Updater"; Filename: "{#MyAppBinsFolder}\updater\updater.exe"; WorkingDir: "{#MyAppBinsFolder}\updater"; Components: "updater\main";
-Name: "{userdesktop}\{#MyAppName}\Toolkit Updater"; Filename: "{#MyAppBinsFolder}\updater\updater.exe"; WorkingDir: "{#MyAppBinsFolder}\updater"; Components: "updater\main";
+Name: "{group}\Toolkit Updater"; Filename: "{#MyAppBinsFolder}\updater\updater.exe"; WorkingDir: "{#MyAppBinsFolder}\updater"; Components: "updater\main";
+Name: "{userdesktop}\{#MyAppNameOriginal}\Toolkit Updater"; Filename: "{#MyAppBinsFolder}\updater\updater.exe"; WorkingDir: "{#MyAppBinsFolder}\updater"; Components: "updater\main";
 
 ; Fix default update config
 [INI]
diff --git a/bin/installer/lite/sections/extras.iss b/bin/installer/lite/sections/extras.iss
index e8ae622..52a62ec 100644
--- a/bin/installer/lite/sections/extras.iss
+++ b/bin/installer/lite/sections/extras.iss
@@ -4,10 +4,10 @@ Name: "extras\sendto"; Description: "Add toolkit menu to ""Send To"""; Types: fu
 
 [Icons]
 ; x64
-Name: "{userappdata}\Microsoft\Windows\SendTo\{#MyAppName}"; Filename: "{#MyAppBinsFolder}\sendto\sendto_x64.exe"; WorkingDir: "{#MyAppBinsFolder}\sendto\"; IconFilename: "{#MyAppToolsIconsFolder}\toolkit.ico"; Components: "extras\sendto"; Check: Is64BitInstallMode;
+Name: "{userappdata}\Microsoft\Windows\SendTo\{#MyAppNameOriginal}"; Filename: "{#MyAppBinsFolder}\sendto\sendto_x64.exe"; WorkingDir: "{#MyAppBinsFolder}\sendto\"; IconFilename: "{#MyAppToolsIconsFolder}\toolkit.ico"; Components: "extras\sendto"; Check: Is64BitInstallMode;
 
 ; x32
-Name: "{userappdata}\Microsoft\Windows\SendTo\{#MyAppName}"; Filename: "{#MyAppBinsFolder}\sendto\sendto_x86.exe"; WorkingDir: "{#MyAppBinsFolder}\sendto\"; IconFilename: "{#MyAppToolsIconsFolder}\toolkit.ico"; Components: "extras\sendto"; Check: not Is64BitInstallMode;
+Name: "{userappdata}\Microsoft\Windows\SendTo\{#MyAppNameOriginal}"; Filename: "{#MyAppBinsFolder}\sendto\sendto_x86.exe"; WorkingDir: "{#MyAppBinsFolder}\sendto\"; IconFilename: "{#MyAppToolsIconsFolder}\toolkit.ico"; Components: "extras\sendto"; Check: not Is64BitInstallMode;
 
 
 
diff --git a/bin/installer/lite/sections/updater.iss b/bin/installer/lite/sections/updater.iss
index 7ba8639..1a47193 100644
--- a/bin/installer/lite/sections/updater.iss
+++ b/bin/installer/lite/sections/updater.iss
@@ -7,8 +7,8 @@ Source: "{#MySrcDir}\bin\updater\*"; DestDir: "{#MyAppBinsFolder}\updater"; Comp
 Source: "{#MySrcDir}\bin\hstart\*"; Destdir: "{#MyAppBinsFolder}\hstart\"; Components: "updater\main"; Flags: ignoreversion recursesubdirs createallsubdirs;
 
 [Icons]
-Name: "{group}\{#MyAppName}\Toolkit Updater"; Filename: "{#MyAppBinsFolder}\updater\updater.exe"; WorkingDir: "{#MyAppBinsFolder}\updater"; Components: "updater\main";
-Name: "{userdesktop}\{#MyAppName}\Toolkit Updater"; Filename: "{#MyAppBinsFolder}\updater\updater.exe"; WorkingDir: "{#MyAppBinsFolder}\updater"; Components: "updater\main";
+Name: "{group}\Toolkit Updater"; Filename: "{#MyAppBinsFolder}\updater\updater.exe"; WorkingDir: "{#MyAppBinsFolder}\updater"; Components: "updater\main";
+Name: "{userdesktop}\{#MyAppNameOriginal}\Toolkit Updater"; Filename: "{#MyAppBinsFolder}\updater\updater.exe"; WorkingDir: "{#MyAppBinsFolder}\updater"; Components: "updater\main";
 
 ; Fix default update config
 [INI]