Index: trunk/src/VBox/Devices/Audio/DrvHostAudioCoreAudio.cpp
===================================================================
--- trunk/src/VBox/Devices/Audio/DrvHostAudioCoreAudio.cpp	(revision 89233)
+++ trunk/src/VBox/Devices/Audio/DrvHostAudioCoreAudio.cpp	(revision 89234)
@@ -197,5 +197,5 @@
     /** Critical section for serializing access between thread + callbacks. */
     RTCRITSECT                  CritSect;
-    /** Buffer that drvHostAudioCaStreamStatusString uses. */
+    /** Buffer that drvHstAudCaStreamStatusString uses. */
     char                        szStatus[64];
 } COREAUDIOSTREAM;
@@ -269,5 +269,5 @@
  * @param   pStreamCA   The stream to get the status for.
  */
-static const char *drvHostAudioCaStreamStatusString(PCOREAUDIOSTREAM pStreamCA)
+static const char *drvHstAudCaStreamStatusString(PCOREAUDIOSTREAM pStreamCA)
 {
     static RTSTRTUPLE const s_aInitState[5] =
@@ -318,5 +318,5 @@
 
 
-static void drvHostAudioCaPrintASBD(const char *pszDesc, const AudioStreamBasicDescription *pASBD)
+static void drvHstAudCaPrintASBD(const char *pszDesc, const AudioStreamBasicDescription *pASBD)
 {
     LogRel2(("CoreAudio: %s description:\n", pszDesc));
@@ -352,5 +352,5 @@
 
 
-static void drvHostAudioCaPCMPropsToASBD(PCPDMAUDIOPCMPROPS pProps, AudioStreamBasicDescription *pASBD)
+static void drvHstAudCaPCMPropsToASBD(PCPDMAUDIOPCMPROPS pProps, AudioStreamBasicDescription *pASBD)
 {
     AssertPtrReturnVoid(pProps);
@@ -375,5 +375,5 @@
 
 #if 0 /* unused */
-static int drvHostAudioCaCFStringToCString(const CFStringRef pCFString, char **ppszString)
+static int drvHstAudCaCFStringToCString(const CFStringRef pCFString, char **ppszString)
 {
     CFIndex cLen = CFStringGetLength(pCFString) + 1;
@@ -389,5 +389,5 @@
 }
 
-static AudioDeviceID drvHostAudioCaDeviceUIDtoID(const char* pszUID)
+static AudioDeviceID drvHstAudCaDeviceUIDtoID(const char* pszUID)
 {
     /* Create a CFString out of our CString. */
@@ -439,6 +439,6 @@
  * (See AudioObjectPropertyListenerProc in the SDK headers.)
  */
-static OSStatus drvHostAudioCaDevicePropertyChangedCallback(AudioObjectID idObject, UInt32 cAddresses,
-                                                            const AudioObjectPropertyAddress paAddresses[], void *pvUser)
+static OSStatus drvHstAudCaDevicePropertyChangedCallback(AudioObjectID idObject, UInt32 cAddresses,
+                                                         const AudioObjectPropertyAddress paAddresses[], void *pvUser)
 {
     PCOREAUDIODEVICEDATA pDev = (PCOREAUDIODEVICEDATA)pvUser;
@@ -475,5 +475,5 @@
  * @param  enmSts   Status to propagate.
  */
-static void drvHostAudioCaDevicePropagateStatus(PCOREAUDIODEVICEDATA pDev, COREAUDIOINITSTATE enmSts)
+static void drvHstAudCaDevicePropagateStatus(PCOREAUDIODEVICEDATA pDev, COREAUDIOINITSTATE enmSts)
 {
 #if 1
@@ -510,6 +510,6 @@
  * (See AudioObjectPropertyListenerProc in the SDK headers.)
  */
-static OSStatus drvHostAudioCaDeviceIsAliveChangedCallback(AudioObjectID idObject, UInt32 cAddresses,
-                                                           const AudioObjectPropertyAddress paAddresses[], void *pvUser)
+static OSStatus drvHstAudCaDeviceIsAliveChangedCallback(AudioObjectID idObject, UInt32 cAddresses,
+                                                        const AudioObjectPropertyAddress paAddresses[], void *pvUser)
 {
     PCOREAUDIODEVICEDATA pDev = (PCOREAUDIODEVICEDATA)pvUser;
@@ -552,5 +552,5 @@
 /** @todo r=bird: This is certifiably insane given how StreamDestroy does absolutely _nothing_ unless the init state is INIT.
  * The queue thread will be running and trashing random heap if it tries to modify anything in the stream structure. */
-        drvHostAudioCaDevicePropagateStatus(pDev, COREAUDIOINITSTATE_UNINIT);
+        drvHstAudCaDevicePropagateStatus(pDev, COREAUDIOINITSTATE_UNINIT);
     }
 
@@ -567,6 +567,6 @@
  * (See AudioObjectPropertyListenerProc in the SDK headers.)
  */
-static OSStatus drvHostAudioCaDefaultDeviceChangedCallback(AudioObjectID idObject, UInt32 cAddresses,
-                                                           const AudioObjectPropertyAddress *paAddresses, void *pvUser)
+static OSStatus drvHstAudCaDefaultDeviceChangedCallback(AudioObjectID idObject, UInt32 cAddresses,
+                                                        const AudioObjectPropertyAddress *paAddresses, void *pvUser)
 
 {
@@ -630,5 +630,5 @@
  * Message handling callback for CFMachPort.
  */
-static void drvHostAudioCaThreadPortCallback(CFMachPortRef hPort, void *pvMsg, CFIndex cbMsg, void *pvUser)
+static void drvHstAudCaThreadPortCallback(CFMachPortRef hPort, void *pvMsg, CFIndex cbMsg, void *pvUser)
 {
     RT_NOREF(hPort, pvMsg, cbMsg, pvUser);
@@ -640,5 +640,5 @@
  * @callback_method_impl{FNRTTHREAD, Worker thread for buffer callbacks.}
  */
-static DECLCALLBACK(int) drvHostAudioCaThread(RTTHREAD hThreadSelf, void *pvUser)
+static DECLCALLBACK(int) drvHstAudCaThread(RTTHREAD hThreadSelf, void *pvUser)
 {
     PDRVHOSTCOREAUDIO pThis = (PDRVHOSTCOREAUDIO)pvUser;
@@ -688,5 +688,5 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnGetConfig}
  */
-static DECLCALLBACK(int) drvHostAudioCaHA_GetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
+static DECLCALLBACK(int) drvHstAudCaHA_GetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
 {
     PDRVHOSTCOREAUDIO pThis = RT_FROM_MEMBER(pInterface, DRVHOSTCOREAUDIO, IHostAudio);
@@ -915,5 +915,5 @@
  *          functions as uncomplicated as possible.
  */
-static int drvHostAudioCaDevicesEnumerateAll(PDRVHOSTCOREAUDIO pThis, PPDMAUDIOHOSTENUM pDevEnm)
+static int drvHstAudCaDevicesEnumerateAll(PDRVHOSTCOREAUDIO pThis, PPDMAUDIOHOSTENUM pDevEnm)
 {
     AssertPtr(pThis);
@@ -1077,5 +1077,5 @@
  *                  NULL is ignored.
  */
-static void drvHostAudioCaDeviceRegisterCallbacks(PCOREAUDIODEVICEDATA pDev)
+static void drvHstAudCaDeviceRegisterCallbacks(PCOREAUDIODEVICEDATA pDev)
 {
     if (pDev)
@@ -1096,5 +1096,5 @@
         };
         OSStatus orc;
-        orc = AudioObjectAddPropertyListener(idDevice, &PropAddr, drvHostAudioCaDeviceIsAliveChangedCallback, pDev);
+        orc = AudioObjectAddPropertyListener(idDevice, &PropAddr, drvHstAudCaDeviceIsAliveChangedCallback, pDev);
         if (   orc != noErr
             && orc != kAudioHardwareIllegalOperationError)
@@ -1103,5 +1103,5 @@
         PropAddr.mSelector = kAudioDeviceProcessorOverload;
         PropAddr.mScope    = kAudioUnitScope_Global;
-        orc = AudioObjectAddPropertyListener(idDevice, &PropAddr, drvHostAudioCaDevicePropertyChangedCallback, pDev);
+        orc = AudioObjectAddPropertyListener(idDevice, &PropAddr, drvHstAudCaDevicePropertyChangedCallback, pDev);
         if (orc != noErr)
             LogRel(("CoreAudio: Failed to register processor overload listener (%#x)\n", orc));
@@ -1109,5 +1109,5 @@
         PropAddr.mSelector = kAudioDevicePropertyNominalSampleRate;
         PropAddr.mScope    = kAudioUnitScope_Global;
-        orc = AudioObjectAddPropertyListener(idDevice, &PropAddr, drvHostAudioCaDevicePropertyChangedCallback, pDev);
+        orc = AudioObjectAddPropertyListener(idDevice, &PropAddr, drvHstAudCaDevicePropertyChangedCallback, pDev);
         if (orc != noErr)
             LogRel(("CoreAudio: Failed to register sample rate changed listener (%#x)\n", orc));
@@ -1122,5 +1122,5 @@
  *                  NULL is ignored.
  */
-static void drvHostAudioCaDeviceUnregisterCallbacks(PCOREAUDIODEVICEDATA pDev)
+static void drvHstAudCaDeviceUnregisterCallbacks(PCOREAUDIODEVICEDATA pDev)
 {
     if (pDev != NULL)
@@ -1141,5 +1141,5 @@
         };
         OSStatus orc;
-        orc = AudioObjectRemovePropertyListener(idDevice, &PropAddr, drvHostAudioCaDevicePropertyChangedCallback, pDev);
+        orc = AudioObjectRemovePropertyListener(idDevice, &PropAddr, drvHstAudCaDevicePropertyChangedCallback, pDev);
         if (   orc != noErr
             && orc != kAudioHardwareBadObjectError)
@@ -1147,5 +1147,5 @@
 
         PropAddr.mSelector = kAudioDevicePropertyNominalSampleRate;
-        orc = AudioObjectRemovePropertyListener(idDevice, &PropAddr, drvHostAudioCaDevicePropertyChangedCallback, pDev);
+        orc = AudioObjectRemovePropertyListener(idDevice, &PropAddr, drvHstAudCaDevicePropertyChangedCallback, pDev);
         if (   orc != noErr
             && orc != kAudioHardwareBadObjectError)
@@ -1153,5 +1153,5 @@
 
         PropAddr.mSelector = kAudioDevicePropertyDeviceIsAlive;
-        orc = AudioObjectRemovePropertyListener(idDevice, &PropAddr, drvHostAudioCaDeviceIsAliveChangedCallback, pDev);
+        orc = AudioObjectRemovePropertyListener(idDevice, &PropAddr, drvHstAudCaDeviceIsAliveChangedCallback, pDev);
         if (   orc != noErr
             && orc != kAudioHardwareBadObjectError)
@@ -1167,5 +1167,5 @@
  * @param   pThis               Host audio driver instance.
  */
-static int drvHostAudioCaEnumerateDevices(PDRVHOSTCOREAUDIO pThis)
+static int drvHstAudCaEnumerateDevices(PDRVHOSTCOREAUDIO pThis)
 {
     LogFlowFuncEnter();
@@ -1176,5 +1176,5 @@
     PDMAUDIOHOSTENUM    LocalEnum;
     PDMAudioHostEnumInit(&LocalEnum);
-    int rc = drvHostAudioCaDevicesEnumerateAll(pThis, &LocalEnum);
+    int rc = drvHstAudCaDevicesEnumerateAll(pThis, &LocalEnum);
     if (RT_SUCCESS(rc))
     {
@@ -1200,7 +1200,7 @@
             LogRel2(("CoreAudio: No default capturing device found (was none)\n"));
 
-        drvHostAudioCaDeviceUnregisterCallbacks(pThis->pDefaultDevIn);
+        drvHstAudCaDeviceUnregisterCallbacks(pThis->pDefaultDevIn);
         pThis->pDefaultDevIn = pDefaultDevIn;
-        drvHostAudioCaDeviceRegisterCallbacks(pDefaultDevIn);
+        drvHstAudCaDeviceRegisterCallbacks(pDefaultDevIn);
 
         /* Default output. */
@@ -1214,7 +1214,7 @@
             LogRel2(("CoreAudio: No default playback device found (was none)\n"));
 
-        drvHostAudioCaDeviceUnregisterCallbacks(pThis->pDefaultDevOut);
+        drvHstAudCaDeviceUnregisterCallbacks(pThis->pDefaultDevOut);
         pThis->pDefaultDevOut = pDefaultDevOut;
-        drvHostAudioCaDeviceRegisterCallbacks(pDefaultDevOut);
+        drvHstAudCaDeviceRegisterCallbacks(pDefaultDevOut);
 
         /* Replace the enum. */
@@ -1235,5 +1235,5 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnGetDevices}
  */
-static DECLCALLBACK(int) drvHostAudioCaHA_GetDevices(PPDMIHOSTAUDIO pInterface, PPDMAUDIOHOSTENUM pDeviceEnum)
+static DECLCALLBACK(int) drvHstAudCaHA_GetDevices(PPDMIHOSTAUDIO pInterface, PPDMAUDIOHOSTENUM pDeviceEnum)
 {
     PDRVHOSTCOREAUDIO pThis = RT_FROM_MEMBER(pInterface, DRVHOSTCOREAUDIO, IHostAudio);
@@ -1245,5 +1245,5 @@
      * We update the enumeration associated with pThis ...
      */
-    int rc = drvHostAudioCaEnumerateDevices(pThis);
+    int rc = drvHstAudCaEnumerateDevices(pThis);
     if (RT_SUCCESS(rc))
     {
@@ -1267,5 +1267,5 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnGetStatus}
  */
-static DECLCALLBACK(PDMAUDIOBACKENDSTS) drvHostAudioCaHA_GetStatus(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
+static DECLCALLBACK(PDMAUDIOBACKENDSTS) drvHstAudCaHA_GetStatus(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
 {
     RT_NOREF(pInterface, enmDir);
@@ -1281,5 +1281,5 @@
  * @param   fQueued         The new queued state.
  */
-DECLINLINE(bool) drvHostAudioCaSetBufferQueued(AudioQueueBufferRef pAudioBuffer, bool fQueued)
+DECLINLINE(bool) drvHstAudCaSetBufferQueued(AudioQueueBufferRef pAudioBuffer, bool fQueued)
 {
     if (fQueued)
@@ -1294,5 +1294,5 @@
  * @param   pAudioBuffer    The buffer.
  */
-DECLINLINE(bool) drvHostAudioCaIsBufferQueued(AudioQueueBufferRef pAudioBuffer)
+DECLINLINE(bool) drvHstAudCaIsBufferQueued(AudioQueueBufferRef pAudioBuffer)
 {
     return ((uintptr_t)pAudioBuffer->mUserData & 1) == 1;
@@ -1305,5 +1305,5 @@
  * Called whenever an audio queue is done processing a buffer.  This routine
  * will set the data fill size to zero and mark it as unqueued so that
- * drvHostAudioCaHA_StreamPlay knowns it can use it.
+ * drvHstAudCaHA_StreamPlay knowns it can use it.
  *
  * @param   pvUser          User argument.
@@ -1313,5 +1313,5 @@
  * @thread  queue thread.
  */
-static void drvHostAudioCaOutputQueueBufferCallback(void *pvUser, AudioQueueRef hAudioQueue, AudioQueueBufferRef pAudioBuffer)
+static void drvHstAudCaOutputQueueBufferCallback(void *pvUser, AudioQueueRef hAudioQueue, AudioQueueBufferRef pAudioBuffer)
 {
 #if defined(VBOX_STRICT) || defined(LOG_ENABLED)
@@ -1327,6 +1327,6 @@
 
     pAudioBuffer->mAudioDataByteSize = 0;
-    bool fWasQueued = drvHostAudioCaSetBufferQueued(pAudioBuffer, false /*fQueued*/);
-    Assert(!drvHostAudioCaIsBufferQueued(pAudioBuffer));
+    bool fWasQueued = drvHstAudCaSetBufferQueued(pAudioBuffer, false /*fQueued*/);
+    Assert(!drvHstAudCaIsBufferQueued(pAudioBuffer));
     Assert(fWasQueued); RT_NOREF(fWasQueued);
 
@@ -1339,6 +1339,6 @@
  *
  * Called whenever input data from the audio queue becomes available.  This
- * routine will mark the buffer unqueued so that drvHostAudioCaHA_StreamCapture
- * can read the data from it.
+ * routine will mark the buffer unqueued so that drvHstAudCaHA_StreamCapture can
+ * read the data from it.
  *
  * @param   pvUser          User argument.
@@ -1349,7 +1349,7 @@
  * @param   paPacketDesc    Array of packet descriptors.
  */
-static void drvHostAudioCaInputQueueBufferCallback(void *pvUser, AudioQueueRef hAudioQueue,
-                                                   AudioQueueBufferRef pAudioBuffer, const AudioTimeStamp *pAudioTS,
-                                                   UInt32 cPacketDesc, const AudioStreamPacketDescription *paPacketDesc)
+static void drvHstAudCaInputQueueBufferCallback(void *pvUser, AudioQueueRef hAudioQueue,
+                                                AudioQueueBufferRef pAudioBuffer, const AudioTimeStamp *pAudioTS,
+                                                UInt32 cPacketDesc, const AudioStreamPacketDescription *paPacketDesc)
 {
 #if defined(VBOX_STRICT) || defined(LOG_ENABLED)
@@ -1364,6 +1364,6 @@
 #endif
 
-    bool fWasQueued = drvHostAudioCaSetBufferQueued(pAudioBuffer, false /*fQueued*/);
-    Assert(!drvHostAudioCaIsBufferQueued(pAudioBuffer));
+    bool fWasQueued = drvHstAudCaSetBufferQueued(pAudioBuffer, false /*fQueued*/);
+    Assert(!drvHstAudCaIsBufferQueued(pAudioBuffer));
     Assert(fWasQueued); RT_NOREF(fWasQueued);
 
@@ -1375,6 +1375,6 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate}
  */
-static DECLCALLBACK(int) drvHostAudioCaHA_StreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
-                                                       PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+static DECLCALLBACK(int) drvHstAudCaHA_StreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                    PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
     PDRVHOSTCOREAUDIO pThis     = RT_FROM_MEMBER(pInterface, DRVHOSTCOREAUDIO, IHostAudio);
@@ -1442,9 +1442,8 @@
              */
             PDMAudioStrmCfgCopy(&pStreamCA->Cfg, pCfgReq);
-            drvHostAudioCaPCMPropsToASBD(&pCfgReq->Props, &pStreamCA->BasicStreamDesc);
+            drvHstAudCaPCMPropsToASBD(&pCfgReq->Props, &pStreamCA->BasicStreamDesc);
             /** @todo Do some validation? */
-            drvHostAudioCaPrintASBD(  pCfgReq->enmDir == PDMAUDIODIR_IN
-                                    ? "Capturing queue format"
-                                    : "Playback queue format", &pStreamCA->BasicStreamDesc);
+            drvHstAudCaPrintASBD(pCfgReq->enmDir == PDMAUDIODIR_IN ? "Capturing queue format" : "Playback queue format",
+                                 &pStreamCA->BasicStreamDesc);
             /*
              * Create audio queue.
@@ -1462,8 +1461,8 @@
             OSStatus orc;
             if (pCfgReq->enmDir == PDMAUDIODIR_OUT)
-                orc = AudioQueueNewOutput(&pStreamCA->BasicStreamDesc, drvHostAudioCaOutputQueueBufferCallback, pStreamCA,
+                orc = AudioQueueNewOutput(&pStreamCA->BasicStreamDesc, drvHstAudCaOutputQueueBufferCallback, pStreamCA,
                                           hRunLoop, hRunLoopMode, 0 /*fFlags - MBZ*/, &pStreamCA->hAudioQueue);
             else
-                orc = AudioQueueNewInput(&pStreamCA->BasicStreamDesc, drvHostAudioCaInputQueueBufferCallback, pStreamCA,
+                orc = AudioQueueNewInput(&pStreamCA->BasicStreamDesc, drvHstAudCaInputQueueBufferCallback, pStreamCA,
                                          hRunLoop, hRunLoopMode, 0 /*fFlags - MBZ*/, &pStreamCA->hAudioQueue);
             LogFlowFunc(("AudioQueueNew%s -> %#x\n", pCfgReq->enmDir == PDMAUDIODIR_OUT ? "Output" : "Input", orc));
@@ -1599,6 +1598,5 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
  */
-static DECLCALLBACK(int) drvHostAudioCaHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
-                                                        bool fImmediate)
+static DECLCALLBACK(int) drvHstAudCaHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream, bool fImmediate)
 {
     RT_NOREF(pInterface);
@@ -1708,5 +1706,5 @@
 #ifdef CORE_AUDIO_WITH_BREAKPOINT_TIMER
 /** @callback_method_impl{FNRTTIMERLR, For debugging things that takes too long.} */
-static DECLCALLBACK(void) drvHostAudioCaBreakpointTimer(RTTIMERLR hTimer, void *pvUser, uint64_t iTick)
+static DECLCALLBACK(void) drvHstAudCaBreakpointTimer(RTTIMERLR hTimer, void *pvUser, uint64_t iTick)
 {
     LogFlowFunc(("Queue-destruction timeout! iTick=%RU64\n", iTick));
@@ -1721,9 +1719,9 @@
  * @ interface_method_impl{PDMIHOSTAUDIO,pfnStreamEnable}
  */
-static DECLCALLBACK(int) drvHostAudioCaHA_StreamEnable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+static DECLCALLBACK(int) drvHstAudCaHA_StreamEnable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     RT_NOREF(pInterface);
     PCOREAUDIOSTREAM pStreamCA = (PCOREAUDIOSTREAM)pStream;
-    LogFlowFunc(("Stream '%s' {%s}\n", pStreamCA->Cfg.szName, drvHostAudioCaStreamStatusString(pStreamCA)));
+    LogFlowFunc(("Stream '%s' {%s}\n", pStreamCA->Cfg.szName, drvHstAudCaStreamStatusString(pStreamCA)));
     AssertReturn(pStreamCA->enmInitState == COREAUDIOINITSTATE_INIT, VERR_AUDIO_STREAM_NOT_READY);
     RTCritSectEnter(&pStreamCA->CritSect);
@@ -1740,5 +1738,5 @@
     Assert(orc == noErr);
     for (uint32_t iBuf = 0; iBuf < pStreamCA->cBuffers; iBuf++)
-        Assert(!drvHostAudioCaIsBufferQueued(pStreamCA->paBuffers[iBuf].pBuf));
+        Assert(!drvHstAudCaIsBufferQueued(pStreamCA->paBuffers[iBuf].pBuf));
 
     pStreamCA->offInternal      = 0;
@@ -1750,5 +1748,5 @@
     /*
      * Input streams will start capturing, while output streams will only start
-     * playing once we get some audio data to play (see drvHostAudioCaHA_StreamPlay).
+     * playing once we get some audio data to play (see drvHstAudCaHA_StreamPlay).
      */
     int rc = VINF_SUCCESS;
@@ -1762,10 +1760,10 @@
             RT_BZERO(pBuf->mAudioData, pBuf->mAudioDataBytesCapacity);
             pBuf->mAudioDataByteSize = 0;
-            drvHostAudioCaSetBufferQueued(pBuf, true /*fQueued*/);
+            drvHstAudCaSetBufferQueued(pBuf, true /*fQueued*/);
 
             orc = AudioQueueEnqueueBuffer(pStreamCA->hAudioQueue, pBuf, 0 /*inNumPacketDescs*/, NULL /*inPacketDescs*/);
             AssertLogRelMsgBreakStmt(orc == noErr, ("CoreAudio: AudioQueueEnqueueBuffer(#%u) -> %#x (%d) - stream '%s'\n",
                                                     iBuf, orc, orc, pStreamCA->Cfg.szName),
-                                     drvHostAudioCaSetBufferQueued(pBuf, false /*fQueued*/));
+                                     drvHstAudCaSetBufferQueued(pBuf, false /*fQueued*/));
         }
 
@@ -1794,5 +1792,5 @@
  * @ interface_method_impl{PDMIHOSTAUDIO,pfnStreamDisable}
  */
-static DECLCALLBACK(int) drvHostAudioCaHA_StreamDisable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+static DECLCALLBACK(int) drvHstAudCaHA_StreamDisable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     RT_NOREF(pInterface);
@@ -1800,5 +1798,5 @@
     LogFlowFunc(("cMsLastTransfer=%RI64 ms, stream '%s' {%s} \n",
                  pStreamCA->msLastTransfer ? RTTimeMilliTS() - pStreamCA->msLastTransfer : -1,
-                 pStreamCA->Cfg.szName, drvHostAudioCaStreamStatusString(pStreamCA) ));
+                 pStreamCA->Cfg.szName, drvHstAudCaStreamStatusString(pStreamCA) ));
     AssertReturn(pStreamCA->enmInitState == COREAUDIOINITSTATE_INIT, VERR_AUDIO_STREAM_NOT_READY);
     RTCritSectEnter(&pStreamCA->CritSect);
@@ -1833,5 +1831,5 @@
 
     RTCritSectLeave(&pStreamCA->CritSect);
-    LogFlowFunc(("returns %Rrc {%s}\n", rc, drvHostAudioCaStreamStatusString(pStreamCA)));
+    LogFlowFunc(("returns %Rrc {%s}\n", rc, drvHstAudCaStreamStatusString(pStreamCA)));
     return rc;
 }
@@ -1841,5 +1839,5 @@
  * @ interface_method_impl{PDMIHOSTAUDIO,pfnStreamPause}
  */
-static DECLCALLBACK(int) drvHostAudioCaHA_StreamPause(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+static DECLCALLBACK(int) drvHstAudCaHA_StreamPause(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     RT_NOREF(pInterface);
@@ -1847,5 +1845,5 @@
     LogFlowFunc(("cMsLastTransfer=%RI64 ms, stream '%s' {%s} \n",
                  pStreamCA->msLastTransfer ? RTTimeMilliTS() - pStreamCA->msLastTransfer : -1,
-                 pStreamCA->Cfg.szName, drvHostAudioCaStreamStatusString(pStreamCA) ));
+                 pStreamCA->Cfg.szName, drvHstAudCaStreamStatusString(pStreamCA) ));
     AssertReturn(pStreamCA->enmInitState == COREAUDIOINITSTATE_INIT, VERR_AUDIO_STREAM_NOT_READY);
     RTCritSectEnter(&pStreamCA->CritSect);
@@ -1879,5 +1877,5 @@
 
     RTCritSectLeave(&pStreamCA->CritSect);
-    LogFlowFunc(("returns %Rrc {%s}\n", rc, drvHostAudioCaStreamStatusString(pStreamCA)));
+    LogFlowFunc(("returns %Rrc {%s}\n", rc, drvHstAudCaStreamStatusString(pStreamCA)));
     return rc;
 }
@@ -1887,14 +1885,14 @@
  * @ interface_method_impl{PDMIHOSTAUDIO,pfnStreamResume}
  */
-static DECLCALLBACK(int) drvHostAudioCaHA_StreamResume(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+static DECLCALLBACK(int) drvHstAudCaHA_StreamResume(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     RT_NOREF(pInterface);
     PCOREAUDIOSTREAM pStreamCA = (PCOREAUDIOSTREAM)pStream;
-    LogFlowFunc(("Stream '%s' {%s}\n", pStreamCA->Cfg.szName, drvHostAudioCaStreamStatusString(pStreamCA)));
+    LogFlowFunc(("Stream '%s' {%s}\n", pStreamCA->Cfg.szName, drvHstAudCaStreamStatusString(pStreamCA)));
     AssertReturn(pStreamCA->enmInitState == COREAUDIOINITSTATE_INIT, VERR_AUDIO_STREAM_NOT_READY);
     RTCritSectEnter(&pStreamCA->CritSect);
 
     /*
-     * Resume according to state saved by drvHostAudioCaHA_StreamPause.
+     * Resume according to state saved by drvHstAudCaHA_StreamPause.
      */
     int rc = VINF_SUCCESS;
@@ -1912,5 +1910,5 @@
 
     RTCritSectLeave(&pStreamCA->CritSect);
-    LogFlowFunc(("returns %Rrc {%s}\n", rc, drvHostAudioCaStreamStatusString(pStreamCA)));
+    LogFlowFunc(("returns %Rrc {%s}\n", rc, drvHstAudCaStreamStatusString(pStreamCA)));
     return rc;
 }
@@ -1920,5 +1918,5 @@
  * @ interface_method_impl{PDMIHOSTAUDIO,pfnStreamDrain}
  */
-static DECLCALLBACK(int) drvHostAudioCaHA_StreamDrain(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+static DECLCALLBACK(int) drvHstAudCaHA_StreamDrain(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     RT_NOREF(pInterface);
@@ -1927,5 +1925,5 @@
     LogFlowFunc(("cMsLastTransfer=%RI64 ms, stream '%s' {%s} \n",
                  pStreamCA->msLastTransfer ? RTTimeMilliTS() - pStreamCA->msLastTransfer : -1,
-                 pStreamCA->Cfg.szName, drvHostAudioCaStreamStatusString(pStreamCA) ));
+                 pStreamCA->Cfg.szName, drvHstAudCaStreamStatusString(pStreamCA) ));
     AssertReturn(pStreamCA->enmInitState == COREAUDIOINITSTATE_INIT, VERR_AUDIO_STREAM_NOT_READY);
     RTCritSectEnter(&pStreamCA->CritSect);
@@ -1961,5 +1959,5 @@
 
     RTCritSectLeave(&pStreamCA->CritSect);
-    LogFlowFunc(("returns %Rrc {%s}\n", rc, drvHostAudioCaStreamStatusString(pStreamCA)));
+    LogFlowFunc(("returns %Rrc {%s}\n", rc, drvHstAudCaStreamStatusString(pStreamCA)));
     return rc;
 }
@@ -1969,6 +1967,6 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamControl}
  */
-static DECLCALLBACK(int) drvHostAudioCaHA_StreamControl(PPDMIHOSTAUDIO pInterface,
-                                                        PPDMAUDIOBACKENDSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
+static DECLCALLBACK(int) drvHstAudCaHA_StreamControl(PPDMIHOSTAUDIO pInterface,
+                                                     PPDMAUDIOBACKENDSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
 {
     /** @todo r=bird: I'd like to get rid of this pfnStreamControl method,
@@ -1979,13 +1977,13 @@
     {
         case PDMAUDIOSTREAMCMD_ENABLE:
-            return drvHostAudioCaHA_StreamEnable(pInterface, pStream);
+            return drvHstAudCaHA_StreamEnable(pInterface, pStream);
         case PDMAUDIOSTREAMCMD_DISABLE:
-            return drvHostAudioCaHA_StreamDisable(pInterface, pStream);
+            return drvHstAudCaHA_StreamDisable(pInterface, pStream);
         case PDMAUDIOSTREAMCMD_PAUSE:
-            return drvHostAudioCaHA_StreamPause(pInterface, pStream);
+            return drvHstAudCaHA_StreamPause(pInterface, pStream);
         case PDMAUDIOSTREAMCMD_RESUME:
-            return drvHostAudioCaHA_StreamResume(pInterface, pStream);
+            return drvHstAudCaHA_StreamResume(pInterface, pStream);
         case PDMAUDIOSTREAMCMD_DRAIN:
-            return drvHostAudioCaHA_StreamDrain(pInterface, pStream);
+            return drvHstAudCaHA_StreamDrain(pInterface, pStream);
 
         case PDMAUDIOSTREAMCMD_END:
@@ -2002,5 +2000,5 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetReadable}
  */
-static DECLCALLBACK(uint32_t) drvHostAudioCaHA_StreamGetReadable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+static DECLCALLBACK(uint32_t) drvHstAudCaHA_StreamGetReadable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     RT_NOREF(pInterface);
@@ -2020,5 +2018,5 @@
 
         if (   cBuffers > 0
-            && !drvHostAudioCaIsBufferQueued(pBuf = paBuffers[idxBuffer].pBuf))
+            && !drvHstAudCaIsBufferQueued(pBuf = paBuffers[idxBuffer].pBuf))
         {
             do
@@ -2038,5 +2036,5 @@
                 else
                     idxBuffer = 0;
-            } while (idxBuffer != idxStart && !drvHostAudioCaIsBufferQueued(pBuf = paBuffers[idxBuffer].pBuf));
+            } while (idxBuffer != idxStart && !drvHstAudCaIsBufferQueued(pBuf = paBuffers[idxBuffer].pBuf));
         }
 
@@ -2051,5 +2049,5 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetWritable}
  */
-static DECLCALLBACK(uint32_t) drvHostAudioCaHA_StreamGetWritable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+static DECLCALLBACK(uint32_t) drvHstAudCaHA_StreamGetWritable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     RT_NOREF(pInterface);
@@ -2069,5 +2067,5 @@
 
         if (   cBuffers > 0
-            && !drvHostAudioCaIsBufferQueued(pBuf = paBuffers[idxBuffer].pBuf))
+            && !drvHstAudCaIsBufferQueued(pBuf = paBuffers[idxBuffer].pBuf))
         {
             do
@@ -2085,5 +2083,5 @@
                 else
                     idxBuffer = 0;
-            } while (idxBuffer != idxStart && !drvHostAudioCaIsBufferQueued(pBuf = paBuffers[idxBuffer].pBuf));
+            } while (idxBuffer != idxStart && !drvHstAudCaIsBufferQueued(pBuf = paBuffers[idxBuffer].pBuf));
         }
 
@@ -2098,6 +2096,6 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetState}
  */
-static DECLCALLBACK(PDMHOSTAUDIOSTREAMSTATE) drvHostAudioCaHA_StreamGetState(PPDMIHOSTAUDIO pInterface,
-                                                                             PPDMAUDIOBACKENDSTREAM pStream)
+static DECLCALLBACK(PDMHOSTAUDIOSTREAMSTATE) drvHstAudCaHA_StreamGetState(PPDMIHOSTAUDIO pInterface,
+                                                                          PPDMAUDIOBACKENDSTREAM pStream)
 {
     RT_NOREF(pInterface);
@@ -2118,5 +2116,5 @@
             uintptr_t           idxBuffer = pStreamCA->cBuffers;
             while (idxBuffer-- > 0)
-                if (!drvHostAudioCaIsBufferQueued(paBuffers[idxBuffer].pBuf))
+                if (!drvHstAudCaIsBufferQueued(paBuffers[idxBuffer].pBuf))
                 { /* likely */ }
                 else
@@ -2125,5 +2123,5 @@
                     uint32_t cQueued = 1;
                     while (idxBuffer-- > 0)
-                        cQueued += drvHostAudioCaIsBufferQueued(paBuffers[idxBuffer].pBuf);
+                        cQueued += drvHstAudCaIsBufferQueued(paBuffers[idxBuffer].pBuf);
                     LogFunc(("Still done draining '%s': %u queued buffers\n", pStreamCA->Cfg.szName, cQueued));
 #endif
@@ -2147,6 +2145,6 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamPlay}
  */
-static DECLCALLBACK(int) drvHostAudioCaHA_StreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
-                                                     const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
+static DECLCALLBACK(int) drvHstAudCaHA_StreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                  const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
 {
     RT_NOREF(pInterface);
@@ -2166,8 +2164,8 @@
         RTCritSectLeave(&pStreamCA->CritSect);
         *pcbWritten = 0;
-        LogFunc(("Skipping %#x byte write to disabled stream {%s}\n", cbBuf, drvHostAudioCaStreamStatusString(pStreamCA) ));
+        LogFunc(("Skipping %#x byte write to disabled stream {%s}\n", cbBuf, drvHstAudCaStreamStatusString(pStreamCA) ));
         return VINF_SUCCESS;
     }
-    Log4Func(("cbBuf=%#x stream '%s' {%s}\n", cbBuf, pStreamCA->Cfg.szName, drvHostAudioCaStreamStatusString(pStreamCA) ));
+    Log4Func(("cbBuf=%#x stream '%s' {%s}\n", cbBuf, pStreamCA->Cfg.szName, drvHstAudCaStreamStatusString(pStreamCA) ));
 
     /*
@@ -2192,5 +2190,5 @@
          */
         AudioQueueBufferRef const pBuf = paBuffers[idxBuffer].pBuf;
-        if (!drvHostAudioCaIsBufferQueued(pBuf))
+        if (!drvHstAudCaIsBufferQueued(pBuf))
         { /* likely */ }
         else
@@ -2213,5 +2211,5 @@
         {
             Log3Func(("@%#RX64: buffer #%u/%u: %#x bytes, have %#x only - leaving unqueued {%s}\n",
-                      pStreamCA->offInternal, idxBuffer, cBuffers, cbAvail, cbBuf, drvHostAudioCaStreamStatusString(pStreamCA) ));
+                      pStreamCA->offInternal, idxBuffer, cBuffers, cbAvail, cbBuf, drvHstAudCaStreamStatusString(pStreamCA) ));
             memcpy((uint8_t *)pBuf->mAudioData + cbUsed, pvBuf, cbBuf);
             pBuf->mAudioDataByteSize = cbUsed + cbBuf;
@@ -2224,10 +2222,10 @@
 
         Log3Func(("@%#RX64: buffer #%u/%u: %#x bytes, have %#x - will queue {%s}\n",
-                  pStreamCA->offInternal, idxBuffer, cBuffers, cbAvail, cbBuf, drvHostAudioCaStreamStatusString(pStreamCA) ));
+                  pStreamCA->offInternal, idxBuffer, cBuffers, cbAvail, cbBuf, drvHstAudCaStreamStatusString(pStreamCA) ));
         memcpy((uint8_t *)pBuf->mAudioData + cbUsed, pvBuf, cbAvail);
         pBuf->mAudioDataByteSize = cbTotal;
         cbWritten               += cbAvail;
         pStreamCA->offInternal  += cbAvail;
-        drvHostAudioCaSetBufferQueued(pBuf, true /*fQueued*/);
+        drvHstAudCaSetBufferQueued(pBuf, true /*fQueued*/);
 
         OSStatus orc = AudioQueueEnqueueBuffer(pStreamCA->hAudioQueue, pBuf, 0 /*inNumPacketDesc*/, NULL /*inPacketDescs*/);
@@ -2238,5 +2236,5 @@
             LogRelMax(256, ("CoreAudio: AudioQueueEnqueueBuffer('%s', #%u) failed: %#x (%d)\n",
                             pStreamCA->Cfg.szName, idxBuffer, orc, orc));
-            drvHostAudioCaSetBufferQueued(pBuf, false /*fQueued*/);
+            drvHstAudCaSetBufferQueued(pBuf, false /*fQueued*/);
             pBuf->mAudioDataByteSize -= PDMAudioPropsFramesToBytes(&pStreamCA->Cfg.Props, 1); /* avoid assertions above */
             rc = VERR_AUDIO_STREAM_NOT_READY;
@@ -2309,5 +2307,5 @@
     }
     LogFlowFunc(("@%#RX64: rc=%Rrc cbWritten=%RU32 cMsDelta=%RU64 (%RU64 -> %RU64) {%s}\n", pStreamCA->offInternal, rc, cbWritten,
-                 msPrev ? msNow - msPrev : 0, msPrev, pStreamCA->msLastTransfer, drvHostAudioCaStreamStatusString(pStreamCA) ));
+                 msPrev ? msNow - msPrev : 0, msPrev, pStreamCA->msLastTransfer, drvHstAudCaStreamStatusString(pStreamCA) ));
     return rc;
 }
