Index: /trunk/include/VBox/pdmdrv.h
===================================================================
--- /trunk/include/VBox/pdmdrv.h	(revision 26165)
+++ /trunk/include/VBox/pdmdrv.h	(revision 26166)
@@ -224,5 +224,5 @@
     uint32_t            u32Version;
     /** Driver name. */
-    char                szDriverName[32];
+    char                szName[32];
     /** Name of the raw-mode context module (no path).
      * Only evalutated if PDM_DRVREG_FLAGS_RC is set. */
Index: /trunk/src/VBox/Devices/Audio/audio.c
===================================================================
--- /trunk/src/VBox/Devices/Audio/audio.c	(revision 26165)
+++ /trunk/src/VBox/Devices/Audio/audio.c	(revision 26166)
@@ -2046,5 +2046,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "AUDIO",
     /* szRCMod */
Index: /trunk/src/VBox/Devices/Input/DrvKeyboardQueue.cpp
===================================================================
--- /trunk/src/VBox/Devices/Input/DrvKeyboardQueue.cpp	(revision 26165)
+++ /trunk/src/VBox/Devices/Input/DrvKeyboardQueue.cpp	(revision 26166)
@@ -325,5 +325,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "KeyboardQueue",
     /* szRCMod */
Index: /trunk/src/VBox/Devices/Input/DrvMouseQueue.cpp
===================================================================
--- /trunk/src/VBox/Devices/Input/DrvMouseQueue.cpp	(revision 26165)
+++ /trunk/src/VBox/Devices/Input/DrvMouseQueue.cpp	(revision 26166)
@@ -312,5 +312,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "MouseQueue",
     /* szRCMod */
Index: /trunk/src/VBox/Devices/Network/DrvIntNet.cpp
===================================================================
--- /trunk/src/VBox/Devices/Network/DrvIntNet.cpp	(revision 26165)
+++ /trunk/src/VBox/Devices/Network/DrvIntNet.cpp	(revision 26166)
@@ -1173,5 +1173,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "IntNet",
     /* szRCMod */
Index: /trunk/src/VBox/Devices/Network/DrvNAT.cpp
===================================================================
--- /trunk/src/VBox/Devices/Network/DrvNAT.cpp	(revision 26165)
+++ /trunk/src/VBox/Devices/Network/DrvNAT.cpp	(revision 26166)
@@ -1197,5 +1197,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "NAT",
     /* szRCMod */
Index: /trunk/src/VBox/Devices/Network/DrvNetSniffer.cpp
===================================================================
--- /trunk/src/VBox/Devices/Network/DrvNetSniffer.cpp	(revision 26165)
+++ /trunk/src/VBox/Devices/Network/DrvNetSniffer.cpp	(revision 26166)
@@ -480,5 +480,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "NetSniffer",
     /* szRCMod */
Index: /trunk/src/VBox/Devices/Network/DrvTAP.cpp
===================================================================
--- /trunk/src/VBox/Devices/Network/DrvTAP.cpp	(revision 26165)
+++ /trunk/src/VBox/Devices/Network/DrvTAP.cpp	(revision 26166)
@@ -1061,5 +1061,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "HostInterface",
     /* szRCMod */
Index: /trunk/src/VBox/Devices/PC/DrvACPI.cpp
===================================================================
--- /trunk/src/VBox/Devices/PC/DrvACPI.cpp	(revision 26165)
+++ /trunk/src/VBox/Devices/PC/DrvACPI.cpp	(revision 26166)
@@ -769,5 +769,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "ACPIHost",
     /* szRCMod */
Index: /trunk/src/VBox/Devices/PC/DrvAcpiCpu.cpp
===================================================================
--- /trunk/src/VBox/Devices/PC/DrvAcpiCpu.cpp	(revision 26165)
+++ /trunk/src/VBox/Devices/PC/DrvAcpiCpu.cpp	(revision 26166)
@@ -96,5 +96,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "ACPICpu",
     /* szRCMod */
Index: /trunk/src/VBox/Devices/Parallel/DrvHostParallel.cpp
===================================================================
--- /trunk/src/VBox/Devices/Parallel/DrvHostParallel.cpp	(revision 26165)
+++ /trunk/src/VBox/Devices/Parallel/DrvHostParallel.cpp	(revision 26166)
@@ -394,5 +394,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "HostParallel",
     /* szRCMod */
Index: /trunk/src/VBox/Devices/Serial/DrvChar.cpp
===================================================================
--- /trunk/src/VBox/Devices/Serial/DrvChar.cpp	(revision 26165)
+++ /trunk/src/VBox/Devices/Serial/DrvChar.cpp	(revision 26166)
@@ -410,5 +410,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "Char",
     /* szRCMod */
Index: /trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp
===================================================================
--- /trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp	(revision 26165)
+++ /trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp	(revision 26166)
@@ -1459,5 +1459,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "Host Serial",
         /* szRCMod */
Index: /trunk/src/VBox/Devices/Serial/DrvNamedPipe.cpp
===================================================================
--- /trunk/src/VBox/Devices/Serial/DrvNamedPipe.cpp	(revision 26165)
+++ /trunk/src/VBox/Devices/Serial/DrvNamedPipe.cpp	(revision 26166)
@@ -608,5 +608,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "NamedPipe",
     /* szRCMod */
Index: /trunk/src/VBox/Devices/Serial/DrvRawFile.cpp
===================================================================
--- /trunk/src/VBox/Devices/Serial/DrvRawFile.cpp	(revision 26165)
+++ /trunk/src/VBox/Devices/Serial/DrvRawFile.cpp	(revision 26166)
@@ -212,5 +212,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "RawFile",
     /* szRCMod */
Index: /trunk/src/VBox/Devices/Storage/DrvBlock.cpp
===================================================================
--- /trunk/src/VBox/Devices/Storage/DrvBlock.cpp	(revision 26165)
+++ /trunk/src/VBox/Devices/Storage/DrvBlock.cpp	(revision 26166)
@@ -899,5 +899,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "Block",
     /* szRCMod */
Index: /trunk/src/VBox/Devices/Storage/DrvHostBase.cpp
===================================================================
--- /trunk/src/VBox/Devices/Storage/DrvHostBase.cpp	(revision 26165)
+++ /trunk/src/VBox/Devices/Storage/DrvHostBase.cpp	(revision 26166)
@@ -140,5 +140,5 @@
     PDRVHOSTBASE pThis = PDMIBLOCK_2_DRVHOSTBASE(pInterface);
     LogFlow(("%s-%d: drvHostBaseRead: off=%#llx pvBuf=%p cbRead=%#x (%s)\n",
-             pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, off, pvBuf, cbRead, pThis->pszDevice));
+             pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, off, pvBuf, cbRead, pThis->pszDevice));
     RTCritSectEnter(&pThis->CritSect);
 
@@ -197,13 +197,13 @@
                 Log2(("%s-%d: drvHostBaseRead: off=%#llx cbRead=%#x\n"
                       "%16.*Rhxd\n",
-                      pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, off, cbRead, cbRead, pvBuf));
+                      pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, off, cbRead, cbRead, pvBuf));
             }
             else
                 Log(("%s-%d: drvHostBaseRead: RTFileRead(%d, %p, %#x) -> %Rrc (off=%#llx '%s')\n",
-                     pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, pThis->FileDevice,
+                     pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->FileDevice,
                      pvBuf, cbRead, rc, off, pThis->pszDevice));
         }
         else
