Index: /trunk/doc/manual/en_US/user_Installation.xml
===================================================================
--- /trunk/doc/manual/en_US/user_Installation.xml	(revision 58564)
+++ /trunk/doc/manual/en_US/user_Installation.xml	(revision 58565)
@@ -204,5 +204,5 @@
         <glosslist>
           <glossentry>
-            <glossterm><para>VBOXINSTALLDESKTOPSHORTCUT</para></glossterm>
+            <glossterm><para>VBOX_INSTALLDESKTOPSHORTCUT</para></glossterm>
 
             <glossdef>
@@ -216,5 +216,5 @@
 
           <glossentry>
-            <glossterm><para>VBOXINSTALLQUICKLAUNCHSHORTCUT</para></glossterm>
+            <glossterm><para>VBOX_INSTALLQUICKLAUNCHSHORTCUT</para></glossterm>
 
             <glossdef>
@@ -228,5 +228,5 @@
 
           <glossentry>
-            <glossterm><para>VBOXREGISTERFILEEXTENSIONS</para></glossterm>
+            <glossterm><para>VBOX_REGISTERFILEEXTENSIONS</para></glossterm>
 
             <glossdef>
@@ -242,5 +242,5 @@
 
           <glossentry>
-            <glossterm><para>VBOXSTART</para></glossterm>
+            <glossterm><para>VBOX_START</para></glossterm>
 
             <para>Specifies whether or not VirtualBox should be started right after
Index: /trunk/src/VBox/Installer/win/UserInterface.wxi
===================================================================
--- /trunk/src/VBox/Installer/win/UserInterface.wxi	(revision 58564)
+++ /trunk/src/VBox/Installer/win/UserInterface.wxi	(revision 58565)
@@ -394,13 +394,13 @@
                  Also see: http://osdir.com/ml/windows.devel.wix.user/2005-02/msg00300.html -->
             <Control Id="DesktopShortcutCheckBox" Type="CheckBox" X="25" Y="95" Width="200" Height="17"
-                     Property="VBOXINSTALLDESKTOPSHORTCUT" CheckBoxValue="1" Default="no">
+                     Property="VBOX_INSTALLDESKTOPSHORTCUT" CheckBoxValue="1" Default="no">
                 <Text>!(loc.Customize2Dlg_CreateShortcut)</Text>
             </Control>
             <Control Id="QuicklaunchShortcutCheckBox" Type="CheckBox" X="25" Y="115" Width="200" Height="17"
-                     Property="VBOXINSTALLQUICKLAUNCHSHORTCUT" CheckBoxValue="1" Default="no">
+                     Property="VBOX_INSTALLQUICKLAUNCHSHORTCUT" CheckBoxValue="1" Default="no">
                 <Text>!(loc.Customize2Dlg_CreateQuickLaunch)</Text>
             </Control>
             <Control Id="RegisterFileExtensionsCheckBox" Type="CheckBox" X="25" Y="135" Width="200" Height="17"
-                     Property="VBOXREGISTERFILEEXTENSIONS" CheckBoxValue="1" Default="no">
+                     Property="VBOX_REGISTERFILEEXTENSIONS" CheckBoxValue="1" Default="no">
                 <Text>!(loc.Customize2Dlg_RegisterFileExtensions)</Text>
             </Control>
Index: /trunk/src/VBox/Installer/win/VirtualBox.wxs
===================================================================
--- /trunk/src/VBox/Installer/win/VirtualBox.wxs	(revision 58564)
+++ /trunk/src/VBox/Installer/win/VirtualBox.wxs	(revision 58565)
@@ -76,22 +76,22 @@
 
     <!-- Whether or not a desktop shortcut should be created. -->
-    <Property Id="VBOXINSTALLDESKTOPSHORTCUT" Value="1" Secure="yes"/>
-    <SetProperty Id="VBOXINSTALLDESKTOPSHORTCUT" After="AppSearch" Sequence="both"
-                 Value="{}"><![CDATA[VBOXINSTALLDESKTOPSHORTCUT="0"]]></SetProperty>
+    <Property Id="VBOX_INSTALLDESKTOPSHORTCUT" Value="1" Secure="yes"/>
+    <SetProperty Id="VBOX_INSTALLDESKTOPSHORTCUT" After="AppSearch" Sequence="both"
+                 Value="{}"><![CDATA[VBOX_INSTALLDESKTOPSHORTCUT="0"]]></SetProperty>
 
     <!-- Whether or not a desktop shortcut for the Quick Launch Bar should be created -->
-    <Property Id="VBOXINSTALLQUICKLAUNCHSHORTCUT" Value="1" Secure="yes"/>
-    <SetProperty Id="VBOXINSTALLQUICKLAUNCHSHORTCUT" After="AppSearch" Sequence="both"
-                 Value="{}"><![CDATA[VBOXINSTALLQUICKLAUNCHSHORTCUT="0"]]></SetProperty>
+    <Property Id="VBOX_INSTALLQUICKLAUNCHSHORTCUT" Value="1" Secure="yes"/>
+    <SetProperty Id="VBOX_INSTALLQUICKLAUNCHSHORTCUT" After="AppSearch" Sequence="both"
+                 Value="{}"><![CDATA[VBOX_INSTALLQUICKLAUNCHSHORTCUT="0"]]></SetProperty>
 
     <!-- Whether or not registering of known desktop shortcut for the Quick Launch Bar should be created -->
-    <Property Id="VBOXREGISTERFILEEXTENSIONS" Value="1" Secure="yes"/>
-    <SetProperty Id="VBOXREGISTERFILEEXTENSIONS" After="AppSearch" Sequence="both"
-                 Value="{}"><![CDATA[VBOXREGISTERFILEEXTENSIONS="0"]]></SetProperty>
+    <Property Id="VBOX_REGISTERFILEEXTENSIONS" Value="1" Secure="yes"/>
+    <SetProperty Id="VBOX_REGISTERFILEEXTENSIONS" After="AppSearch" Sequence="both"
+                 Value="{}"><![CDATA[VBOX_REGISTERFILEEXTENSIONS="0"]]></SetProperty>
 
     <!-- Whether or not VirtualBox should be started automatically right after successful installation -->
-    <Property Id="VBOXSTART" Value="1" Secure="yes"/>
-    <SetProperty Id="VBOXSTART" After="AppSearch" Sequence="both"
-                 Value="{}"><![CDATA[VBOXSTART="0"]]></SetProperty>
+    <Property Id="VBOX_START" Value="1" Secure="yes"/>
+    <SetProperty Id="VBOX_START" After="AppSearch" Sequence="both"
+                 Value="{}"><![CDATA[VBOX_START="0"]]></SetProperty>
 
     <!-- Make sure installation will not start on anything other but the NT family -->