@@ -2317,6 +2315,6 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCapture}
  */
-static DECLCALLBACK(int) drvHostAudioCaHA_StreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
-                                                        void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
+static DECLCALLBACK(int) drvHstAudCaHA_StreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                     void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
 {
     RT_NOREF(pInterface);
@@ -2336,8 +2334,8 @@
         RTCritSectLeave(&pStreamCA->CritSect);
         *pcbRead = 0;
-        LogFunc(("Skipping %#x byte read from disabled stream {%s}\n", cbBuf, drvHostAudioCaStreamStatusString(pStreamCA)));
+        LogFunc(("Skipping %#x byte read from disabled stream {%s}\n", cbBuf, drvHstAudCaStreamStatusString(pStreamCA)));
         return VINF_SUCCESS;
     }
-    Log4Func(("cbBuf=%#x stream '%s' {%s}\n", cbBuf, pStreamCA->Cfg.szName, drvHostAudioCaStreamStatusString(pStreamCA) ));
+    Log4Func(("cbBuf=%#x stream '%s' {%s}\n", cbBuf, pStreamCA->Cfg.szName, drvHstAudCaStreamStatusString(pStreamCA) ));
 
 
@@ -2364,5 +2362,5 @@
          */
         AudioQueueBufferRef const pBuf = paBuffers[idxBuffer].pBuf;