-            Log(("%s-%d: drvHostBaseRead: RTFileSeek(%d,%#llx,) -> %Rrc\n", pThis->pDrvIns->pReg->szDriverName,
+            Log(("%s-%d: drvHostBaseRead: RTFileSeek(%d,%#llx,) -> %Rrc\n", pThis->pDrvIns->pReg->szName,
                  pThis->pDrvIns->iInstance, pThis->FileDevice, off, rc));
 #endif
@@ -213,5 +213,5 @@
 
     RTCritSectLeave(&pThis->CritSect);
-    LogFlow(("%s-%d: drvHostBaseRead: returns %Rrc\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, rc));
+    LogFlow(("%s-%d: drvHostBaseRead: returns %Rrc\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, rc));
     return rc;
 }
@@ -223,8 +223,8 @@
     PDRVHOSTBASE pThis = PDMIBLOCK_2_DRVHOSTBASE(pInterface);
     LogFlow(("%s-%d: drvHostBaseWrite: off=%#llx pvBuf=%p cbWrite=%#x (%s)\n",
-             pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, off, pvBuf, cbWrite, pThis->pszDevice));
+             pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, off, pvBuf, cbWrite, pThis->pszDevice));
     Log2(("%s-%d: drvHostBaseWrite: off=%#llx cbWrite=%#x\n"
           "%16.*Rhxd\n",
-          pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, off, cbWrite, cbWrite, pvBuf));
+          pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, off, cbWrite, cbWrite, pvBuf));
     RTCritSectEnter(&pThis->CritSect);
 
@@ -251,10 +251,10 @@
                 if (RT_FAILURE(rc))
                     Log(("%s-%d: drvHostBaseWrite: RTFileWrite(%d, %p, %#x) -> %Rrc (off=%#llx '%s')\n",
-                         pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, pThis->FileDevice,
+                         pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->FileDevice,
                          pvBuf, cbWrite, rc, off, pThis->pszDevice));
             }
             else
                 Log(("%s-%d: drvHostBaseWrite: RTFileSeek(%d,%#llx,) -> %Rrc\n",
-                     pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, pThis->FileDevice, off, rc));
+                     pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->FileDevice, off, rc));
 #endif
         }
@@ -266,5 +266,5 @@
 
     RTCritSectLeave(&pThis->CritSect);
