Index: Application/Riskeer/src/Application.Riskeer.Setup/Product.wxs
===================================================================
diff -u -rb1be91dba855dec94b1029df5b7f28d173823aef -r29f403310694d8f3fc902666e88a3542b0f1df96
--- Application/Riskeer/src/Application.Riskeer.Setup/Product.wxs	(.../Product.wxs)	(revision b1be91dba855dec94b1029df5b7f28d173823aef)
+++ Application/Riskeer/src/Application.Riskeer.Setup/Product.wxs	(.../Product.wxs)	(revision 29f403310694d8f3fc902666e88a3542b0f1df96)
@@ -64,7 +64,7 @@
               <Shortcut Id="ApplicationInstallDirShortcut"
                         Name="!(loc.ApplicationLongName)"
                         Description="!(loc.StartApplicationDescription)"
-                        Target="[BINDIR]$(var.Application.Riskeer.TargetFileName)"
+                        Target="[BINDIR]!(loc.ApplicationLongName).exe"
                         WorkingDirectory="INSTALLDIR"
                         Icon="Riskeer.ico"/>
               
@@ -95,7 +95,7 @@
               <Shortcut Id="ApplicationStartMenuShortcut"
                         Name="!(loc.ApplicationLongName)"
                         Description="!(loc.StartApplicationDescription)"
-                        Target="[BINDIR]$(var.Application.Riskeer.TargetFileName)"
+                        Target="[BINDIR]!(loc.ApplicationLongName).exe"
                         WorkingDirectory="INSTALLDIR"
                         Icon="Riskeer.ico"/>
               <RemoveFolder Id="RemoveProgramMenuShortcut" Directory="ProgramMenuRiskeer" On="uninstall" />
@@ -123,7 +123,7 @@
           <Shortcut Id="ApplicationDesktopShortcut"
                     Name="!(loc.ApplicationLongName)"
                     Description="!(loc.StartApplicationDescription)"
-                    Target="[BINDIR]$(var.Application.Riskeer.TargetFileName)"
+                    Target="[BINDIR]!(loc.ApplicationLongName).exe"
                     WorkingDirectory="INSTALLDIR"
                     Icon="Riskeer.ico"/>