-        if (!drvHostAudioCaIsBufferQueued(pBuf))
+        if (!drvHstAudCaIsBufferQueued(pBuf))
         { /* likely */ }
         else
@@ -2386,5 +2384,5 @@
         {
             Log3Func(("@%#RX64: buffer #%u/%u: %#x bytes, want %#x - leaving unqueued {%s}\n",
-                      pStreamCA->offInternal, idxBuffer, cBuffers, cbLeft, cbBuf, drvHostAudioCaStreamStatusString(pStreamCA) ));
+                      pStreamCA->offInternal, idxBuffer, cBuffers, cbLeft, cbBuf, drvHstAudCaStreamStatusString(pStreamCA) ));
             memcpy(pvBuf, (uint8_t const *)pBuf->mAudioData + offRead, cbBuf);
             paBuffers[idxBuffer].offRead = offRead + cbBuf;
@@ -2395,5 +2393,5 @@
 
         Log3Func(("@%#RX64: buffer #%u/%u: %#x bytes, want all (%#x) - will queue {%s}\n",
-                  pStreamCA->offInternal, idxBuffer, cBuffers, cbLeft, cbBuf, drvHostAudioCaStreamStatusString(pStreamCA) ));
+                  pStreamCA->offInternal, idxBuffer, cBuffers, cbLeft, cbBuf, drvHstAudCaStreamStatusString(pStreamCA) ));
         memcpy(pvBuf, (uint8_t const *)pBuf->mAudioData + offRead, cbLeft);
         cbRead                  += cbLeft;
