diff --git a/checkin_notes b/checkin_notes
index ce2c7f1956..747fa75751 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -2923,3 +2923,12 @@ David  21 Mar 2012
     client/
         app.h
         app_control.cpp
+
+Rom    21 Mar 2012
+    - VBOX: We don't need to display the state of the VM before startup.
+    - VBOX: Change the snapshot naming scheme by removing the quotes and
+        prefixing the checkpoint time with 'boinc_'.  Hopefully this will
+        prevent the VM from asserting during the snapshot process.
+
+    samples/vboxwrapper/
+        vbox.cpp, .h
diff --git a/samples/vboxwrapper/vbox.cpp b/samples/vboxwrapper/vbox.cpp
index c4751427bc..0bd2e586e5 100644
--- a/samples/vboxwrapper/vbox.cpp
+++ b/samples/vboxwrapper/vbox.cpp
@@ -219,7 +219,7 @@ int VBOX_VM::run(double elapsed_time) {
     vm_name = vm_master_name;
 
     // Check to see if the VM is already in a running state, if so, poweroff.
-    poll();
+    poll(false);
     if (online) {
         poweroff();
     }
@@ -398,18 +398,16 @@ int VBOX_VM::createsnapshot(double elapsed_time, double checkpoint_cpu_time) {
     // Create new snapshot
     sprintf(buf, "%d", (int)elapsed_time);
     command = "snapshot \"" + vm_name + "\" ";
-    command += "take \"";
+    command += "take boinc_";
     command += buf;
-    command += "\" ";
     retval = vbm_popen(command, output, "create new snapshot");
     if (retval) return retval;
 
     // Delete stale snapshot
     sprintf(buf, "%d", (int)checkpoint_cpu_time);
     command = "snapshot \"" + vm_name + "\" ";
-    command += "delete \"";
+    command += "delete boinc_";
     command += buf;
-    command += "\" ";
     retval = vbm_popen(command, output, "delete stale snapshot");
     if (retval) return retval;
 
diff --git a/win_build/vboxwrapper.vcproj b/win_build/vboxwrapper.vcproj
index ba3f9cf477..3991d329a8 100644
--- a/win_build/vboxwrapper.vcproj
+++ b/win_build/vboxwrapper.vcproj
@@ -81,13 +81,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libcmt.lib libcpmt.lib kernel32.lib user32.lib gdi32.lib ole32.lib wsock32.lib"
-				OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25433_windows_intelx86.exe"
+				OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25469_windows_intelx86.exe"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreAllDefaultLibraries="true"
 				DelayLoadDLLs=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25433_windows_intelx86.pdb"
+				ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25469_windows_intelx86.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -182,13 +182,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libcmt.lib libcpmt.lib  kernel32.lib user32.lib gdi32.lib ole32.lib wsock32.lib"
-				OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25433_windows_x86_64.exe"
+				OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25469_windows_x86_64.exe"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreAllDefaultLibraries="true"
 				DelayLoadDLLs=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25433_windows_x86_64.pdb"
+				ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25469_windows_x86_64.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>