-    LogFlow(("%s-%d: drvHostBaseWrite: returns %Rrc\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, rc));
+    LogFlow(("%s-%d: drvHostBaseWrite: returns %Rrc\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, rc));
     return rc;
 }
@@ -277,5 +277,5 @@
     PDRVHOSTBASE pThis = PDMIBLOCK_2_DRVHOSTBASE(pInterface);
     LogFlow(("%s-%d: drvHostBaseFlush: (%s)\n",
-             pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, pThis->pszDevice));
+             pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->pszDevice));
     RTCritSectEnter(&pThis->CritSect);
 
@@ -293,5 +293,5 @@
 
     RTCritSectLeave(&pThis->CritSect);
-    LogFlow(("%s-%d: drvHostBaseFlush: returns %Rrc\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, rc));
+    LogFlow(("%s-%d: drvHostBaseFlush: returns %Rrc\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, rc));
     return rc;
 }
@@ -317,5 +317,5 @@
 
     RTCritSectLeave(&pThis->CritSect);
-    LogFlow(("%s-%d: drvHostBaseGetSize: returns %llu\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, cb));
+    LogFlow(("%s-%d: drvHostBaseGetSize: returns %llu\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, cb));
     return cb;
 }
@@ -326,5 +326,5 @@
 {
     PDRVHOSTBASE pThis = PDMIBLOCK_2_DRVHOSTBASE(pInterface);
-    LogFlow(("%s-%d: drvHostBaseGetType: returns %d\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, pThis->enmType));
+    LogFlow(("%s-%d: drvHostBaseGetType: returns %d\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->enmType));
     return pThis->enmType;
 }
@@ -338,5 +338,5 @@
     *pUuid = pThis->Uuid;
 
-    LogFlow(("%s-%d: drvHostBaseGetUuid: returns VINF_SUCCESS *pUuid=%RTuuid\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, pUuid));
+    LogFlow(("%s-%d: drvHostBaseGetUuid: returns VINF_SUCCESS *pUuid=%RTuuid\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pUuid));
     return VINF_SUCCESS;
 }
@@ -372,5 +372,5 @@
     RTCritSectLeave(&pThis->CritSect);
     LogFlow(("%s-%d: %s: returns %Rrc CHS={%d,%d,%d}\n",
-             pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, __FUNCTION__, rc, pThis->PCHSGeometry.cCylinders, pThis->PCHSGeometry.cHeads, pThis->PCHSGeometry.cSectors));
+             pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, __FUNCTION__, rc, pThis->PCHSGeometry.cCylinders, pThis->PCHSGeometry.cHeads, pThis->PCHSGeometry.cSectors));
     return rc;
 }
@@ -382,5 +382,5 @@
     PDRVHOSTBASE pThis = PDMIBLOCKBIOS_2_DRVHOSTBASE(pInterface);
     LogFlow(("%s-%d: %s: cCylinders=%d cHeads=%d cSectors=%d\n",
-             pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, __FUNCTION__, pPCHSGeometry->cCylinders, pPCHSGeometry->cHeads, pPCHSGeometry->cSectors));
+             pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, __FUNCTION__, pPCHSGeometry->cCylinders, pPCHSGeometry->cHeads, pPCHSGeometry->cSectors));
     RTCritSectEnter(&pThis->CritSect);
 
@@ -424,5 +424,5 @@
     RTCritSectLeave(&pThis->CritSect);
     LogFlow(("%s-%d: %s: returns %Rrc CHS={%d,%d,%d}\n",
-             pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, __FUNCTION__, rc, pThis->LCHSGeometry.cCylinders, pThis->LCHSGeometry.cHeads, pThis->LCHSGeometry.cSectors));
+             pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, __FUNCTION__, rc, pThis->LCHSGeometry.cCylinders, pThis->LCHSGeometry.cHeads, pThis->LCHSGeometry.cSectors));
     return rc;
 }
@@ -434,5 +434,5 @@
     PDRVHOSTBASE pThis = PDMIBLOCKBIOS_2_DRVHOSTBASE(pInterface);
     LogFlow(("%s-%d: %s: cCylinders=%d cHeads=%d cSectors=%d\n",
-             pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, __FUNCTION__, pLCHSGeometry->cCylinders, pLCHSGeometry->cHeads, pLCHSGeometry->cSectors));
+             pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, __FUNCTION__, pLCHSGeometry->cCylinders, pLCHSGeometry->cHeads, pLCHSGeometry->cSectors));
     RTCritSectEnter(&pThis->CritSect);
 
@@ -517,8 +517,8 @@
     }
     else
-        LogFlow(("%s-%d: drvHostBaseLock: already locked\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance));
+        LogFlow(("%s-%d: drvHostBaseLock: already locked\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance));
 
     RTCritSectLeave(&pThis->CritSect);
-    LogFlow(("%s-%d: drvHostBaseLock: returns %Rrc\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, rc));
+    LogFlow(("%s-%d: drvHostBaseLock: returns %Rrc\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, rc));
     return rc;
 }
@@ -540,8 +540,8 @@
     }
     else
-        LogFlow(("%s-%d: drvHostBaseUnlock: not locked\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance));
+        LogFlow(("%s-%d: drvHostBaseUnlock: not locked\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance));
 
     RTCritSectLeave(&pThis->CritSect);
-    LogFlow(("%s-%d: drvHostBaseUnlock: returns %Rrc\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, rc));
+    LogFlow(("%s-%d: drvHostBaseUnlock: returns %Rrc\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, rc));
     return rc;
 }
@@ -706,5 +706,5 @@
                      * Try claim the device.
                      */
-                    Log(("%s-%d: calling DADiskClaim on '%s'.\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, szName));
+                    Log(("%s-%d: calling DADiskClaim on '%s'.\n", pDrvIns->pReg->szName, pDrvIns->iInstance, szName));
                     int rcDA = -2;
                     DADiskClaim(pThis->pDADisk, kDADiskClaimOptionDefault, NULL, NULL, drvHostBaseDADoneCallback, &rcDA);
@@ -717,5 +717,5 @@
                          * Try unmount the device.
                          */
-                        Log(("%s-%d: calling DADiskUnmount on '%s'.\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, szName));
+                        Log(("%s-%d: calling DADiskUnmount on '%s'.\n", pDrvIns->pReg->szName, pDrvIns->iInstance, szName));
                         rcDA = -2;
                         DADiskUnmount(pThis->pDADisk, kDADiskUnmountOptionWhole, drvHostBaseDADoneCallback, &rcDA);
@@ -727,8 +727,8 @@
                             iTry = 99;
                             DASessionUnscheduleFromRunLoop(pThis->pDASession, CFRunLoopGetCurrent(), MY_RUN_LOOP_MODE);
-                            Log(("%s-%d: unmount succeed - retrying.\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance));
+                            Log(("%s-%d: unmount succeed - retrying.\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
                             continue;
                         }
-                        Log(("%s-%d: umount => rc32=%d & rcDA=%#x\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc32, rcDA));
+                        Log(("%s-%d: umount => rc32=%d & rcDA=%#x\n", pDrvIns->pReg->szName, pDrvIns->iInstance, rc32, rcDA));
 
                         /* failed - cleanup */
@@ -736,5 +736,5 @@
                     }
                     else
-                        Log(("%s-%d: claim => rc32=%d & rcDA=%#x\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc32, rcDA));
+                        Log(("%s-%d: claim => rc32=%d & rcDA=%#x\n", pDrvIns->pReg->szName, pDrvIns->iInstance, rc32, rcDA));
 
                     CFRelease(pThis->pDADisk);
@@ -742,5 +742,5 @@
                 }
                 else
-                    Log(("%s-%d: failed to open disk '%s'!\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, szName));
+                    Log(("%s-%d: failed to open disk '%s'!\n", pDrvIns->pReg->szName, pDrvIns->iInstance, szName));
 
                 DASessionUnscheduleFromRunLoop(pThis->pDASession, CFRunLoopGetCurrent(), MY_RUN_LOOP_MODE);
@@ -749,5 +749,5 @@
             }
             else
-                Log(("%s-%d: failed to create DA session!\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance));
+                Log(("%s-%d: failed to create DA session!\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
         }
         RTThreadSleep(10);
@@ -1073,5 +1073,5 @@
 {
 #ifndef RT_OS_DARWIN /* Only *one* open for darwin. */
-    LogFlow(("%s-%d: drvHostBaseReopen: '%s'\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, pThis->pszDeviceOpen));
+    LogFlow(("%s-%d: drvHostBaseReopen: '%s'\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->pszDeviceOpen));
 
     RTFILE FileDevice;
@@ -1096,5 +1096,5 @@
         if (!pThis->fReadOnlyConfig)
         {
-            LogFlow(("%s-%d: drvHostBaseReopen: '%s' - retry readonly (%Rrc)\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, pThis->pszDeviceOpen, rc));
+            LogFlow(("%s-%d: drvHostBaseReopen: '%s' - retry readonly (%Rrc)\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->pszDeviceOpen, rc));
 #ifdef RT_OS_SOLARIS
             rc = drvHostBaseOpen(pThis, &FileDevice, &FileRawDevice, false);
@@ -1106,5 +1106,5 @@
         {
             LogFlow(("%s-%d: failed to open device '%s', rc=%Rrc\n",
-                     pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, pThis->pszDevice, rc));
+                     pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->pszDevice, rc));
             return rc;
         }
@@ -1436,5 +1436,5 @@
     {
         LogFlow(("%s-%d: failed to figure media size of %s, rc=%Rrc\n",
-                 pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, pThis->pszDevice, rc));
+                 pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->pszDevice, rc));
         return rc;
     }
@@ -1448,5 +1448,5 @@
         pThis->pDrvMountNotify->pfnMountNotify(pThis->pDrvMountNotify);
     LogFlow(("%s-%d: drvHostBaseMediaPresent: cbSize=%lld (%#llx)\n",
-             pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, pThis->cbSize, pThis->cbSize));
+             pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->cbSize, pThis->cbSize));
     return VINF_SUCCESS;
 }
@@ -1543,5 +1543,5 @@
     PDRVHOSTBASE pThis = (PDRVHOSTBASE)pvUser;
     LogFlow(("%s-%d: drvHostBaseMediaThread: ThreadSelf=%p pvUser=%p\n",
-             pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, ThreadSelf, pvUser));
+             pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, ThreadSelf, pvUser));
 #ifdef RT_OS_WINDOWS
     static WNDCLASS s_classDeviceChange = {0};
@@ -1576,8 +1576,8 @@
     if (!hwnd)
     {
-        LogFlow(("%s-%d: drvHostBaseMediaThread: returns VERR_GENERAL_FAILURE\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance));
+        LogFlow(("%s-%d: drvHostBaseMediaThread: returns VERR_GENERAL_FAILURE\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance));
         return VERR_GENERAL_FAILURE;
     }
-    LogFlow(("%s-%d: drvHostBaseMediaThread: Created hwndDeviceChange=%p\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, hwnd));
+    LogFlow(("%s-%d: drvHostBaseMediaThread: Created hwndDeviceChange=%p\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, hwnd));
 
     /*
@@ -1644,5 +1644,5 @@
 
     /* (Don't clear the thread handle here, the destructor thread is using it to wait.) */
-    LogFlow(("%s-%d: drvHostBaseMediaThread: returns VINF_SUCCESS\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance));
+    LogFlow(("%s-%d: drvHostBaseMediaThread: returns VINF_SUCCESS\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance));
     return VINF_SUCCESS;
 }
@@ -1661,5 +1661,5 @@
 {
     PDRVHOSTBASE pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTBASE);
-    LogFlow(("%s-%d: drvHostBaseMediaThread:\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance));
+    LogFlow(("%s-%d: drvHostBaseMediaThread:\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance));
     RTCritSectEnter(&pThis->CritSect);
 
@@ -1683,5 +1683,5 @@
 {
     PDRVHOSTBASE pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTBASE);
-    LogFlow(("%s-%d: drvHostBaseDestruct: iInstance=%d\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, pDrvIns->iInstance));
+    LogFlow(("%s-%d: drvHostBaseDestruct: iInstance=%d\n", pDrvIns->pReg->szName, pDrvIns->iInstance, pDrvIns->iInstance));
 
     /*
@@ -1758,5 +1758,5 @@
     if (pThis->ppScsiTaskDI)
     {
-        LogFlow(("%s-%d: releasing exclusive scsi access!\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance));
+        LogFlow(("%s-%d: releasing exclusive scsi access!\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
         (*pThis->ppScsiTaskDI)->ReleaseExclusiveAccess(pThis->ppScsiTaskDI);
         (*pThis->ppScsiTaskDI)->Release(pThis->ppScsiTaskDI);
@@ -1765,5 +1765,5 @@
     if (pThis->pDADisk)
     {
-        LogFlow(("%s-%d: unclaiming the disk!\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance));
+        LogFlow(("%s-%d: unclaiming the disk!\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
         DADiskUnclaim(pThis->pDADisk);
         CFRelease(pThis->pDADisk);
@@ -1772,5 +1772,5 @@
     if (pThis->ppMMCDI)
     {
-        LogFlow(("%s-%d: releasing the MMC object!\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance));
+        LogFlow(("%s-%d: releasing the MMC object!\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
         (*pThis->ppMMCDI)->Release(pThis->ppMMCDI);
         pThis->ppMMCDI = NULL;
@@ -1783,5 +1783,5 @@
     if (pThis->pDASession)
     {
-        LogFlow(("%s-%d: releasing the DA session!\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance));
+        LogFlow(("%s-%d: releasing the DA session!\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
         CFRelease(pThis->pDASession);
         pThis->pDASession = NULL;
@@ -1830,5 +1830,5 @@
     if (!pThis->fKeepInstance && RTCritSectIsInitialized(&pThis->CritSect))
         RTCritSectDelete(&pThis->CritSect);
-    LogFlow(("%s-%d: drvHostBaseDestruct completed\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance));
+    LogFlow(("%s-%d: drvHostBaseDestruct completed\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
 }
 
@@ -1850,5 +1850,5 @@
 {
     PDRVHOSTBASE pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTBASE);
-    LogFlow(("%s-%d: DRVHostBaseInitData: iInstance=%d\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, pDrvIns->iInstance));
+    LogFlow(("%s-%d: DRVHostBaseInitData: iInstance=%d\n", pDrvIns->pReg->szName, pDrvIns->iInstance, pDrvIns->iInstance));
 
     /*
@@ -2045,5 +2045,5 @@
     /* log config summary */
     Log(("%s-%d: pszDevice='%s' (%s) cMilliesPoller=%d fReadOnlyConfig=%d fLocked=%d fBIOSVisible=%d Uuid=%RTuuid\n",
-         pDrvIns->pReg->szDriverName, pDrvIns->iInstance, pThis->pszDevice, pThis->pszDeviceOpen, pThis->cMilliesPoller,
+         pDrvIns->pReg->szName, pDrvIns->iInstance, pThis->pszDevice, pThis->pszDeviceOpen, pThis->cMilliesPoller,
          pThis->fReadOnlyConfig, pThis->fLocked, pThis->fBiosVisible, &pThis->Uuid));
 
Index: /trunk/src/VBox/Devices/Storage/DrvHostDVD.cpp
===================================================================
--- /trunk/src/VBox/Devices/Storage/DrvHostDVD.cpp	(revision 26165)
+++ /trunk/src/VBox/Devices/Storage/DrvHostDVD.cpp	(revision 26166)
@@ -828,5 +828,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "HostDVD",
     /* szRCMod */
Index: /trunk/src/VBox/Devices/Storage/DrvHostFloppy.cpp
===================================================================
--- /trunk/src/VBox/Devices/Storage/DrvHostFloppy.cpp	(revision 26165)
+++ /trunk/src/VBox/Devices/Storage/DrvHostFloppy.cpp	(revision 26166)
@@ -202,5 +202,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "HostFloppy",
     /* szRCMod */
Index: /trunk/src/VBox/Devices/Storage/DrvMediaISO.cpp
===================================================================
--- /trunk/src/VBox/Devices/Storage/DrvMediaISO.cpp	(revision 26165)
+++ /trunk/src/VBox/Devices/Storage/DrvMediaISO.cpp	(revision 26166)
@@ -293,5 +293,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "MediaISO",
     /* szRCMod */
Index: /trunk/src/VBox/Devices/Storage/DrvRawImage.cpp
===================================================================
--- /trunk/src/VBox/Devices/Storage/DrvRawImage.cpp	(revision 26165)
+++ /trunk/src/VBox/Devices/Storage/DrvRawImage.cpp	(revision 26166)
@@ -345,5 +345,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "RawImage",
     /* szRCMod */
Index: /trunk/src/VBox/Devices/Storage/DrvSCSI.cpp
===================================================================
--- /trunk/src/VBox/Devices/Storage/DrvSCSI.cpp	(revision 26165)
+++ /trunk/src/VBox/Devices/Storage/DrvSCSI.cpp	(revision 26166)
@@ -1025,5 +1025,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "SCSI",
     /* szRCMod */
Index: /trunk/src/VBox/Devices/Storage/DrvSCSIHost.cpp
===================================================================
--- /trunk/src/VBox/Devices/Storage/DrvSCSIHost.cpp	(revision 26165)
+++ /trunk/src/VBox/Devices/Storage/DrvSCSIHost.cpp	(revision 26166)
@@ -498,5 +498,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "SCSIHost",
     /* szRCMod */
Index: /trunk/src/VBox/Devices/Storage/DrvVD.cpp
===================================================================
--- /trunk/src/VBox/Devices/Storage/DrvVD.cpp	(revision 26165)
+++ /trunk/src/VBox/Devices/Storage/DrvVD.cpp	(revision 26166)
@@ -1334,5 +1334,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "VD",
     /* szRCMod */
Index: /trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp	(revision 26165)
+++ /trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp	(revision 26166)
@@ -1240,5 +1240,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "MainDisplay",
     /* szRCMod */
Index: /trunk/src/VBox/Frontends/VBoxBFE/KeyboardImpl.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxBFE/KeyboardImpl.cpp	(revision 26165)
+++ /trunk/src/VBox/Frontends/VBoxBFE/KeyboardImpl.cpp	(revision 26166)
@@ -257,5 +257,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "MainKeyboard",
     /* szRCMod */
Index: /trunk/src/VBox/Frontends/VBoxBFE/MouseImpl.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxBFE/MouseImpl.cpp	(revision 26165)
+++ /trunk/src/VBox/Frontends/VBoxBFE/MouseImpl.cpp	(revision 26166)
@@ -262,5 +262,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "MainMouse",
     /* szRCMod */
Index: /trunk/src/VBox/Frontends/VBoxBFE/StatusImpl.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxBFE/StatusImpl.cpp	(revision 26165)
+++ /trunk/src/VBox/Frontends/VBoxBFE/StatusImpl.cpp	(revision 26166)
@@ -197,5 +197,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "MainStatus",
     /* szRCMod */
Index: /trunk/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp	(revision 26165)
+++ /trunk/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp	(revision 26166)
@@ -477,5 +477,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "HGCM",
     /* szRCMod */
Index: /trunk/src/VBox/Main/AudioSnifferInterface.cpp
===================================================================
--- /trunk/src/VBox/Main/AudioSnifferInterface.cpp	(revision 26165)
+++ /trunk/src/VBox/Main/AudioSnifferInterface.cpp	(revision 26166)
@@ -213,5 +213,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "MainAudioSniffer",
     /* szRCMod */
Index: /trunk/src/VBox/Main/ConsoleImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/ConsoleImpl.cpp	(revision 26165)
+++ /trunk/src/VBox/Main/ConsoleImpl.cpp	(revision 26166)
@@ -8238,5 +8238,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "MainStatus",
     /* szRCMod */
Index: /trunk/src/VBox/Main/DisplayImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/DisplayImpl.cpp	(revision 26165)
+++ /trunk/src/VBox/Main/DisplayImpl.cpp	(revision 26166)
@@ -3499,5 +3499,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "MainDisplay",
     /* szRCMod */
Index: /trunk/src/VBox/Main/KeyboardImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/KeyboardImpl.cpp	(revision 26165)
+++ /trunk/src/VBox/Main/KeyboardImpl.cpp	(revision 26166)
@@ -321,5 +321,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "MainKeyboard",
     /* szRCMod */
Index: /trunk/src/VBox/Main/MouseImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/MouseImpl.cpp	(revision 26165)
+++ /trunk/src/VBox/Main/MouseImpl.cpp	(revision 26166)
@@ -446,5 +446,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "MainMouse",
     /* szRCMod */
Index: /trunk/src/VBox/Main/VMMDevInterface.cpp
===================================================================
--- /trunk/src/VBox/Main/VMMDevInterface.cpp	(revision 26165)
+++ /trunk/src/VBox/Main/VMMDevInterface.cpp	(revision 26166)
@@ -819,5 +819,5 @@
     /* u32Version */
     PDM_DRVREG_VERSION,
-    /* szDriverName */
+    /* szName */
     "HGCM",
     /* szRCMod */
Index: /trunk/src/VBox/VMM/PDM.cpp
===================================================================
--- /trunk/src/VBox/VMM/PDM.cpp	(revision 26165)
+++ /trunk/src/VBox/VMM/PDM.cpp	(revision 26166)
@@ -504,5 +504,5 @@
             {
                 LogFlow(("pdmR3DevTerm: Destroying - driver '%s'/%d on LUN#%d of device '%s'/%d\n",
-                         pDrvIns->pReg->szDriverName, pDrvIns->iInstance, pLun->iLun, pszDevice, iInstance));
+                         pDrvIns->pReg->szName, pDrvIns->iInstance, pLun->iLun, pszDevice, iInstance));
                 pDrvIns->pReg->pfnDestruct(pDrvIns);
             }
@@ -926,10 +926,10 @@
     {
         LogFlow(("PDMR3PowerOn: Notifying - driver '%s'/%d on LUN#%d of device '%s'/%d\n",
-                 pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
+                 pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
         int rc = VINF_SUCCESS; pDrvIns->pReg->pfnPowerOn(pDrvIns);
         if (RT_FAILURE(rc))
         {
             LogRel(("PDMR3PowerOn: driver '%s'/%d on LUN#%d of device '%s'/%d -> %Rrc\n",
-                    pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance, rc));
+                    pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance, rc));
             return rc;
         }
@@ -1060,9 +1060,9 @@
             {
                 LogFlow(("PDMR3Reset: Notifying - driver '%s'/%d on LUN#%d of device '%s'/%d\n",
-                         pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
+                         pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
                 pDrvIns->pReg->pfnReset(pDrvIns);
                 if (pDrvIns->Internal.s.pfnAsyncNotify)
                     LogFlow(("PDMR3Reset: Async notification started - driver '%s'/%d on LUN#%d of device '%s'/%d\n",
-                             pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
+                             pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
             }
             else if (pDrvIns->Internal.s.pfnAsyncNotify(pDrvIns))
@@ -1070,5 +1070,5 @@
                 pDrvIns->Internal.s.pfnAsyncNotify = false;
                 LogFlow(("PDMR3Reset: Async notification completed - driver '%s'/%d on LUN#%d of device '%s'/%d\n",
-                         pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
+                         pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
             }
             if (pDrvIns->Internal.s.pfnAsyncNotify)
@@ -1286,9 +1286,9 @@
             {
                 LogFlow(("PDMR3Suspend: Notifying - driver '%s'/%d on LUN#%d of device '%s'/%d\n",
-                         pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
+                         pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
                 pDrvIns->pReg->pfnSuspend(pDrvIns);
                 if (pDrvIns->Internal.s.pfnAsyncNotify)
                     LogFlow(("PDMR3Suspend: Async notification started - driver '%s'/%d on LUN#%d of device '%s'/%d\n",
-                             pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
+                             pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
             }
             else if (pDrvIns->Internal.s.pfnAsyncNotify(pDrvIns))
@@ -1296,5 +1296,5 @@
                 pDrvIns->Internal.s.pfnAsyncNotify = false;
                 LogFlow(("PDMR3Suspend: Async notification completed - driver '%s'/%d on LUN#%d of device '%s'/%d\n",
-                         pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
+                         pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
             }
             if (pDrvIns->Internal.s.pfnAsyncNotify)
@@ -1484,10 +1484,10 @@
     {
         LogFlow(("PDMR3Resume: Notifying - driver '%s'/%d on LUN#%d of device '%s'/%d\n",
-                 pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
+                 pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
         int rc = VINF_SUCCESS; pDrvIns->pReg->pfnResume(pDrvIns);
         if (RT_FAILURE(rc))
         {
             LogRel(("PDMR3Resume: driver '%s'/%d on LUN#%d of device '%s'/%d -> %Rrc\n",
-                    pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance, rc));
+                    pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance, rc));
             return rc;
         }
@@ -1618,9 +1618,9 @@
             {
                 LogFlow(("PDMR3PowerOff: Notifying - driver '%s'/%d on LUN#%d of device '%s'/%d\n",
-                         pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
+                         pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
                 pDrvIns->pReg->pfnPowerOff(pDrvIns);
                 if (pDrvIns->Internal.s.pfnAsyncNotify)
                     LogFlow(("PDMR3PowerOff: Async notification started - driver '%s'/%d on LUN#%d of device '%s'/%d\n",
-                             pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
+                             pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
             }
             else if (pDrvIns->Internal.s.pfnAsyncNotify(pDrvIns))
@@ -1628,5 +1628,5 @@
                 pDrvIns->Internal.s.pfnAsyncNotify = false;
                 LogFlow(("PDMR3PowerOff: Async notification completed - driver '%s'/%d on LUN#%d of device '%s'/%d\n",
-                         pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
+                         pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
             }
             if (pDrvIns->Internal.s.pfnAsyncNotify)
Index: /trunk/src/VBox/VMM/PDMDevice.cpp
===================================================================
--- /trunk/src/VBox/VMM/PDMDevice.cpp	(revision 26165)
+++ /trunk/src/VBox/VMM/PDMDevice.cpp	(revision 26166)
@@ -938,5 +938,5 @@
                 while (pDrvIns)
                 {
-                    if (!strcmp(pDrvIns->pReg->szDriverName, pszDriver))
+                    if (!strcmp(pDrvIns->pReg->szName, pszDriver))
                     {
                         if (iOccurance == 0)
Index: /trunk/src/VBox/VMM/PDMDriver.cpp
===================================================================
--- /trunk/src/VBox/VMM/PDMDriver.cpp	(revision 26165)
+++ /trunk/src/VBox/VMM/PDMDriver.cpp	(revision 26166)
@@ -279,44 +279,44 @@
                     ("%#x\n", pReg->u32Version),
                     VERR_PDM_UNKNOWN_DRVREG_VERSION);
-    AssertReturn(pReg->szDriverName[0], VERR_PDM_INVALID_DRIVER_REGISTRATION);
-    AssertMsgReturn(memchr(pReg->szDriverName, '\0', sizeof(pReg->szDriverName)),
-                    (".*s\n", sizeof(pReg->szDriverName), pReg->szDriverName),
+    AssertReturn(pReg->szName[0], VERR_PDM_INVALID_DRIVER_REGISTRATION);
+    AssertMsgReturn(memchr(pReg->szName, '\0', sizeof(pReg->szName)),
+                    (".*s\n", sizeof(pReg->szName), pReg->szName),
                     VERR_PDM_INVALID_DRIVER_REGISTRATION);
     AssertMsgReturn(    !(pReg->fFlags & PDM_DRVREG_FLAGS_R0)
                     ||  (   pReg->szR0Mod[0]
                          && memchr(pReg->szR0Mod, '\0', sizeof(pReg->szR0Mod))),
-                    ("%s: %.*s\n", pReg->szDriverName, sizeof(pReg->szR0Mod), pReg->szR0Mod),
+                    ("%s: %.*s\n", pReg->szName, sizeof(pReg->szR0Mod), pReg->szR0Mod),
                     VERR_PDM_INVALID_DRIVER_REGISTRATION);
     AssertMsgReturn(    !(pReg->fFlags & PDM_DRVREG_FLAGS_RC)
                     ||  (   pReg->szRCMod[0]
                          && memchr(pReg->szRCMod, '\0', sizeof(pReg->szRCMod))),
-                    ("%s: %.*s\n", pReg->szDriverName, sizeof(pReg->szRCMod), pReg->szRCMod),
+                    ("%s: %.*s\n", pReg->szName, sizeof(pReg->szRCMod), pReg->szRCMod),
                     VERR_PDM_INVALID_DRIVER_REGISTRATION);
     AssertMsgReturn(VALID_PTR(pReg->pszDescription),
-                    ("%s: %p\n", pReg->szDriverName, pReg->pszDescription),
+                    ("%s: %p\n", pReg->szName, pReg->pszDescription),
                     VERR_PDM_INVALID_DRIVER_REGISTRATION);
     AssertMsgReturn(!(pReg->fFlags & ~(PDM_DRVREG_FLAGS_HOST_BITS_MASK | PDM_DRVREG_FLAGS_R0 | PDM_DRVREG_FLAGS_RC)),
-                    ("%s: %#x\n", pReg->szDriverName, pReg->fFlags),
+                    ("%s: %#x\n", pReg->szName, pReg->fFlags),
                     VERR_PDM_INVALID_DRIVER_REGISTRATION);
     AssertMsgReturn((pReg->fFlags & PDM_DRVREG_FLAGS_HOST_BITS_MASK) == PDM_DRVREG_FLAGS_HOST_BITS_DEFAULT,
-                    ("%s: %#x\n", pReg->szDriverName, pReg->fFlags),
+                    ("%s: %#x\n", pReg->szName, pReg->fFlags),
                     VERR_PDM_INVALID_DRIVER_HOST_BITS);
     AssertMsgReturn(pReg->cMaxInstances > 0,
-                    ("%s: %#x\n", pReg->szDriverName, pReg->cMaxInstances),
+                    ("%s: %#x\n", pReg->szName, pReg->cMaxInstances),
                     VERR_PDM_INVALID_DRIVER_REGISTRATION);
     AssertMsgReturn(pReg->cbInstance <= _1M,
-                    ("%s: %#x\n", pReg->szDriverName, pReg->cbInstance),
+                    ("%s: %#x\n", pReg->szName, pReg->cbInstance),
                     VERR_PDM_INVALID_DRIVER_REGISTRATION);
     AssertMsgReturn(VALID_PTR(pReg->pfnConstruct),
-                    ("%s: %p\n", pReg->szDriverName, pReg->pfnConstruct),
+                    ("%s: %p\n", pReg->szName, pReg->pfnConstruct),
                     VERR_PDM_INVALID_DRIVER_REGISTRATION);
     AssertMsgReturn(VALID_PTR(pReg->pfnRelocate) || !(pReg->fFlags & PDM_DRVREG_FLAGS_RC),
-                    ("%s: %#x\n", pReg->szDriverName, pReg->cbInstance),
+                    ("%s: %#x\n", pReg->szName, pReg->cbInstance),
                     VERR_PDM_INVALID_DRIVER_REGISTRATION);
     AssertMsgReturn(pReg->pfnSoftReset == NULL,
-                    ("%s: %p\n", pReg->szDriverName, pReg->pfnSoftReset),
+                    ("%s: %p\n", pReg->szName, pReg->pfnSoftReset),
                     VERR_PDM_INVALID_DRIVER_REGISTRATION);
     AssertMsgReturn(pReg->u32VersionEnd == PDM_DRVREG_VERSION,
-                    ("%s: #x\n", pReg->szDriverName, pReg->u32VersionEnd),
+                    ("%s: #x\n", pReg->szName, pReg->u32VersionEnd),
                     VERR_PDM_INVALID_DRIVER_REGISTRATION);
 
@@ -329,7 +329,7 @@
     for (; pDrv; pDrvPrev = pDrv, pDrv = pDrv->pNext)
     {
-        if (!strcmp(pDrv->pReg->szDriverName, pReg->szDriverName))
-        {
-            AssertMsgFailed(("Driver '%s' already exists\n", pReg->szDriverName));
+        if (!strcmp(pDrv->pReg->szName, pReg->szName))
+        {
+            AssertMsgFailed(("Driver '%s' already exists\n", pReg->szName));
             return VERR_PDM_DRIVER_NAME_CLASH;
         }
@@ -351,5 +351,5 @@
         else
             pRegCB->pVM->pdm.s.pDrvs = pDrv;
-        Log(("PDM: Registered driver '%s'\n", pReg->szDriverName));
+        Log(("PDM: Registered driver '%s'\n", pReg->szName));
         return VINF_SUCCESS;
     }
@@ -365,5 +365,5 @@
 {
     for (PPDMDRV pDrv = pVM->pdm.s.pDrvs; pDrv; pDrv = pDrv->pNext)
-        if (!strcmp(pDrv->pReg->szDriverName, pszName))
+        if (!strcmp(pDrv->pReg->szName, pszName))
             return pDrv;
     return NULL;
@@ -500,13 +500,13 @@
                         if (pLun)
                             Log(("PDM: Attached driver %p:'%s'/%d to LUN#%d on device '%s'/%d, pDrvAbove=%p:'%s'/%d\n",
-                                 pNew, pDrv->pReg->szDriverName, pNew->iInstance,
+                                 pNew, pDrv->pReg->szName, pNew->iInstance,
                                  pLun->iLun,
                                  pLun->pDevIns ? pLun->pDevIns->pReg->szName : pLun->pUsbIns->pReg->szName,
                                  pLun->pDevIns ? pLun->pDevIns->iInstance             : pLun->pUsbIns->iInstance,
-                                 pDrvAbove, pDrvAbove ? pDrvAbove->pReg->szDriverName : "", pDrvAbove ? pDrvAbove->iInstance : -1));
+                                 pDrvAbove, pDrvAbove ? pDrvAbove->pReg->szName : "", pDrvAbove ? pDrvAbove->iInstance : -1));
                         else
                             Log(("PDM: Attached driver %p:'%s'/%d, pDrvAbove=%p:'%s'/%d\n",
-                                 pNew, pDrv->pReg->szDriverName, pNew->iInstance,
-                                 pDrvAbove, pDrvAbove ? pDrvAbove->pReg->szDriverName : "", pDrvAbove ? pDrvAbove->iInstance : -1));
+                                 pNew, pDrv->pReg->szName, pNew->iInstance,
+                                 pDrvAbove, pDrvAbove ? pDrvAbove->pReg->szName : "", pDrvAbove ? pDrvAbove->iInstance : -1));
                     }
                     else
@@ -554,5 +554,5 @@
 {
     PDMDRV_ASSERT_DRVINS(pDrvIns);
-    LogFlow(("pdmR3DrvDetach: pDrvIns=%p '%s'/%d\n", pDrvIns, pDrvIns->pReg->szDriverName, pDrvIns->iInstance));
+    LogFlow(("pdmR3DrvDetach: pDrvIns=%p '%s'/%d\n", pDrvIns, pDrvIns->pReg->szName, pDrvIns->iInstance));
     VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
 
@@ -562,5 +562,5 @@
     if (pDrvIns->Internal.s.fDetaching)
     {
-        AssertMsgFailed(("Recursive detach! '%s'/%d\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance));
+        AssertMsgFailed(("Recursive detach! '%s'/%d\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
         return VINF_SUCCESS;           }
 
@@ -610,5 +610,5 @@
         while (pCur->Internal.s.pDown)
             pCur = pCur->Internal.s.pDown;
-        LogFlow(("pdmR3DrvDestroyChain: pCur=%p '%s'/%d\n", pCur, pCur->pReg->szDriverName, pCur->iInstance));
+        LogFlow(("pdmR3DrvDestroyChain: pCur=%p '%s'/%d\n", pCur, pCur->pReg->szName, pCur->iInstance));
 
         /*
@@ -693,5 +693,5 @@
     PVM pVM = pDrvIns->Internal.s.pVMR3;
     VM_ASSERT_EMT(pVM);
-    LogFlow(("pdmR3DrvHlp_Attach: caller='%s'/%d: fFlags=%#x\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, fFlags));
+    LogFlow(("pdmR3DrvHlp_Attach: caller='%s'/%d: fFlags=%#x\n", pDrvIns->pReg->szName, pDrvIns->iInstance, fFlags));
     Assert(!(fFlags & ~(PDM_TACH_FLAGS_NOT_HOT_PLUG)));
 
@@ -720,5 +720,5 @@
 
     LogFlow(("pdmR3DrvHlp_Attach: caller='%s'/%d: return %Rrc\n",
-             pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc));
+             pDrvIns->pReg->szName, pDrvIns->iInstance, rc));
     return rc;
 }
@@ -730,5 +730,5 @@
     PDMDRV_ASSERT_DRVINS(pDrvIns);
     LogFlow(("pdmR3DrvHlp_Detach: caller='%s'/%d: fFlags=%#x\n",
-             pDrvIns->pReg->szDriverName, pDrvIns->iInstance, fFlags));
+             pDrvIns->pReg->szName, pDrvIns->iInstance, fFlags));
     VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
 
@@ -746,5 +746,5 @@
 
     LogFlow(("pdmR3DrvHlp_Detach: caller='%s'/%d: returns %Rrc\n",
-             pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc));
+             pDrvIns->pReg->szName, pDrvIns->iInstance, rc));
     return rc;
 }
@@ -756,5 +756,5 @@
     PDMDRV_ASSERT_DRVINS(pDrvIns);
     LogFlow(("pdmR3DrvHlp_DetachSelf: caller='%s'/%d: fFlags=%#x\n",
-             pDrvIns->pReg->szDriverName, pDrvIns->iInstance, fFlags));
+             pDrvIns->pReg->szName, pDrvIns->iInstance, fFlags));
     VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
 
@@ -771,5 +771,5 @@
     PDMDRV_ASSERT_DRVINS(pDrvIns);
     LogFlow(("pdmR3DrvHlp_MountPrepare: caller='%s'/%d: pszFilename=%p:{%s} pszCoreDriver=%p:{%s}\n",
-             pDrvIns->pReg->szDriverName, pDrvIns->iInstance, pszFilename, pszFilename, pszCoreDriver, pszCoreDriver));
+             pDrvIns->pReg->szName, pDrvIns->iInstance, pszFilename, pszFilename, pszCoreDriver, pszCoreDriver));
     VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
 
@@ -818,5 +818,5 @@
                 {
                     LogFlow(("pdmR3DrvHlp_MountPrepare: caller='%s'/%d: returns %Rrc (Driver=%s)\n",
-                             pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc, pszCoreDriver));
+                             pDrvIns->pReg->szName, pDrvIns->iInstance, rc, pszCoreDriver));
                     return rc;
                 }
@@ -835,5 +835,5 @@
 
     LogFlow(("pdmR3DrvHlp_MountPrepare: caller='%s'/%d: returns %Rrc\n",
-             pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc));
+             pDrvIns->pReg->szName, pDrvIns->iInstance, rc));
     return rc;
 }
@@ -848,5 +848,5 @@
 
     char szMsg[100];
-    RTStrPrintf(szMsg, sizeof(szMsg), "AssertEMT '%s'/%d\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance);
+    RTStrPrintf(szMsg, sizeof(szMsg), "AssertEMT '%s'/%d\n", pDrvIns->pReg->szName, pDrvIns->iInstance);
     RTAssertMsg1Weak(szMsg, iLine, pszFile, pszFunction);
     AssertBreakpoint();
@@ -864,5 +864,5 @@
 
     char szMsg[100];
-    RTStrPrintf(szMsg, sizeof(szMsg), "AssertOther '%s'/%d\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance);
+    RTStrPrintf(szMsg, sizeof(szMsg), "AssertOther '%s'/%d\n", pDrvIns->pReg->szName, pDrvIns->iInstance);
     RTAssertMsg1Weak(szMsg, iLine, pszFile, pszFunction);
     AssertBreakpoint();
@@ -921,5 +921,5 @@
     VMSTATE enmVMState = VMR3GetState(pDrvIns->Internal.s.pVMR3);
 
-    LogFlow(("pdmR3DrvHlp_VMState: caller='%s'/%d: returns %d (%s)\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance,
+    LogFlow(("pdmR3DrvHlp_VMState: caller='%s'/%d: returns %d (%s)\n", pDrvIns->pReg->szName, pDrvIns->iInstance,
              enmVMState, VMR3GetStateName(enmVMState)));
     return enmVMState;
@@ -934,5 +934,5 @@
     bool fRc = VMR3TeleportedAndNotFullyResumedYet(pDrvIns->Internal.s.pVMR3);
 
-    LogFlow(("pdmR3DrvHlp_VMState: caller='%s'/%d: returns %RTbool)\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance,
+    LogFlow(("pdmR3DrvHlp_VMState: caller='%s'/%d: returns %RTbool)\n", pDrvIns->pReg->szName, pDrvIns->iInstance,
              fRc));
     return fRc;
@@ -946,5 +946,5 @@
     PDMDRV_ASSERT_DRVINS(pDrvIns);
     LogFlow(("pdmR3DrvHlp_PDMQueueCreate: caller='%s'/%d: cbItem=%d cItems=%d cMilliesInterval=%d pfnCallback=%p pszName=%p:{%s} ppQueue=%p\n",
-             pDrvIns->pReg->szDriverName, pDrvIns->iInstance, cbItem, cItems, cMilliesInterval, pfnCallback, pszName, pszName, ppQueue, ppQueue));
+             pDrvIns->pReg->szName, pDrvIns->iInstance, cbItem, cItems, cMilliesInterval, pfnCallback, pszName, pszName, ppQueue, ppQueue));
     PVM pVM = pDrvIns->Internal.s.pVMR3;
     VM_ASSERT_EMT(pVM);
@@ -958,5 +958,5 @@
     int rc = PDMR3QueueCreateDriver(pVM, pDrvIns, cbItem, cItems, cMilliesInterval, pfnCallback, pszName, ppQueue);
 
-    LogFlow(("pdmR3DrvHlp_PDMQueueCreate: caller='%s'/%d: returns %Rrc *ppQueue=%p\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc, *ppQueue));
+    LogFlow(("pdmR3DrvHlp_PDMQueueCreate: caller='%s'/%d: returns %Rrc *ppQueue=%p\n", pDrvIns->pReg->szName, pDrvIns->iInstance, rc, *ppQueue));
     return rc;
 }
@@ -986,9 +986,9 @@
     PDMDRV_ASSERT_DRVINS(pDrvIns);
     LogFlow(("pdmR3DrvHlp_TMTimerCreate: caller='%s'/%d: enmClock=%d pfnCallback=%p pvUser=%p fFlags=%#x pszDesc=%p:{%s} ppTimer=%p\n",
-             pDrvIns->pReg->szDriverName, pDrvIns->iInstance, enmClock, pfnCallback, pvUser, fFlags, pszDesc, pszDesc, ppTimer));
+             pDrvIns->pReg->szName, pDrvIns->iInstance, enmClock, pfnCallback, pvUser, fFlags, pszDesc, pszDesc, ppTimer));
 
     int rc = TMR3TimerCreateDriver(pDrvIns->Internal.s.pVMR3, pDrvIns, enmClock, pfnCallback, pvUser, fFlags, pszDesc, ppTimer);
 
-    LogFlow(("pdmR3DrvHlp_TMTimerCreate: caller='%s'/%d: returns %Rrc *ppTimer=%p\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc, *ppTimer));
+    LogFlow(("pdmR3DrvHlp_TMTimerCreate: caller='%s'/%d: returns %Rrc *ppTimer=%p\n", pDrvIns->pReg->szName, pDrvIns->iInstance, rc, *ppTimer));
     return rc;
 }
@@ -1006,9 +1006,9 @@
     LogFlow(("pdmR3DrvHlp_SSMRegister: caller='%s'/%d: uVersion=#x cbGuess=%#x \n"
              "    pfnLivePrep=%p pfnLiveExec=%p pfnLiveVote=%p  pfnSavePrep=%p pfnSaveExec=%p pfnSaveDone=%p pszLoadPrep=%p pfnLoadExec=%p pfnLoaddone=%p\n",
-             pDrvIns->pReg->szDriverName, pDrvIns->iInstance, uVersion, cbGuess,
+             pDrvIns->pReg->szName, pDrvIns->iInstance, uVersion, cbGuess,
              pfnLivePrep, pfnLiveExec, pfnLiveVote,
              pfnSavePrep, pfnSaveExec, pfnSaveDone, pfnLoadPrep, pfnLoadExec, pfnLoadDone));
 
-    int rc = SSMR3RegisterDriver(pDrvIns->Internal.s.pVMR3, pDrvIns, pDrvIns->pReg->szDriverName, pDrvIns->iInstance,
+    int rc = SSMR3RegisterDriver(pDrvIns->Internal.s.pVMR3, pDrvIns, pDrvIns->pReg->szName, pDrvIns->iInstance,
                                  uVersion, cbGuess,
                                  pfnLivePrep, pfnLiveExec, pfnLiveVote,
@@ -1016,5 +1016,5 @@
                                  pfnLoadPrep, pfnLoadExec, pfnLoadDone);
 
-    LogFlow(("pdmR3DrvHlp_SSMRegister: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc));
+    LogFlow(("pdmR3DrvHlp_SSMRegister: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szName, pDrvIns->iInstance, rc));
     return rc;
 }
@@ -1027,9 +1027,9 @@
     VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
     LogFlow(("pdmR3DrvHlp_SSMDeregister: caller='%s'/%d: pszName=%p:{%s} u32Instance=%#x\n",
-             pDrvIns->pReg->szDriverName, pDrvIns->iInstance, pszName, pszName, u32Instance));
+             pDrvIns->pReg->szName, pDrvIns->iInstance, pszName, pszName, u32Instance));
 
     int rc = SSMR3DeregisterDriver(pDrvIns->Internal.s.pVMR3, pDrvIns, pszName, u32Instance);
 
-    LogFlow(("pdmR3DrvHlp_SSMDeregister: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc));
+    LogFlow(("pdmR3DrvHlp_SSMDeregister: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szName, pDrvIns->iInstance, rc));
     return rc;
 }
@@ -1092,5 +1092,5 @@
     PDMDRV_ASSERT_DRVINS(pDrvIns);
     LogFlow(("pdmR3DrvHlp_SSMCallVMMR0Ex: caller='%s'/%d: uOperation=%u pvArg=%p cbArg=%d\n",
-             pDrvIns->pReg->szDriverName, pDrvIns->iInstance, uOperation, pvArg, cbArg));
+             pDrvIns->pReg->szName, pDrvIns->iInstance, uOperation, pvArg, cbArg));
     int rc;
     if (    uOperation >= VMMR0_DO_SRV_START
@@ -1103,5 +1103,5 @@
     }
 
-    LogFlow(("pdmR3DrvHlp_SUPCallVMMR0Ex: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc));
+    LogFlow(("pdmR3DrvHlp_SUPCallVMMR0Ex: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szName, pDrvIns->iInstance, rc));
     return rc;
 }
@@ -1114,5 +1114,5 @@
     VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
     LogFlow(("pdmR3DrvHlp_USBRegisterHub: caller='%s'/%d: fVersions=%#x cPorts=%#x pUsbHubReg=%p ppUsbHubHlp=%p\n",
-             pDrvIns->pReg->szDriverName, pDrvIns->iInstance, fVersions, cPorts, pUsbHubReg, ppUsbHubHlp));
+             pDrvIns->pReg->szName, pDrvIns->iInstance, fVersions, cPorts, pUsbHubReg, ppUsbHubHlp));
 
 #ifdef VBOX_WITH_USB
@@ -1122,5 +1122,5 @@
 #endif
 
-    LogFlow(("pdmR3DrvHlp_USBRegisterHub: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc));
+    LogFlow(("pdmR3DrvHlp_USBRegisterHub: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szName, pDrvIns->iInstance, rc));
     return rc;
 }
@@ -1132,5 +1132,5 @@
     PDMDRV_ASSERT_DRVINS(pDrvIns);
     VM_ASSERT_EMT0(pDrvIns->Internal.s.pVMR3);
-    LogFlow(("pdmR3DrvHlp_SetAsyncNotification: caller='%s'/%d: pfnAsyncNotify=%p\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, pfnAsyncNotify));
+    LogFlow(("pdmR3DrvHlp_SetAsyncNotification: caller='%s'/%d: pfnAsyncNotify=%p\n", pDrvIns->pReg->szName, pDrvIns->iInstance, pfnAsyncNotify));
 
     int rc = VINF_SUCCESS;
@@ -1151,5 +1151,5 @@
         pDrvIns->Internal.s.pfnAsyncNotify = pfnAsyncNotify;
 
-    LogFlow(("pdmR3DrvHlp_SetAsyncNotification: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc));
+    LogFlow(("pdmR3DrvHlp_SetAsyncNotification: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szName, pDrvIns->iInstance, rc));
     return rc;
 }
@@ -1171,9 +1171,9 @@
         || enmVMState == VMSTATE_POWERING_OFF_LS)
     {
-        LogFlow(("pdmR3DrvHlp_AsyncNotificationCompleted: caller='%s'/%d:\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance));
+        LogFlow(("pdmR3DrvHlp_AsyncNotificationCompleted: caller='%s'/%d:\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
         VMR3AsyncPdmNotificationWakeupU(pVM->pUVM);
     }
     else
-        LogFlow(("pdmR3DrvHlp_AsyncNotificationCompleted: caller='%s'/%d: enmVMState=%d\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, enmVMState));
+        LogFlow(("pdmR3DrvHlp_AsyncNotificationCompleted: caller='%s'/%d: enmVMState=%d\n", pDrvIns->pReg->szName, pDrvIns->iInstance, enmVMState));
 }
 
@@ -1186,9 +1186,9 @@
     VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
     LogFlow(("pdmR3DrvHlp_PDMThreadCreate: caller='%s'/%d: ppThread=%p pvUser=%p pfnThread=%p pfnWakeup=%p cbStack=%#zx enmType=%d pszName=%p:{%s}\n",
-             pDrvIns->pReg->szDriverName, pDrvIns->iInstance, ppThread, pvUser, pfnThread, pfnWakeup, cbStack, enmType, pszName, pszName));
+             pDrvIns->pReg->szName, pDrvIns->iInstance, ppThread, pvUser, pfnThread, pfnWakeup, cbStack, enmType, pszName, pszName));
 
     int rc = pdmR3ThreadCreateDriver(pDrvIns->Internal.s.pVMR3, pDrvIns, ppThread, pvUser, pfnThread, pfnWakeup, cbStack, enmType, pszName);
 
-    LogFlow(("pdmR3DrvHlp_PDMThreadCreate: caller='%s'/%d: returns %Rrc *ppThread=%RTthrd\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance,
+    LogFlow(("pdmR3DrvHlp_PDMThreadCreate: caller='%s'/%d: returns %Rrc *ppThread=%RTthrd\n", pDrvIns->pReg->szName, pDrvIns->iInstance,
             rc, *ppThread));
     return rc;
@@ -1204,9 +1204,9 @@
     VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
     LogFlow(("pdmR3DrvHlp_PDMAsyncCompletionTemplateCreate: caller='%s'/%d: ppTemplate=%p pfnCompleted=%p pszDesc=%p:{%s}\n",
-             pDrvIns->pReg->szDriverName, pDrvIns->iInstance, ppTemplate, pfnCompleted, pszDesc, pszDesc));
+             pDrvIns->pReg->szName, pDrvIns->iInstance, ppTemplate, pfnCompleted, pszDesc, pszDesc));
 
     int rc = PDMR3AsyncCompletionTemplateCreateDriver(pDrvIns->Internal.s.pVMR3, pDrvIns, ppTemplate, pfnCompleted, pvTemplateUser, pszDesc);
 
-    LogFlow(("pdmR3DrvHlp_PDMAsyncCompletionTemplateCreate: caller='%s'/%d: returns %Rrc *ppThread=%p\n", pDrvIns->pReg->szDriverName,
+    LogFlow(("pdmR3DrvHlp_PDMAsyncCompletionTemplateCreate: caller='%s'/%d: returns %Rrc *ppThread=%p\n", pDrvIns->pReg->szName,
              pDrvIns->iInstance, rc, *ppTemplate));
     return rc;
@@ -1221,13 +1221,13 @@
     VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
     LogFlow(("pdmR3DrvHlp_PDMLdrGetRCInterfaceSymbols: caller='%s'/%d: pvInterface=%p cbInterface=%zu pszSymPrefix=%p:{%s} pszSymList=%p:{%s}\n",
-             pDrvIns->pReg->szDriverName, pDrvIns->iInstance, pvInterface, cbInterface, pszSymPrefix, pszSymPrefix, pszSymList, pszSymList));
+             pDrvIns->pReg->szName, pDrvIns->iInstance, pvInterface, cbInterface, pszSymPrefix, pszSymPrefix, pszSymList, pszSymList));
 
     int rc;
     if (   strncmp(pszSymPrefix, "drv", 3) == 0
-        && RTStrIStr(pszSymPrefix + 3, pDrvIns->pReg->szDriverName) != NULL)
+        && RTStrIStr(pszSymPrefix + 3, pDrvIns->pReg->szName) != NULL)
     {
         if (pDrvIns->pReg->fFlags & PDM_DRVREG_FLAGS_RC)
             rc = PDMR3LdrGetInterfaceSymbols(pDrvIns->Internal.s.pVMR3, pvInterface, cbInterface,
-                                             pDrvIns->pReg->szDriverName, pszSymPrefix, pszSymList,
+                                             pDrvIns->pReg->szName, pszSymPrefix, pszSymList,
                                              false /*fRing0OrRC*/);
         else
@@ -1240,9 +1240,9 @@
     {
         AssertMsgFailed(("Invalid prefix '%s' for '%s'; must start with 'drv' and contain the driver name!\n",
-                         pszSymPrefix, pDrvIns->pReg->szDriverName));
+                         pszSymPrefix, pDrvIns->pReg->szName));
         rc = VERR_INVALID_NAME;
     }
 
-    LogFlow(("pdmR3DrvHlp_PDMLdrGetRCInterfaceSymbols: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szDriverName,
+    LogFlow(("pdmR3DrvHlp_PDMLdrGetRCInterfaceSymbols: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szName,
              pDrvIns->iInstance, rc));
     return rc;
@@ -1257,13 +1257,13 @@
     VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
     LogFlow(("pdmR3DrvHlp_PDMLdrGetR0InterfaceSymbols: caller='%s'/%d: pvInterface=%p cbInterface=%zu pszSymPrefix=%p:{%s} pszSymList=%p:{%s}\n",
-             pDrvIns->pReg->szDriverName, pDrvIns->iInstance, pvInterface, cbInterface, pszSymPrefix, pszSymPrefix, pszSymList, pszSymList));
+             pDrvIns->pReg->szName, pDrvIns->iInstance, pvInterface, cbInterface, pszSymPrefix, pszSymPrefix, pszSymList, pszSymList));
 
     int rc;
     if (   strncmp(pszSymPrefix, "drv", 3) == 0
-        && RTStrIStr(pszSymPrefix + 3, pDrvIns->pReg->szDriverName) != NULL)
+        && RTStrIStr(pszSymPrefix + 3, pDrvIns->pReg->szName) != NULL)
     {
         if (pDrvIns->pReg->fFlags & PDM_DRVREG_FLAGS_R0)
             rc = PDMR3LdrGetInterfaceSymbols(pDrvIns->Internal.s.pVMR3, pvInterface, cbInterface,
-                                             pDrvIns->pReg->szDriverName, pszSymPrefix, pszSymList,
+                                             pDrvIns->pReg->szName, pszSymPrefix, pszSymList,
                                              true /*fRing0OrRC*/);
         else
@@ -1276,9 +1276,9 @@
     {
         AssertMsgFailed(("Invalid prefix '%s' for '%s'; must start with 'drv' and contain the driver name!\n",
-                         pszSymPrefix, pDrvIns->pReg->szDriverName));
+                         pszSymPrefix, pDrvIns->pReg->szName));
         rc = VERR_INVALID_NAME;
     }
 
-    LogFlow(("pdmR3DrvHlp_PDMLdrGetR0InterfaceSymbols: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szDriverName,
+    LogFlow(("pdmR3DrvHlp_PDMLdrGetR0InterfaceSymbols: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szName,
              pDrvIns->iInstance, rc));
     return rc;