@@ -2403,5 +2401,5 @@
         paBuffers[idxBuffer].offRead = 0;
         pBuf->mAudioDataByteSize     = 0;
-        drvHostAudioCaSetBufferQueued(pBuf, true /*fQueued*/);
+        drvHstAudCaSetBufferQueued(pBuf, true /*fQueued*/);
 
         OSStatus orc = AudioQueueEnqueueBuffer(pStreamCA->hAudioQueue, pBuf, 0 /*inNumPacketDesc*/, NULL /*inPacketDescs*/);
@@ -2412,5 +2410,5 @@
             LogRelMax(256, ("CoreAudio: AudioQueueEnqueueBuffer('%s', #%u) failed: %#x (%d)\n",
                             pStreamCA->Cfg.szName, idxBuffer, orc, orc));
-            drvHostAudioCaSetBufferQueued(pBuf, false /*fQueued*/);
+            drvHstAudCaSetBufferQueued(pBuf, false /*fQueued*/);
             rc = VERR_AUDIO_STREAM_NOT_READY;
             break;
@@ -2452,5 +2450,5 @@
     }
     LogFlowFunc(("@%#RX64: rc=%Rrc cbRead=%RU32 cMsDelta=%RU64 (%RU64 -> %RU64) {%s}\n", pStreamCA->offInternal, rc, cbRead,
-                 msPrev ? msNow - msPrev : 0, msPrev, pStreamCA->msLastTransfer, drvHostAudioCaStreamStatusString(pStreamCA) ));
+                 msPrev ? msNow - msPrev : 0, msPrev, pStreamCA->msLastTransfer, drvHstAudCaStreamStatusString(pStreamCA) ));
     return rc;
 }
