Index: DamClients/DamUI/trunk/Dam.Setup/Product.wxs
===================================================================
diff -u -r6706 -r6735
--- DamClients/DamUI/trunk/Dam.Setup/Product.wxs	(.../Product.wxs)	(revision 6706)
+++ DamClients/DamUI/trunk/Dam.Setup/Product.wxs	(.../Product.wxs)	(revision 6735)
@@ -5,7 +5,7 @@
            Version="$(var.ProductVersion)" Manufacturer="Deltares" UpgradeCode="$(var.UpgradeGuid)" 
            InstallerVersion="200">
 
-    <!--Look for current version of Ds_Flex in registry -->
+    <!--Look for current version of DS_Flex in registry -->
     <Property Id="DSFLEXVERSION" Secure="yes">
       <RegistrySearch Id="DSFlexVersion"
                       Root="HKLM"
@@ -27,7 +27,7 @@
     <Launch Message="There is a problem. The Common Files Files are missing or too old (Found [COMMONFILESVERSION] is smaller than required $(var.MinimumCommonFilesVersion)). A new version must be installed before we can install [ProductName].>"
             Condition="Installed OR (COMMONFILESVERSION >= &quot;$(var.MinimumCommonFilesVersion)&quot;)" />
 
-    <!-- Add the launch condition for the check on Ds_Flex version (>= MinimumDsFlexVersion) -->
+    <!-- Add the launch condition for the check on DS_Flex version (>= MinimumDsFlexVersion) -->
     <!-- This launch condition should not be needed when the common files are installed properly  -->
     <!-- but we keep it for when DAM or other programs do not (or no longer) need the common files  -->
     <Launch Message="There is a problem. The Ds_Flex Files are missing or too old (Found [DSFLEXVERSION] is smaller than required $(var.MinimumDsFlexVersion)). A new version must be installed before we can install [ProductName]."
@@ -39,23 +39,22 @@
       <Files Include="$(var.ReleaseFolder)\**\*" />
     </ComponentGroup>
     <!-- Tutorial files -->
-    <Property Id="PROGRAMTUTORIALS" Secure="yes"/>
-    <CustomAction Id="SetTutorialsDir" Property="PROGRAMTUTORIALS" 
+    <Property Id="TUTORIALFILES" Secure="yes"/>
+    <CustomAction Id="SetTutorialsDir" Property="TUTORIALFILES" 
                   Value="C:\Users\Public\Documents\Deltares\$(var.ProductIdWithVersion)"/>
     <InstallUISequence>
       <Custom Action="SetTutorialsDir" Before="CostInitialize" Condition="NOT Installed"/>
     </InstallUISequence>
 
-    <ComponentGroup Id="TutorialFilesComponent" Directory="PROGRAMTUTORIALS">
+    <ComponentGroup Id="TutorialFilesComponent" Directory="TUTORIALFILES">
         <Component Id="TutorialFilesComponents" Guid="$(var.ExamplesDirGuid)">
             <RegistryValue Root="HKMU" Key="Software\[Manufacturer]\$(var.ProductIdWithVersion)" 
-                           Name="PROGRAMTUTORIALS" Type="integer" Value="1" KeyPath="yes" />
-            <RemoveFolder Id="PROGRAMTUTORIALS" Directory="PROGRAMTUTORIALS" On="uninstall" />
+                           Name="TUTORIALFILES" Type="integer" Value="1" KeyPath="yes" />
+            <RemoveFolder Id="TUTORIALFILES" Directory="TUTORIALFILES" On="uninstall" />
         </Component>
         <Files Include="$(var.TutorialFolder)\**\*" />
     </ComponentGroup>
-    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." 
-                  AllowSameVersionUpgrades="yes" />
+    
     <MediaTemplate EmbedCab="yes" />
     <Icon Id="icon.ico" SourceFile="$(var.ProjectDir)\resources\$(var.ProductId).ico" />
     
@@ -113,7 +112,7 @@
       </StandardDirectory>
       
       <!-- Public Documents folder for the tutorials -->
-      <Directory Id="PROGRAMTUTORIALS" Name="$(var.ProductIdWithVersion)"/>
+      <Directory Id="TUTORIALFILES" Name="$(var.ProductIdWithVersion)"/>
   </Fragment>
 
   <!-- Desktop application shortcut -->