12bdc95f62dc7adedca4b9f48262c4611a287b1b
diff --git a/programs/winecfg/drivedetect.c b/programs/winecfg/drivedetect.c
index 7c3cf3d..2b55ade 100644
--- a/programs/winecfg/drivedetect.c
+++ b/programs/winecfg/drivedetect.c
@@ -172,7 +172,7 @@ static void report_error(int code)
             if (gui_mode)
                 MessageBox(NULL, "No virtual drive C mapped\n\nTry running wineprefixcreate", "", MB_OK | MB_ICONEXCLAMATION);
             else
-                fprintf(stderr, "winecfg: no drive_c directory\n");
+                fprintf(stderr, "winecfg: no drive C mapped\n");
 
         case NO_HOME:
             if (gui_mode)
@@ -250,14 +250,14 @@ static void ensure_drive_c_is_mapped(voi
     
     if (drives[2].in_use) return;
 
-    len = snprintf(NULL, 0, "%s/../drive_c", configdir);
+    len = snprintf(NULL, 0, "%s/../harddiskvolume1", configdir);
     drive_c_dir = HeapAlloc(GetProcessHeap(), 0, len);
-    snprintf(drive_c_dir, len, "%s/../drive_c", configdir);
+    snprintf(drive_c_dir, len, "%s/../harddiskvolume1", configdir);
     HeapFree(GetProcessHeap(), 0, drive_c_dir);
 
     if (stat(drive_c_dir, &buf) == 0)
     {
-        add_drive('C', "../drive_c", "Virtual Windows Drive", "0", DRIVE_FIXED);
+        add_drive('C', "../harddiskvolume1", "Virtual Windows Drive", "0", DRIVE_FIXED);
     }
     else
     {
diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c
index ea80889..2dfc2a4 100644
--- a/programs/winecfg/driveui.c
+++ b/programs/winecfg/driveui.c
@@ -342,7 +342,7 @@ static void on_add_click(HWND dialog)
 
     WINE_TRACE("allocating drive letter %c\n", new);
 
-    if (new == 'C') add_drive(new, "../drive_c", "System Drive", "", DRIVE_FIXED);
+    if (new == 'C') add_drive(new, "../harddiskvolume1", "System Drive", "", DRIVE_FIXED);
     else add_drive(new, "/", "", "", DRIVE_UNKNOWN);
 
     fill_drives_list(dialog);
@@ -525,7 +525,7 @@ static void on_edit_changed(HWND dialog,
 
             path = get_text(dialog, id);
             HeapFree(GetProcessHeap(), 0, current_drive->unixpath);
-            current_drive->unixpath = path ? path : strdupA("drive_c");
+            current_drive->unixpath = path ? path : strdupA("harddiskvolume1");
 
             WINE_TRACE("set path to %s\n", current_drive->unixpath);
 
diff --git a/tools/wineprefixcreate.in b/tools/wineprefixcreate.in
index 3effdb5..dcff18c 100644
--- a/tools/wineprefixcreate.in
+++ b/tools/wineprefixcreate.in
@@ -142,8 +142,8 @@ WINEPREFIX=`cd "$WINEPREFIX" && pwd`
 if [ ! -d "$WINEPREFIX/dosdevices" ]
 then
     mkdir "$WINEPREFIX/dosdevices"
-    [ -d "$WINEPREFIX/drive_c" ] || mkdir "$WINEPREFIX/drive_c"
-    ln -s "../drive_c" "$WINEPREFIX/dosdevices/c:"
+    [ -d "$WINEPREFIX/harddiskvolume1" ] || mkdir "$WINEPREFIX/harddiskvolume1"
+    ln -s "../harddiskvolume1" "$WINEPREFIX/dosdevices/c:"
     ln -s "/" "$WINEPREFIX/dosdevices/z:"
 fi