@@ -2464,5 +2462,5 @@
  * @interface_method_impl{PDMIBASE,pfnQueryInterface}
  */
-static DECLCALLBACK(void *) drvHostAudioCaQueryInterface(PPDMIBASE pInterface, const char *pszIID)
+static DECLCALLBACK(void *) drvHstAudCaQueryInterface(PPDMIBASE pInterface, const char *pszIID)
 {
     PPDMDRVINS        pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
@@ -2483,5 +2481,5 @@
  * Worker for the power off and destructor callbacks.
  */
-static void drvHostAudioCaRemoveDefaultDeviceListners(PDRVHOSTCOREAUDIO pThis)
+static void drvHstAudCaRemoveDefaultDeviceListners(PDRVHOSTCOREAUDIO pThis)
 {
     /*
@@ -2499,5 +2497,5 @@
     {
         orc = AudioObjectRemovePropertyListener(kAudioObjectSystemObject, &PropAddr,
-                                                drvHostAudioCaDefaultDeviceChangedCallback, pThis);
+                                                drvHstAudCaDefaultDeviceChangedCallback, pThis);
         if (   orc != noErr
             && orc != kAudioHardwareBadObjectError)
@@ -2511,5 +2509,5 @@
         PropAddr.mSelector = kAudioHardwarePropertyDefaultOutputDevice;
         orc = AudioObjectRemovePropertyListener(kAudioObjectSystemObject, &PropAddr,
-                                                drvHostAudioCaDefaultDeviceChangedCallback, pThis);
+                                                drvHstAudCaDefaultDeviceChangedCallback, pThis);
         if (   orc != noErr
             && orc != kAudioHardwareBadObjectError)
@@ -2525,8 +2523,8 @@
  * @interface_method_impl{PDMDRVREG,pfnPowerOff}
  */
-static DECLCALLBACK(void) drvHostAudioCaPowerOff(PPDMDRVINS pDrvIns)
+static DECLCALLBACK(void) drvHstAudCaPowerOff(PPDMDRVINS pDrvIns)
 {
     PDRVHOSTCOREAUDIO pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTCOREAUDIO);
-    drvHostAudioCaRemoveDefaultDeviceListners(pThis);
+    drvHstAudCaRemoveDefaultDeviceListners(pThis);
 }
 
@@ -2535,16 +2533,16 @@
  * @callback_method_impl{FNPDMDRVDESTRUCT}
  */
-static DECLCALLBACK(void) drvHostAudioCaDestruct(PPDMDRVINS pDrvIns)
+static DECLCALLBACK(void) drvHstAudCaDestruct(PPDMDRVINS pDrvIns)
 {
     PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
     PDRVHOSTCOREAUDIO pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTCOREAUDIO);
 
-    drvHostAudioCaRemoveDefaultDeviceListners(pThis);
+    drvHstAudCaRemoveDefaultDeviceListners(pThis);
 
     if (RTCritSectIsInitialized(&pThis->CritSect))
     {
         RTCritSectEnter(&pThis->CritSect);
-        drvHostAudioCaDeviceUnregisterCallbacks(pThis->pDefaultDevIn);
-        drvHostAudioCaDeviceUnregisterCallbacks(pThis->pDefaultDevOut);
+        drvHstAudCaDeviceUnregisterCallbacks(pThis->pDefaultDevIn);
+        drvHstAudCaDeviceUnregisterCallbacks(pThis->pDefaultDevOut);
         RTCritSectLeave(&pThis->CritSect);
     }
@@ -2608,5 +2606,5 @@
  *      Construct a Core Audio driver instance.}
  */
-static DECLCALLBACK(int) drvHostAudioCaConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
+static DECLCALLBACK(int) drvHstAudCaConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
 {
     RT_NOREF(pCfg, fFlags);
@@ -2627,22 +2625,22 @@
     PDMAudioHostEnumInit(&pThis->Devices);
     /* IBase */
-    pDrvIns->IBase.pfnQueryInterface = drvHostAudioCaQueryInterface;
+    pDrvIns->IBase.pfnQueryInterface = drvHstAudCaQueryInterface;
     /* IHostAudio */
-    pThis->IHostAudio.pfnGetConfig                  = drvHostAudioCaHA_GetConfig;
-    pThis->IHostAudio.pfnGetDevices                 = drvHostAudioCaHA_GetDevices;
-    pThis->IHostAudio.pfnGetStatus                  = drvHostAudioCaHA_GetStatus;
+    pThis->IHostAudio.pfnGetConfig                  = drvHstAudCaHA_GetConfig;
+    pThis->IHostAudio.pfnGetDevices                 = drvHstAudCaHA_GetDevices;
+    pThis->IHostAudio.pfnGetStatus                  = drvHstAudCaHA_GetStatus;
     pThis->IHostAudio.pfnDoOnWorkerThread           = NULL;
     pThis->IHostAudio.pfnStreamConfigHint           = NULL;
-    pThis->IHostAudio.pfnStreamCreate               = drvHostAudioCaHA_StreamCreate;
+    pThis->IHostAudio.pfnStreamCreate               = drvHstAudCaHA_StreamCreate;
     pThis->IHostAudio.pfnStreamInitAsync            = NULL;
-    pThis->IHostAudio.pfnStreamDestroy              = drvHostAudioCaHA_StreamDestroy;
+    pThis->IHostAudio.pfnStreamDestroy              = drvHstAudCaHA_StreamDestroy;
     pThis->IHostAudio.pfnStreamNotifyDeviceChanged  = NULL;
-    pThis->IHostAudio.pfnStreamControl              = drvHostAudioCaHA_StreamControl;
-    pThis->IHostAudio.pfnStreamGetReadable          = drvHostAudioCaHA_StreamGetReadable;
-    pThis->IHostAudio.pfnStreamGetWritable          = drvHostAudioCaHA_StreamGetWritable;
+    pThis->IHostAudio.pfnStreamControl              = drvHstAudCaHA_StreamControl;
+    pThis->IHostAudio.pfnStreamGetReadable          = drvHstAudCaHA_StreamGetReadable;
+    pThis->IHostAudio.pfnStreamGetWritable          = drvHstAudCaHA_StreamGetWritable;
     pThis->IHostAudio.pfnStreamGetPending           = NULL;
-    pThis->IHostAudio.pfnStreamGetState             = drvHostAudioCaHA_StreamGetState;
-    pThis->IHostAudio.pfnStreamPlay                 = drvHostAudioCaHA_StreamPlay;
-    pThis->IHostAudio.pfnStreamCapture              = drvHostAudioCaHA_StreamCapture;
+    pThis->IHostAudio.pfnStreamGetState             = drvHstAudCaHA_StreamGetState;
+    pThis->IHostAudio.pfnStreamPlay                 = drvHstAudCaHA_StreamPlay;
+    pThis->IHostAudio.pfnStreamCapture              = drvHstAudCaHA_StreamCapture;
 
     int rc = RTCritSectInit(&pThis->CritSect);
@@ -2659,5 +2657,5 @@
     PortCtx.release         = NULL;
     PortCtx.copyDescription = NULL;
-    pThis->hThreadPort = CFMachPortCreate(NULL /*allocator*/, drvHostAudioCaThreadPortCallback, &PortCtx, NULL);
+    pThis->hThreadPort = CFMachPortCreate(NULL /*allocator*/, drvHstAudCaThreadPortCallback, &PortCtx, NULL);
     AssertLogRelReturn(pThis->hThreadPort != NULL, VERR_NO_MEMORY);
 
@@ -2665,5 +2663,5 @@
     AssertLogRelReturn(pThis->hThreadPortSrc != NULL, VERR_NO_MEMORY);
 
-    rc = RTThreadCreateF(&pThis->hThread, drvHostAudioCaThread, pThis, 0, RTTHREADTYPE_IO,
+    rc = RTThreadCreateF(&pThis->hThread, drvHstAudCaThread, pThis, 0, RTTHREADTYPE_IO,
                          RTTHREADFLAGS_WAITABLE, "CaAud-%u", pDrvIns->iInstance);
     AssertLogRelMsgReturn(RT_SUCCESS(rc), ("RTThreadCreateF failed: %Rrc\n", rc), rc);
@@ -2677,5 +2675,5 @@
      * Create a IPRT timer.  The TM timers won't necessarily work as EMT is probably busy.
      */
-    rc = RTTimerLRCreateEx(&pThis->hBreakpointTimer, 0 /*no interval*/, 0, drvHostAudioCaBreakpointTimer, pThis);
+    rc = RTTimerLRCreateEx(&pThis->hBreakpointTimer, 0 /*no interval*/, 0, drvHstAudCaBreakpointTimer, pThis);
     AssertRCReturn(rc, rc);
 #endif
@@ -2684,5 +2682,5 @@
      * Enumerate audio devices.
      */
-    rc = drvHostAudioCaEnumerateDevices(pThis);
+    rc = drvHstAudCaEnumerateDevices(pThis);
     AssertRCReturn(rc, rc);
 
@@ -2698,5 +2696,6 @@
     };
 
-    OSStatus orc = AudioObjectAddPropertyListener(kAudioObjectSystemObject, &PropAddr, drvHostAudioCaDefaultDeviceChangedCallback, pThis);
+    OSStatus orc = AudioObjectAddPropertyListener(kAudioObjectSystemObject, &PropAddr,
+                                                  drvHstAudCaDefaultDeviceChangedCallback, pThis);
     pThis->fRegisteredDefaultInputListener = orc == noErr;
     if (   orc != noErr
@@ -2705,5 +2704,5 @@
 
     PropAddr.mSelector = kAudioHardwarePropertyDefaultOutputDevice;
-    orc = AudioObjectAddPropertyListener(kAudioObjectSystemObject, &PropAddr, drvHostAudioCaDefaultDeviceChangedCallback, pThis);
+    orc = AudioObjectAddPropertyListener(kAudioObjectSystemObject, &PropAddr, drvHstAudCaDefaultDeviceChangedCallback, pThis);
     pThis->fRegisteredDefaultOutputListener = orc == noErr;
     if (   orc != noErr
@@ -2751,7 +2750,7 @@
     sizeof(DRVHOSTCOREAUDIO),
     /* pfnConstruct */
-    drvHostAudioCaConstruct,
+    drvHstAudCaConstruct,
     /* pfnDestruct */
-    drvHostAudioCaDestruct,
+    drvHstAudCaDestruct,
     /* pfnRelocate */
     NULL,
@@ -2771,5 +2770,5 @@
     NULL,
     /* pfnPowerOff */
-    drvHostAudioCaPowerOff,
+    drvHstAudCaPowerOff,
     /* pfnSoftReset */
     NULL,
