Index: trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp
===================================================================
--- trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp	(revision 42550)
+++ trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp	(revision 42551)
@@ -495,5 +495,5 @@
                 break;
             }
-            CHECK_ERROR(adapter, COMGETTER(NatDriver)(engine.asOutParam()));
+            CHECK_ERROR(adapter, COMGETTER(NATEngine)(engine.asOutParam()));
             if (!engine)
             {
Index: trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp
===================================================================
--- trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp	(revision 42550)
+++ trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp	(revision 42551)
@@ -59,4 +59,6 @@
 
 using namespace com;
+
+#undef VBOX_WITH_GUEST_CONTROL2
 
 /**
@@ -225,6 +227,6 @@
                  "                            --image <path to program> --username <name>\n"
                  "                            [--passwordfile <file> | --password <password>]\n"
+                 "                            [--domain <domain>] [--verbose] [--timeout <msec>]\n"
                  "                            [--environment \"<NAME>=<VALUE> [<NAME>=<VALUE>]\"]\n"
-                 "                            [--verbose] [--timeout <msec>]\n"
                  "                            [--wait-exit] [--wait-stdout] [--wait-stderr]\n"
                  "                            [--dos2unix] [--unix2dos]\n"
@@ -236,20 +238,23 @@
                  "                            <guest source> <host dest> --username <name>\n"
                  "                            [--passwordfile <file> | --password <password>]\n"
-                 "                            [--dryrun] [--follow] [--recursive] [--verbose]\n"
+                 "                            [--domain <domain>] [--verbose]\n"
+                 "                            [--dryrun] [--follow] [--recursive]\n"
                  "\n"
                  "                            copyto|cp\n"
                  "                            <host source> <guest dest> --username <name>\n"
                  "                            [--passwordfile <file> | --password <password>]\n"
-                 "                            [--dryrun] [--follow] [--recursive] [--verbose]\n"
+                 "                            [--domain <domain>] [--verbose]\n"
+                 "                            [--dryrun] [--follow] [--recursive]\n"
                  "\n"
                  "                            createdir[ectory]|mkdir|md\n"
                  "                            <guest directory>... --username <name>\n"
                  "                            [--passwordfile <file> | --password <password>]\n"
-                 "                            [--parents] [--mode <mode>] [--verbose]\n"
+                 "                            [--domain <domain>] [--verbose]\n"
+                 "                            [--parents] [--mode <mode>]\n"
                  "\n"
                  "                            stat\n"
                  "                            <file>... --username <name>\n"
                  "                            [--passwordfile <file> | --password <password>]\n"
-                 "                            [--verbose]\n"
+                 "                            [--domain <domain>] [--verbose]\n"
                  "\n"
                  "                            updateadditions\n"
@@ -296,4 +301,5 @@
 }
 
+#ifndef VBOX_WITH_GUEST_CONTROL2
 /**
  * Translates a process status to a human readable
@@ -363,4 +369,88 @@
     return rc;
 }
+#else
+/**
+ * Translates a process status to a human readable
+ * string.
+ */
+static const char *ctrlExecProcessStatusToText(ProcessStatus_T enmStatus)
+{
+    switch (enmStatus)
+    {
+        case ProcessStatus_Starting:
+            return "starting";
+        case ProcessStatus_Started:
+            return "started";
+        case ProcessStatus_Paused:
+            return "paused";
+        case ProcessStatus_Terminating:
+            return "terminating";
+        case ProcessStatus_TerminatedNormally:
+            return "successfully terminated";
+        case ProcessStatus_TerminatedSignal:
+            return "terminated by signal";
+        case ProcessStatus_TerminatedAbnormally:
+            return "abnormally aborted";
+        case ProcessStatus_TimedOutKilled:
+            return "timed out";
+        case ProcessStatus_TimedOutAbnormally:
+            return "timed out, hanging";
+        case ProcessStatus_Down:
+            return "killed";
+        case ProcessStatus_Error:
+            return "error";
+        default:
+            break;
+    }
+    return "unknown";
+}
+
+static int ctrlExecProcessStatusToExitCode(ProcessStatus_T enmStatus, ULONG uExitCode)
+{
+    int rc = EXITCODEEXEC_SUCCESS;
+    switch (enmStatus)
+    {
+        case ProcessStatus_Starting:
+            rc = EXITCODEEXEC_SUCCESS;
+            break;
+        case ProcessStatus_Started:
+            rc = EXITCODEEXEC_SUCCESS;
+            break;
+        case ProcessStatus_Paused:
+            rc = EXITCODEEXEC_SUCCESS;
+            break;
+        case ProcessStatus_Terminating:
+            rc = EXITCODEEXEC_SUCCESS;
+            break;
+        case ProcessStatus_TerminatedNormally:
+            rc = !uExitCode ? EXITCODEEXEC_SUCCESS : EXITCODEEXEC_CODE;
+            break;
+        case ProcessStatus_TerminatedSignal:
+            rc = EXITCODEEXEC_TERM_SIGNAL;
+            break;
+        case ProcessStatus_TerminatedAbnormally:
+            rc = EXITCODEEXEC_TERM_ABEND;
+            break;
+        case ProcessStatus_TimedOutKilled:
+            rc = EXITCODEEXEC_TIMEOUT;
+            break;
+        case ProcessStatus_TimedOutAbnormally:
+            rc = EXITCODEEXEC_TIMEOUT;
+            break;
+        case ProcessStatus_Down:
+            /* Service/OS is stopping, process was killed, so
+             * not exactly an error of the started process ... */
+            rc = EXITCODEEXEC_DOWN;
+            break;
+        case ProcessStatus_Error:
+            rc = EXITCODEEXEC_FAILED;
+            break;
+        default:
+            AssertMsgFailed(("Unknown exit code (%u) from guest process returned!\n", enmStatus));
+            break;
+    }
+    return rc;
+}
+#endif
 
 static int ctrlPrintError(com::ErrorInfo &errorInfo)
@@ -482,4 +572,5 @@
 }
 
+#ifndef VBOX_WITH_GUEST_CONTROL2
 /**
  * Prints the desired guest output to a stream.
@@ -493,5 +584,5 @@
 static int ctrlExecPrintOutput(IGuest *pGuest, ULONG uPID,
                                PRTSTREAM pStrmOutput, uint32_t fOutputFlags,
-                               uint32_t cMsTimeout)
+                               RTMSINTERVAL cMsTimeout)
 {
     AssertPtrReturn(pGuest, VERR_INVALID_POINTER);
@@ -565,4 +656,37 @@
     return vrc;
 }
+#else
+/**
+ * Prints the desired guest output to a stream.
+ *
+ * @return  IPRT status code.
+ * @param   pProcess        Pointer to appropriate process object.
+ * @param   pStrmOutput     Where to write the data.
+ * @param   hStream         Where to read the data from.
+ */
+static int ctrlExecPrintOutput(IProcess *pProcess, PRTSTREAM pStrmOutput,
+                               ULONG uHandle)
+{
+    AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
+    AssertPtrReturn(pStrmOutput, VERR_INVALID_POINTER);
+
+    int vrc = VINF_SUCCESS;
+
+    SafeArray<BYTE> aOutputData;
+    HRESULT rc = pProcess->Read(uHandle, _64K, 1 /* timeout */,
+                                ComSafeArrayAsOutParam(aOutputData));
+    if (FAILED(rc))
+        vrc = ctrlPrintError(pProcess, COM_IIDOF(IProcess));
+    else
+    {
+        /** @todo implement the dos2unix/unix2dos conversions */
+        vrc = RTStrmWrite(pStrmOutput, aOutputData.raw(), aOutputData.size());
+        if (RT_FAILURE(vrc))
+            RTMsgError("Unable to write output, rc=%Rrc\n", vrc);
+    }
+
+    return vrc;
+}
+#endif
 
 /**
@@ -572,16 +696,16 @@
  * @return  RTMSINTERVAL    Time left (in ms).
  * @param   u64StartMs      Start time (in ms).
- * @param   u32TimeoutMs    Timeout value (in ms).
- */
-inline RTMSINTERVAL ctrlExecGetRemainingTime(uint64_t u64StartMs, uint32_t u32TimeoutMs)
-{
-    if (!u32TimeoutMs) /* If no timeout specified, wait forever. */
+ * @param   cMsTimeout      Timeout value (in ms).
+ */
+inline RTMSINTERVAL ctrlExecGetRemainingTime(uint64_t u64StartMs, RTMSINTERVAL cMsTimeout)
+{
+    if (!cMsTimeout || cMsTimeout == RT_INDEFINITE_WAIT) /* If no timeout specified, wait forever. */
         return RT_INDEFINITE_WAIT;
 
     uint64_t u64ElapsedMs = RTTimeMilliTS() - u64StartMs;
-    if (u64ElapsedMs >= u32TimeoutMs)
+    if (u64ElapsedMs >= cMsTimeout)
         return 0;
 
-    return u32TimeoutMs - u64ElapsedMs;
+    return cMsTimeout - u64ElapsedMs;
 }
 
@@ -605,9 +729,10 @@
         { "--image",                        'i',                                      RTGETOPT_REQ_STRING  },
         { "--no-profile",                   GETOPTDEF_EXEC_NO_PROFILE,                RTGETOPT_REQ_NOTHING },
+        { "--username",                     'u',                                      RTGETOPT_REQ_STRING  },
         { "--passwordfile",                 'p',                                      RTGETOPT_REQ_STRING  },
         { "--password",                     GETOPTDEF_EXEC_PASSWORD,                  RTGETOPT_REQ_STRING  },
+        { "--domain",                       'd',                                      RTGETOPT_REQ_STRING  },
         { "--timeout",                      't',                                      RTGETOPT_REQ_UINT32  },
         { "--unix2dos",                     GETOPTDEF_EXEC_UNIX2DOS,                  RTGETOPT_REQ_NOTHING },
-        { "--username",                     'u',                                      RTGETOPT_REQ_STRING  },
         { "--verbose",                      'v',                                      RTGETOPT_REQ_NOTHING },
         { "--wait-exit",                    GETOPTDEF_EXEC_WAITFOREXIT,               RTGETOPT_REQ_NOTHING },
@@ -621,13 +746,18 @@
     RTGetOptInit(&GetState, pArg->argc, pArg->argv, s_aOptions, RT_ELEMENTS(s_aOptions), 0, 0);
 
-    Utf8Str                 Utf8Cmd;
+    Utf8Str                 strCmd;
+#ifndef VBOX_WITH_GUEST_CONTROL2
     uint32_t                fExecFlags      = ExecuteProcessFlag_None;
+#else
+    com::SafeArray<ProcessCreateFlag_T> aCreateFlags;
+    com::SafeArray<ProcessWaitForFlag_T> aWaitFlags;
+#endif
     com::SafeArray<IN_BSTR> args;
     com::SafeArray<IN_BSTR> env;
-    Utf8Str                 Utf8UserName;
-    Utf8Str                 Utf8Password;
-    uint32_t                cMsTimeout      = 0;
+    Utf8Str                 strUserName;
+    Utf8Str                 strPassword;
+    Utf8Str                 strDomain;
+    RTMSINTERVAL            cMsTimeout      = 0;
     OUTPUTTYPE              eOutputType     = OUTPUTTYPE_UNDEFINED;
-    bool                    fOutputBinary   = false;
     bool                    fWaitForExit    = false;
     bool                    fVerbose        = false;
@@ -662,28 +792,44 @@
 
             case GETOPTDEF_EXEC_IGNOREORPHANEDPROCESSES:
+#ifndef VBOX_WITH_GUEST_CONTROL2
                 fExecFlags |= ExecuteProcessFlag_IgnoreOrphanedProcesses;
+#else
+                aCreateFlags.push_back(ProcessCreateFlag_IgnoreOrphanedProcesses);
+#endif
                 break;
 
             case GETOPTDEF_EXEC_NO_PROFILE:
+#ifndef VBOX_WITH_GUEST_CONTROL2
                 fExecFlags |= ExecuteProcessFlag_NoProfile;
+#else
+                aCreateFlags.push_back(ProcessCreateFlag_NoProfile);
+#endif
                 break;
 
             case 'i':
-                Utf8Cmd = ValueUnion.psz;
+                strCmd = ValueUnion.psz;
                 break;
 
             /** @todo Add a hidden flag. */
 
+            case 'u': /* User name */
+                strUserName = ValueUnion.psz;
+                break;
+
             case GETOPTDEF_EXEC_PASSWORD: /* Password */
-                Utf8Password = ValueUnion.psz;
+                strPassword = ValueUnion.psz;
                 break;
 
             case 'p': /* Password file */
             {
-                RTEXITCODE rcExit = readPasswordFile(ValueUnion.psz, &Utf8Password);
+                RTEXITCODE rcExit = readPasswordFile(ValueUnion.psz, &strPassword);
                 if (rcExit != RTEXITCODE_SUCCESS)
                     return rcExit;
                 break;
             }
+
+            case 'd': /* domain */
+                strDomain = ValueUnion.psz;
+                break;
 
             case 't': /* Timeout */
@@ -697,8 +843,4 @@
                 break;
 
-            case 'u': /* User name */
-                Utf8UserName = ValueUnion.psz;
-                break;
-
             case 'v': /* Verbose */
                 fVerbose = true;
@@ -706,14 +848,28 @@
 
             case GETOPTDEF_EXEC_WAITFOREXIT:
+#ifndef VBOX_WITH_GUEST_CONTROL2
+#else
+                aWaitFlags.push_back(ProcessWaitForFlag_Terminate);
+#endif
                 fWaitForExit = true;
                 break;
 
             case GETOPTDEF_EXEC_WAITFORSTDOUT:
+#ifndef VBOX_WITH_GUEST_CONTROL2
                 fExecFlags |= ExecuteProcessFlag_WaitForStdOut;
+#else
+                aCreateFlags.push_back(ProcessCreateFlag_WaitForStdOut);
+                aWaitFlags.push_back(ProcessWaitForFlag_StdOut);
+#endif
                 fWaitForExit = true;
                 break;
 
             case GETOPTDEF_EXEC_WAITFORSTDERR:
+#ifndef VBOX_WITH_GUEST_CONTROL2
                 fExecFlags |= ExecuteProcessFlag_WaitForStdErr;
+#else
+                aCreateFlags.push_back(ProcessCreateFlag_WaitForStdErr);
+                aWaitFlags.push_back(ProcessWaitForFlag_StdErr);
+#endif
                 fWaitForExit = true;
                 break;
@@ -721,6 +877,6 @@
             case VINF_GETOPT_NOT_OPTION:
             {
-                if (args.size() == 0 && Utf8Cmd.isEmpty())
-                    Utf8Cmd = ValueUnion.psz;
+                if (args.size() == 0 && strCmd.isEmpty())
+                    strCmd = ValueUnion.psz;
                 else
                     args.push_back(Bstr(ValueUnion.psz).raw());
@@ -733,8 +889,8 @@
     }
 
-    if (Utf8Cmd.isEmpty())
+    if (strCmd.isEmpty())
         return errorSyntax(USAGE_GUESTCONTROL, "No command to execute specified!");
 
-    if (Utf8UserName.isEmpty())
+    if (strUserName.isEmpty())
         return errorSyntax(USAGE_GUESTCONTROL, "No user name specified!");
 
@@ -744,5 +900,5 @@
 
     /*
-     * <missing comment indicating that we're done parsing args and started doing something else>
+     * Start with the real work.
      */
     HRESULT rc = S_OK;
@@ -755,25 +911,30 @@
     }
 
+#ifndef VBOX_WITH_GUEST_CONTROL2
     /* Get current time stamp to later calculate rest of timeout left. */
     uint64_t u64StartMS = RTTimeMilliTS();
 
-    /* Execute the process. */
-    int rcExit = RTEXITCODE_FAILURE;
-    ComPtr<IProgress> progress;
+    /*
+     * Execute the process.
+     */
+    ComPtr<IProgress> pProgress;
     ULONG uPID = 0;
-    rc = pGuest->ExecuteProcess(Bstr(Utf8Cmd).raw(),
+    rc = pGuest->ExecuteProcess(Bstr(strCmd).raw(),
                                fExecFlags,
                                ComSafeArrayAsInParam(args),
                                ComSafeArrayAsInParam(env),
-                               Bstr(Utf8UserName).raw(),
-                               Bstr(Utf8Password).raw(),
+                               Bstr(strUserName).raw(),
+                               Bstr(strPassword).raw(),
                                cMsTimeout,
                                &uPID,
-                               progress.asOutParam());
+                               pProgress.asOutParam());
     if (FAILED(rc))
-        return ctrlPrintError(pGuest, COM_IIDOF(IGuest));
+    {
+        ctrlPrintError(pGuest, COM_IIDOF(IGuest));
+        return RTEXITCODE_FAILURE;
+    }
 
     if (fVerbose)
-        RTPrintf("Process '%s' (PID: %u) started\n", Utf8Cmd.c_str(), uPID);
+        RTPrintf("Process '%s' (PID: %u) started\n", strCmd.c_str(), uPID);
     if (fWaitForExit)
     {
@@ -795,8 +956,8 @@
 
         /* Setup signal handling if cancelable. */
-        ASSERT(progress);
+        ASSERT(pProgress);
         bool fCanceledAlready = false;
         BOOL fCancelable;
-        HRESULT hrc = progress->COMGETTER(Cancelable)(&fCancelable);
+        HRESULT hrc = pProgress->COMGETTER(Cancelable)(&fCancelable);
         if (FAILED(hrc))
             fCancelable = FALSE;
@@ -814,9 +975,9 @@
         BOOL fCompleted    = FALSE;
         BOOL fCanceled     = FALSE;
-        while (   SUCCEEDED(progress->COMGETTER(Completed(&fCompleted)))
+        while (   SUCCEEDED(pProgress->COMGETTER(Completed(&fCompleted)))
                && !fCompleted)
         {
             /* Do we need to output stuff? */
-            uint32_t cMsTimeLeft;
+            RTMSINTERVAL cMsTimeLeft;
             if (fExecFlags & ExecuteProcessFlag_WaitForStdOut)
             {
@@ -840,5 +1001,5 @@
             if (g_fGuestCtrlCanceled && !fCanceledAlready)
             {
-                hrc = progress->Cancel();
+                hrc = pProgress->Cancel();
                 if (SUCCEEDED(hrc))
                     fCanceledAlready = TRUE;
@@ -848,5 +1009,5 @@
 
             /* Progress canceled by Main API? */
-            if (   SUCCEEDED(progress->COMGETTER(Canceled(&fCanceled)))
+            if (   SUCCEEDED(pProgress->COMGETTER(Canceled(&fCanceled)))
                 && fCanceled)
                 break;
@@ -856,5 +1017,5 @@
                 && RTTimeMilliTS() - u64StartMS > cMsTimeout)
             {
-                progress->Cancel();
+                pProgress->Cancel();
                 break;
             }
@@ -870,5 +1031,5 @@
             if (fVerbose)
                 RTPrintf("Process execution canceled!\n");
-            rcExit = EXITCODEEXEC_CANCELED;
+            return EXITCODEEXEC_CANCELED;
         }
         else if (   fCompleted
@@ -876,7 +1037,7 @@
         {
             LONG iRc;
-            CHECK_ERROR_RET(progress, COMGETTER(ResultCode)(&iRc), rc);
+            CHECK_ERROR_RET(pProgress, COMGETTER(ResultCode)(&iRc), rc);
             if (FAILED(iRc))
-                vrc = ctrlPrintProgressError(progress);
+                vrc = ctrlPrintProgressError(pProgress);
             else
             {
@@ -888,10 +1049,10 @@
                     if (fVerbose)
                         RTPrintf("Exit code=%u (Status=%u [%s], Flags=%u)\n", uRetExitCode, retStatus, ctrlExecProcessStatusToText(retStatus), uRetFlags);
-                    rcExit = ctrlExecProcessStatusToExitCode(retStatus, uRetExitCode);
+                    return ctrlExecProcessStatusToExitCode(retStatus, uRetExitCode);
                 }
                 else
                 {
                     ctrlPrintError(pGuest, COM_IIDOF(IGuest));
-                    rcExit = RTEXITCODE_FAILURE;
+                    return RTEXITCODE_FAILURE;
                 }
             }
@@ -901,11 +1062,140 @@
             if (fVerbose)
                 RTPrintf("Process execution aborted!\n");
-            rcExit = EXITCODEEXEC_TERM_ABEND;
-        }
-    }
-
-    if (RT_FAILURE(vrc) || FAILED(rc))
+            return EXITCODEEXEC_TERM_ABEND;
+        }
+    }
+#else
+    ComPtr<IGuestSession> pGuestSession;
+    rc = pGuest->CreateSession(Bstr(strUserName).raw(),
+                               Bstr(strPassword).raw(),
+                               Bstr(strDomain).raw(),
+                               Bstr("guest exec").raw(),
+                               pGuestSession.asOutParam());
+    if (FAILED(rc))
+    {
+        ctrlPrintError(pGuest, COM_IIDOF(IGuest));
         return RTEXITCODE_FAILURE;
-    return rcExit;
+    }
+
+    /* Get current time stamp to later calculate rest of timeout left. */
+    uint64_t u64StartMS = RTTimeMilliTS();
+
+    /*
+     * Execute the process.
+     */
+    ComPtr<IGuestProcess> pProcess;
+    rc = pGuestSession->ProcessCreate(Bstr(strCmd).raw(),
+                                      ComSafeArrayAsInParam(args),
+                                      ComSafeArrayAsInParam(env),
+                                      ComSafeArrayAsInParam(aCreateFlags),
+                                      cMsTimeout,
+                                      pProcess.asOutParam());
+    if (FAILED(rc))
+    {
+        ctrlPrintError(pGuestSession, COM_IIDOF(IGuestSession));
+        return RTEXITCODE_FAILURE;
+    }
+    ULONG uPID = 0;
+    rc = pProcess->COMGETTER(PID)(&uPID);
+    if (FAILED(rc))
+    {
+        ctrlPrintError(pProcess, COM_IIDOF(IProcess));
+        return RTEXITCODE_FAILURE;
+    }
+
+    if (fVerbose)
+        RTPrintf("Process '%s' (PID: %u) started\n", strCmd.c_str(), uPID);
+
+    if (fWaitForExit)
+    {
+        if (fVerbose)
+        {
+            if (cMsTimeout) /* Wait with a certain timeout. */
+            {
+                /* Calculate timeout value left after process has been started.  */
+                uint64_t u64Elapsed = RTTimeMilliTS() - u64StartMS;
+                /* Is timeout still bigger than current difference? */
+                if (cMsTimeout > u64Elapsed)
+                    RTPrintf("Waiting for process to exit (%ums left) ...\n", cMsTimeout - u64Elapsed);
+                else
+                    RTPrintf("No time left to wait for process!\n"); /** @todo a bit misleading ... */
+            }
+            else /* Wait forever. */
+                RTPrintf("Waiting for process to exit ...\n");
+        }
+
+        /** @todo does this need signal handling? there's no progress object etc etc */
+
+        vrc = RTStrmSetMode(g_pStdOut, 1 /* Binary mode */, -1 /* Code set, unchanged */);
+        if (RT_FAILURE(vrc))
+            RTMsgError("Unable to set stdout's binary mode, rc=%Rrc\n", vrc);
+        vrc = RTStrmSetMode(g_pStdErr, 1 /* Binary mode */, -1 /* Code set, unchanged */);
+        if (RT_FAILURE(vrc))
+            RTMsgError("Unable to set stderr's binary mode, rc=%Rrc\n", vrc);
+
+        /* Wait for process to exit ... */
+        RTMSINTERVAL cMsTimeLeft = 1;
+        bool fCompleted = false;
+        while (!fCompleted && cMsTimeLeft != 0)
+        {
+            cMsTimeLeft = ctrlExecGetRemainingTime(u64StartMS, cMsTimeout);
+            ProcessWaitResult_T waitResult;
+            rc = pProcess->WaitForArray(ComSafeArrayAsInParam(aWaitFlags), cMsTimeLeft, &waitResult);
+            if (FAILED(rc))
+            {
+                ctrlPrintError(pProcess, COM_IIDOF(IProcess));
+                return RTEXITCODE_FAILURE;
+            }
+
+            switch (waitResult)
+            {
+                case ProcessWaitResult_StdOut:
+                    /* Do we need to fetch stdout data? */
+                    vrc = ctrlExecPrintOutput(pProcess, g_pStdOut, 1 /* StdOut */);
+                    break;
+                case ProcessWaitResult_StdErr:
+                    /* Do we need to fetch stderr data? */
+                    vrc = ctrlExecPrintOutput(pProcess, g_pStdErr, 2 /* StdErr */);
+                    break;
+                case ProcessWaitResult_Terminate:
+                    /* Process terminated, we're done */
+                    fCompleted = true;
+                    break;
+                default:
+                    /* Ignore all other results, let the timeout expire */;
+            }
+        } /* while */
+
+        /* Report status back to the user. */
+        if (fCompleted)
+        {
+            ProcessStatus_T status;
+            rc = pProcess->COMGETTER(Status)(&status);
+            if (FAILED(rc))
+            {
+                ctrlPrintError(pProcess, COM_IIDOF(IProcess));
+                return RTEXITCODE_FAILURE;
+            }
+            LONG exitCode;
+            rc = pProcess->COMGETTER(ExitCode)(&exitCode);
+            if (FAILED(rc))
+            {
+                ctrlPrintError(pProcess, COM_IIDOF(IProcess));
+                return RTEXITCODE_FAILURE;
+            }
+            if (fVerbose)
+                RTPrintf("Exit code=%u (Status=%u [%s])\n", exitCode, status, ctrlExecProcessStatusToText(status));
+            return ctrlExecProcessStatusToExitCode(status, exitCode);
+        }
+        else
+        {
+            if (fVerbose)
+                RTPrintf("Process execution aborted!\n");
+            return EXITCODEEXEC_TERM_ABEND;
+        }
+    }
+#endif
+
+    return RT_FAILURE(vrc) || FAILED(rc) ? RTEXITCODE_FAILURE : RTEXITCODE_SUCCESS;
 }
 
@@ -1322,5 +1612,5 @@
 
     int vrc = VINF_SUCCESS;
-    ComPtr<IProgress> progress;
+    ComPtr<IProgress> pProgress;
     HRESULT rc;
     if (pContext->fHostToGuest)
@@ -1328,5 +1618,5 @@
         rc = pContext->pGuest->CopyToGuest(Bstr(pszFileSource).raw(), Bstr(pszFileDest).raw(),
                                            Bstr(pContext->pszUsername).raw(), Bstr(pContext->pszPassword).raw(),
-                                           fFlags, progress.asOutParam());
+                                           fFlags, pProgress.asOutParam());
     }
     else
@@ -1334,5 +1624,5 @@
         rc = pContext->pGuest->CopyFromGuest(Bstr(pszFileSource).raw(), Bstr(pszFileDest).raw(),
                                              Bstr(pContext->pszUsername).raw(), Bstr(pContext->pszPassword).raw(),
-                                             fFlags, progress.asOutParam());
+                                             fFlags, pProgress.asOutParam());
     }
 
@@ -1342,10 +1632,10 @@
     {
         if (pContext->fVerbose)
-            rc = showProgress(progress);
+            rc = showProgress(pProgress);
         else
-            rc = progress->WaitForCompletion(-1 /* No timeout */);
+            rc = pProgress->WaitForCompletion(-1 /* No timeout */);
         if (SUCCEEDED(rc))
-            CHECK_PROGRESS_ERROR(progress, ("File copy failed"));
-        vrc = ctrlPrintProgressError(progress);
+            CHECK_PROGRESS_ERROR(pProgress, ("File copy failed"));
+        vrc = ctrlPrintProgressError(pProgress);
     }
 
@@ -1591,6 +1881,6 @@
                     if (pContext->fVerbose)
                     {
-                        Utf8Str Utf8Dir(strName);
-                        RTPrintf("Directory: %s\n", Utf8Dir.c_str());
+                        Utf8Str strDir(strName);
+                        RTPrintf("Directory: %s\n", strDir.c_str());
                     }
 
@@ -1820,9 +2110,10 @@
         { "--dryrun",              GETOPTDEF_COPY_DRYRUN,           RTGETOPT_REQ_NOTHING },
         { "--follow",              GETOPTDEF_COPY_FOLLOW,           RTGETOPT_REQ_NOTHING },
+        { "--username",            'u',                             RTGETOPT_REQ_STRING  },
         { "--passwordfile",        'p',                             RTGETOPT_REQ_STRING  },
         { "--password",            GETOPTDEF_COPY_PASSWORD,         RTGETOPT_REQ_STRING  },
+        { "--domain",              'd',                             RTGETOPT_REQ_STRING  },
         { "--recursive",           'R',                             RTGETOPT_REQ_NOTHING },
         { "--target-directory",    GETOPTDEF_COPY_TARGETDIR,        RTGETOPT_REQ_STRING  },
-        { "--username",            'u',                             RTGETOPT_REQ_STRING  },
         { "--verbose",             'v',                             RTGETOPT_REQ_NOTHING }
     };
@@ -1834,8 +2125,9 @@
                  s_aOptions, RT_ELEMENTS(s_aOptions), 0, RTGETOPTINIT_FLAGS_OPTS_FIRST);
 
-    Utf8Str Utf8Source;
-    Utf8Str Utf8Dest;
-    Utf8Str Utf8UserName;
-    Utf8Str Utf8Password;
+    Utf8Str strSource;
+    Utf8Str strDest;
+    Utf8Str strUserName;
+    Utf8Str strPassword;
+    Utf8Str strDomain;
     uint32_t fFlags = CopyFileFlag_None;
     bool fVerbose = false;
@@ -1859,11 +2151,15 @@
                 break;
 
+            case 'u': /* User name */
+                strUserName = ValueUnion.psz;
+                break;
+
             case GETOPTDEF_COPY_PASSWORD: /* Password */
-                Utf8Password = ValueUnion.psz;
+                strPassword = ValueUnion.psz;
                 break;
 
             case 'p': /* Password file */
             {
-                RTEXITCODE rcExit = readPasswordFile(ValueUnion.psz, &Utf8Password);
+                RTEXITCODE rcExit = readPasswordFile(ValueUnion.psz, &strPassword);
                 if (rcExit != RTEXITCODE_SUCCESS)
                     return rcExit;
@@ -1871,4 +2167,8 @@
             }
 
+            case 'd': /* domain */
+                strDomain = ValueUnion.psz;
+                break;
+
             case 'R': /* Recursive processing */
                 fFlags |= CopyFileFlag_Recursive;
@@ -1876,9 +2176,5 @@
 
             case GETOPTDEF_COPY_TARGETDIR:
-                Utf8Dest = ValueUnion.psz;
-                break;
-
-            case 'u': /* User name */
-                Utf8UserName = ValueUnion.psz;
+                strDest = ValueUnion.psz;
                 break;
 
@@ -1893,7 +2189,7 @@
                  * (= last) argument as destination. */
                 if (   pArg->argc == GetState.iNext
-                    && Utf8Dest.isEmpty())
+                    && strDest.isEmpty())
                 {
-                    Utf8Dest = ValueUnion.psz;
+                    strDest = ValueUnion.psz;
                 }
                 else
@@ -1914,9 +2210,9 @@
                            "No source(s) specified!");
 
-    if (Utf8Dest.isEmpty())
+    if (strDest.isEmpty())
         return errorSyntax(USAGE_GUESTCONTROL,
                            "No destination specified!");
 
-    if (Utf8UserName.isEmpty())
+    if (strUserName.isEmpty())
         return errorSyntax(USAGE_GUESTCONTROL,
                            "No user name specified!");
@@ -1939,5 +2235,5 @@
     PCOPYCONTEXT pContext;
     vrc = ctrlCopyContextCreate(guest, fVerbose, fDryRun, fHostToGuest,
-                                Utf8UserName.c_str(), Utf8Password.c_str(),
+                                strUserName.c_str(), strPassword.c_str(),
                                 &pContext);
     if (RT_FAILURE(vrc))
@@ -1948,5 +2244,5 @@
 
     /* If the destination is a path, (try to) create it. */
-    const char *pszDest = Utf8Dest.c_str();
+    const char *pszDest = strDest.c_str();
     if (!RTPathFilename(pszDest))
     {
@@ -2028,5 +2324,5 @@
                     char *pszDestFile;
                     vrc = ctrlCopyTranslatePath(pszSourceRoot, pszSource,
-                                                Utf8Dest.c_str(), &pszDestFile);
+                                                strDest.c_str(), &pszDestFile);
                     if (RT_SUCCESS(vrc))
                     {
@@ -2043,5 +2339,5 @@
                     /* Directory (with filter?). */
                     vrc = ctrlCopyDirToDest(pContext, pszSource, pszFilter,
-                                            Utf8Dest.c_str(), fFlags);
+                                            strDest.c_str(), fFlags);
                 }
             }
@@ -2088,7 +2384,8 @@
         { "--mode",                'm',                             RTGETOPT_REQ_UINT32  },
         { "--parents",             'P',                             RTGETOPT_REQ_NOTHING },
+        { "--username",            'u',                             RTGETOPT_REQ_STRING  },
         { "--passwordfile",        'p',                             RTGETOPT_REQ_STRING  },
         { "--password",            GETOPTDEF_MKDIR_PASSWORD,        RTGETOPT_REQ_STRING  },
-        { "--username",            'u',                             RTGETOPT_REQ_STRING  },
+        { "--domain",              'd',                             RTGETOPT_REQ_STRING  },
         { "--verbose",             'v',                             RTGETOPT_REQ_NOTHING }
     };
@@ -2100,6 +2397,7 @@
                  s_aOptions, RT_ELEMENTS(s_aOptions), 0, RTGETOPTINIT_FLAGS_OPTS_FIRST);
 
-    Utf8Str Utf8UserName;
-    Utf8Str Utf8Password;
+    Utf8Str strUserName;
+    Utf8Str strPassword;
+    Utf8Str strDomain;
     uint32_t fFlags = DirectoryCreateFlag_None;
     uint32_t fDirMode = 0; /* Default mode. */
@@ -2121,11 +2419,15 @@
                 break;
 
+            case 'u': /* User name */
+                strUserName = ValueUnion.psz;
+                break;
+
             case GETOPTDEF_MKDIR_PASSWORD: /* Password */
-                Utf8Password = ValueUnion.psz;
+                strPassword = ValueUnion.psz;
                 break;
 
             case 'p': /* Password file */
             {
-                RTEXITCODE rcExit = readPasswordFile(ValueUnion.psz, &Utf8Password);
+                RTEXITCODE rcExit = readPasswordFile(ValueUnion.psz, &strPassword);
                 if (rcExit != RTEXITCODE_SUCCESS)
                     return rcExit;
@@ -2133,6 +2435,6 @@
             }
 
-            case 'u': /* User name */
-                Utf8UserName = ValueUnion.psz;
+            case 'd': /* domain */
+                strDomain = ValueUnion.psz;
                 break;
 
@@ -2156,5 +2458,5 @@
         return errorSyntax(USAGE_GUESTCONTROL, "No directory to create specified!");
 
-    if (Utf8UserName.isEmpty())
+    if (strUserName.isEmpty())
         return errorSyntax(USAGE_GUESTCONTROL, "No user name specified!");
 
@@ -2173,5 +2475,5 @@
 
         hrc = guest->DirectoryCreate(Bstr(it->first).raw(),
-                                     Bstr(Utf8UserName).raw(), Bstr(Utf8Password).raw(),
+                                     Bstr(strUserName).raw(), Bstr(strPassword).raw(),
                                      fDirMode, fFlags);
         if (FAILED(hrc))
@@ -2196,8 +2498,9 @@
         { "--file-system",         'f',                             RTGETOPT_REQ_NOTHING },
         { "--format",              'c',                             RTGETOPT_REQ_STRING },
+        { "--username",            'u',                             RTGETOPT_REQ_STRING  },
         { "--passwordfile",        'p',                             RTGETOPT_REQ_STRING  },
         { "--password",            GETOPTDEF_STAT_PASSWORD,         RTGETOPT_REQ_STRING  },
+        { "--domain",              'd',                             RTGETOPT_REQ_STRING  },
         { "--terse",               't',                             RTGETOPT_REQ_NOTHING },
-        { "--username",            'u',                             RTGETOPT_REQ_STRING  },
         { "--verbose",             'v',                             RTGETOPT_REQ_NOTHING }
     };
@@ -2209,6 +2512,7 @@
                  s_aOptions, RT_ELEMENTS(s_aOptions), 0, RTGETOPTINIT_FLAGS_OPTS_FIRST);
 
-    Utf8Str Utf8UserName;
-    Utf8Str Utf8Password;
+    Utf8Str strUserName;
+    Utf8Str strPassword;
+    Utf8Str strDomain;
 
     bool fVerbose = false;
@@ -2220,11 +2524,15 @@
         switch (ch)
         {
+            case 'u': /* User name */
+                strUserName = ValueUnion.psz;
+                break;
+
             case GETOPTDEF_STAT_PASSWORD: /* Password */
-                Utf8Password = ValueUnion.psz;
+                strPassword = ValueUnion.psz;
                 break;
 
             case 'p': /* Password file */
             {
-                RTEXITCODE rcExit = readPasswordFile(ValueUnion.psz, &Utf8Password);
+                RTEXITCODE rcExit = readPasswordFile(ValueUnion.psz, &strPassword);
                 if (rcExit != RTEXITCODE_SUCCESS)
                     return rcExit;
@@ -2232,6 +2540,6 @@
             }
 
-            case 'u': /* User name */
-                Utf8UserName = ValueUnion.psz;
+            case 'd': /* domain */
+                strDomain = ValueUnion.psz;
                 break;
 
@@ -2263,5 +2571,5 @@
         return errorSyntax(USAGE_GUESTCONTROL, "No element(s) to check specified!");
 
-    if (Utf8UserName.isEmpty())
+    if (strUserName.isEmpty())
         return errorSyntax(USAGE_GUESTCONTROL, "No user name specified!");
 
@@ -2279,5 +2587,5 @@
         BOOL fExists;
         hrc = guest->FileExists(Bstr(it->first).raw(),
-                                Bstr(Utf8UserName).raw(), Bstr(Utf8Password).raw(),
+                                Bstr(strUserName).raw(), Bstr(strPassword).raw(),
                                 &fExists);
         if (FAILED(hrc))
@@ -2316,5 +2624,5 @@
      * arguments.
      */
-    Utf8Str Utf8Source;
+    Utf8Str strSource;
     bool fVerbose = false;
 
@@ -2337,5 +2645,5 @@
         {
             case 's':
-                Utf8Source = ValueUnion.psz;
+                strSource = ValueUnion.psz;
                 break;
 
@@ -2353,25 +2661,25 @@
 
 #ifdef DEBUG_andy
-    if (Utf8Source.isEmpty())
-        Utf8Source = "c:\\Downloads\\VBoxGuestAdditions-r67158.iso";
+    if (strSource.isEmpty())
+        strSource = "c:\\Downloads\\VBoxGuestAdditions-r67158.iso";
 #endif
 
     /* Determine source if not set yet. */
-    if (Utf8Source.isEmpty())
+    if (strSource.isEmpty())
     {
         char strTemp[RTPATH_MAX];
         vrc = RTPathAppPrivateNoArch(strTemp, sizeof(strTemp));
         AssertRC(vrc);
-        Utf8Str Utf8Src1 = Utf8Str(strTemp).append("/VBoxGuestAdditions.iso");
+        Utf8Str strSrc1 = Utf8Str(strTemp).append("/VBoxGuestAdditions.iso");
 
         vrc = RTPathExecDir(strTemp, sizeof(strTemp));
         AssertRC(vrc);
-        Utf8Str Utf8Src2 = Utf8Str(strTemp).append("/additions/VBoxGuestAdditions.iso");
+        Utf8Str strSrc2 = Utf8Str(strTemp).append("/additions/VBoxGuestAdditions.iso");
 
         /* Check the standard image locations */
-        if (RTFileExists(Utf8Src1.c_str()))
-            Utf8Source = Utf8Src1;
-        else if (RTFileExists(Utf8Src2.c_str()))
-            Utf8Source = Utf8Src2;
+        if (RTFileExists(strSrc1.c_str()))
+            strSource = strSrc1;
+        else if (RTFileExists(strSrc2.c_str()))
+            strSource = strSrc2;
         else
         {
@@ -2380,7 +2688,7 @@
         }
     }
-    else if (!RTFileExists(Utf8Source.c_str()))
-    {
-        RTMsgError("Source \"%s\" does not exist!\n", Utf8Source.c_str());
+    else if (!RTFileExists(strSource.c_str()))
+    {
+        RTMsgError("Source \"%s\" does not exist!\n", strSource.c_str());
         vrc = VERR_FILE_NOT_FOUND;
     }
@@ -2389,9 +2697,9 @@
     {
         if (fVerbose)
-            RTPrintf("Using source: %s\n", Utf8Source.c_str());
+            RTPrintf("Using source: %s\n", strSource.c_str());
 
         HRESULT rc = S_OK;
         ComPtr<IProgress> pProgress;
-        CHECK_ERROR(guest, UpdateGuestAdditions(Bstr(Utf8Source).raw(),
+        CHECK_ERROR(guest, UpdateGuestAdditions(Bstr(strSource).raw(),
                                                 /* Wait for whole update process to complete. */
                                                 AdditionsUpdateFlag_None,
Index: trunk/src/VBox/Frontends/VBoxManage/VBoxManageHostonly.cpp
===================================================================
--- trunk/src/VBox/Frontends/VBoxManage/VBoxManageHostonly.cpp	(revision 42550)
+++ trunk/src/VBox/Frontends/VBoxManage/VBoxManageHostonly.cpp	(revision 42551)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -225,5 +225,5 @@
     if (bDhcp)
     {
-        CHECK_ERROR(hif, EnableDynamicIpConfig ());
+        CHECK_ERROR(hif, EnableDynamicIPConfig ());
     }
     else if (pIp)
@@ -232,5 +232,5 @@
             pNetmask = "255.255.255.0"; /* ?? */
 
-        CHECK_ERROR(hif, EnableStaticIpConfig(Bstr(pIp).raw(),
+        CHECK_ERROR(hif, EnableStaticIPConfig(Bstr(pIp).raw(),
                                               Bstr(pNetmask).raw()));
     }
@@ -250,5 +250,5 @@
 
         Bstr ipv6str(pIpv6);
-        CHECK_ERROR(hif, EnableStaticIpConfigV6(ipv6str.raw(),
+        CHECK_ERROR(hif, EnableStaticIPConfigV6(ipv6str.raw(),
                                                 (ULONG)uNetmasklengthv6));
     }
Index: trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp
===================================================================
--- trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp	(revision 42550)
+++ trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp	(revision 42551)
@@ -923,9 +923,9 @@
                     {
                         Bstr strNetwork;
-                        ComPtr<INATEngine> driver;
-                        nic->COMGETTER(NatDriver)(driver.asOutParam());
-                        driver->COMGETTER(Network)(strNetwork.asOutParam());
+                        ComPtr<INATEngine> engine;
+                        nic->COMGETTER(NATEngine)(engine.asOutParam());
+                        engine->COMGETTER(Network)(strNetwork.asOutParam());
                         com::SafeArray<BSTR> forwardings;
-                        driver->COMGETTER(Redirects)(ComSafeArrayAsOutParam(forwardings));
+                        engine->COMGETTER(Redirects)(ComSafeArrayAsOutParam(forwardings));
                         strNatForwardings = "";
                         for (size_t i = 0; i < forwardings.size(); ++i)
@@ -1000,5 +1000,5 @@
                         ULONG tcpSnd = 0;
                         ULONG tcpRcv = 0;
-                        driver->GetNetworkSettings(&mtu, &sockSnd, &sockRcv, &tcpSnd, &tcpRcv);
+                        engine->GetNetworkSettings(&mtu, &sockSnd, &sockRcv, &tcpSnd, &tcpRcv);
 
                         if (details == VMINFO_MACHINEREADABLE)
@@ -1176,29 +1176,29 @@
 
     /* Pointing device information */
-    PointingHidType_T aPointingHid;
-    const char *pszHid = "Unknown";
-    const char *pszMrHid = "unknown";
-    machine->COMGETTER(PointingHidType)(&aPointingHid);
-    switch (aPointingHid)
-    {
-        case PointingHidType_None:
-            pszHid = "None";
-            pszMrHid = "none";
+    PointingHIDType_T aPointingHID;
+    const char *pszHID = "Unknown";
+    const char *pszMrHID = "unknown";
+    machine->COMGETTER(PointingHIDType)(&aPointingHID);
+    switch (aPointingHID)
+    {
+        case PointingHIDType_None:
+            pszHID = "None";
+            pszMrHID = "none";
             break;
-        case PointingHidType_PS2Mouse:
-            pszHid = "PS/2 Mouse";
-            pszMrHid = "ps2mouse";
+        case PointingHIDType_PS2Mouse:
+            pszHID = "PS/2 Mouse";
+            pszMrHID = "ps2mouse";
             break;
-        case PointingHidType_USBMouse:
-            pszHid = "USB Mouse";
-            pszMrHid = "usbmouse";
+        case PointingHIDType_USBMouse:
+            pszHID = "USB Mouse";
+            pszMrHID = "usbmouse";
             break;
-        case PointingHidType_USBTablet:
-            pszHid = "USB Tablet";
-            pszMrHid = "usbtablet";
+        case PointingHIDType_USBTablet:
+            pszHID = "USB Tablet";
+            pszMrHID = "usbtablet";
             break;
-        case PointingHidType_ComboMouse:
-            pszHid = "USB Tablet and PS/2 Mouse";
-            pszMrHid = "combomouse";
+        case PointingHIDType_ComboMouse:
+            pszHID = "USB Tablet and PS/2 Mouse";
+            pszMrHID = "combomouse";
             break;
         default:
@@ -1206,30 +1206,30 @@
     }
     if (details == VMINFO_MACHINEREADABLE)
-        RTPrintf("hidpointing=\"%s\"\n", pszMrHid);
+        RTPrintf("hidpointing=\"%s\"\n", pszMrHID);
     else
-        RTPrintf("Pointing Device: %s\n", pszHid);
+        RTPrintf("Pointing Device: %s\n", pszHID);
 
     /* Keyboard device information */
-    KeyboardHidType_T aKeyboardHid;
-    machine->COMGETTER(KeyboardHidType)(&aKeyboardHid);
-    pszHid = "Unknown";
-    pszMrHid = "unknown";
-    switch (aKeyboardHid)
-    {
-        case KeyboardHidType_None:
-            pszHid = "None";
-            pszMrHid = "none";
+    KeyboardHIDType_T aKeyboardHID;
+    machine->COMGETTER(KeyboardHIDType)(&aKeyboardHID);
+    pszHID = "Unknown";
+    pszMrHID = "unknown";
+    switch (aKeyboardHID)
+    {
+        case KeyboardHIDType_None:
+            pszHID = "None";
+            pszMrHID = "none";
             break;
-        case KeyboardHidType_PS2Keyboard:
-            pszHid = "PS/2 Keyboard";
-            pszMrHid = "ps2kbd";
+        case KeyboardHIDType_PS2Keyboard:
+            pszHID = "PS/2 Keyboard";
+            pszMrHID = "ps2kbd";
             break;
-        case KeyboardHidType_USBKeyboard:
-            pszHid = "USB Keyboard";
-            pszMrHid = "usbkbd";
+        case KeyboardHIDType_USBKeyboard:
+            pszHID = "USB Keyboard";
+            pszMrHID = "usbkbd";
             break;
-        case KeyboardHidType_ComboKeyboard:
-            pszHid = "USB and PS/2 Keyboard";
-            pszMrHid = "combokbd";
+        case KeyboardHIDType_ComboKeyboard:
+            pszHID = "USB and PS/2 Keyboard";
+            pszMrHID = "combokbd";
             break;
         default:
@@ -1237,7 +1237,7 @@
     }
     if (details == VMINFO_MACHINEREADABLE)
-        RTPrintf("hidkeyboard=\"%s\"\n", pszMrHid);
+        RTPrintf("hidkeyboard=\"%s\"\n", pszMrHID);
     else
-        RTPrintf("Keyboard Device: %s\n", pszHid);
+        RTPrintf("Keyboard Device: %s\n", pszHID);
 
     ComPtr<ISystemProperties> sysProps;
@@ -1713,5 +1713,5 @@
     {
         BOOL fEnabled;
-        BOOL fEhciEnabled;
+        BOOL fEHCIEnabled;
         rc = USBCtl->COMGETTER(Enabled)(&fEnabled);
         if (FAILED(rc))
@@ -1722,11 +1722,11 @@
             RTPrintf("USB:             %s\n", fEnabled ? "enabled" : "disabled");
 
-        rc = USBCtl->COMGETTER(EnabledEhci)(&fEhciEnabled);
+        rc = USBCtl->COMGETTER(EnabledEHCI)(&fEHCIEnabled);
         if (FAILED(rc))
-            fEhciEnabled = false;
+            fEHCIEnabled = false;
         if (details == VMINFO_MACHINEREADABLE)
-            RTPrintf("ehci=\"%s\"\n", fEhciEnabled ? "on" : "off");
+            RTPrintf("ehci=\"%s\"\n", fEHCIEnabled ? "on" : "off");
         else
-            RTPrintf("EHCI:            %s\n", fEhciEnabled ? "enabled" : "disabled");
+            RTPrintf("EHCI:            %s\n", fEHCIEnabled ? "enabled" : "disabled");
 
         SafeIfaceArray <IUSBDeviceFilter> Coll;
@@ -1998,6 +1998,6 @@
     /* Host PCI passthrough devices */
     {
-         SafeIfaceArray <IPciDeviceAttachment> assignments;
-         rc = machine->COMGETTER(PciDeviceAssignments)(ComSafeArrayAsOutParam(assignments));
+         SafeIfaceArray <IPCIDeviceAttachment> assignments;
+         rc = machine->COMGETTER(PCIDeviceAssignments)(ComSafeArrayAsOutParam(assignments));
          if (SUCCEEDED(rc))
          {
@@ -2009,19 +2009,19 @@
              for (size_t index = 0; index < assignments.size(); ++index)
              {
-                 ComPtr<IPciDeviceAttachment> Assignment = assignments[index];
-                 char szHostPciAddress[32], szGuestPciAddress[32];
-                 LONG iHostPciAddress = -1, iGuestPciAddress = -1;
+                 ComPtr<IPCIDeviceAttachment> Assignment = assignments[index];
+                 char szHostPCIAddress[32], szGuestPCIAddress[32];
+                 LONG iHostPCIAddress = -1, iGuestPCIAddress = -1;
                  Bstr DevName;
 
                  Assignment->COMGETTER(Name)(DevName.asOutParam());
-                 Assignment->COMGETTER(HostAddress)(&iHostPciAddress);
-                 Assignment->COMGETTER(GuestAddress)(&iGuestPciAddress);
-                 PciBusAddress().fromLong(iHostPciAddress).format(szHostPciAddress, sizeof(szHostPciAddress));
-                 PciBusAddress().fromLong(iGuestPciAddress).format(szGuestPciAddress, sizeof(szGuestPciAddress));
+                 Assignment->COMGETTER(HostAddress)(&iHostPCIAddress);
+                 Assignment->COMGETTER(GuestAddress)(&iGuestPCIAddress);
+                 PCIBusAddress().fromLong(iHostPCIAddress).format(szHostPCIAddress, sizeof(szHostPCIAddress));
+                 PCIBusAddress().fromLong(iGuestPCIAddress).format(szGuestPCIAddress, sizeof(szGuestPCIAddress));
 
                  if (details == VMINFO_MACHINEREADABLE)
-                     RTPrintf("AttachedHostPci=%s,%s\n", szHostPciAddress, szGuestPciAddress);
+                     RTPrintf("AttachedHostPCI=%s,%s\n", szHostPCIAddress, szGuestPCIAddress);
                  else
-                     RTPrintf("   Host device %ls at %s attached as %s\n", DevName.raw(), szHostPciAddress, szGuestPciAddress);
+                     RTPrintf("   Host device %ls at %s attached as %s\n", DevName.raw(), szHostPCIAddress, szGuestPCIAddress);
              }
 
Index: trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp
===================================================================
--- trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp	(revision 42550)
+++ trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp	(revision 42551)
@@ -489,7 +489,7 @@
                 networkInterface->COMGETTER(Id)(interfaceGuid.asOutParam());
                 RTPrintf("GUID:            %ls\n", interfaceGuid.raw());
-                BOOL bDhcpEnabled;
-                networkInterface->COMGETTER(DhcpEnabled)(&bDhcpEnabled);
-                RTPrintf("Dhcp:            %s\n", bDhcpEnabled ? "Enabled" : "Disabled");
+                BOOL bDHCPEnabled;
+                networkInterface->COMGETTER(DHCPEnabled)(&bDHCPEnabled);
+                RTPrintf("DHCP:            %s\n", bDHCPEnabled ? "Enabled" : "Disabled");
 
                 Bstr IPAddress;
Index: trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp
===================================================================
--- trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp	(revision 42550)
+++ trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp	(revision 42551)
@@ -1395,10 +1395,10 @@
             {
                 ComPtr<INetworkAdapter> nic;
-                ComPtr<INATEngine> driver;
-
-                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
-                ASSERT(nic);
-
-                CHECK_ERROR(nic, COMGETTER(NatDriver)(driver.asOutParam()));
+                ComPtr<INATEngine> engine;
+
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam()));
 
                 const char *psz = ValueUnion.psz;
@@ -1406,5 +1406,5 @@
                     psz = "";
 
-                CHECK_ERROR(driver, COMSETTER(Network)(Bstr(psz).raw()));
+                CHECK_ERROR(engine, COMSETTER(Network)(Bstr(psz).raw()));
                 break;
             }
@@ -1413,11 +1413,11 @@
             {
                 ComPtr<INetworkAdapter> nic;
-                ComPtr<INATEngine> driver;
-
-                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
-                ASSERT(nic);
-
-                CHECK_ERROR(nic, COMGETTER(NatDriver)(driver.asOutParam()));
-                CHECK_ERROR(driver, COMSETTER(HostIP)(Bstr(ValueUnion.psz).raw()));
+                ComPtr<INATEngine> engine;
+
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam()));
+                CHECK_ERROR(engine, COMSETTER(HostIP)(Bstr(ValueUnion.psz).raw()));
                 break;
             }
@@ -1442,5 +1442,5 @@
             {
                 ComPtr<INetworkAdapter> nic;
-                ComPtr<INATEngine> driver;
+                ComPtr<INATEngine> engine;
                 char *strMtu;
                 char *strSockSnd;
@@ -1463,6 +1463,6 @@
                 ASSERT(nic);
 
-                CHECK_ERROR(nic, COMGETTER(NatDriver)(driver.asOutParam()));
-                CHECK_ERROR(driver, SetNetworkSettings(RTStrToUInt32(strMtu), RTStrToUInt32(strSockSnd), RTStrToUInt32(strSockRcv),
+                CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam()));
+                CHECK_ERROR(engine, SetNetworkSettings(RTStrToUInt32(strMtu), RTStrToUInt32(strSockSnd), RTStrToUInt32(strSockRcv),
                                     RTStrToUInt32(strTcpSnd), RTStrToUInt32(strTcpRcv)));
                 break;
@@ -1473,10 +1473,10 @@
             {
                 ComPtr<INetworkAdapter> nic;
-                ComPtr<INATEngine> driver;
-
-                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
-                ASSERT(nic);
-
-                CHECK_ERROR(nic, COMGETTER(NatDriver)(driver.asOutParam()));
+                ComPtr<INATEngine> engine;
+
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam()));
                 /* format name:proto:hostip:hostport:guestip:guestport*/
                 if (RTStrCmp(ValueUnion.psz, "delete") != 0)
@@ -1512,5 +1512,5 @@
                         break;
                     }
-                    CHECK_ERROR(driver, AddRedirect(Bstr(strName).raw(), proto,
+                    CHECK_ERROR(engine, AddRedirect(Bstr(strName).raw(), proto,
                                         Bstr(strHostIp).raw(),
                                         RTStrToUInt16(strHostPort),
@@ -1525,5 +1525,5 @@
                     if (RT_FAILURE(vrc))
                         return errorSyntax(USAGE_MODIFYVM, "Not enough parameters");
-                    CHECK_ERROR(driver, RemoveRedirect(Bstr(ValueUnion.psz).raw()));
+                    CHECK_ERROR(engine, RemoveRedirect(Bstr(ValueUnion.psz).raw()));
                 }
                 break;
@@ -1533,5 +1533,5 @@
             {
                 ComPtr<INetworkAdapter> nic;
-                ComPtr<INATEngine> driver;
+                ComPtr<INATEngine> engine;
                 uint32_t aliasMode = 0;
 
@@ -1539,5 +1539,5 @@
                 ASSERT(nic);
 
-                CHECK_ERROR(nic, COMGETTER(NatDriver)(driver.asOutParam()));
+                CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam()));
                 if (RTStrCmp(ValueUnion.psz,"default") == 0)
                 {
@@ -1561,5 +1561,5 @@
                     }
                 }
-                CHECK_ERROR(driver, COMSETTER(AliasMode)(aliasMode));
+                CHECK_ERROR(engine, COMSETTER(AliasMode)(aliasMode));
                 break;
             }
@@ -1568,11 +1568,11 @@
             {
                 ComPtr<INetworkAdapter> nic;
-                ComPtr<INATEngine> driver;
-
-                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
-                ASSERT(nic);
-
-                CHECK_ERROR(nic, COMGETTER(NatDriver)(driver.asOutParam()));
-                CHECK_ERROR(driver, COMSETTER(TftpPrefix)(Bstr(ValueUnion.psz).raw()));
+                ComPtr<INATEngine> engine;
+
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam()));
+                CHECK_ERROR(engine, COMSETTER(TFTPPrefix)(Bstr(ValueUnion.psz).raw()));
                 break;
             }
@@ -1581,11 +1581,11 @@
             {
                 ComPtr<INetworkAdapter> nic;
-                ComPtr<INATEngine> driver;
-
-                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
-                ASSERT(nic);
-
-                CHECK_ERROR(nic, COMGETTER(NatDriver)(driver.asOutParam()));
-                CHECK_ERROR(driver, COMSETTER(TftpBootFile)(Bstr(ValueUnion.psz).raw()));
+                ComPtr<INATEngine> engine;
+
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam()));
+                CHECK_ERROR(engine, COMSETTER(TFTPBootFile)(Bstr(ValueUnion.psz).raw()));
                 break;
             }
@@ -1594,11 +1594,11 @@
             {
                 ComPtr<INetworkAdapter> nic;
-                ComPtr<INATEngine> driver;
-
-                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
-                ASSERT(nic);
-
-                CHECK_ERROR(nic, COMGETTER(NatDriver)(driver.asOutParam()));
-                CHECK_ERROR(driver, COMSETTER(TftpNextServer)(Bstr(ValueUnion.psz).raw()));
+                ComPtr<INATEngine> engine;
+
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam()));
+                CHECK_ERROR(engine, COMSETTER(TFTPNextServer)(Bstr(ValueUnion.psz).raw()));
                 break;
             }
@@ -1606,11 +1606,11 @@
             {
                 ComPtr<INetworkAdapter> nic;
-                ComPtr<INATEngine> driver;
-
-                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
-                ASSERT(nic);
-
-                CHECK_ERROR(nic, COMGETTER(NatDriver)(driver.asOutParam()));
-                CHECK_ERROR(driver, COMSETTER(DnsPassDomain)(ValueUnion.f));
+                ComPtr<INATEngine> engine;
+
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam()));
+                CHECK_ERROR(engine, COMSETTER(DNSPassDomain)(ValueUnion.f));
                 break;
             }
@@ -1619,11 +1619,11 @@
             {
                 ComPtr<INetworkAdapter> nic;
-                ComPtr<INATEngine> driver;
-
-                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
-                ASSERT(nic);
-
-                CHECK_ERROR(nic, COMGETTER(NatDriver)(driver.asOutParam()));
-                CHECK_ERROR(driver, COMSETTER(DnsProxy)(ValueUnion.f));
+                ComPtr<INATEngine> engine;
+
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam()));
+                CHECK_ERROR(engine, COMSETTER(DNSProxy)(ValueUnion.f));
                 break;
             }
@@ -1632,11 +1632,11 @@
             {
                 ComPtr<INetworkAdapter> nic;
-                ComPtr<INATEngine> driver;
-
-                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
-                ASSERT(nic);
-
-                CHECK_ERROR(nic, COMGETTER(NatDriver)(driver.asOutParam()));
-                CHECK_ERROR(driver, COMSETTER(DnsUseHostResolver)(ValueUnion.f));
+                ComPtr<INATEngine> engine;
+
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam()));
+                CHECK_ERROR(engine, COMSETTER(DNSUseHostResolver)(ValueUnion.f));
                 break;
             }
@@ -1665,9 +1665,9 @@
                 if (!strcmp(ValueUnion.psz, "ps2"))
                 {
-                    CHECK_ERROR(machine, COMSETTER(PointingHidType)(PointingHidType_PS2Mouse));
+                    CHECK_ERROR(machine, COMSETTER(PointingHIDType)(PointingHIDType_PS2Mouse));
                 }
                 else if (!strcmp(ValueUnion.psz, "usb"))
                 {
-                    CHECK_ERROR(machine, COMSETTER(PointingHidType)(PointingHidType_USBMouse));
+                    CHECK_ERROR(machine, COMSETTER(PointingHIDType)(PointingHIDType_USBMouse));
                     if (SUCCEEDED(rc))
                         fEnableUsb = true;
@@ -1675,5 +1675,5 @@
                 else if (!strcmp(ValueUnion.psz, "usbtablet"))
                 {
-                    CHECK_ERROR(machine, COMSETTER(PointingHidType)(PointingHidType_USBTablet));
+                    CHECK_ERROR(machine, COMSETTER(PointingHIDType)(PointingHIDType_USBTablet));
                     if (SUCCEEDED(rc))
                         fEnableUsb = true;
@@ -1707,9 +1707,9 @@
                 if (!strcmp(ValueUnion.psz, "ps2"))
                 {
-                    CHECK_ERROR(machine, COMSETTER(KeyboardHidType)(KeyboardHidType_PS2Keyboard));
+                    CHECK_ERROR(machine, COMSETTER(KeyboardHIDType)(KeyboardHIDType_PS2Keyboard));
                 }
                 else if (!strcmp(ValueUnion.psz, "usb"))
                 {
-                    CHECK_ERROR(machine, COMSETTER(KeyboardHidType)(KeyboardHidType_USBKeyboard));
+                    CHECK_ERROR(machine, COMSETTER(KeyboardHIDType)(KeyboardHIDType_USBKeyboard));
                     if (SUCCEEDED(rc))
                         fEnableUsb = true;
@@ -2229,5 +2229,5 @@
                 CHECK_ERROR(machine, COMGETTER(USBController)(UsbCtl.asOutParam()));
                 if (SUCCEEDED(rc))
-                    CHECK_ERROR(UsbCtl, COMSETTER(EnabledEhci)(ValueUnion.f));
+                    CHECK_ERROR(UsbCtl, COMSETTER(EnabledEHCI)(ValueUnion.f));
                 break;
             }
@@ -2355,5 +2355,5 @@
             case MODIFYVM_HPET:
             {
-                CHECK_ERROR(machine, COMSETTER(HpetEnabled)(ValueUnion.f));
+                CHECK_ERROR(machine, COMSETTER(HPETEnabled)(ValueUnion.f));
                 break;
             }
@@ -2361,5 +2361,5 @@
             case MODIFYVM_IOCACHE:
             {
-                CHECK_ERROR(machine, COMSETTER(IoCacheEnabled)(ValueUnion.f));
+                CHECK_ERROR(machine, COMSETTER(IOCacheEnabled)(ValueUnion.f));
                 break;
             }
@@ -2367,5 +2367,5 @@
             case MODIFYVM_IOCACHESIZE:
             {
-                CHECK_ERROR(machine, COMSETTER(IoCacheSize)(ValueUnion.u32));
+                CHECK_ERROR(machine, COMSETTER(IOCacheSize)(ValueUnion.u32));
                 break;
             }
@@ -2445,5 +2445,5 @@
                 else
                 {
-                    CHECK_ERROR(machine, AttachHostPciDevice(iHostAddr, iGuestAddr, TRUE));
+                    CHECK_ERROR(machine, AttachHostPCIDevice(iHostAddr, iGuestAddr, TRUE));
                 }
 
@@ -2462,5 +2462,5 @@
                 else
                 {
-                    CHECK_ERROR(machine, DetachHostPciDevice(iHostAddr));
+                    CHECK_ERROR(machine, DetachHostPCIDevice(iHostAddr));
                 }
 
Index: trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp
===================================================================
--- trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp	(revision 42550)
+++ trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp	(revision 42551)
@@ -649,5 +649,5 @@
             if (pMedium2Mount && (fSetNewUuid || fSetNewParentUuid))
             {
-                CHECK_ERROR(pMedium2Mount, SetIDs(fSetNewUuid, bstrNewUuid.raw(),
+                CHECK_ERROR(pMedium2Mount, SetIds(fSetNewUuid, bstrNewUuid.raw(),
                                                   fSetNewParentUuid, bstrNewParentUuid.raw()));
                 if (FAILED(rc))
Index: trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp	(revision 42550)
+++ trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp	(revision 42551)
@@ -7,5 +7,5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -250,5 +250,5 @@
         else
         {
-            m_pid = m_machine.GetSessionPid();
+            m_pid = m_machine.GetSessionPID();
     /// @todo Remove. See @c todo in #switchTo() below.
 #if 0
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp	(revision 42550)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp	(revision 42551)
@@ -7,5 +7,5 @@
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -323,5 +323,5 @@
             if (data.m_interface.m_fDhcpClientEnabled)
             {
-                iface.EnableDynamicIpConfig();
+                iface.EnableDynamicIPConfig();
             }
             else
@@ -333,5 +333,5 @@
                           QHostAddress(data.m_interface.m_strInterfaceMask).protocol() == QAbstractSocket::IPv4Protocol,
                           ("Interface IPv4 network mask must be empty or IPv4-valid!\n"));
-                iface.EnableStaticIpConfig(data.m_interface.m_strInterfaceAddress, data.m_interface.m_strInterfaceMask);
+                iface.EnableStaticIPConfig(data.m_interface.m_strInterfaceAddress, data.m_interface.m_strInterfaceMask);
                 if (iface.GetIPV6Supported())
                 {
@@ -339,5 +339,5 @@
                               QHostAddress(data.m_interface.m_strInterfaceAddress6).protocol() == QAbstractSocket::IPv6Protocol,
                               ("Interface IPv6 address must be empty or IPv6-valid!\n"));
-                    iface.EnableStaticIpConfigV6(data.m_interface.m_strInterfaceAddress6, data.m_interface.m_strInterfaceMaskLength6.toULong());
+                    iface.EnableStaticIPConfigV6(data.m_interface.m_strInterfaceAddress6, data.m_interface.m_strInterfaceMaskLength6.toULong());
                 }
             }
@@ -554,5 +554,5 @@
     /* Host-only interface settings */
     data.m_interface.m_strName = iface.GetName();
-    data.m_interface.m_fDhcpClientEnabled = iface.GetDhcpEnabled();
+    data.m_interface.m_fDhcpClientEnabled = iface.GetDHCPEnabled();
     data.m_interface.m_strInterfaceAddress = iface.GetIPAddress();
     data.m_interface.m_strInterfaceMask = iface.GetNetworkMask();
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp	(revision 42550)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp	(revision 42551)
@@ -7,5 +7,5 @@
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -790,5 +790,5 @@
 
             /* Gather redirect options: */
-            QVector<QString> redirects = adapter.GetNatDriver().GetRedirects();
+            QVector<QString> redirects = adapter.GetNATEngine().GetRedirects();
             for (int i = 0; i < redirects.size(); ++i)
             {
@@ -922,12 +922,12 @@
                         adapter.SetCableConnected(adapterData.m_fCableConnected);
                         /* Redirect options: */
-                        QVector<QString> oldRedirects = adapter.GetNatDriver().GetRedirects();
+                        QVector<QString> oldRedirects = adapter.GetNATEngine().GetRedirects();
                         for (int i = 0; i < oldRedirects.size(); ++i)
-                            adapter.GetNatDriver().RemoveRedirect(oldRedirects[i].section(',', 0, 0));
+                            adapter.GetNATEngine().RemoveRedirect(oldRedirects[i].section(',', 0, 0));
                         UIPortForwardingDataList newRedirects = adapterData.m_redirects;
                         for (int i = 0; i < newRedirects.size(); ++i)
                         {
                             UIPortForwardingData newRedirect = newRedirects[i];
-                            adapter.GetNatDriver().AddRedirect(newRedirect.name, newRedirect.protocol,
+                            adapter.GetNATEngine().AddRedirect(newRedirect.name, newRedirect.protocol,
                                                                newRedirect.hostIp, newRedirect.hostPort.value(),
                                                                newRedirect.guestIp, newRedirect.guestPort.value());
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp	(revision 42550)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp	(revision 42551)
@@ -7,5 +7,5 @@
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -238,5 +238,5 @@
     systemData.m_fEFIEnabled = m_machine.GetFirmwareType() >= KFirmwareType_EFI && m_machine.GetFirmwareType() <= KFirmwareType_EFIDUAL;
     systemData.m_fUTCEnabled = m_machine.GetRTCUseUTC();
-    systemData.m_fUseAbsHID = m_machine.GetPointingHidType() == KPointingHidType_USBTablet;
+    systemData.m_fUseAbsHID = m_machine.GetPointingHIDType() == KPointingHIDType_USBTablet;
     systemData.m_fPAEEnabled = m_machine.GetCPUProperty(KCPUPropertyType_PAE);
     systemData.m_fHwVirtExEnabled = m_machine.GetHWVirtExProperty(KHWVirtExPropertyType_Enabled);
@@ -363,5 +363,5 @@
             m_machine.SetFirmwareType(systemData.m_fEFIEnabled ? KFirmwareType_EFI : KFirmwareType_BIOS);
             m_machine.SetRTCUseUTC(systemData.m_fUTCEnabled);
-            m_machine.SetPointingHidType(systemData.m_fUseAbsHID ? KPointingHidType_USBTablet : KPointingHidType_PS2Mouse);
+            m_machine.SetPointingHIDType(systemData.m_fUseAbsHID ? KPointingHIDType_USBTablet : KPointingHIDType_PS2Mouse);
             /* Processor tab: */
             m_machine.SetCPUCount(systemData.m_cCPUCount);
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp	(revision 42550)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp	(revision 42551)
@@ -7,5 +7,5 @@
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -309,5 +309,5 @@
                 /* Gather USB values: */
                 usbData.m_fUSBEnabled = controller.GetEnabled();
-                usbData.m_fEHCIEnabled = controller.GetEnabledEhci();
+                usbData.m_fEHCIEnabled = controller.GetEnabledEHCI();
 
                 /* For each USB filter: */
@@ -506,5 +506,5 @@
                     {
                         controller.SetEnabled(usbData.m_fUSBEnabled);
-                        controller.SetEnabledEhci(usbData.m_fEHCIEnabled);
+                        controller.SetEnabledEHCI(usbData.m_fEHCIEnabled);
                     }
                     /* Store USB filters data: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRun.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRun.cpp	(revision 42550)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRun.cpp	(revision 42551)
@@ -49,6 +49,6 @@
     const CGuestOSType &osType = vbox.GetGuestOSType(m_machine.GetOSTypeId());
     /* Determine recommended controller's 'bus' & 'type': */
-    KStorageBus dvdCtrBus = osType.GetRecommendedDvdStorageBus();
-    KStorageControllerType dvdCtrType = osType.GetRecommendedDvdStorageController();
+    KStorageBus dvdCtrBus = osType.GetRecommendedDVDStorageBus();
+    KStorageControllerType dvdCtrType = osType.GetRecommendedDVDStorageController();
     /* Declare null 'dvd' attachment: */
     CMediumAttachment cda;
@@ -132,6 +132,6 @@
     const CGuestOSType &osType = vbox.GetGuestOSType(machine.GetOSTypeId());
     /* Determine recommended controller's 'bus' & 'type': */
-    KStorageBus hdCtrBus = osType.GetRecommendedHdStorageBus();
-    KStorageControllerType hdCtrType = osType.GetRecommendedHdStorageController();
+    KStorageBus hdCtrBus = osType.GetRecommendedHDStorageBus();
+    KStorageControllerType hdCtrType = osType.GetRecommendedHDStorageController();
     /* Enumerate attachments vector: */
     const CMediumAttachmentVector &attachments = machine.GetMediumAttachments();
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp	(revision 42550)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp	(revision 42551)
@@ -91,5 +91,5 @@
     /* Enable the OHCI and EHCI controller by default for new VMs. (new in 2.2): */
     CUSBController usbController = m_machine.GetUSBController();
-    if (!usbController.isNull() && type.GetRecommendedUsb() && usbController.GetProxyAvailable())
+    if (!usbController.isNull() && type.GetRecommendedUSB() && usbController.GetProxyAvailable())
     {
         usbController.SetEnabled(true);
@@ -101,5 +101,5 @@
         CExtPackManager manager = vboxGlobal().virtualBox().GetExtensionPackManager();
         if (manager.IsExtPackUsable(GUI_ExtPackName))
-            usbController.SetEnabledEhci(true);
+            usbController.SetEnabledEHCI(true);
     }
 
@@ -114,23 +114,23 @@
 
     /* Create recommended DVD storage controller: */
-    KStorageBus strDvdBus = type.GetRecommendedDvdStorageBus();
-    QString strDvdName = getNextControllerName(strDvdBus);
-    m_machine.AddStorageController(strDvdName, strDvdBus);
+    KStorageBus strDVDBus = type.GetRecommendedDVDStorageBus();
+    QString strDVDName = getNextControllerName(strDVDBus);
+    m_machine.AddStorageController(strDVDName, strDVDBus);
 
     /* Set recommended DVD storage controller type: */
-    CStorageController dvdCtr = m_machine.GetStorageControllerByName(strDvdName);
-    KStorageControllerType dvdStorageControllerType = type.GetRecommendedDvdStorageController();
+    CStorageController dvdCtr = m_machine.GetStorageControllerByName(strDVDName);
+    KStorageControllerType dvdStorageControllerType = type.GetRecommendedDVDStorageController();
     dvdCtr.SetControllerType(dvdStorageControllerType);
 
     /* Create recommended HD storage controller if it's not the same as the DVD controller: */
-    KStorageBus ctrHdBus = type.GetRecommendedHdStorageBus();
-    KStorageControllerType hdStorageControllerType = type.GetRecommendedHdStorageController();
+    KStorageBus ctrHDBus = type.GetRecommendedHDStorageBus();
+    KStorageControllerType hdStorageControllerType = type.GetRecommendedHDStorageController();
     CStorageController hdCtr;
-    QString strHdName;
-    if (ctrHdBus != strDvdBus || hdStorageControllerType != dvdStorageControllerType)
-    {
-        strHdName = getNextControllerName(ctrHdBus);
-        m_machine.AddStorageController(strHdName, ctrHdBus);
-        hdCtr = m_machine.GetStorageControllerByName(strHdName);
+    QString strHDName;
+    if (ctrHDBus != strDVDBus || hdStorageControllerType != dvdStorageControllerType)
+    {
+        strHDName = getNextControllerName(ctrHDBus);
+        m_machine.AddStorageController(strHDName, ctrHDBus);
+        hdCtr = m_machine.GetStorageControllerByName(strHDName);
         hdCtr.SetControllerType(hdStorageControllerType);
 
@@ -143,9 +143,9 @@
         /* The HD controller is the same as DVD: */
         hdCtr = dvdCtr;
-        strHdName = strDvdName;
+        strHDName = strDVDName;
     }
 
     /* Turn on PAE, if recommended: */
-    m_machine.SetCPUProperty(KCPUPropertyType_PAE, type.GetRecommendedPae());
+    m_machine.SetCPUProperty(KCPUPropertyType_PAE, type.GetRecommendedPAE());
 
     /* Set recommended firmware type: */
@@ -154,15 +154,15 @@
 
     /* Set recommended human interface device types: */
-    if (type.GetRecommendedUsbHid())
-    {
-        m_machine.SetKeyboardHidType(KKeyboardHidType_USBKeyboard);
-        m_machine.SetPointingHidType(KPointingHidType_USBMouse);
+    if (type.GetRecommendedUSBHID())
+    {
+        m_machine.SetKeyboardHIDType(KKeyboardHIDType_USBKeyboard);
+        m_machine.SetPointingHIDType(KPointingHIDType_USBMouse);
         if (!usbController.isNull())
             usbController.SetEnabled(true);
     }
 
-    if (type.GetRecommendedUsbTablet())
-    {
-        m_machine.SetPointingHidType(KPointingHidType_USBTablet);
+    if (type.GetRecommendedUSBTablet())
+    {
+        m_machine.SetPointingHIDType(KPointingHIDType_USBTablet);
         if (!usbController.isNull())
             usbController.SetEnabled(true);
@@ -170,8 +170,8 @@
 
     /* Set HPET flag: */
-    m_machine.SetHpetEnabled(type.GetRecommendedHpet());
+    m_machine.SetHPETEnabled(type.GetRecommendedHPET());
 
     /* Set UTC flags: */
-    m_machine.SetRTCUseUTC(type.GetRecommendedRtcUseUtc());
+    m_machine.SetRTCUseUTC(type.GetRecommendedRTCUseUTC());
 
     /* Set graphic bits: */
@@ -205,14 +205,14 @@
                 UIMedium vmedium = vboxGlobal().findMedium(strId);
                 CMedium medium = vmedium.medium();              // @todo r=dj can this be cached somewhere?
-                machine.AttachDevice(strHdName, 0, 0, KDeviceType_HardDisk, medium);
+                machine.AttachDevice(strHDName, 0, 0, KDeviceType_HardDisk, medium);
                 if (!machine.isOk())
                     msgCenter().cannotAttachDevice(machine, UIMediumType_HardDisk, field("virtualDiskLocation").toString(),
-                                                   StorageSlot(ctrHdBus, 0, 0), this);
+                                                   StorageSlot(ctrHDBus, 0, 0), this);
             }
 
             /* Attach empty CD/DVD ROM Device */
-            machine.AttachDevice(strDvdName, 1, 0, KDeviceType_DVD, CMedium());
+            machine.AttachDevice(strDVDName, 1, 0, KDeviceType_DVD, CMedium());
             if (!machine.isOk())
-                msgCenter().cannotAttachDevice(machine, UIMediumType_DVD, QString(), StorageSlot(strDvdBus, 1, 0), this);
+                msgCenter().cannotAttachDevice(machine, UIMediumType_DVD, QString(), StorageSlot(strDVDBus, 1, 0), this);
 
 
Index: trunk/src/VBox/Main/Makefile.kmk
===================================================================
--- trunk/src/VBox/Main/Makefile.kmk	(revision 42550)
+++ trunk/src/VBox/Main/Makefile.kmk	(revision 42551)
@@ -290,5 +290,5 @@
 	src-all/HashedPw.cpp \
 	src-all/Logging.cpp \
-	src-all/PciDeviceAttachmentImpl.cpp \
+	src-all/PCIDeviceAttachmentImpl.cpp \
 	src-all/ProgressImpl.cpp \
 	src-all/SharedFolderImpl.cpp \
@@ -595,5 +595,5 @@
 	src-all/HashedPw.cpp \
 	src-all/Logging.cpp \
-	src-all/PciDeviceAttachmentImpl.cpp \
+	src-all/PCIDeviceAttachmentImpl.cpp \
 	src-all/ProgressImpl.cpp \
 	src-all/SharedFolderImpl.cpp \
@@ -606,5 +606,5 @@
 	src-client/AudioSnifferInterface.cpp \
 	src-client/BusAssignmentManager.cpp \
-	$(if $(VBOX_WITH_PCI_PASSTHROUGH),src-client/PciRawDevImpl.cpp,) \
+	$(if $(VBOX_WITH_PCI_PASSTHROUGH),src-client/PCIRawDevImpl.cpp,) \
 	src-client/ConsoleImpl.cpp \
 	src-client/ConsoleImpl2.cpp \
Index: trunk/src/VBox/Main/idl/VirtualBox.xidl
===================================================================
--- trunk/src/VBox/Main/idl/VirtualBox.xidl	(revision 42550)
+++ trunk/src/VBox/Main/idl/VirtualBox.xidl	(revision 42551)
@@ -107,4 +107,11 @@
   represent virtual machine sessions which are used to configure virtual
   machines and control their execution.
+
+  The naming of methods and attributes is very clearly defined: they all start
+  with a lowercase letter (except if they start with an acronym), and are using
+  CamelCase style otherwise. This naming only applies to the IDL description,
+  and is modified by the various language bindings (some convert the first
+  character to upper case, some not). See the SDK reference for more details
+  about how to call a method or attribute from a specific programming language.
 </desc>
 
@@ -843,5 +850,5 @@
         In <link to="IMachine::sessionState"/>, this means that the machine
         is currently locked for a session, whose process identifier can
-        then be found in the <link to="IMachine::sessionPid" /> attribute.
+        then be found in the <link to="IMachine::sessionPID" /> attribute.
 
         In <link to="ISession::state"/>, this means that a machine is
@@ -1153,6 +1160,6 @@
 
   <enum
-    name="PointingHidType"
-    uuid="0d3c17a2-821a-4b2e-ae41-890c6c60aa97"
+    name="PointingHIDType"
+    uuid="e44b2f7b-72ba-44fb-9e53-2186014f0d17"
     >
     <desc>
@@ -1178,6 +1185,6 @@
 
   <enum
-    name="KeyboardHidType"
-    uuid="5a5b0996-3a3e-44bb-9019-56979812cbcc"
+    name="KeyboardHIDType"
+    uuid="383e43d7-5c7c-4ec8-9cb8-eda1bccd6699"
     >
     <desc>
@@ -1310,7 +1317,7 @@
     >
     <desc>
-      The IDHCPServer interface represents the vbox dhcp server configuration.
-
-      To enumerate all the dhcp servers on the host, use the
+      The IDHCPServer interface represents the vbox DHCP server configuration.
+
+      To enumerate all the DHCP servers on the host, use the
       <link to="IVirtualBox::DHCPServers"/> attribute.
     </desc>
@@ -1318,5 +1325,5 @@
     <attribute name="enabled" type="boolean">
       <desc>
-        specifies if the dhcp server is enabled
+        specifies if the DHCP server is enabled
       </desc>
     </attribute>
@@ -1943,5 +1950,5 @@
         or a new UUID will be randomly generated (e.g. for ISO and RAW files).
         If for some reason you need to change the medium's UUID, use
-        <link to="IMedium::setIDs" />.
+        <link to="IMedium::setIds" />.
 
         If a differencing hard disk medium is to be opened by this method, the
@@ -2168,5 +2175,5 @@
     <!--method name="createDHCPServerForInterface">
       <desc>
-        Creates a dhcp server settings to be used for the given interface
+        Creates a DHCP server settings to be used for the given interface
         <result name="E_INVALIDARG">
           Host network interface @a name already exists.
@@ -2177,5 +2184,5 @@
       </param>
       <param name="server" type="IDHCPServer" dir="out">
-        <desc>Dhcp server settings</desc>
+        <desc>DHCP server settings</desc>
       </param>
     </method-->
@@ -2183,5 +2190,5 @@
     <method name="createDHCPServer">
       <desc>
-        Creates a dhcp server settings to be used for the given internal network name
+        Creates a DHCP server settings to be used for the given internal network name
         <result name="E_INVALIDARG">
           Host network interface @a name already exists.
@@ -2192,5 +2199,5 @@
       </param>
       <param name="server" type="IDHCPServer" dir="return">
-        <desc>Dhcp server settings</desc>
+        <desc>DHCP server settings</desc>
       </param>
     </method>
@@ -2198,5 +2205,5 @@
     <method name="findDHCPServerByNetworkName">
       <desc>
-        Searches a dhcp server settings to be used for the given internal network name
+        Searches a DHCP server settings to be used for the given internal network name
         <result name="E_INVALIDARG">
           Host network interface @a name already exists.
@@ -2208,5 +2215,5 @@
       </param>
       <param name="server" type="IDHCPServer" dir="return">
-        <desc>Dhcp server settings</desc>
+        <desc>DHCP server settings</desc>
       </param>
     </method>
@@ -2214,5 +2221,5 @@
     <!--method name="findDHCPServerForInterface">
       <desc>
-        Searches a dhcp server settings to be used for the given interface
+        Searches a DHCP server settings to be used for the given interface
         <result name="E_INVALIDARG">
           Host network interface @a name already exists.
@@ -2223,5 +2230,5 @@
       </param>
       <param name="server" type="IDHCPServer" dir="out">
-        <desc>Dhcp server settings</desc>
+        <desc>DHCP server settings</desc>
       </param>
     </method-->
@@ -2229,5 +2236,5 @@
     <method name="removeDHCPServer">
       <desc>
-        Removes the dhcp server settings
+        Removes the DHCP server settings
         <result name="E_INVALIDARG">
           Host network interface @a name already exists.
@@ -2235,5 +2242,5 @@
       </desc>
       <param name="server" type="IDHCPServer" dir="in">
-        <desc>Dhcp server settings to be removed</desc>
+        <desc>DHCP server settings to be removed</desc>
       </param>
     </method>
@@ -3607,5 +3614,5 @@
 
   <interface
-    name="IPciAddress" extends="$unknown"
+    name="IPCIAddress" extends="$unknown"
     uuid="D88B324F-DB19-4D3B-A1A9-BF5B127199A8"
     wsmap="struct"
@@ -3650,5 +3657,5 @@
 
   <interface
-    name="IPciDeviceAttachment" extends="$unknown"
+    name="IPCIDeviceAttachment" extends="$unknown"
     uuid="91f33d6f-e621-4f70-a77e-15f0e3c714d5"
     wsmap="struct"
@@ -3757,5 +3764,5 @@
   <interface
     name="IMachine" extends="$unknown"
-    uuid="481ae051-96ed-4ba3-81e6-7b2c186005bc"
+    uuid="22781af3-1c96-4126-9edf-67a020e0e858"
     wsmap="managed"
     >
@@ -3968,5 +3975,5 @@
     </attribute>
 
-      <attribute name="memorySize" type="unsigned long">
+    <attribute name="memorySize" type="unsigned long">
       <desc>System memory size in megabytes.</desc>
     </attribute>
@@ -4018,5 +4025,5 @@
     </attribute>
 
-    <attribute name="pointingHidType" type="PointingHidType">
+    <attribute name="pointingHIDType" type="PointingHIDType">
       <desc>Type of pointing HID (such as mouse or tablet) used in this VM.
         The default is typically "PS2Mouse" but can vary depending on the
@@ -4024,5 +4031,5 @@
     </attribute>
 
-    <attribute name="keyboardHidType" type="KeyboardHidType">
+    <attribute name="keyboardHIDType" type="KeyboardHIDType">
       <desc>Type of keyboard HID used in this VM.
         The default is typically "PS2Keyboard" but can vary depending on the
@@ -4030,5 +4037,5 @@
     </attribute>
 
-    <attribute name="hpetEnabled" type="boolean">
+    <attribute name="HPETEnabled" type="boolean">
       <desc>This attribute controls if High Precision Event Timer (HPET) is
         enabled in this VM. Use this property if you want to provide guests
@@ -4151,5 +4158,5 @@
     </attribute>
 
-    <attribute name="sessionPid" type="unsigned long" readonly="yes">
+    <attribute name="sessionPID" type="unsigned long" readonly="yes">
       <desc>
         Identifier of the session process. This attribute contains the
@@ -4360,5 +4367,5 @@
     </attribute>
 
-    <attribute name="ioCacheEnabled" type="boolean">
+    <attribute name="IOCacheEnabled" type="boolean">
       <desc>
         When set to @a true, the builtin I/O cache of the virtual machine
@@ -4367,5 +4374,5 @@
     </attribute>
 
-    <attribute name="ioCacheSize" type="unsigned long">
+    <attribute name="IOCacheSize" type="unsigned long">
       <desc>
         Maximum size of the I/O cache in MB.
@@ -4373,8 +4380,8 @@
     </attribute>
 
-    <attribute name="pciDeviceAssignments" type="IPciDeviceAttachment" readonly="yes" safearray="yes">
+    <attribute name="PCIDeviceAssignments" type="IPCIDeviceAttachment" readonly="yes" safearray="yes">
       <desc>Array of PCI devices assigned to this machine, to get list of all
         PCI devices attached to the machine use
-        <link to="IConsole::attachedPciDevices"/> attribute, as this attribute
+        <link to="IConsole::attachedPCIDevices"/> attribute, as this attribute
         is intended to list only devices additional to what described in
         virtual hardware config. Usually, this list keeps host's physical
@@ -5321,13 +5328,13 @@
     </method>
 
-    <method name="attachHostPciDevice">
+    <method name="attachHostPCIDevice">
       <desc>
         Attaches host PCI device with the given (host) PCI address to the
         PCI bus of the virtual machine. Please note, that this operation
         is two phase, as real attachment will happen when VM will start,
-        and most information will be delivered as IHostPciDevicePlugEvent
+        and most information will be delivered as IHostPCIDevicePlugEvent
         on IVirtualBox event source.
 
-        <see><link to="IHostPciDevicePlugEvent"/></see>
+        <see><link to="IHostPCIDevicePlugEvent"/></see>
 
         <result name="VBOX_E_INVALID_VM_STATE">
@@ -5353,12 +5360,12 @@
     </method>
 
-    <method name="detachHostPciDevice">
+    <method name="detachHostPCIDevice">
       <desc>
         Detach host PCI device from the virtual machine.
-        Also HostPciDevicePlugEvent on IVirtualBox event source
+        Also HostPCIDevicePlugEvent on IVirtualBox event source
         will be delivered. As currently we don't support hot device
-        unplug, IHostPciDevicePlugEvent event is delivered immediately.
-
-        <see><link to="IHostPciDevicePlugEvent"/></see>
+        unplug, IHostPCIDevicePlugEvent event is delivered immediately.
+
+        <see><link to="IHostPCIDevicePlugEvent"/></see>
 
         <result name="VBOX_E_INVALID_VM_STATE">
@@ -6724,5 +6731,5 @@
   <interface
     name="IConsole" extends="$unknown"
-    uuid="1968b7d3-e3bf-4ceb-99e0-cb7c913317bb"
+    uuid="db7ab4ca-2a3f-4183-9243-c1208da92392"
     wsmap="managed"
     >
@@ -6851,5 +6858,5 @@
     </attribute>
 
-    <attribute name="attachedPciDevices" type="IPciDeviceAttachment" readonly="yes" safearray="yes">
+    <attribute name="attachedPCIDevices" type="IPCIDeviceAttachment" readonly="yes" safearray="yes">
       <desc>Array of PCI devices attached to this machine.</desc>
     </attribute>
@@ -7617,5 +7624,5 @@
   <interface
     name="IHostNetworkInterface" extends="$unknown"
-    uuid="ce6fae58-7642-4102-b5db-c9005c2320a8"
+    uuid="87a4153d-6889-4dd6-9654-2e9ff0ae8dec"
     wsmap="managed"
     >
@@ -7638,5 +7645,5 @@
     </attribute>
 
-    <attribute name="dhcpEnabled" type="boolean" readonly="yes">
+    <attribute name="DHCPEnabled" type="boolean" readonly="yes">
       <desc>Specifies whether the DHCP is enabled for the interface.</desc>
     </attribute>
@@ -7678,5 +7685,5 @@
     </attribute>
 
-    <method name="enableStaticIpConfig">
+    <method name="enableStaticIPConfig">
       <desc>sets and enables the static IP V4 configuration for the given interface.</desc>
       <param name="IPAddress" type="wstring" dir="in">
@@ -7692,5 +7699,5 @@
     </method>
 
-    <method name="enableStaticIpConfigV6">
+    <method name="enableStaticIPConfigV6">
       <desc>sets and enables the static IP V6 configuration for the given interface.</desc>
       <param name="IPV6Address" type="wstring" dir="in">
@@ -7706,10 +7713,10 @@
     </method>
 
-    <method name="enableDynamicIpConfig">
+    <method name="enableDynamicIPConfig">
       <desc>enables the dynamic IP configuration.</desc>
     </method>
 
-    <method name="dhcpRediscover">
-      <desc>refreshes the IP configuration for dhcp-enabled interface.</desc>
+    <method name="DHCPRediscover">
+      <desc>refreshes the IP configuration for DHCP-enabled interface.</desc>
     </method>
 
@@ -7718,5 +7725,5 @@
   <interface
     name="IHost" extends="$unknown"
-    uuid="dab4a2b8-c735-4f08-94fc-9bec84182e2f"
+    uuid="30678943-32df-4830-b413-931b25ac86a0"
     wsmap="managed"
     >
@@ -7911,5 +7918,5 @@
     </attribute>
 
-    <attribute name="Acceleration3DAvailable" type="boolean" readonly="yes">
+    <attribute name="acceleration3DAvailable" type="boolean" readonly="yes">
       <desc>Returns @c true when the host supports 3D hardware acceleration.</desc>
     </attribute>
@@ -8560,5 +8567,5 @@
   <interface
     name="IGuestOSType" extends="$unknown"
-    uuid="63a03874-e495-41f7-a6dd-48b92fba8355"
+    uuid="6d968f9a-858b-4c50-bf17-241f069e94c2"
     wsmap="struct"
     >
@@ -8618,21 +8625,21 @@
     </attribute>
 
-    <attribute name="recommendedPae" type="boolean" readonly="yes">
+    <attribute name="recommendedPAE" type="boolean" readonly="yes">
       <desc>Returns @c true if using PAE is recommended for this OS type.</desc>
     </attribute>
 
-    <attribute name="recommendedDvdStorageController" type="StorageControllerType" readonly="yes">
+    <attribute name="recommendedDVDStorageController" type="StorageControllerType" readonly="yes">
       <desc>Recommended storage controller type for DVD/CD drives.</desc>
     </attribute>
 
-    <attribute name="recommendedDvdStorageBus" type="StorageBus" readonly="yes">
+    <attribute name="recommendedDVDStorageBus" type="StorageBus" readonly="yes">
       <desc>Recommended storage bus type for DVD/CD drives.</desc>
     </attribute>
 
-    <attribute name="recommendedHdStorageController" type="StorageControllerType" readonly="yes">
+    <attribute name="recommendedHDStorageController" type="StorageControllerType" readonly="yes">
       <desc>Recommended storage controller type for HD drives.</desc>
     </attribute>
 
-    <attribute name="recommendedHdStorageBus" type="StorageBus" readonly="yes">
+    <attribute name="recommendedHDStorageBus" type="StorageBus" readonly="yes">
       <desc>Recommended storage bus type for HD drives.</desc>
     </attribute>
@@ -8642,17 +8649,17 @@
     </attribute>
 
-    <attribute name="recommendedUsbHid" type="boolean" readonly="yes">
+    <attribute name="recommendedUSBHID" type="boolean" readonly="yes">
       <desc>Returns @c true if using USB Human Interface Devices, such as keyboard and mouse recommended.</desc>
     </attribute>
 
-    <attribute name="recommendedHpet" type="boolean" readonly="yes">
+    <attribute name="recommendedHPET" type="boolean" readonly="yes">
       <desc>Returns @c true if using HPET is recommended for this OS type.</desc>
     </attribute>
 
-    <attribute name="recommendedUsbTablet" type="boolean" readonly="yes">
+    <attribute name="recommendedUSBTablet" type="boolean" readonly="yes">
       <desc>Returns @c true if using a USB Tablet is recommended.</desc>
     </attribute>
 
-    <attribute name="recommendedRtcUseUtc" type="boolean" readonly="yes">
+    <attribute name="recommendedRTCUseUTC" type="boolean" readonly="yes">
       <desc>Returns @c true if the RTC of this VM should be set to UTC</desc>
     </attribute>
@@ -8670,5 +8677,5 @@
     </attribute>
 
-    <attribute name="recommendedUsb" type="boolean" readonly="yes">
+    <attribute name="recommendedUSB" type="boolean" readonly="yes">
       <desc>Returns @c true a USB controller is recommended for this OS type.</desc>
     </attribute>
@@ -9360,5 +9367,5 @@
   <interface
     name="IGuestSession" extends="$unknown"
-    uuid="89f39320-d86c-4705-a376-d083f3c5c4e3"
+    uuid="a8bbf136-3f0d-42cd-9fd3-c5816adb10a0"
     wsmap="managed"
     >
@@ -9409,5 +9416,5 @@
     </attribute>
     
-    <attribute name="environment" type="wstring" readonly="yes" safearray="yes">
+    <attribute name="environment" type="wstring" safearray="yes">
       <desc>
         TODO
@@ -9433,5 +9440,5 @@
     </attribute>
     
-    <method name="Close">
+    <method name="close">
       <desc>
         TODO
@@ -9443,5 +9450,5 @@
     </method>
     
-    <method name="CopyFrom">
+    <method name="copyFrom">
       <desc>
         TODO
@@ -9465,5 +9472,5 @@
     </method>
     
-    <method name="CopyTo">
+    <method name="copyTo">
       <desc>
         TODO
@@ -9509,5 +9516,5 @@
     </method>
     
-    <method name="DirectoryCreateTemp">
+    <method name="directoryCreateTemp">
       <desc>
         TODO
@@ -9531,5 +9538,5 @@
     </method>
     
-    <method name="DirectoryExists">
+    <method name="directoryExists">
       <desc>
         TODO
@@ -9547,5 +9554,5 @@
     </method>
     
-    <method name="DirectoryOpen">
+    <method name="directoryOpen">
       <desc>
         TODO
@@ -9569,5 +9576,5 @@
     </method>
     
-    <method name="DirectoryQueryInfo">
+    <method name="directoryQueryInfo">
       <desc>
         TODO
@@ -9585,5 +9592,5 @@
     </method>
     
-    <method name="DirectoryRemove">
+    <method name="directoryRemove">
       <desc>
         TODO
@@ -9598,5 +9605,5 @@
     </method>
     
-    <method name="DirectoryRemoveRecursive">
+    <method name="directoryRemoveRecursive">
       <desc>
         TODO
@@ -9617,5 +9624,5 @@
     </method>
     
-    <method name="DirectoryRename">
+    <method name="directoryRename">
       <desc>
         TODO
@@ -9636,5 +9643,5 @@
     </method>
     
-    <method name="DirectorySetACL">
+    <method name="directorySetACL">
       <desc>
         TODO
@@ -9652,5 +9659,5 @@
     </method>
     
-    <method name="EnvironmentClear">
+    <method name="environmentClear">
       <desc>
         TODO
@@ -9662,5 +9669,5 @@
     </method>
     
-    <method name="EnvironmentGet">
+    <method name="environmentGet">
       <desc>
         TODO
@@ -9678,5 +9685,5 @@
     </method>
     
-    <method name="EnvironmentSet">
+    <method name="environmentSet">
       <desc>
         TODO
@@ -9694,5 +9701,5 @@
     </method>
     
-    <method name="EnvironmentSetArray">
+    <method name="environmentUnset">
       <desc>
         TODO
@@ -9702,10 +9709,171 @@
         </result>
       </desc>
+      <param name="name" type="wstring" dir="in">
+        <desc>TODO</desc>
+      </param>
+    </method>
+    
+    <method name="fileCreateTemp">
+      <desc>
+        TODO
+
+        <result name="VBOX_E_NOT_SUPPORTED">
+          TODO
+        </result>
+      </desc>
+      <param name="templateName" type="wstring" dir="in">
+        <desc>TODO</desc>
+      </param>
+      <param name="mode" type="unsigned long" dir="in">
+        <desc>TODO</desc>
+      </param>
+      <param name="path" type="wstring" dir="in">
+        <desc>TODO</desc>
+      </param>
+      <param name="file" type="IGuestFile" dir="return">
+        <desc>Optional.</desc>
+      </param>
+    </method>
+    
+    <method name="fileExists">
+      <desc>
+        TODO
+
+        <result name="VBOX_E_NOT_SUPPORTED">
+          TODO
+        </result>
+      </desc>
+      <param name="path" type="wstring" dir="in">
+        <desc>TODO</desc>
+      </param>
+      <param name="exists" type="boolean" dir="return">
+        <desc>TODO</desc>
+      </param>
+    </method>
+    
+    <method name="fileOpen">
+      <desc>
+        TODO
+
+        <result name="VBOX_E_NOT_SUPPORTED">
+          TODO
+        </result>
+      </desc>
+      <param name="path" type="wstring" dir="in">
+        <desc>TODO</desc>
+      </param>
+      <param name="openMode" type="wstring" dir="in">
+        <desc>TODO</desc>
+      </param>
+      <param name="disposition" type="wstring" dir="in">
+        <desc>TODO</desc>
+      </param>
+      <param name="creationMode" type="unsigned long" dir="in">
+        <desc>TODO</desc>
+      </param>
+      <param name="offset" type="long long" dir="in">
+        <desc>TODO</desc>
+      </param>
+      <param name="file" type="IGuestFile" dir="return">
+        <desc>TODO</desc>
+      </param>
+    </method>
+    
+    <method name="fileQueryInfo">
+      <desc>
+        TODO
+
+        <result name="VBOX_E_NOT_SUPPORTED">
+          TODO
+        </result>
+      </desc>
+      <param name="path" type="wstring" dir="in">
+        <desc>TODO</desc>
+      </param>
+      <param name="info" type="IGuestFsObjInfo" dir="return">
+        <desc>TODO</desc>
+      </param>
+    </method>
+    
+    <method name="fileQuerySize">
+      <desc>
+        TODO
+
+        <result name="VBOX_E_NOT_SUPPORTED">
+          TODO
+        </result>
+      </desc>
+      <param name="path" type="wstring" dir="in">
+        <desc>TODO</desc>
+      </param>
+      <param name="size" type="long long" dir="return">
+        <desc>TODO</desc>
+      </param>
+    </method>
+    
+    <method name="fileRename">
+      <desc>
+        TODO
+
+        <result name="VBOX_E_NOT_SUPPORTED">
+          TODO
+        </result>
+      </desc>
+      <param name="source" type="wstring" dir="in">
+        <desc>TODO</desc>
+      </param>
+      <param name="dest" type="wstring" dir="in">
+        <desc>TODO</desc>
+      </param>
+      <param name="flags" type="PathRenameFlag" dir="in" safearray="yes">
+        <desc>TODO</desc>
+      </param>
+    </method>
+    
+    <method name="fileSetACL">
+      <desc>
+        TODO
+
+        <result name="VBOX_E_NOT_SUPPORTED">
+          TODO
+        </result>
+      </desc>
+      <param name="file" type="wstring" dir="in">
+        <desc>TODO</desc>
+      </param>
+      <param name="acl" type="wstring" dir="in">
+        <desc>TODO</desc>
+      </param>
+    </method>
+    
+    <method name="processCreate">
+      <desc>
+        TODO
+
+        <result name="VBOX_E_NOT_SUPPORTED">
+          TODO
+        </result>
+      </desc>
+      <param name="command" type="wstring" dir="in">
+        <desc>TODO</desc>
+      </param>
+      <param name="arguments" type="wstring" dir="in" safearray="yes">
+        <desc>TODO</desc>
+      </param>
       <param name="environment" type="wstring" dir="in" safearray="yes">
         <desc>TODO</desc>
       </param>
+      <param name="flags" type="ProcessCreateFlag" dir="in" safearray="yes">
+        <desc>TODO</desc>
+      </param>
+      <param name="timeoutMS" type="unsigned long" dir="in">
+        <desc>TODO</desc>
+      </param>
+      <param name="guestProcess" type="IGuestProcess" dir="return">
+        <desc>TODO</desc>
+      </param>
     </method>
     
-    <method name="EnvironmentUnset">
+    <method name="processCreateEx">
       <desc>
         TODO
@@ -9715,10 +9883,31 @@
         </result>
       </desc>
-      <param name="name" type="wstring" dir="in">
+      <param name="command" type="wstring" dir="in">
         <desc>TODO</desc>
       </param>
+      <param name="arguments" type="wstring" dir="in" safearray="yes">
+        <desc>TODO</desc>
+      </param>
+      <param name="environment" type="wstring" dir="in" safearray="yes">
+        <desc>TODO</desc>
+      </param>
+      <param name="flags" type="ProcessCreateFlag" dir="in" safearray="yes">
+        <desc>TODO</desc>
+      </param>
+      <param name="timeoutMS" type="unsigned long" dir="in">
+        <desc>TODO</desc>
+      </param>
+      <param name="priority" type="ProcessPriority" dir="in">
+        <desc>TODO</desc>
+      </param>
+      <param name="affinity" type="long" dir="in" safearray="yes">
+        <desc>TODO</desc>
+      </param>
+      <param name="guestProcess" type="IGuestProcess" dir="return">
+        <desc>TODO</desc>
+      </param>
     </method>
     
-    <method name="FileCreateTemp">
+    <method name="processGet">
       <desc>
         TODO
@@ -9728,19 +9917,80 @@
         </result>
       </desc>
-      <param name="templateName" type="wstring" dir="in">
+      <param name="pid" type="unsigned long" dir="in">
         <desc>TODO</desc>
       </param>
-      <param name="mode" type="unsigned long" dir="in">
+      <param name="guestProcess" type="IGuestProcess" dir="return">
         <desc>TODO</desc>
       </param>
+    </method>
+    
+    <method name="symlinkCreate">
+      <desc>
+        TODO
+
+        <result name="VBOX_E_NOT_SUPPORTED">
+          TODO
+        </result>
+      </desc>
+      <param name="source" type="wstring" dir="in">
+        <desc>TODO</desc>
+      </param>
+      <param name="target" type="wstring" dir="in">
+        <desc>TODO</desc>
+      </param>
+      <param name="type" type="SymlinkType" dir="in">
+        <desc>TODO</desc>
+      </param>
+    </method>
+    
+    <method name="symlinkExists">
+      <desc>
+        TODO
+
+        <result name="VBOX_E_NOT_SUPPORTED">
+          TODO
+        </result>
+      </desc>
+      <param name="symlink" type="wstring" dir="in">
+        <desc>TODO</desc>
+      </param>
+      <param name="exists" type="boolean" dir="return">
+        <desc>TODO</desc>
+      </param>
+    </method>
+    
+    <method name="symlinkRead">
+      <desc>
+        TODO
+
+        <result name="VBOX_E_NOT_SUPPORTED">
+          TODO
+        </result>
+      </desc>
+      <param name="symlink" type="wstring" dir="in">
+        <desc>TODO</desc>
+      </param>
+      <param name="flags" type="SymlinkReadFlag" dir="in" safearray="yes">
+        <desc>TODO</desc>
+      </param>
+      <param name="target" type="wstring" dir="return">
+        <desc>TODO</desc>
+      </param>
+    </method>
+    
+    <method name="symlinkRemoveDirectory">
+      <desc>
+        TODO
+
+        <result name="VBOX_E_NOT_SUPPORTED">
+          TODO
+        </result>
+      </desc>
       <param name="path" type="wstring" dir="in">
         <desc>TODO</desc>
       </param>
-      <param name="file" type="IGuestFile" dir="return">
-        <desc>Optional.</desc>
-      </param>
     </method>
     
-    <method name="FileExists">
+    <method name="symlinkRemoveFile">
       <desc>
         TODO
@@ -9750,263 +10000,7 @@
         </result>
       </desc>
-      <param name="path" type="wstring" dir="in">
-        <desc>TODO</desc>
-      </param>
-      <param name="exists" type="boolean" dir="return">
-        <desc>TODO</desc>
-      </param>
-    </method>
-    
-    <method name="FileOpen">
-      <desc>
-        TODO
-
-        <result name="VBOX_E_NOT_SUPPORTED">
-          TODO
-        </result>
-      </desc>
-      <param name="path" type="wstring" dir="in">
-        <desc>TODO</desc>
-      </param>
-      <param name="openMode" type="wstring" dir="in">
-        <desc>TODO</desc>
-      </param>
-      <param name="disposition" type="wstring" dir="in">
-        <desc>TODO</desc>
-      </param>
-      <param name="creationMode" type="unsigned long" dir="in">
-        <desc>TODO</desc>
-      </param>
-      <param name="offset" type="long long" dir="in">
-        <desc>TODO</desc>
-      </param>
-      <param name="file" type="IGuestFile" dir="return">
-        <desc>TODO</desc>
-      </param>
-    </method>
-    
-    <method name="FileQueryInfo">
-      <desc>
-        TODO
-
-        <result name="VBOX_E_NOT_SUPPORTED">
-          TODO
-        </result>
-      </desc>
-      <param name="path" type="wstring" dir="in">
-        <desc>TODO</desc>
-      </param>
-      <param name="info" type="IGuestFsObjInfo" dir="return">
-        <desc>TODO</desc>
-      </param>
-    </method>
-    
-    <method name="FileQuerySize">
-      <desc>
-        TODO
-
-        <result name="VBOX_E_NOT_SUPPORTED">
-          TODO
-        </result>
-      </desc>
-      <param name="path" type="wstring" dir="in">
-        <desc>TODO</desc>
-      </param>
-      <param name="size" type="long long" dir="return">
-        <desc>TODO</desc>
-      </param>
-    </method>
-    
-    <method name="FileRename">
-      <desc>
-        TODO
-
-        <result name="VBOX_E_NOT_SUPPORTED">
-          TODO
-        </result>
-      </desc>
-      <param name="source" type="wstring" dir="in">
-        <desc>TODO</desc>
-      </param>
-      <param name="dest" type="wstring" dir="in">
-        <desc>TODO</desc>
-      </param>
-      <param name="flags" type="PathRenameFlag" dir="in" safearray="yes">
-        <desc>TODO</desc>
-      </param>
-    </method>
-    
-    <method name="FileSetACL">
-      <desc>
-        TODO
-
-        <result name="VBOX_E_NOT_SUPPORTED">
-          TODO
-        </result>
-      </desc>
       <param name="file" type="wstring" dir="in">
         <desc>TODO</desc>
       </param>
-      <param name="acl" type="wstring" dir="in">
-        <desc>TODO</desc>
-      </param>
-    </method>
-    
-    <method name="ProcessCreate">
-      <desc>
-        TODO
-
-        <result name="VBOX_E_NOT_SUPPORTED">
-          TODO
-        </result>
-      </desc>
-      <param name="command" type="wstring" dir="in">
-        <desc>TODO</desc>
-      </param>
-      <param name="arguments" type="wstring" dir="in" safearray="yes">
-        <desc>TODO</desc>
-      </param>
-      <param name="environment" type="wstring" dir="in" safearray="yes">
-        <desc>TODO</desc>
-      </param>
-      <param name="flags" type="ProcessCreateFlag" dir="in" safearray="yes">
-        <desc>TODO</desc>
-      </param>
-      <param name="timeoutMS" type="unsigned long" dir="in">
-        <desc>TODO</desc>
-      </param>
-      <param name="guestProcess" type="IGuestProcess" dir="return">
-        <desc>TODO</desc>
-      </param>
-    </method>
-    
-    <method name="ProcessCreateEx">
-      <desc>
-        TODO
-
-        <result name="VBOX_E_NOT_SUPPORTED">
-          TODO
-        </result>
-      </desc>
-      <param name="command" type="wstring" dir="in">
-        <desc>TODO</desc>
-      </param>
-      <param name="arguments" type="wstring" dir="in" safearray="yes">
-        <desc>TODO</desc>
-      </param>
-      <param name="environment" type="wstring" dir="in" safearray="yes">
-        <desc>TODO</desc>
-      </param>
-      <param name="flags" type="ProcessCreateFlag" dir="in" safearray="yes">
-        <desc>TODO</desc>
-      </param>
-      <param name="timeoutMS" type="unsigned long" dir="in">
-        <desc>TODO</desc>
-      </param>
-      <param name="priority" type="ProcessPriority" dir="in">
-        <desc>TODO</desc>
-      </param>
-      <param name="affinity" type="long" dir="in" safearray="yes">
-        <desc>TODO</desc>
-      </param>
-      <param name="guestProcess" type="IGuestProcess" dir="return">
-        <desc>TODO</desc>
-      </param>
-    </method>
-    
-    <method name="ProcessGet">
-      <desc>
-        TODO
-
-        <result name="VBOX_E_NOT_SUPPORTED">
-          TODO
-        </result>
-      </desc>
-      <param name="pid" type="unsigned long" dir="in">
-        <desc>TODO</desc>
-      </param>
-      <param name="guestProcess" type="IGuestProcess" dir="return">
-        <desc>TODO</desc>
-      </param>
-    </method>
-    
-    <method name="SymlinkCreate">
-      <desc>
-        TODO
-
-        <result name="VBOX_E_NOT_SUPPORTED">
-          TODO
-        </result>
-      </desc>
-      <param name="source" type="wstring" dir="in">
-        <desc>TODO</desc>
-      </param>
-      <param name="target" type="wstring" dir="in">
-        <desc>TODO</desc>
-      </param>
-      <param name="type" type="SymlinkType" dir="in">
-        <desc>TODO</desc>
-      </param>
-    </method>
-    
-    <method name="SymlinkExists">
-      <desc>
-        TODO
-
-        <result name="VBOX_E_NOT_SUPPORTED">
-          TODO
-        </result>
-      </desc>
-      <param name="symlink" type="wstring" dir="in">
-        <desc>TODO</desc>
-      </param>
-      <param name="exists" type="boolean" dir="return">
-        <desc>TODO</desc>
-      </param>
-    </method>
-    
-    <method name="SymlinkRead">
-      <desc>
-        TODO
-
-        <result name="VBOX_E_NOT_SUPPORTED">
-          TODO
-        </result>
-      </desc>
-      <param name="symlink" type="wstring" dir="in">
-        <desc>TODO</desc>
-      </param>
-      <param name="flags" type="SymlinkReadFlag" dir="in" safearray="yes">
-        <desc>TODO</desc>
-      </param>
-      <param name="target" type="wstring" dir="return">
-        <desc>TODO</desc>
-      </param>
-    </method>
-    
-    <method name="SymlinkRemoveDirectory">
-      <desc>
-        TODO
-
-        <result name="VBOX_E_NOT_SUPPORTED">
-          TODO
-        </result>
-      </desc>
-      <param name="path" type="wstring" dir="in">
-        <desc>TODO</desc>
-      </param>
-    </method>
-    
-    <method name="SymlinkRemoveFile">
-      <desc>
-        TODO
-
-        <result name="VBOX_E_NOT_SUPPORTED">
-          TODO
-        </result>
-      </desc>
-      <param name="file" type="wstring" dir="in">
-        <desc>TODO</desc>
-      </param>
     </method>
     
@@ -10015,5 +10009,5 @@
   <interface
     name="IProcess" extends="$unknown"
-    uuid="83275f41-01ee-4362-ac44-298191b5186c"
+    uuid="896df50a-c5d1-4892-8bc6-b78d0c1f4e33"
     wsmap="managed"
     >
@@ -10021,5 +10015,5 @@
       TODO
     </desc>
-    <attribute name="pid" type="unsigned long" readonly="yes">
+    <attribute name="PID" type="unsigned long" readonly="yes">
       <desc>
         TODO
@@ -10078,5 +10072,5 @@
     </attribute>
     
-    <method name="WaitFor">
+    <method name="waitFor">
       <desc>
         TODO
@@ -10097,7 +10091,7 @@
     </method>
     
-    <method name="WaitForArray">
-      <desc>
-        Scriptable version of <link to="#WaitFor" />.
+    <method name="waitForArray">
+      <desc>
+        Scriptable version of <link to="#waitFor" />.
 
         <result name="VBOX_E_NOT_SUPPORTED">
@@ -10116,5 +10110,5 @@
     </method>
     
-    <method name="Read">
+    <method name="read">
       <desc>
         TODO
@@ -10138,5 +10132,5 @@
     </method>
     
-    <method name="Write">
+    <method name="write">
       <desc>
         TODO
@@ -10192,5 +10186,5 @@
     </method>
     
-    <method name="Terminate">
+    <method name="terminate">
       <desc>
         TODO
@@ -10215,5 +10209,5 @@
   <interface
     name="IDirectory" extends="$unknown"
-    uuid="edb0fb3b-9c74-40a6-9c54-ed7abd9d7533"
+    uuid="e55ab5e5-4feb-452b-86ed-59cff4c581a3"
     wsmap="managed"
     >
@@ -10231,5 +10225,5 @@
     </attribute>
     
-    <method name="Read">
+    <method name="read">
       <desc>
         TODO
@@ -10257,5 +10251,5 @@
   <interface
     name="IFile" extends="$unknown"
-    uuid="3f067338-2490-47e4-ae81-45a65300f3b1"
+    uuid="2615152d-35c0-4363-8325-ab7e1f2b8b34"
     wsmap="managed"
     >
@@ -10297,5 +10291,5 @@
     </attribute>
     
-    <method name="Close">
+    <method name="close">
       <desc>
         TODO
@@ -10307,5 +10301,5 @@
     </method>
     
-    <method name="QueryInfo">
+    <method name="queryInfo">
       <desc>
         TODO
@@ -10320,5 +10314,5 @@
     </method>  
         
-    <method name="Read">
+    <method name="read">
       <desc>
         TODO
@@ -10339,5 +10333,5 @@
     </method>
         
-    <method name="ReadAt">
+    <method name="readAt">
       <desc>
         TODO
@@ -10361,5 +10355,5 @@
     </method>
     
-    <method name="Seek">
+    <method name="seek">
       <desc>
         TODO
@@ -10377,5 +10371,5 @@
     </method>
     
-    <method name="SetACL">
+    <method name="setACL">
       <desc>
         TODO
@@ -10390,5 +10384,5 @@
     </method>
     
-    <method name="Write">
+    <method name="write">
       <desc>
         TODO
@@ -10406,5 +10400,5 @@
     </method>
     
-    <method name="WriteAt">
+    <method name="writeAt">
       <desc>
         TODO
@@ -10439,5 +10433,5 @@
   <interface
     name="IFsObjInfo" extends="$unknown"
-    uuid="fbcde6d8-69a4-41a3-950f-f98aed6ade52"
+    uuid="4925335b-9aa6-4870-bda3-8edb09fb602c"
     wsmap="managed"
     >
@@ -10502,5 +10496,5 @@
       </desc>
     </attribute>
-    <attribute name="gid" type="unsigned long" readonly="yes">
+    <attribute name="GID" type="unsigned long" readonly="yes">
       <desc>
         TODO
@@ -10574,5 +10568,5 @@
       </desc>
     </attribute>      
-    <attribute name="uid" type="unsigned long" readonly="yes">
+    <attribute name="UID" type="unsigned long" readonly="yes">
       <desc>
         TODO
@@ -12846,5 +12840,5 @@
     </attribute>
 
-    <method name="setIDs">
+    <method name="setIds">
       <desc>
         Changes the UUID and parent UUID for a hard disk medium.
@@ -14935,5 +14929,5 @@
   <interface
     name="INetworkAdapter" extends="$unknown"
-    uuid="8b2e705c-0547-4008-b7bc-788757346092"
+    uuid="efa0f965-63c7-4c60-afdf-b1cc9943b9c0"
     wsmap="managed"
     >
@@ -15052,5 +15046,5 @@
     </attribute>
 
-    <attribute name="natDriver" type="INATEngine" readonly="yes">
+    <attribute name="NATEngine" type="INATEngine" readonly="yes">
       <desc>
         Points to the NAT engine which handles the network address translation
@@ -15766,5 +15760,5 @@
   <interface
     name="IUSBController" extends="$unknown"
-    uuid="6fdcccc5-abd3-4fec-9387-2ad3914fc4a8"
+    uuid="01e6f13a-0580-452f-a40f-74e32a5e4921"
     wsmap="managed"
     >
@@ -15778,5 +15772,5 @@
     </attribute>
 
-    <attribute name="enabledEhci" type="boolean">
+    <attribute name="enabledEHCI" type="boolean">
       <desc>
         Flag whether the USB EHCI controller is present in the
@@ -18026,10 +18020,10 @@
   <interface
     name="INATEngine" extends="$unknown"
-    uuid="4b286616-eb03-11de-b0fb-1701eca42246"
+    uuid="26451b99-3b2d-4dcb-8e4b-d63654218175"
     wsmap="managed"
     >
     <desc>Interface for managing a NAT engine which is used with a virtual machine. This
       allows for changing NAT behavior such as port-forwarding rules. This interface is
-      used in the <link to="INetworkAdapter::natDriver" /> attribute.</desc>
+      used in the <link to="INetworkAdapter::NATEngine" /> attribute.</desc>
     <attribute name="network" type="wstring">
       <desc>The network attribute of the NAT engine (the same value is used with built-in
@@ -18041,13 +18035,13 @@
       </desc>
     </attribute>
-    <attribute name="tftpPrefix" type="wstring">
+    <attribute name="TFTPPrefix" type="wstring">
       <desc>TFTP prefix attribute which is used with the built-in DHCP server to fill
         the corresponding fields of DHCP leases.</desc>
     </attribute>
-    <attribute name="tftpBootFile" type="wstring">
+    <attribute name="TFTPBootFile" type="wstring">
       <desc>TFTP boot file attribute which is used with the built-in DHCP server to fill
         the corresponding fields of DHCP leases.</desc>
     </attribute>
-    <attribute name="tftpNextServer" type="wstring">
+    <attribute name="TFTPNextServer" type="wstring">
       <desc>TFTP server attribute which is used with the built-in DHCP server to fill
         the corresponding fields of DHCP leases.
@@ -18058,12 +18052,12 @@
       <desc></desc>
     </attribute>
-    <attribute name="dnsPassDomain" type="boolean">
+    <attribute name="DNSPassDomain" type="boolean">
       <desc>Whether the DHCP server should pass the DNS domain used by the host.</desc>
     </attribute>
-    <attribute name="dnsProxy" type="boolean">
+    <attribute name="DNSProxy" type="boolean">
       <desc>Whether the DHCP server (and the DNS traffic by NAT) should pass the address
         of the DNS proxy and process traffic using DNS servers registered on the host.</desc>
     </attribute>
-    <attribute name="dnsUseHostResolver" type="boolean">
+    <attribute name="DNSUseHostResolver" type="boolean">
       <desc>Whether the DHCP server (and the DNS traffic by NAT) should pass the address
         of the DNS proxy and process traffic using the host resolver mechanism.</desc>
@@ -18111,5 +18105,5 @@
           <desc>Protocol handled with the rule.</desc>
         </param>
-        <param name="hostIp" type="wstring" dir="in">
+        <param name="hostIP" type="wstring" dir="in">
           <desc>IP of the host interface to which the rule should apply. An empty ip address is
             acceptable, in which case the NAT engine binds the handling socket to any interface.</desc>
@@ -18118,5 +18112,5 @@
           <desc>The port number to listen on.</desc>
         </param>
-        <param name="guestIp" type="wstring" dir="in">
+        <param name="guestIP" type="wstring" dir="in">
           <desc>The IP address of the guest which the NAT engine will forward matching packets
             to. An empty IP address is acceptable, in which case the NAT engine will forward
@@ -18609,5 +18603,5 @@
   <enum
     name="VBoxEventType"
-    uuid="b627520a-6b1a-4a9a-914d-f31434d3d10f"
+    uuid="0d67e79e-b7b1-4919-aab3-b36866075515"
     >
 
@@ -18842,7 +18836,7 @@
       </desc>
     </const>
-    <const name="OnHostPciDevicePlug" value="67">
-      <desc>
-        See <link to="IHostPciDevicePlugEvent">IHostPciDevicePlugEvent</link>.
+    <const name="OnHostPCIDevicePlug" value="67">
+      <desc>
+        See <link to="IHostPCIDevicePlugEvent">IHostPCIDevicePlugEvent</link>.
       </desc>
     </const>
@@ -19656,5 +19650,5 @@
   <interface
     name="ICPUChangedEvent" extends="IEvent"
-    uuid="D0F0BECC-EE17-4D17-A8CC-383B0EB55E9D"
+    uuid="4da2dec7-71b2-4817-9a64-4ed12c17388e"
     wsmap="managed" autogen="VBoxEvent" id="OnCPUChanged"
     >
@@ -19662,5 +19656,5 @@
       Notification when a CPU changes.
     </desc>
-    <attribute name="cpu" type="unsigned long" readonly="yes">
+    <attribute name="CPU" type="unsigned long" readonly="yes">
       <desc>
         The CPU which changed.
@@ -20113,5 +20107,5 @@
   <interface
     name="INATRedirectEvent" extends="IMachineEvent"
-    uuid="57DE97D7-3CBB-42A0-888F-610D5832D16B"
+    uuid="24eef068-c380-4510-bc7c-19314a7352f1"
     wsmap="managed" autogen="VBoxEvent" id="OnNATRedirect"
     >
@@ -20139,5 +20133,5 @@
       </desc>
     </attribute>
-    <attribute name="hostIp"  type="wstring" readonly="yes">
+    <attribute name="hostIP"  type="wstring" readonly="yes">
       <desc>
         Host ip address to bind socket on.
@@ -20149,5 +20143,5 @@
       </desc>
     </attribute>
-    <attribute name="guestIp"  type="wstring" readonly="yes">
+    <attribute name="guestIP"  type="wstring" readonly="yes">
       <desc>
         Guest ip address to redirect to.
@@ -20162,15 +20156,15 @@
 
   <interface
-    name="IHostPciDevicePlugEvent" extends="IMachineEvent"
+    name="IHostPCIDevicePlugEvent" extends="IMachineEvent"
     waitable="yes"
-    uuid="9cebfc27-c579-4965-8eb7-d31794cd7dcf"
-    wsmap="managed" autogen="VBoxEvent" id="OnHostPciDevicePlug"
+    uuid="a0bad6df-d612-47d3-89d4-db3992533948"
+    wsmap="managed" autogen="VBoxEvent" id="OnHostPCIDevicePlug"
     >
     <desc>
       Notification when host PCI device is plugged/unplugged. Plugging
       usually takes place on VM startup, unplug - when
-      <link to="IMachine::detachHostPciDevice"/> is called.
-
-      <see><link to="IMachine::detachHostPciDevice"/></see>
+      <link to="IMachine::detachHostPCIDevice"/> is called.
+
+      <see><link to="IMachine::detachHostPCIDevice"/></see>
 
     </desc>
@@ -20189,5 +20183,5 @@
     </attribute>
 
-    <attribute name="attachment" type="IPciDeviceAttachment" readonly="yes">
+    <attribute name="attachment" type="IPCIDeviceAttachment" readonly="yes">
       <desc>
         Attachment info for this device.
Index: trunk/src/VBox/Main/include/BandwidthControlImpl.h
===================================================================
--- trunk/src/VBox/Main/include/BandwidthControlImpl.h	(revision 42550)
+++ trunk/src/VBox/Main/include/BandwidthControlImpl.h	(revision 42551)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2006-2009 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -25,5 +25,5 @@
 namespace settings
 {
-    struct IoSettings;
+    struct IOSettings;
 }
 
@@ -63,6 +63,6 @@
     // public internal methods
 
-    HRESULT loadSettings(const settings::IoSettings &data);
-    HRESULT saveSettings(settings::IoSettings &data);
+    HRESULT loadSettings(const settings::IOSettings &data);
+    HRESULT saveSettings(settings::IOSettings &data);
 
     void rollback();
Index: trunk/src/VBox/Main/include/BusAssignmentManager.h
===================================================================
--- trunk/src/VBox/Main/include/BusAssignmentManager.h	(revision 42550)
+++ trunk/src/VBox/Main/include/BusAssignmentManager.h	(revision 42551)
@@ -7,5 +7,5 @@
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -33,5 +33,5 @@
     virtual ~BusAssignmentManager();
 
-    HRESULT assignPciDeviceImpl(const char* pszDevName, PCFGMNODE pCfg, PciBusAddress& GuestAddress, PciBusAddress HostAddress, bool fGuestAddressRequired = false);
+    HRESULT assignPCIDeviceImpl(const char* pszDevName, PCFGMNODE pCfg, PCIBusAddress& GuestAddress, PCIBusAddress HostAddress, bool fGuestAddressRequired = false);
 
 public:
@@ -40,28 +40,28 @@
     virtual void Release();
 
-    virtual HRESULT assignHostPciDevice(const char* pszDevName, PCFGMNODE pCfg, PciBusAddress HostAddress, PciBusAddress& GuestAddress, bool fAddressRequired = false)
+    virtual HRESULT assignHostPCIDevice(const char* pszDevName, PCFGMNODE pCfg, PCIBusAddress HostAddress, PCIBusAddress& GuestAddress, bool fAddressRequired = false)
     {
-        return assignPciDeviceImpl(pszDevName, pCfg, GuestAddress, HostAddress, fAddressRequired);
+        return assignPCIDeviceImpl(pszDevName, pCfg, GuestAddress, HostAddress, fAddressRequired);
     }
 
-    virtual HRESULT assignPciDevice(const char* pszDevName, PCFGMNODE pCfg, PciBusAddress& Address, bool fAddressRequired = false)
+    virtual HRESULT assignPCIDevice(const char* pszDevName, PCFGMNODE pCfg, PCIBusAddress& Address, bool fAddressRequired = false)
     {
-        PciBusAddress HostAddress;
-        return assignPciDeviceImpl(pszDevName, pCfg, Address, HostAddress, fAddressRequired);
+        PCIBusAddress HostAddress;
+        return assignPCIDeviceImpl(pszDevName, pCfg, Address, HostAddress, fAddressRequired);
     }
 
-    virtual HRESULT assignPciDevice(const char* pszDevName, PCFGMNODE pCfg)
+    virtual HRESULT assignPCIDevice(const char* pszDevName, PCFGMNODE pCfg)
     {
-        PciBusAddress GuestAddress;
-        PciBusAddress HostAddress;
-        return assignPciDeviceImpl(pszDevName, pCfg, GuestAddress, HostAddress, false);
+        PCIBusAddress GuestAddress;
+        PCIBusAddress HostAddress;
+        return assignPCIDeviceImpl(pszDevName, pCfg, GuestAddress, HostAddress, false);
     }
-    virtual bool findPciAddress(const char* pszDevName, int iInstance, PciBusAddress& Address);
-    virtual bool hasPciDevice(const char* pszDevName, int iInstance)
+    virtual bool findPCIAddress(const char* pszDevName, int iInstance, PCIBusAddress& Address);
+    virtual bool hasPCIDevice(const char* pszDevName, int iInstance)
     {
-        PciBusAddress Address;
-        return findPciAddress(pszDevName, iInstance, Address);
+        PCIBusAddress Address;
+        return findPCIAddress(pszDevName, iInstance, Address);
     }
-    virtual void listAttachedPciDevices(ComSafeArrayOut(IPciDeviceAttachment*, aAttached));
+    virtual void listAttachedPCIDevices(ComSafeArrayOut(IPCIDeviceAttachment*, aAttached));
 };
 
Index: trunk/src/VBox/Main/include/ConsoleImpl.h
===================================================================
--- trunk/src/VBox/Main/include/ConsoleImpl.h	(revision 42550)
+++ trunk/src/VBox/Main/include/ConsoleImpl.h	(revision 42551)
@@ -130,5 +130,5 @@
     STDMETHOD(COMGETTER(SharedFolders))(ComSafeArrayOut(ISharedFolder *, aSharedFolders));
     STDMETHOD(COMGETTER(EventSource)) (IEventSource ** aEventSource);
-    STDMETHOD(COMGETTER(AttachedPciDevices))(ComSafeArrayOut(IPciDeviceAttachment *, aAttachments));
+    STDMETHOD(COMGETTER(AttachedPCIDevices))(ComSafeArrayOut(IPCIDeviceAttachment *, aAttachments));
     STDMETHOD(COMGETTER(UseHostClipboard))(BOOL *aUseHostClipboard);
     STDMETHOD(COMSETTER(UseHostClipboard))(BOOL aUseHostClipboard);
@@ -575,5 +575,5 @@
                                                    bool fForce);
 
-    HRESULT attachRawPciDevices(PVM pVM, BusAssignmentManager *BusMgr, PCFGMNODE pDevices);
+    HRESULT attachRawPCIDevices(PVM pVM, BusAssignmentManager *BusMgr, PCFGMNODE pDevices);
     void attachStatusDriver(PCFGMNODE pCtlInst, PPDMLED *papLeds,
                             uint64_t uFirst, uint64_t uLast,
Index: trunk/src/VBox/Main/include/GuestOSTypeImpl.h
===================================================================
--- trunk/src/VBox/Main/include/GuestOSTypeImpl.h	(revision 42550)
+++ trunk/src/VBox/Main/include/GuestOSTypeImpl.h	(revision 42551)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -63,17 +63,17 @@
     STDMETHOD(COMGETTER(AdapterType))(NetworkAdapterType_T *aNetworkAdapterType);
     STDMETHOD(COMGETTER(RecommendedFirmware))(FirmwareType_T *aFirmwareType);
-    STDMETHOD(COMGETTER(RecommendedDvdStorageBus))(StorageBus_T *aStorageBusType);
-    STDMETHOD(COMGETTER(RecommendedDvdStorageController))(StorageControllerType_T *aStorageControllerType);
-    STDMETHOD(COMGETTER(RecommendedHdStorageBus))(StorageBus_T *aStorageBusType);
-    STDMETHOD(COMGETTER(RecommendedHdStorageController))(StorageControllerType_T *aStorageControllerType);
-    STDMETHOD(COMGETTER(RecommendedPae))(BOOL *aRecommendedExtHw);
-    STDMETHOD(COMGETTER(RecommendedUsbHid))(BOOL *aRecommendedUsbHid);
-    STDMETHOD(COMGETTER(RecommendedHpet))(BOOL *aRecommendedHpet);
-    STDMETHOD(COMGETTER(RecommendedUsbTablet))(BOOL *aRecommendedUsbTablet);
-    STDMETHOD(COMGETTER(RecommendedRtcUseUtc))(BOOL *aRecommendedRtcUseUtc);
-    STDMETHOD(COMGETTER(RecommendedChipset)) (ChipsetType_T *aChipsetType);
-    STDMETHOD(COMGETTER(RecommendedAudioController)) (AudioControllerType_T *aAudioController);
-    STDMETHOD(COMGETTER(RecommendedFloppy)) (BOOL *aRecommendedFloppy);
-    STDMETHOD(COMGETTER(RecommendedUsb)) (BOOL *aRecommendedUsb);
+    STDMETHOD(COMGETTER(RecommendedDVDStorageBus))(StorageBus_T *aStorageBusType);
+    STDMETHOD(COMGETTER(RecommendedDVDStorageController))(StorageControllerType_T *aStorageControllerType);
+    STDMETHOD(COMGETTER(RecommendedHDStorageBus))(StorageBus_T *aStorageBusType);
+    STDMETHOD(COMGETTER(RecommendedHDStorageController))(StorageControllerType_T *aStorageControllerType);
+    STDMETHOD(COMGETTER(RecommendedPAE))(BOOL *aRecommendedExtHw);
+    STDMETHOD(COMGETTER(RecommendedUSBHID))(BOOL *aRecommendedUSBHID);
+    STDMETHOD(COMGETTER(RecommendedHPET))(BOOL *aRecommendedHPET);
+    STDMETHOD(COMGETTER(RecommendedUSBTablet))(BOOL *aRecommendedUSBTablet);
+    STDMETHOD(COMGETTER(RecommendedRTCUseUTC))(BOOL *aRecommendedRTCUseUTC);
+    STDMETHOD(COMGETTER(RecommendedChipset))(ChipsetType_T *aChipsetType);
+    STDMETHOD(COMGETTER(RecommendedAudioController))(AudioControllerType_T *aAudioController);
+    STDMETHOD(COMGETTER(RecommendedFloppy))(BOOL *aRecommendedFloppy);
+    STDMETHOD(COMGETTER(RecommendedUSB))(BOOL *aRecommendedUSB);
 
     // public methods only for internal purposes
@@ -100,8 +100,8 @@
     const NetworkAdapterType_T mNetworkAdapterType;
     const uint32_t mNumSerialEnabled;
-    const StorageControllerType_T mDvdStorageControllerType;
-    const StorageBus_T mDvdStorageBusType;
-    const StorageControllerType_T mHdStorageControllerType;
-    const StorageBus_T mHdStorageBusType;
+    const StorageControllerType_T mDVDStorageControllerType;
+    const StorageBus_T mDVDStorageBusType;
+    const StorageControllerType_T mHDStorageControllerType;
+    const StorageBus_T mHDStorageBusType;
     const ChipsetType_T mChipsetType;
     const AudioControllerType_T mAudioControllerType;
Index: trunk/src/VBox/Main/include/GuestProcessImpl.h
===================================================================
--- trunk/src/VBox/Main/include/GuestProcessImpl.h	(revision 42550)
+++ trunk/src/VBox/Main/include/GuestProcessImpl.h	(revision 42551)
@@ -58,5 +58,5 @@
     STDMETHOD(COMGETTER(ExitCode))(LONG *aExitCode);
     STDMETHOD(COMGETTER(Name))(BSTR *aName);
-    STDMETHOD(COMGETTER(Pid))(ULONG *aPID);
+    STDMETHOD(COMGETTER(PID))(ULONG *aPID);
     STDMETHOD(COMGETTER(Status))(ProcessStatus_T *aStatus);
 
Index: trunk/src/VBox/Main/include/GuestSessionImpl.h
===================================================================
--- trunk/src/VBox/Main/include/GuestSessionImpl.h	(revision 42550)
+++ trunk/src/VBox/Main/include/GuestSessionImpl.h	(revision 42551)
@@ -63,4 +63,5 @@
     STDMETHOD(COMSETTER(Timeout))(ULONG aTimeout);
     STDMETHOD(COMGETTER(Environment))(ComSafeArrayOut(BSTR, aEnvironment));
+    STDMETHOD(COMSETTER(Environment))(ComSafeArrayIn(IN_BSTR, aEnvironment));
     STDMETHOD(COMGETTER(Processes))(ComSafeArrayOut(IGuestProcess *, aProcesses));
     STDMETHOD(COMGETTER(Directories))(ComSafeArrayOut(IGuestDirectory *, aDirectories));
@@ -85,5 +86,4 @@
     STDMETHOD(EnvironmentGet)(IN_BSTR aName, BSTR *aValue);
     STDMETHOD(EnvironmentSet)(IN_BSTR aName, IN_BSTR aValue);
-    STDMETHOD(EnvironmentSetArray)(ComSafeArrayIn(IN_BSTR, aValues));
     STDMETHOD(EnvironmentUnset)(IN_BSTR aName);
     STDMETHOD(FileCreateTemp)(IN_BSTR aTemplate, ULONG aMode, IN_BSTR aName, IGuestFile **aFile);
Index: trunk/src/VBox/Main/include/HostNetworkInterfaceImpl.h
===================================================================
--- trunk/src/VBox/Main/include/HostNetworkInterfaceImpl.h	(revision 42550)
+++ trunk/src/VBox/Main/include/HostNetworkInterfaceImpl.h	(revision 42551)
@@ -7,5 +7,5 @@
 
 /*
- * Copyright (C) 2006-2009 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -38,13 +38,13 @@
     VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(HostNetworkInterface, IHostNetworkInterface)
 
-    DECLARE_NOT_AGGREGATABLE (HostNetworkInterface)
+    DECLARE_NOT_AGGREGATABLE(HostNetworkInterface)
 
     DECLARE_PROTECT_FINAL_CONSTRUCT()
 
-    BEGIN_COM_MAP (HostNetworkInterface)
+    BEGIN_COM_MAP(HostNetworkInterface)
         VBOX_DEFAULT_INTERFACE_ENTRIES(IHostNetworkInterface)
     END_COM_MAP()
 
-    DECLARE_EMPTY_CTOR_DTOR (HostNetworkInterface)
+    DECLARE_EMPTY_CTOR_DTOR(HostNetworkInterface)
 
     HRESULT FinalConstruct();
@@ -52,29 +52,29 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init (Bstr interfaceName, Bstr shortName, Guid guid, HostNetworkInterfaceType_T ifType);
+    HRESULT init(Bstr interfaceName, Bstr shortName, Guid guid, HostNetworkInterfaceType_T ifType);
 #ifdef VBOX_WITH_HOSTNETIF_API
-    HRESULT init (Bstr aInterfaceName, HostNetworkInterfaceType_T ifType, struct NETIFINFO *pIfs);
-    HRESULT updateConfig ();
+    HRESULT init(Bstr aInterfaceName, HostNetworkInterfaceType_T ifType, struct NETIFINFO *pIfs);
+    HRESULT updateConfig();
 #endif
 
     // IHostNetworkInterface properties
-    STDMETHOD(COMGETTER(Name)) (BSTR *aInterfaceName);
-    STDMETHOD(COMGETTER(Id)) (BSTR *aGuid);
-    STDMETHOD(COMGETTER(DhcpEnabled)) (BOOL *aDhcpEnabled);
-    STDMETHOD(COMGETTER(IPAddress)) (BSTR *aIPAddress);
-    STDMETHOD(COMGETTER(NetworkMask)) (BSTR *aNetworkMask);
-    STDMETHOD(COMGETTER(IPV6Supported)) (BOOL *aIPV6Supported);
-    STDMETHOD(COMGETTER(IPV6Address)) (BSTR *aIPV6Address);
-    STDMETHOD(COMGETTER(IPV6NetworkMaskPrefixLength)) (ULONG *aIPV6NetworkMaskPrefixLength);
-    STDMETHOD(COMGETTER(HardwareAddress)) (BSTR *aHardwareAddress);
-    STDMETHOD(COMGETTER(MediumType)) (HostNetworkInterfaceMediumType_T *aType);
-    STDMETHOD(COMGETTER(Status)) (HostNetworkInterfaceStatus_T *aStatus);
-    STDMETHOD(COMGETTER(InterfaceType)) (HostNetworkInterfaceType_T *aType);
-    STDMETHOD(COMGETTER(NetworkName)) (BSTR *aNetworkName);
+    STDMETHOD(COMGETTER(Name))(BSTR *aInterfaceName);
+    STDMETHOD(COMGETTER(Id))(BSTR *aGuid);
+    STDMETHOD(COMGETTER(DHCPEnabled))(BOOL *aDHCPEnabled);
+    STDMETHOD(COMGETTER(IPAddress))(BSTR *aIPAddress);
+    STDMETHOD(COMGETTER(NetworkMask))(BSTR *aNetworkMask);
+    STDMETHOD(COMGETTER(IPV6Supported))(BOOL *aIPV6Supported);
+    STDMETHOD(COMGETTER(IPV6Address))(BSTR *aIPV6Address);
+    STDMETHOD(COMGETTER(IPV6NetworkMaskPrefixLength))(ULONG *aIPV6NetworkMaskPrefixLength);
+    STDMETHOD(COMGETTER(HardwareAddress))(BSTR *aHardwareAddress);
+    STDMETHOD(COMGETTER(MediumType))(HostNetworkInterfaceMediumType_T *aType);
+    STDMETHOD(COMGETTER(Status))(HostNetworkInterfaceStatus_T *aStatus);
+    STDMETHOD(COMGETTER(InterfaceType))(HostNetworkInterfaceType_T *aType);
+    STDMETHOD(COMGETTER(NetworkName))(BSTR *aNetworkName);
 
-    STDMETHOD(EnableStaticIpConfig) (IN_BSTR aIPAddress, IN_BSTR aNetworkMask);
-    STDMETHOD(EnableStaticIpConfigV6) (IN_BSTR aIPV6Address, ULONG aIPV6MaskPrefixLength);
-    STDMETHOD(EnableDynamicIpConfig) ();
-    STDMETHOD(DhcpRediscover) ();
+    STDMETHOD(EnableStaticIPConfig)(IN_BSTR aIPAddress, IN_BSTR aNetworkMask);
+    STDMETHOD(EnableStaticIPConfigV6)(IN_BSTR aIPV6Address, ULONG aIPV6MaskPrefixLength);
+    STDMETHOD(EnableDynamicIPConfig)();
+    STDMETHOD(DHCPRediscover)();
 
     HRESULT setVirtualBox(VirtualBox *pVBox);
@@ -92,6 +92,6 @@
     struct Data
     {
-        Data() : IPAddress (0), networkMask (0), dhcpEnabled(FALSE),
-            mediumType (HostNetworkInterfaceMediumType_Unknown),
+        Data() : IPAddress(0), networkMask(0), dhcpEnabled(FALSE),
+            mediumType(HostNetworkInterfaceMediumType_Unknown),
             status(HostNetworkInterfaceStatus_Down){}
 
Index: trunk/src/VBox/Main/include/MachineImpl.h
===================================================================
--- trunk/src/VBox/Main/include/MachineImpl.h	(revision 42550)
+++ trunk/src/VBox/Main/include/MachineImpl.h	(revision 42551)
@@ -24,5 +24,5 @@
 #include "VRDEServerImpl.h"
 #include "MediumAttachmentImpl.h"
-#include "PciDeviceAttachmentImpl.h"
+#include "PCIDeviceAttachmentImpl.h"
 #include "MediumLock.h"
 #include "NetworkAdapterImpl.h"
@@ -139,5 +139,5 @@
              * process created by launchVMProcess())
              */
-            RTPROCESS mPid;
+            RTPROCESS mPID;
 
             /** Current session state */
@@ -272,5 +272,5 @@
         ULONG                mCpuExecutionCap;
         BOOL                 mAccelerate3DEnabled;
-        BOOL                 mHpetEnabled;
+        BOOL                 mHPETEnabled;
 
         BOOL                 mCPUAttached[SchemaDefs::MaxCPUCount];
@@ -292,14 +292,14 @@
 
         FirmwareType_T       mFirmwareType;
-        KeyboardHidType_T    mKeyboardHidType;
-        PointingHidType_T    mPointingHidType;
+        KeyboardHIDType_T    mKeyboardHIDType;
+        PointingHIDType_T    mPointingHIDType;
         ChipsetType_T        mChipsetType;
         BOOL                 mEmulatedUSBCardReaderEnabled;
 
-        BOOL                 mIoCacheEnabled;
-        ULONG                mIoCacheSize;
-
-        typedef std::list<ComObjPtr<PciDeviceAttachment> > PciDeviceAssignmentList;
-        PciDeviceAssignmentList mPciDeviceAssignments;
+        BOOL                 mIOCacheEnabled;
+        ULONG                mIOCacheSize;
+
+        typedef std::list<ComObjPtr<PCIDeviceAttachment> > PCIDeviceAssignmentList;
+        PCIDeviceAssignmentList mPCIDeviceAssignments;
 
         settings::Debugging  mDebugging;
@@ -406,6 +406,6 @@
     STDMETHOD(COMGETTER(EmulatedUSBWebcameraEnabled))(BOOL *enabled);
     STDMETHOD(COMSETTER(EmulatedUSBWebcameraEnabled))(BOOL enabled);
-    STDMETHOD(COMGETTER(HpetEnabled))(BOOL *enabled);
-    STDMETHOD(COMSETTER(HpetEnabled))(BOOL enabled);
+    STDMETHOD(COMGETTER(HPETEnabled))(BOOL *enabled);
+    STDMETHOD(COMSETTER(HPETEnabled))(BOOL enabled);
     STDMETHOD(COMGETTER(MemoryBalloonSize))(ULONG *memoryBalloonSize);
     STDMETHOD(COMSETTER(MemoryBalloonSize))(ULONG memoryBalloonSize);
@@ -431,5 +431,5 @@
     STDMETHOD(COMGETTER(SessionState))(SessionState_T *aSessionState);
     STDMETHOD(COMGETTER(SessionType))(BSTR *aSessionType);
-    STDMETHOD(COMGETTER(SessionPid))(ULONG *aSessionPid);
+    STDMETHOD(COMGETTER(SessionPID))(ULONG *aSessionPID);
     STDMETHOD(COMGETTER(State))(MachineState_T *machineState);
     STDMETHOD(COMGETTER(LastStateChange))(LONG64 *aLastStateChange);
@@ -467,17 +467,17 @@
     STDMETHOD(COMGETTER(RTCUseUTC))(BOOL *aEnabled);
     STDMETHOD(COMSETTER(RTCUseUTC))(BOOL aEnabled);
-    STDMETHOD(COMGETTER(FirmwareType)) (FirmwareType_T *aFirmware);
-    STDMETHOD(COMSETTER(FirmwareType)) (FirmwareType_T  aFirmware);
-    STDMETHOD(COMGETTER(KeyboardHidType)) (KeyboardHidType_T *aKeyboardHidType);
-    STDMETHOD(COMSETTER(KeyboardHidType)) (KeyboardHidType_T  aKeyboardHidType);
-    STDMETHOD(COMGETTER(PointingHidType)) (PointingHidType_T *aPointingHidType);
-    STDMETHOD(COMSETTER(PointingHidType)) (PointingHidType_T  aPointingHidType);
-    STDMETHOD(COMGETTER(ChipsetType)) (ChipsetType_T *aChipsetType);
-    STDMETHOD(COMSETTER(ChipsetType)) (ChipsetType_T  aChipsetType);
-    STDMETHOD(COMGETTER(IoCacheEnabled)) (BOOL *aEnabled);
-    STDMETHOD(COMSETTER(IoCacheEnabled)) (BOOL  aEnabled);
-    STDMETHOD(COMGETTER(IoCacheSize)) (ULONG *aIoCacheSize);
-    STDMETHOD(COMSETTER(IoCacheSize)) (ULONG  aIoCacheSize);
-    STDMETHOD(COMGETTER(PciDeviceAssignments))(ComSafeArrayOut(IPciDeviceAttachment *, aAssignments));
+    STDMETHOD(COMGETTER(FirmwareType))(FirmwareType_T *aFirmware);
+    STDMETHOD(COMSETTER(FirmwareType))(FirmwareType_T  aFirmware);
+    STDMETHOD(COMGETTER(KeyboardHIDType))(KeyboardHIDType_T *aKeyboardHIDType);
+    STDMETHOD(COMSETTER(KeyboardHIDType))(KeyboardHIDType_T  aKeyboardHIDType);
+    STDMETHOD(COMGETTER(PointingHIDType))(PointingHIDType_T *aPointingHIDType);
+    STDMETHOD(COMSETTER(PointingHIDType))(PointingHIDType_T  aPointingHIDType);
+    STDMETHOD(COMGETTER(ChipsetType))(ChipsetType_T *aChipsetType);
+    STDMETHOD(COMSETTER(ChipsetType))(ChipsetType_T  aChipsetType);
+    STDMETHOD(COMGETTER(IOCacheEnabled))(BOOL *aEnabled);
+    STDMETHOD(COMSETTER(IOCacheEnabled))(BOOL  aEnabled);
+    STDMETHOD(COMGETTER(IOCacheSize))(ULONG *aIOCacheSize);
+    STDMETHOD(COMSETTER(IOCacheSize))(ULONG  aIOCacheSize);
+    STDMETHOD(COMGETTER(PCIDeviceAssignments))(ComSafeArrayOut(IPCIDeviceAttachment *, aAssignments));
     STDMETHOD(COMGETTER(BandwidthControl))(IBandwidthControl **aBandwidthControl);
     STDMETHOD(COMGETTER(TracingEnabled))(BOOL *pfEnabled);
@@ -568,6 +568,6 @@
     STDMETHOD(QueryLogFilename(ULONG aIdx, BSTR *aName));
     STDMETHOD(ReadLog(ULONG aIdx, LONG64 aOffset, LONG64 aSize, ComSafeArrayOut(BYTE, aData)));
-    STDMETHOD(AttachHostPciDevice(LONG hostAddress, LONG desiredGuestAddress, BOOL tryToUnbind));
-    STDMETHOD(DetachHostPciDevice(LONG hostAddress));
+    STDMETHOD(AttachHostPCIDevice(LONG hostAddress, LONG desiredGuestAddress, BOOL tryToUnbind));
+    STDMETHOD(DetachHostPCIDevice(LONG hostAddress));
     STDMETHOD(CloneTo(IMachine *pTarget, CloneMode_T mode, ComSafeArrayIn(CloneOptions_T, options), IProgress **pProgress));
     // public methods only for internal purposes
Index: trunk/src/VBox/Main/include/MediumImpl.h
===================================================================
--- trunk/src/VBox/Main/include/MediumImpl.h	(revision 42550)
+++ trunk/src/VBox/Main/include/MediumImpl.h	(revision 42551)
@@ -127,5 +127,5 @@
 
     // IMedium methods
-    STDMETHOD(SetIDs)(BOOL aSetImageId, IN_BSTR aImageId,
+    STDMETHOD(SetIds)(BOOL aSetImageId, IN_BSTR aImageId,
                       BOOL aSetParentId, IN_BSTR aParentId);
     STDMETHOD(RefreshState)(MediumState_T *aState);
Index: trunk/src/VBox/Main/include/NATEngineImpl.h
===================================================================
--- trunk/src/VBox/Main/include/NATEngineImpl.h	(revision 42550)
+++ trunk/src/VBox/Main/include/NATEngineImpl.h	(revision 42551)
@@ -7,5 +7,5 @@
 
 /*
- * Copyright (C) 2006-2009 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -18,6 +18,6 @@
  */
 
-#ifndef ____H_NATDRIVER
-#define ____H_NATDRIVER
+#ifndef ____H_NATENGINE
+#define ____H_NATENGINE
 
 
@@ -43,7 +43,7 @@
                  mTcpRcv(0),
                  mTcpSnd(0),
-                 mDnsPassDomain(TRUE),
-                 mDnsProxy(FALSE),
-                 mDnsUseHostResolver(FALSE),
+                 mDNSPassDomain(TRUE),
+                 mDNSProxy(FALSE),
+                 mDNSUseHostResolver(FALSE),
                  mAliasMode(0)
         {}
@@ -57,11 +57,11 @@
         uint32_t mTcpSnd;
         /* TFTP service */
-        Utf8Str  mTftpPrefix;
-        Utf8Str  mTftpBootFile;
-        Utf8Str  mTftpNextServer;
+        Utf8Str  mTFTPPrefix;
+        Utf8Str  mTFTPBootFile;
+        Utf8Str  mTFTPNextServer;
         /* DNS service */
-        BOOL     mDnsPassDomain;
-        BOOL     mDnsProxy;
-        BOOL     mDnsUseHostResolver;
+        BOOL     mDNSPassDomain;
+        BOOL     mDNSProxy;
+        BOOL     mDNSUseHostResolver;
         /* Alias service */
         ULONG    mAliasMode;
@@ -74,8 +74,8 @@
 
     BEGIN_COM_MAP(NATEngine)
-        VBOX_DEFAULT_INTERFACE_ENTRIES (INATEngine)
+        VBOX_DEFAULT_INTERFACE_ENTRIES(INATEngine)
     END_COM_MAP()
 
-    DECLARE_EMPTY_CTOR_DTOR (NATEngine)
+    DECLARE_EMPTY_CTOR_DTOR(NATEngine)
 
     HRESULT FinalConstruct();
@@ -93,30 +93,30 @@
     HRESULT saveSettings(settings::NAT &data);
 
-    STDMETHOD(COMSETTER(Network)) (IN_BSTR aNetwork);
-    STDMETHOD(COMGETTER(Network)) (BSTR *aNetwork);
-    STDMETHOD(COMSETTER(HostIP)) (IN_BSTR aBindIP);
-    STDMETHOD(COMGETTER(HostIP)) (BSTR *aBindIP);
+    STDMETHOD(COMSETTER(Network))(IN_BSTR aNetwork);
+    STDMETHOD(COMGETTER(Network))(BSTR *aNetwork);
+    STDMETHOD(COMSETTER(HostIP))(IN_BSTR aBindIP);
+    STDMETHOD(COMGETTER(HostIP))(BSTR *aBindIP);
     /* TFTP attributes */
-    STDMETHOD(COMSETTER(TftpPrefix)) (IN_BSTR aTftpPrefix);
-    STDMETHOD(COMGETTER(TftpPrefix)) (BSTR *aTftpPrefix);
-    STDMETHOD(COMSETTER(TftpBootFile)) (IN_BSTR aTftpBootFile);
-    STDMETHOD(COMGETTER(TftpBootFile)) (BSTR *aTftpBootFile);
-    STDMETHOD(COMSETTER(TftpNextServer)) (IN_BSTR aTftpNextServer);
-    STDMETHOD(COMGETTER(TftpNextServer)) (BSTR *aTftpNextServer);
+    STDMETHOD(COMSETTER(TFTPPrefix))(IN_BSTR aTFTPPrefix);
+    STDMETHOD(COMGETTER(TFTPPrefix))(BSTR *aTFTPPrefix);
+    STDMETHOD(COMSETTER(TFTPBootFile))(IN_BSTR aTFTPBootFile);
+    STDMETHOD(COMGETTER(TFTPBootFile))(BSTR *aTFTPBootFile);
+    STDMETHOD(COMSETTER(TFTPNextServer))(IN_BSTR aTFTPNextServer);
+    STDMETHOD(COMGETTER(TFTPNextServer))(BSTR *aTFTPNextServer);
     /* Alias attributes */
-    STDMETHOD(COMSETTER(AliasMode)) (ULONG aAliasLog);
-    STDMETHOD(COMGETTER(AliasMode)) (ULONG *aAliasLog);
+    STDMETHOD(COMSETTER(AliasMode))(ULONG aAliasLog);
+    STDMETHOD(COMGETTER(AliasMode))(ULONG *aAliasLog);
     /* DNS attributes */
-    STDMETHOD(COMSETTER(DnsPassDomain)) (BOOL aDnsPassDomain);
-    STDMETHOD(COMGETTER(DnsPassDomain)) (BOOL *aDnsPassDomain);
-    STDMETHOD(COMSETTER(DnsProxy)) (BOOL aDnsProxy);
-    STDMETHOD(COMGETTER(DnsProxy)) (BOOL *aDnsProxy);
-    STDMETHOD(COMGETTER(DnsUseHostResolver)) (BOOL *aDnsUseHostResolver);
-    STDMETHOD(COMSETTER(DnsUseHostResolver)) (BOOL aDnsUseHostResolver);
+    STDMETHOD(COMSETTER(DNSPassDomain))(BOOL aDNSPassDomain);
+    STDMETHOD(COMGETTER(DNSPassDomain))(BOOL *aDNSPassDomain);
+    STDMETHOD(COMSETTER(DNSProxy))(BOOL aDNSProxy);
+    STDMETHOD(COMGETTER(DNSProxy))(BOOL *aDNSProxy);
+    STDMETHOD(COMGETTER(DNSUseHostResolver))(BOOL *aDNSUseHostResolver);
+    STDMETHOD(COMSETTER(DNSUseHostResolver))(BOOL aDNSUseHostResolver);
 
     STDMETHOD(SetNetworkSettings)(ULONG aMtu, ULONG aSockSnd, ULONG aSockRcv, ULONG aTcpWndSnd, ULONG aTcpWndRcv);
     STDMETHOD(GetNetworkSettings)(ULONG *aMtu, ULONG *aSockSnd, ULONG *aSockRcv, ULONG *aTcpWndSnd, ULONG *aTcpWndRcv);
 
-    STDMETHOD(COMGETTER(Redirects)) (ComSafeArrayOut (BSTR, aNatRules));
+    STDMETHOD(COMGETTER(Redirects))(ComSafeArrayOut(BSTR, aNatRules));
     STDMETHOD(AddRedirect)(IN_BSTR aName, NATProtocol_T aProto, IN_BSTR aBindIp, USHORT aHostPort, IN_BSTR aGuestIP, USHORT aGuestPort);
     STDMETHOD(RemoveRedirect)(IN_BSTR aName);
Index: trunk/src/VBox/Main/include/NetworkAdapterImpl.h
===================================================================
--- trunk/src/VBox/Main/include/NetworkAdapterImpl.h	(revision 42550)
+++ trunk/src/VBox/Main/include/NetworkAdapterImpl.h	(revision 42551)
@@ -7,5 +7,5 @@
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -124,5 +124,5 @@
     STDMETHOD(COMGETTER(TraceFile))(BSTR *aTraceFile);
     STDMETHOD(COMSETTER(TraceFile))(IN_BSTR aTraceFile);
-    STDMETHOD(COMGETTER(NatDriver))(INATEngine **aNatDriver);
+    STDMETHOD(COMGETTER(NATEngine))(INATEngine **aNATEngine);
     STDMETHOD(COMGETTER(BootPriority))(ULONG *aBootPriority);
     STDMETHOD(COMSETTER(BootPriority))(ULONG aBootPriority);
Index: trunk/src/VBox/Main/include/PCIDeviceAttachmentImpl.h
===================================================================
--- trunk/src/VBox/Main/include/PCIDeviceAttachmentImpl.h	(revision 42551)
+++ trunk/src/VBox/Main/include/PCIDeviceAttachmentImpl.h	(revision 42551)
@@ -0,0 +1,134 @@
+/* $Id$ */
+
+/** @file
+ *
+ * PCI attachment information implmentation.
+ */
+
+/*
+ * Copyright (C) 2010-2012 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
+
+#ifndef ____H_PCIDEVICEATTACHMENTIMPL
+#define ____H_PCIDEVICEATTACHMENTIMPL
+
+#include "VirtualBoxBase.h"
+#include <VBox/settings.h>
+
+class ATL_NO_VTABLE PCIAddress :
+    public VirtualBoxBase,
+    VBOX_SCRIPTABLE_IMPL(IPCIAddress)
+{
+public:
+    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(PCIAddress, IPCIAddress)
+
+    DECLARE_NOT_AGGREGATABLE(PCIAddress)
+
+    DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+    BEGIN_COM_MAP(PCIAddress)
+        VBOX_DEFAULT_INTERFACE_ENTRIES(IPCIAddress)
+    END_COM_MAP()
+
+    PCIAddress() { }
+    ~PCIAddress() { }
+
+    // public initializer/uninitializer for internal purposes only
+    HRESULT init(LONG aAddess);
+    void uninit();
+
+    HRESULT FinalConstruct();
+    void FinalRelease();
+
+    // IPCIAddress properties
+    STDMETHOD(COMGETTER(Bus))(SHORT *aBus)
+    {
+        *aBus = mBus;
+        return S_OK;
+    }
+    STDMETHOD(COMSETTER(Bus))(SHORT aBus)
+    {
+        mBus = aBus;
+        return S_OK;
+    }
+    STDMETHOD(COMGETTER(Device))(SHORT *aDevice)
+    {
+        *aDevice = mDevice;
+        return S_OK;
+    }
+    STDMETHOD(COMSETTER(Device))(SHORT aDevice)
+    {
+        mDevice = aDevice;
+        return S_OK;
+    }
+
+    STDMETHOD(COMGETTER(DevFunction))(SHORT *aDevFunction)
+    {
+        *aDevFunction = mFn;
+        return S_OK;
+    }
+    STDMETHOD(COMSETTER(DevFunction))(SHORT aDevFunction)
+    {
+        mFn = aDevFunction;
+        return S_OK;
+    }
+
+private:
+    SHORT mBus, mDevice, mFn;
+};
+
+class ATL_NO_VTABLE PCIDeviceAttachment :
+    public VirtualBoxBase,
+    VBOX_SCRIPTABLE_IMPL(IPCIDeviceAttachment)
+{
+public:
+    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(PCIDeviceAttachment, IPCIDeviceAttachment)
+
+    DECLARE_NOT_AGGREGATABLE(PCIDeviceAttachment)
+
+    DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+    BEGIN_COM_MAP(PCIDeviceAttachment)
+        VBOX_DEFAULT_INTERFACE_ENTRIES(IPCIDeviceAttachment)
+    END_COM_MAP()
+
+    PCIDeviceAttachment() { }
+    ~PCIDeviceAttachment() { }
+
+    // public initializer/uninitializer for internal purposes only
+    HRESULT init(IMachine *    aParent,
+                 const Bstr    &aName,
+                 LONG          aHostAddess,
+                 LONG          aGuestAddress,
+                 BOOL          fPhysical);
+
+    void uninit();
+
+    // settings
+    HRESULT loadSettings(IMachine * aParent,
+                         const settings::HostPCIDeviceAttachment& aHpda);
+    HRESULT saveSettings(settings::HostPCIDeviceAttachment &data);
+
+    HRESULT FinalConstruct();
+    void FinalRelease();
+
+    // IPCIDeviceAttachment properties
+    STDMETHOD(COMGETTER(Name))(BSTR * aName);
+    STDMETHOD(COMGETTER(IsPhysicalDevice))(BOOL * aPhysical);
+    STDMETHOD(COMGETTER(HostAddress))(LONG  * hostAddress);
+    STDMETHOD(COMGETTER(GuestAddress))(LONG * guestAddress);
+
+private:
+    struct Data;
+    Data*  m;
+};
+
+#endif // ____H_PCIDEVICEATTACHMENTIMPL
Index: trunk/src/VBox/Main/include/PCIRawDevImpl.h
===================================================================
--- trunk/src/VBox/Main/include/PCIRawDevImpl.h	(revision 42551)
+++ trunk/src/VBox/Main/include/PCIRawDevImpl.h	(revision 42551)
@@ -0,0 +1,54 @@
+/* $Id$ */
+/** @file
+ * VirtualBox Driver interface to raw PCI device
+ */
+
+/*
+ * Copyright (C) 2010-2012 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
+
+#ifndef ____H_PCIRAWDEV
+#define ____H_PCIRAWDEV
+
+#include "VirtualBoxBase.h"
+#include <VBox/vmm/pdmdrv.h>
+
+class Console;
+struct DRVMAINPCIRAWDEV;
+
+class PCIRawDev
+{
+  public:
+    PCIRawDev(Console *console);
+    virtual ~PCIRawDev();
+
+    static const PDMDRVREG DrvReg;
+    struct DRVMAINPCIRAWDEV *mpDrv;
+
+    Console *getParent() const
+    {
+        return mParent;
+    }
+
+  private:
+    static DECLCALLBACK(void *) drvQueryInterface(PPDMIBASE pInterface, const char *pszIID);
+    static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags);
+    static DECLCALLBACK(void)   drvDestruct(PPDMDRVINS pDrvIns);
+    static DECLCALLBACK(void)   drvReset(PPDMDRVINS pDrvIns);
+    static DECLCALLBACK(int)    drvDeviceConstructComplete(PPDMIPCIRAWCONNECTOR pInterface, const char *pcszName,
+                                                           uint32_t uHostPCIAddress, uint32_t uGuestPCIAddress,
+                                                           int rc);
+
+
+    Console * const mParent;
+};
+
+#endif // !____H_PCIRAWDEV
Index: trunk/src/VBox/Main/include/PciDeviceAttachmentImpl.h
===================================================================
--- trunk/src/VBox/Main/include/PciDeviceAttachmentImpl.h	(revision 42550)
+++ 	(revision )
@@ -1,134 +1,0 @@
-/* $Id$ */
-
-/** @file
- *
- * PCI attachment information implmentation.
- */
-
-/*
- * Copyright (C) 2010 Oracle Corporation
- *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- */
-
-#ifndef ____H_PCIDEVICEATTACHMENTIMPL
-#define ____H_PCIDEVICEATTACHMENTIMPL
-
-#include "VirtualBoxBase.h"
-#include <VBox/settings.h>
-
-class ATL_NO_VTABLE PciAddress :
-    public VirtualBoxBase,
-    VBOX_SCRIPTABLE_IMPL(IPciAddress)
-{
-public:
-    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(PciAddress, IPciAddress)
-
-    DECLARE_NOT_AGGREGATABLE(PciAddress)
-
-    DECLARE_PROTECT_FINAL_CONSTRUCT()
-
-    BEGIN_COM_MAP(PciAddress)
-        VBOX_DEFAULT_INTERFACE_ENTRIES(IPciAddress)
-    END_COM_MAP()
-
-    PciAddress() { }
-    ~PciAddress() { }
-
-    // public initializer/uninitializer for internal purposes only
-    HRESULT init(LONG aAddess);
-    void uninit();
-
-    HRESULT FinalConstruct();
-    void FinalRelease();
-
-    // IPciAddress properties
-    STDMETHOD(COMGETTER(Bus))(SHORT *aBus)
-    {
-        *aBus = mBus;
-        return S_OK;
-    }
-    STDMETHOD(COMSETTER(Bus))(SHORT aBus)
-    {
-        mBus = aBus;
-        return S_OK;
-    }
-    STDMETHOD(COMGETTER(Device))(SHORT *aDevice)
-    {
-        *aDevice = mDevice;
-        return S_OK;
-    }
-    STDMETHOD(COMSETTER(Device))(SHORT aDevice)
-    {
-        mDevice = aDevice;
-        return S_OK;
-    }
-
-    STDMETHOD(COMGETTER(DevFunction))(SHORT *aDevFunction)
-    {
-        *aDevFunction = mFn;
-        return S_OK;
-    }
-    STDMETHOD(COMSETTER(DevFunction))(SHORT aDevFunction)
-    {
-        mFn = aDevFunction;
-        return S_OK;
-    }
-
-private:
-    SHORT mBus, mDevice, mFn;
-};
-
-class ATL_NO_VTABLE PciDeviceAttachment :
-    public VirtualBoxBase,
-    VBOX_SCRIPTABLE_IMPL(IPciDeviceAttachment)
-{
-public:
-    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(PciDeviceAttachment, IPciDeviceAttachment)
-
-    DECLARE_NOT_AGGREGATABLE(PciDeviceAttachment)
-
-    DECLARE_PROTECT_FINAL_CONSTRUCT()
-
-    BEGIN_COM_MAP(PciDeviceAttachment)
-        VBOX_DEFAULT_INTERFACE_ENTRIES(IPciDeviceAttachment)
-    END_COM_MAP()
-
-    PciDeviceAttachment() { }
-    ~PciDeviceAttachment() { }
-
-    // public initializer/uninitializer for internal purposes only
-    HRESULT init(IMachine *    aParent,
-                 const Bstr    &aName,
-                 LONG          aHostAddess,
-                 LONG          aGuestAddress,
-                 BOOL          fPhysical);
-
-    void uninit();
-
-    // settings
-    HRESULT loadSettings(IMachine * aParent,
-                         const settings::HostPciDeviceAttachment& aHpda);
-    HRESULT saveSettings(settings::HostPciDeviceAttachment &data);
-
-    HRESULT FinalConstruct();
-    void FinalRelease();
-
-    // IPciDeviceAttachment properties
-    STDMETHOD(COMGETTER(Name))(BSTR * aName);
-    STDMETHOD(COMGETTER(IsPhysicalDevice))(BOOL * aPhysical);
-    STDMETHOD(COMGETTER(HostAddress))(LONG  * hostAddress);
-    STDMETHOD(COMGETTER(GuestAddress))(LONG * guestAddress);
-
-private:
-    struct Data;
-    Data*  m;
-};
-
-#endif // ____H_PCIDEVICEATTACHMENTIMPL
Index: trunk/src/VBox/Main/include/PciRawDevImpl.h
===================================================================
--- trunk/src/VBox/Main/include/PciRawDevImpl.h	(revision 42550)
+++ 	(revision )
@@ -1,54 +1,0 @@
-/* $Id$ */
-/** @file
- * VirtualBox Driver interface to raw PCI device
- */
-
-/*
- * Copyright (C) 2010-2011 Oracle Corporation
- *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- */
-
-#ifndef ____H_PCIRAWDEV
-#define ____H_PCIRAWDEV
-
-#include "VirtualBoxBase.h"
-#include <VBox/vmm/pdmdrv.h>
-
-class Console;
-struct DRVMAINPCIRAWDEV;
-
-class PciRawDev
-{
-  public:
-    PciRawDev(Console *console);
-    virtual ~PciRawDev();
-
-    static const PDMDRVREG DrvReg;
-    struct DRVMAINPCIRAWDEV *mpDrv;
-
-    Console *getParent() const
-    {
-        return mParent;
-    }
-
-  private:
-    static DECLCALLBACK(void *) drvQueryInterface(PPDMIBASE pInterface, const char *pszIID);
-    static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags);
-    static DECLCALLBACK(void)   drvDestruct(PPDMDRVINS pDrvIns);
-    static DECLCALLBACK(void)   drvReset(PPDMDRVINS pDrvIns);
-    static DECLCALLBACK(int)    drvDeviceConstructComplete(PPDMIPCIRAWCONNECTOR pInterface, const char *pcszName,
-                                                           uint32_t uHostPciAddress, uint32_t uGuestPciAddress,
-                                                           int rc);
-
-
-    Console * const mParent;
-};
-
-#endif // !____H_PCIRAWDEV
Index: trunk/src/VBox/Main/include/USBControllerImpl.h
===================================================================
--- trunk/src/VBox/Main/include/USBControllerImpl.h	(revision 42550)
+++ trunk/src/VBox/Main/include/USBControllerImpl.h	(revision 42551)
@@ -60,6 +60,6 @@
     STDMETHOD(COMGETTER(Enabled))(BOOL *aEnabled);
     STDMETHOD(COMSETTER(Enabled))(BOOL aEnabled);
-    STDMETHOD(COMGETTER(EnabledEhci))(BOOL *aEnabled);
-    STDMETHOD(COMSETTER(EnabledEhci))(BOOL aEnabled);
+    STDMETHOD(COMGETTER(EnabledEHCI))(BOOL *aEnabled);
+    STDMETHOD(COMSETTER(EnabledEHCI))(BOOL aEnabled);
     STDMETHOD(COMGETTER(ProxyAvailable))(BOOL *aEnabled);
     STDMETHOD(COMGETTER(USBStandard))(USHORT *aUSBStandard);
Index: trunk/src/VBox/Main/src-all/PCIDeviceAttachmentImpl.cpp
===================================================================
--- trunk/src/VBox/Main/src-all/PCIDeviceAttachmentImpl.cpp	(revision 42551)
+++ trunk/src/VBox/Main/src-all/PCIDeviceAttachmentImpl.cpp	(revision 42551)
@@ -0,0 +1,136 @@
+/* $Id$ */
+
+/** @file
+ *
+ * PCI attachment information implmentation.
+ */
+
+/*
+ * Copyright (C) 2010-2012 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
+
+#include "PCIDeviceAttachmentImpl.h"
+#include "AutoCaller.h"
+#include "Global.h"
+#include "Logging.h"
+
+struct PCIDeviceAttachment::Data
+{
+    Data(const Bstr    &aDevName,
+         LONG          aHostAddress,
+         LONG          aGuestAddress,
+         BOOL          afPhysical)
+        : HostAddress(aHostAddress), GuestAddress(aGuestAddress),
+          fPhysical(afPhysical)
+    {
+        DevName = aDevName;
+    }
+
+    Bstr             DevName;
+    LONG             HostAddress;
+    LONG             GuestAddress;
+    BOOL             fPhysical;
+};
+
+// constructor / destructor
+/////////////////////////////////////////////////////////////////////////////
+
+HRESULT PCIDeviceAttachment::FinalConstruct()
+{
+    LogFlowThisFunc(("\n"));
+    return BaseFinalConstruct();
+}
+
+void PCIDeviceAttachment::FinalRelease()
+{
+    LogFlowThisFunc(("\n"));
+    uninit();
+    BaseFinalRelease();
+}
+
+// public initializer/uninitializer for internal purposes only
+/////////////////////////////////////////////////////////////////////////////
+HRESULT PCIDeviceAttachment::init(IMachine      *aParent,
+                                  const Bstr   &aDevName,
+                                  LONG          aHostAddress,
+                                  LONG          aGuestAddress,
+                                  BOOL          fPhysical)
+{
+    (void)aParent;
+    m = new Data(aDevName, aHostAddress, aGuestAddress, fPhysical);
+
+    return m != NULL ? S_OK : E_FAIL;
+}
+
+HRESULT PCIDeviceAttachment::loadSettings(IMachine *aParent,
+                                          const settings::HostPCIDeviceAttachment &hpda)
+{
+    Bstr bname(hpda.strDeviceName);
+    return init(aParent, bname,  hpda.uHostAddress, hpda.uGuestAddress, TRUE);
+}
+
+
+HRESULT PCIDeviceAttachment::saveSettings(settings::HostPCIDeviceAttachment &data)
+{
+    Assert(m);
+    data.uHostAddress = m->HostAddress;
+    data.uGuestAddress = m->GuestAddress;
+    data.strDeviceName = m->DevName;
+
+    return S_OK;
+}
+
+/**
+ * Uninitializes the instance.
+ * Called from FinalRelease().
+ */
+void PCIDeviceAttachment::uninit()
+{
+    if (m)
+    {
+        delete m;
+        m = NULL;
+    }
+}
+
+// IPCIDeviceAttachment properties
+/////////////////////////////////////////////////////////////////////////////
+
+STDMETHODIMP PCIDeviceAttachment::COMGETTER(Name)(BSTR * aName)
+{
+    CheckComArgOutPointerValid(aName);
+    m->DevName.cloneTo(aName);
+    return S_OK;
+}
+
+STDMETHODIMP PCIDeviceAttachment::COMGETTER(IsPhysicalDevice)(BOOL * aPhysical)
+{
+    CheckComArgOutPointerValid(aPhysical);
+    *aPhysical = m->fPhysical;
+    return S_OK;
+}
+
+STDMETHODIMP PCIDeviceAttachment::COMGETTER(HostAddress)(LONG * aHostAddress)
+{
+    *aHostAddress = m->HostAddress;
+    return S_OK;
+}
+
+STDMETHODIMP PCIDeviceAttachment::COMGETTER(GuestAddress)(LONG * aGuestAddress)
+{
+    *aGuestAddress = m->GuestAddress;
+    return S_OK;
+}
+
+#ifdef VBOX_WITH_XPCOM
+NS_DECL_CLASSINFO(PCIDeviceAttachment)
+NS_IMPL_THREADSAFE_ISUPPORTS1_CI(PCIDeviceAttachment, IPCIDeviceAttachment)
+#endif
Index: trunk/src/VBox/Main/src-all/PciDeviceAttachmentImpl.cpp
===================================================================
--- trunk/src/VBox/Main/src-all/PciDeviceAttachmentImpl.cpp	(revision 42550)
+++ 	(revision )
@@ -1,136 +1,0 @@
-/* $Id$ */
-
-/** @file
- *
- * PCI attachment information implmentation.
- */
-
-/*
- * Copyright (C) 2010 Oracle Corporation
- *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- */
-
-#include "PciDeviceAttachmentImpl.h"
-#include "AutoCaller.h"
-#include "Global.h"
-#include "Logging.h"
-
-struct PciDeviceAttachment::Data
-{
-    Data(const Bstr    &aDevName,
-         LONG          aHostAddress,
-         LONG          aGuestAddress,
-         BOOL          afPhysical)
-        : HostAddress(aHostAddress), GuestAddress(aGuestAddress),
-          fPhysical(afPhysical)
-    {
-        DevName = aDevName;
-    }
-
-    Bstr             DevName;
-    LONG             HostAddress;
-    LONG             GuestAddress;
-    BOOL             fPhysical;
-};
-
-// constructor / destructor
-/////////////////////////////////////////////////////////////////////////////
-
-HRESULT PciDeviceAttachment::FinalConstruct()
-{
-    LogFlowThisFunc(("\n"));
-    return BaseFinalConstruct();
-}
-
-void PciDeviceAttachment::FinalRelease()
-{
-    LogFlowThisFunc(("\n"));
-    uninit();
-    BaseFinalRelease();
-}
-
-// public initializer/uninitializer for internal purposes only
-/////////////////////////////////////////////////////////////////////////////
-HRESULT PciDeviceAttachment::init(IMachine      *aParent,
-                                  const Bstr   &aDevName,
-                                  LONG          aHostAddress,
-                                  LONG          aGuestAddress,
-                                  BOOL          fPhysical)
-{
-    (void)aParent;
-    m = new Data(aDevName, aHostAddress, aGuestAddress, fPhysical);
-
-    return m != NULL ? S_OK : E_FAIL;
-}
-
-HRESULT PciDeviceAttachment::loadSettings(IMachine *aParent,
-                                          const settings::HostPciDeviceAttachment &hpda)
-{
-    Bstr bname(hpda.strDeviceName);
-    return init(aParent, bname,  hpda.uHostAddress, hpda.uGuestAddress, TRUE);
-}
-
-
-HRESULT PciDeviceAttachment::saveSettings(settings::HostPciDeviceAttachment &data)
-{
-    Assert(m);
-    data.uHostAddress = m->HostAddress;
-    data.uGuestAddress = m->GuestAddress;
-    data.strDeviceName = m->DevName;
-
-    return S_OK;
-}
-
-/**
- * Uninitializes the instance.
- * Called from FinalRelease().
- */
-void PciDeviceAttachment::uninit()
-{
-    if (m)
-    {
-        delete m;
-        m = NULL;
-    }
-}
-
-// IPciDeviceAttachment properties
-/////////////////////////////////////////////////////////////////////////////
-
-STDMETHODIMP PciDeviceAttachment::COMGETTER(Name)(BSTR * aName)
-{
-    CheckComArgOutPointerValid(aName);
-    m->DevName.cloneTo(aName);
-    return S_OK;
-}
-
-STDMETHODIMP PciDeviceAttachment::COMGETTER(IsPhysicalDevice)(BOOL * aPhysical)
-{
-    CheckComArgOutPointerValid(aPhysical);
-    *aPhysical = m->fPhysical;
-    return S_OK;
-}
-
-STDMETHODIMP PciDeviceAttachment::COMGETTER(HostAddress)(LONG * aHostAddress)
-{
-    *aHostAddress = m->HostAddress;
-    return S_OK;
-}
-
-STDMETHODIMP PciDeviceAttachment::COMGETTER(GuestAddress)(LONG * aGuestAddress)
-{
-    *aGuestAddress = m->GuestAddress;
-    return S_OK;
-}
-
-#ifdef VBOX_WITH_XPCOM
-NS_DECL_CLASSINFO(PciDeviceAttachment)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI(PciDeviceAttachment, IPciDeviceAttachment)
-#endif
Index: trunk/src/VBox/Main/src-client/BusAssignmentManager.cpp
===================================================================
--- trunk/src/VBox/Main/src-client/BusAssignmentManager.cpp	(revision 42550)
+++ trunk/src/VBox/Main/src-client/BusAssignmentManager.cpp	(revision 42551)
@@ -7,5 +7,5 @@
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -26,5 +26,5 @@
 
 
-#include "PciDeviceAttachmentImpl.h"
+#include "PCIDeviceAttachmentImpl.h"
 
 #include <map>
@@ -217,10 +217,10 @@
 struct BusAssignmentManager::State
 {
-    struct PciDeviceRecord
+    struct PCIDeviceRecord
     {
         char          szDevName[32];
-        PciBusAddress HostAddress;
-
-        PciDeviceRecord(const char* pszName, PciBusAddress aHostAddress)
+        PCIBusAddress HostAddress;
+
+        PCIDeviceRecord(const char* pszName, PCIBusAddress aHostAddress)
         {
             RTStrCopy(this->szDevName, sizeof(szDevName), pszName);
@@ -228,15 +228,15 @@
         }
 
-        PciDeviceRecord(const char* pszName)
+        PCIDeviceRecord(const char* pszName)
         {
             RTStrCopy(this->szDevName, sizeof(szDevName), pszName);
         }
 
-        bool operator<(const PciDeviceRecord &a) const
+        bool operator<(const PCIDeviceRecord &a) const
         {
             return RTStrNCmp(szDevName, a.szDevName, sizeof(szDevName)) < 0;
         }
 
-        bool operator==(const PciDeviceRecord &a) const
+        bool operator==(const PCIDeviceRecord &a) const
         {
             return RTStrNCmp(szDevName, a.szDevName, sizeof(szDevName)) == 0;
@@ -244,13 +244,13 @@
     };
 
-    typedef std::map <PciBusAddress,PciDeviceRecord > PciMap;
-    typedef std::vector<PciBusAddress>                PciAddrList;
-    typedef std::vector<const DeviceAssignmentRule*>  PciRulesList;
-    typedef std::map <PciDeviceRecord,PciAddrList >   ReversePciMap;
+    typedef std::map <PCIBusAddress,PCIDeviceRecord > PCIMap;
+    typedef std::vector<PCIBusAddress>                PCIAddrList;
+    typedef std::vector<const DeviceAssignmentRule*>  PCIRulesList;
+    typedef std::map <PCIDeviceRecord,PCIAddrList >   ReversePCIMap;
 
     volatile int32_t cRefCnt;
     ChipsetType_T    mChipsetType;
-    PciMap           mPciMap;
-    ReversePciMap    mReversePciMap;
+    PCIMap           mPCIMap;
+    ReversePCIMap    mReversePCIMap;
 
     State()
@@ -262,12 +262,12 @@
     HRESULT init(ChipsetType_T chipsetType);
 
-    HRESULT record(const char* pszName, PciBusAddress& GuestAddress, PciBusAddress HostAddress);
-    HRESULT autoAssign(const char* pszName, PciBusAddress& Address);
-    bool    checkAvailable(PciBusAddress& Address);
-    bool    findPciAddress(const char* pszDevName, int iInstance, PciBusAddress& Address);
+    HRESULT record(const char* pszName, PCIBusAddress& GuestAddress, PCIBusAddress HostAddress);
+    HRESULT autoAssign(const char* pszName, PCIBusAddress& Address);
+    bool    checkAvailable(PCIBusAddress& Address);
+    bool    findPCIAddress(const char* pszDevName, int iInstance, PCIBusAddress& Address);
 
     const char* findAlias(const char* pszName);
-    void addMatchingRules(const char* pszName, PciRulesList& aList);
-    void listAttachedPciDevices(ComSafeArrayOut(IPciDeviceAttachment*, aAttached));
+    void addMatchingRules(const char* pszName, PCIRulesList& aList);
+    void listAttachedPCIDevices(ComSafeArrayOut(IPCIDeviceAttachment*, aAttached));
 };
 
@@ -278,16 +278,16 @@
 }
 
-HRESULT BusAssignmentManager::State::record(const char* pszName, PciBusAddress& Address, PciBusAddress HostAddress)
-{
-    PciDeviceRecord devRec(pszName, HostAddress);
+HRESULT BusAssignmentManager::State::record(const char* pszName, PCIBusAddress& Address, PCIBusAddress HostAddress)
+{
+    PCIDeviceRecord devRec(pszName, HostAddress);
 
     /* Remember address -> device mapping */
-    mPciMap.insert(PciMap::value_type(Address, devRec));
-
-    ReversePciMap::iterator it = mReversePciMap.find(devRec);
-    if (it == mReversePciMap.end())
-    {
-        mReversePciMap.insert(ReversePciMap::value_type(devRec, PciAddrList()));
-        it = mReversePciMap.find(devRec);
+    mPCIMap.insert(PCIMap::value_type(Address, devRec));
+
+    ReversePCIMap::iterator it = mReversePCIMap.find(devRec);
+    if (it == mReversePCIMap.end())
+    {
+        mReversePCIMap.insert(ReversePCIMap::value_type(devRec, PCIAddrList()));
+        it = mReversePCIMap.find(devRec);
     }
 
@@ -298,10 +298,10 @@
 }
 
-bool    BusAssignmentManager::State::findPciAddress(const char* pszDevName, int iInstance, PciBusAddress& Address)
-{
-    PciDeviceRecord devRec(pszDevName);
-
-    ReversePciMap::iterator it = mReversePciMap.find(devRec);
-    if (it == mReversePciMap.end())
+bool    BusAssignmentManager::State::findPCIAddress(const char* pszDevName, int iInstance, PCIBusAddress& Address)
+{
+    PCIDeviceRecord devRec(pszDevName);
+
+    ReversePCIMap::iterator it = mReversePCIMap.find(devRec);
+    if (it == mReversePCIMap.end())
         return false;
 
@@ -313,5 +313,5 @@
 }
 
-void BusAssignmentManager::State::addMatchingRules(const char* pszName, PciRulesList& aList)
+void BusAssignmentManager::State::addMatchingRules(const char* pszName, PCIRulesList& aList)
 {
     size_t iRuleset, iRule;
@@ -359,7 +359,7 @@
 }
 
-HRESULT BusAssignmentManager::State::autoAssign(const char* pszName, PciBusAddress& Address)
-{
-    PciRulesList matchingRules;
+HRESULT BusAssignmentManager::State::autoAssign(const char* pszName, PCIBusAddress& Address)
+{
+    PCIRulesList matchingRules;
 
     addMatchingRules(pszName,  matchingRules);
@@ -388,19 +388,19 @@
 }
 
-bool BusAssignmentManager::State::checkAvailable(PciBusAddress& Address)
-{
-    PciMap::const_iterator it = mPciMap.find(Address);
-
-    return (it == mPciMap.end());
-}
-
-
-void BusAssignmentManager::State::listAttachedPciDevices(ComSafeArrayOut(IPciDeviceAttachment*, aAttached))
-{
-    com::SafeIfaceArray<IPciDeviceAttachment> result(mPciMap.size());
+bool BusAssignmentManager::State::checkAvailable(PCIBusAddress& Address)
+{
+    PCIMap::const_iterator it = mPCIMap.find(Address);
+
+    return (it == mPCIMap.end());
+}
+
+
+void BusAssignmentManager::State::listAttachedPCIDevices(ComSafeArrayOut(IPCIDeviceAttachment*, aAttached))
+{
+    com::SafeIfaceArray<IPCIDeviceAttachment> result(mPCIMap.size());
 
     size_t iIndex = 0;
-    ComObjPtr<PciDeviceAttachment> dev;
-    for (PciMap::const_iterator it = mPciMap.begin(); it !=  mPciMap.end(); ++it)
+    ComObjPtr<PCIDeviceAttachment> dev;
+    for (PCIMap::const_iterator it = mPCIMap.begin(); it !=  mPCIMap.end(); ++it)
     {
         dev.createObject();
@@ -458,8 +458,8 @@
 }
 
-HRESULT BusAssignmentManager::assignPciDeviceImpl(const char* pszDevName,
+HRESULT BusAssignmentManager::assignPCIDeviceImpl(const char* pszDevName,
                                                   PCFGMNODE pCfg,
-                                                  PciBusAddress& GuestAddress,
-                                                  PciBusAddress HostAddress,
+                                                  PCIBusAddress& GuestAddress,
+                                                  PCIBusAddress HostAddress,
                                                   bool fGuestAddressRequired)
 {
@@ -504,11 +504,11 @@
 
 
-bool BusAssignmentManager::findPciAddress(const char* pszDevName, int iInstance, PciBusAddress& Address)
-{
-    return pState->findPciAddress(pszDevName, iInstance, Address);
-}
-
-void BusAssignmentManager::listAttachedPciDevices(ComSafeArrayOut(IPciDeviceAttachment*, aAttached))
-{
-    pState->listAttachedPciDevices(ComSafeArrayOutArg(aAttached));
-}
+bool BusAssignmentManager::findPCIAddress(const char* pszDevName, int iInstance, PCIBusAddress& Address)
+{
+    return pState->findPCIAddress(pszDevName, iInstance, Address);
+}
+
+void BusAssignmentManager::listAttachedPCIDevices(ComSafeArrayOut(IPCIDeviceAttachment*, aAttached))
+{
+    pState->listAttachedPCIDevices(ComSafeArrayOutArg(aAttached));
+}
Index: trunk/src/VBox/Main/src-client/ConsoleImpl.cpp
===================================================================
--- trunk/src/VBox/Main/src-client/ConsoleImpl.cpp	(revision 42550)
+++ trunk/src/VBox/Main/src-client/ConsoleImpl.cpp	(revision 42551)
@@ -325,7 +325,7 @@
                 Bstr hostIp, guestIp;
                 LONG hostPort, guestPort;
-                pNREv->COMGETTER(HostIp)(hostIp.asOutParam());
+                pNREv->COMGETTER(HostIP)(hostIp.asOutParam());
                 pNREv->COMGETTER(HostPort)(&hostPort);
-                pNREv->COMGETTER(GuestIp)(guestIp.asOutParam());
+                pNREv->COMGETTER(GuestIP)(guestIp.asOutParam());
                 pNREv->COMGETTER(GuestPort)(&guestPort);
                 ULONG ulSlot;
@@ -338,5 +338,5 @@
             break;
 
-            case VBoxEventType_OnHostPciDevicePlug:
+            case VBoxEventType_OnHostPCIDevicePlug:
             {
                 // handle if needed
@@ -555,5 +555,5 @@
             com::SafeArray<VBoxEventType_T> eventTypes;
             eventTypes.push_back(VBoxEventType_OnNATRedirect);
-            eventTypes.push_back(VBoxEventType_OnHostPciDevicePlug);
+            eventTypes.push_back(VBoxEventType_OnHostPCIDevicePlug);
             rc = pES->RegisterListener(aVmListener, ComSafeArrayAsInParam(eventTypes), true);
             AssertComRC(rc);
@@ -1923,5 +1923,5 @@
 }
 
-STDMETHODIMP Console::COMGETTER(AttachedPciDevices)(ComSafeArrayOut(IPciDeviceAttachment *, aAttachments))
+STDMETHODIMP Console::COMGETTER(AttachedPCIDevices)(ComSafeArrayOut(IPCIDeviceAttachment *, aAttachments))
 {
     CheckComArgOutSafeArrayPointerValid(aAttachments);
@@ -1933,8 +1933,8 @@
 
     if (mBusMgr)
-        mBusMgr->listAttachedPciDevices(ComSafeArrayOutArg(aAttachments));
+        mBusMgr->listAttachedPCIDevices(ComSafeArrayOutArg(aAttachments));
     else
     {
-        com::SafeIfaceArray<IPciDeviceAttachment> result((size_t)0);
+        com::SafeIfaceArray<IPCIDeviceAttachment> result((size_t)0);
         result.detachTo(ComSafeArrayOutArg(aAttachments));
     }
@@ -3775,5 +3775,5 @@
                                              fUseHostIOCache,
                                              false /* fSetupMerge */,
-                                             false /* fBuiltinIoCache */,
+                                             false /* fBuiltinIOCache */,
                                              0 /* uMergeSource */,
                                              0 /* uMergeTarget */,
@@ -4020,5 +4020,5 @@
                                              fUseHostIOCache,
                                              false /* fSetupMerge */,
-                                             false /* fBuiltinIoCache */,
+                                             false /* fBuiltinIOCache */,
                                              0 /* uMergeSource */,
                                              0 /* uMergeTarget */,
@@ -4436,5 +4436,5 @@
  */
 HRESULT Console::onNATRedirectRuleChange(ULONG ulInstance, BOOL aNatRuleRemove,
-                                         NATProtocol_T aProto, IN_BSTR aHostIp, LONG aHostPort, IN_BSTR aGuestIp, LONG aGuestPort)
+                                         NATProtocol_T aProto, IN_BSTR aHostIP, LONG aHostPort, IN_BSTR aGuestIP, LONG aGuestPort)
 {
     LogFlowThisFunc(("\n"));
@@ -4507,5 +4507,5 @@
             bool fUdp = aProto == NATProtocol_UDP;
             vrc = pNetNatCfg->pfnRedirectRuleCommand(pNetNatCfg, !!aNatRuleRemove, fUdp,
-                                                     Utf8Str(aHostIp).c_str(), aHostPort, Utf8Str(aGuestIp).c_str(),
+                                                     Utf8Str(aHostIP).c_str(), aHostPort, Utf8Str(aGuestIP).c_str(),
                                                      aGuestPort);
             if (RT_FAILURE(vrc))
@@ -5558,6 +5558,6 @@
     /** @todo AssertComRC -> AssertComRCReturn! Could potentially end up
      *        using uninitialized variables here. */
-    BOOL fBuiltinIoCache;
-    rc = mMachine->COMGETTER(IoCacheEnabled)(&fBuiltinIoCache);
+    BOOL fBuiltinIOCache;
+    rc = mMachine->COMGETTER(IOCacheEnabled)(&fBuiltinIOCache);
     AssertComRC(rc);
     SafeIfaceArray<IStorageController> ctrls;
@@ -5643,5 +5643,5 @@
                           enmBus,
                           fUseHostIOCache,
-                          fBuiltinIoCache,
+                          fBuiltinIOCache,
                           true /* fSetupMerge */,
                           aSourceIdx,
@@ -5719,5 +5719,5 @@
                           enmBus,
                           fUseHostIOCache,
-                          fBuiltinIoCache,
+                          fBuiltinIOCache,
                           false /* fSetupMerge */,
                           0 /* uMergeSource */,
@@ -9096,5 +9096,5 @@
                                                        StorageBus_T enmBus,
                                                        bool fUseHostIOCache,
-                                                       bool fBuiltinIoCache,
+                                                       bool fBuiltinIOCache,
                                                        bool fSetupMerge,
                                                        unsigned uMergeSource,
@@ -9131,5 +9131,5 @@
                                           enmBus,
                                           fUseHostIOCache,
-                                          fBuiltinIoCache,
+                                          fBuiltinIOCache,
                                           fSetupMerge,
                                           uMergeSource,
@@ -9314,6 +9314,6 @@
                 const char *pcszDevice = Console::convertControllerTypeToDev(enmController);
 
-                BOOL fBuiltinIoCache;
-                rc = that->mMachine->COMGETTER(IoCacheEnabled)(&fBuiltinIoCache);
+                BOOL fBuiltinIOCache;
+                rc = that->mMachine->COMGETTER(IOCacheEnabled)(&fBuiltinIOCache);
                 if (FAILED(rc))
                     throw rc;
@@ -9333,5 +9333,5 @@
                                       enmBus,
                                       fUseHostIOCache,
-                                      fBuiltinIoCache,
+                                      fBuiltinIOCache,
                                       false /* fSetupMerge */,
                                       0 /* uMergeSource */,
Index: trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp
===================================================================
--- trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp	(revision 42550)
+++ trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp	(revision 42551)
@@ -38,5 +38,5 @@
 #include "Global.h"
 #ifdef VBOX_WITH_PCI_PASSTHROUGH
-# include "PciRawDevImpl.h"
+# include "PCIRawDevImpl.h"
 #endif
 
@@ -217,5 +217,5 @@
 {
     ULONG          mInstance;
-    PciBusAddress  mPciAddress;
+    PCIBusAddress  mPCIAddress;
 
     ULONG          mBootPrio;
@@ -466,5 +466,5 @@
 
 #ifdef VBOX_WITH_PCI_PASSTHROUGH
-HRESULT Console::attachRawPciDevices(PVM pVM,
+HRESULT Console::attachRawPCIDevices(PVM pVM,
                                      BusAssignmentManager *BusMgr,
                                      PCFGMNODE            pDevices)
@@ -473,8 +473,8 @@
     PCFGMNODE pInst, pCfg, pLunL0, pLunL1;
 
-    SafeIfaceArray<IPciDeviceAttachment> assignments;
+    SafeIfaceArray<IPCIDeviceAttachment> assignments;
     ComPtr<IMachine> aMachine = machine();
 
-    hrc = aMachine->COMGETTER(PciDeviceAssignments)(ComSafeArrayAsOutParam(assignments));
+    hrc = aMachine->COMGETTER(PCIDeviceAssignments)(ComSafeArrayAsOutParam(assignments));
     if (   hrc != S_OK
         || assignments.size() < 1)
@@ -490,6 +490,6 @@
      */
 # ifdef VBOX_WITH_EXTPACK
-    static const char *s_pszPciRawExtPackName = "Oracle VM VirtualBox Extension Pack";
-    if (!mptrExtPackManager->isExtPackUsable(s_pszPciRawExtPackName))
+    static const char *s_pszPCIRawExtPackName = "Oracle VM VirtualBox Extension Pack";
+    if (!mptrExtPackManager->isExtPackUsable(s_pszPCIRawExtPackName))
     {
         /* Always fatal! */
@@ -498,5 +498,5 @@
                    "The VM cannot be started. To fix this problem, either "
                    "install the '%s' or disable PCI passthrough via VBoxManage"),
-                s_pszPciRawExtPackName);
+                s_pszPCIRawExtPackName);
     }
 # endif
@@ -508,18 +508,18 @@
     for (size_t iDev = 0; iDev < assignments.size(); iDev++)
     {
-        ComPtr<IPciDeviceAttachment> assignment = assignments[iDev];
+        ComPtr<IPCIDeviceAttachment> assignment = assignments[iDev];
         LONG guest = 0;
-        PciBusAddress GuestPciAddress;
+        PCIBusAddress GuestPCIAddress;
 
         assignment->COMGETTER(GuestAddress)(&guest);
-        GuestPciAddress.fromLong(guest);
-        Assert(GuestPciAddress.valid());
-
-        if (GuestPciAddress.miBus > 0)
+        GuestPCIAddress.fromLong(guest);
+        Assert(GuestPCIAddress.valid());
+
+        if (GuestPCIAddress.miBus > 0)
         {
             int iBridgesMissed = 0;
-            int iBase = GuestPciAddress.miBus - 1;
-
-            while (!BusMgr->hasPciDevice("ich9pcibridge", iBase) && iBase > 0)
+            int iBase = GuestPCIAddress.miBus - 1;
+
+            while (!BusMgr->hasPCIDevice("ich9pcibridge", iBase) && iBase > 0)
             {
                 iBridgesMissed++; iBase--;
@@ -531,5 +531,5 @@
                 InsertConfigNode(pBridges, Utf8StrFmt("%d", iBase + iBridge).c_str(), &pInst);
                 InsertConfigInteger(pInst, "Trusted",              1);
-                hrc = BusMgr->assignPciDevice("ich9pcibridge", pInst);
+                hrc = BusMgr->assignPCIDevice("ich9pcibridge", pInst);
             }
         }
@@ -537,13 +537,13 @@
 
     /* Now actually add devices */
-    PCFGMNODE pPciDevs = NULL;
+    PCFGMNODE pPCIDevs = NULL;
 
     if (assignments.size() > 0)
     {
-        InsertConfigNode(pDevices, "pciraw",  &pPciDevs);
+        InsertConfigNode(pDevices, "pciraw",  &pPCIDevs);
 
         PCFGMNODE pRoot = CFGMR3GetParent(pDevices); Assert(pRoot);
 
-        /* Tell PGM to tell GPciRaw about guest mappings. */
+        /* Tell PGM to tell GPCIRaw about guest mappings. */
         CFGMR3InsertNode(pRoot, "PGM", NULL);
         InsertConfigInteger(CFGMR3GetChild(pRoot, "PGM"), "PciPassThrough", 1);
@@ -560,6 +560,6 @@
     for (size_t iDev = 0; iDev < assignments.size(); iDev++)
     {
-        PciBusAddress HostPciAddress, GuestPciAddress;
-        ComPtr<IPciDeviceAttachment> assignment = assignments[iDev];
+        PCIBusAddress HostPCIAddress, GuestPCIAddress;
+        ComPtr<IPCIDeviceAttachment> assignment = assignments[iDev];
         LONG host, guest;
         Bstr aDevName;
@@ -569,26 +569,26 @@
         assignment->COMGETTER(Name)(aDevName.asOutParam());
 
-        InsertConfigNode(pPciDevs, Utf8StrFmt("%d", iDev).c_str(), &pInst);
+        InsertConfigNode(pPCIDevs, Utf8StrFmt("%d", iDev).c_str(), &pInst);
         InsertConfigInteger(pInst, "Trusted", 1);
 
-        HostPciAddress.fromLong(host);
-        Assert(HostPciAddress.valid());
+        HostPCIAddress.fromLong(host);
+        Assert(HostPCIAddress.valid());
         InsertConfigNode(pInst,        "Config",  &pCfg);
         InsertConfigString(pCfg,       "DeviceName",  aDevName);
 
         InsertConfigInteger(pCfg,      "DetachHostDriver",  1);
-        InsertConfigInteger(pCfg,      "HostPCIBusNo",      HostPciAddress.miBus);
-        InsertConfigInteger(pCfg,      "HostPCIDeviceNo",   HostPciAddress.miDevice);
-        InsertConfigInteger(pCfg,      "HostPCIFunctionNo", HostPciAddress.miFn);
-
-        GuestPciAddress.fromLong(guest);
-        Assert(GuestPciAddress.valid());
-        hrc = BusMgr->assignHostPciDevice("pciraw", pInst, HostPciAddress, GuestPciAddress, true);
+        InsertConfigInteger(pCfg,      "HostPCIBusNo",      HostPCIAddress.miBus);
+        InsertConfigInteger(pCfg,      "HostPCIDeviceNo",   HostPCIAddress.miDevice);
+        InsertConfigInteger(pCfg,      "HostPCIFunctionNo", HostPCIAddress.miFn);
+
+        GuestPCIAddress.fromLong(guest);
+        Assert(GuestPCIAddress.valid());
+        hrc = BusMgr->assignHostPCIDevice("pciraw", pInst, HostPCIAddress, GuestPCIAddress, true);
         if (hrc != S_OK)
             return hrc;
 
-        InsertConfigInteger(pCfg,      "GuestPCIBusNo",      GuestPciAddress.miBus);
-        InsertConfigInteger(pCfg,      "GuestPCIDeviceNo",   GuestPciAddress.miDevice);
-        InsertConfigInteger(pCfg,      "GuestPCIFunctionNo", GuestPciAddress.miFn);
+        InsertConfigInteger(pCfg,      "GuestPCIBusNo",      GuestPCIAddress.miBus);
+        InsertConfigInteger(pCfg,      "GuestPCIDeviceNo",   GuestPCIAddress.miDevice);
+        InsertConfigInteger(pCfg,      "GuestPCIFunctionNo", GuestPCIAddress.miFn);
 
         /* the driver */
@@ -600,5 +600,5 @@
         InsertConfigString(pLunL1,     "Driver", "MainPciRaw");
         InsertConfigNode(pLunL1,       "Config", &pCfg);
-        PciRawDev* pMainDev = new PciRawDev(this);
+        PCIRawDev* pMainDev = new PCIRawDev(this);
         InsertConfigInteger(pCfg,      "Object", (uintptr_t)pMainDev);
     }
@@ -1002,5 +1002,5 @@
         /* I/O cache size */
         ULONG ioCacheSize = 5;
-        hrc = pMachine->COMGETTER(IoCacheSize)(&ioCacheSize);                               H();
+        hrc = pMachine->COMGETTER(IOCacheSize)(&ioCacheSize);                               H();
         InsertConfigInteger(pPDMBlkCache, "CacheSize", ioCacheSize * _1M);
 
@@ -1100,5 +1100,5 @@
          * PCI buses.
          */
-        uint32_t uIocPciAddress, uHbcPciAddress;
+        uint32_t uIocPCIAddress, uHbcPCIAddress;
         switch (chipsetType)
         {
@@ -1107,11 +1107,11 @@
             case ChipsetType_PIIX3:
                 InsertConfigNode(pDevices, "pci", &pDev);
-                uHbcPciAddress = (0x0 << 16) | 0;
-                uIocPciAddress = (0x1 << 16) | 0; // ISA controller
+                uHbcPCIAddress = (0x0 << 16) | 0;
+                uIocPCIAddress = (0x1 << 16) | 0; // ISA controller
                 break;
             case ChipsetType_ICH9:
                 InsertConfigNode(pDevices, "ich9pci", &pDev);
-                uHbcPciAddress = (0x1e << 16) | 0;
-                uIocPciAddress = (0x1f << 16) | 0; // LPC controller
+                uHbcPCIAddress = (0x1e << 16) | 0;
+                uIocPCIAddress = (0x1f << 16) | 0; // LPC controller
                 break;
         }
@@ -1131,13 +1131,13 @@
             InsertConfigNode(pDev,     "0", &pInst);
             InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
-            hrc = BusMgr->assignPciDevice("ich9pcibridge", pInst);                          H();
+            hrc = BusMgr->assignPCIDevice("ich9pcibridge", pInst);                          H();
 
             InsertConfigNode(pDev,     "1", &pInst);
             InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
-            hrc = BusMgr->assignPciDevice("ich9pcibridge", pInst);                          H();
+            hrc = BusMgr->assignPCIDevice("ich9pcibridge", pInst);                          H();
 
 #ifdef VBOX_WITH_PCI_PASSTHROUGH
             /* Add PCI passthrough devices */
-            hrc = attachRawPciDevices(pVM, BusMgr, pDevices);                               H();
+            hrc = attachRawPCIDevices(pVM, BusMgr, pDevices);                               H();
 #endif
         }
@@ -1150,12 +1150,12 @@
          * High Precision Event Timer (HPET)
          */
-        BOOL fHpetEnabled;
+        BOOL fHPETEnabled;
         /* Other guests may wish to use HPET too, but MacOS X not functional without it */
-        hrc = pMachine->COMGETTER(HpetEnabled)(&fHpetEnabled);                              H();
+        hrc = pMachine->COMGETTER(HPETEnabled)(&fHPETEnabled);                              H();
         /* so always enable HPET in extended profile */
-        fHpetEnabled |= fOsXGuest;
+        fHPETEnabled |= fOsXGuest;
         /* HPET is always present on ICH9 */
-        fHpetEnabled |= (chipsetType == ChipsetType_ICH9);
-        if (fHpetEnabled)
+        fHPETEnabled |= (chipsetType == ChipsetType_ICH9);
+        if (fHPETEnabled)
         {
             InsertConfigNode(pDevices, "hpet", &pDev);
@@ -1197,5 +1197,5 @@
             InsertConfigNode(pDevices, "lpc", &pDev);
             InsertConfigNode(pDev,     "0", &pInst);
-            hrc = BusMgr->assignPciDevice("lpc", pInst);                                    H();
+            hrc = BusMgr->assignPCIDevice("lpc", pInst);                                    H();
             InsertConfigInteger(pInst, "Trusted",   1); /* boolean */
         }
@@ -1293,5 +1293,5 @@
         InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
 
-        hrc = BusMgr->assignPciDevice("vga", pInst);                                        H();
+        hrc = BusMgr->assignPCIDevice("vga", pInst);                                        H();
         InsertConfigNode(pInst,    "Config", &pCfg);
         ULONG cVRamMBs;
@@ -1564,5 +1564,5 @@
                 case StorageControllerType_LsiLogic:
                 {
-                    hrc = BusMgr->assignPciDevice("lsilogic", pCtlInst);                    H();
+                    hrc = BusMgr->assignPCIDevice("lsilogic", pCtlInst);                    H();
 
                     InsertConfigInteger(pCfg, "Bootable",  fBootable);
@@ -1578,5 +1578,5 @@
                 case StorageControllerType_BusLogic:
                 {
-                    hrc = BusMgr->assignPciDevice("buslogic", pCtlInst);                    H();
+                    hrc = BusMgr->assignPCIDevice("buslogic", pCtlInst);                    H();
 
                     InsertConfigInteger(pCfg, "Bootable",  fBootable);
@@ -1592,5 +1592,5 @@
                 case StorageControllerType_IntelAhci:
                 {
-                    hrc = BusMgr->assignPciDevice("ahci", pCtlInst);                        H();
+                    hrc = BusMgr->assignPCIDevice("ahci", pCtlInst);                        H();
 
                     ULONG cPorts = 0;
@@ -1600,5 +1600,5 @@
 
                     /* Needed configuration values for the bios, only first controller. */
-                    if (!BusMgr->hasPciDevice("ahci", 1))
+                    if (!BusMgr->hasPCIDevice("ahci", 1))
                     {
                         if (pBiosCfg)
@@ -1635,5 +1635,5 @@
                      * IDE (update this when the main interface changes)
                      */
-                    hrc = BusMgr->assignPciDevice("piix3ide", pCtlInst);                    H();
+                    hrc = BusMgr->assignPCIDevice("piix3ide", pCtlInst);                    H();
                     InsertConfigString(pCfg,   "Type", controllerString(enmCtrlType));
                     /* Attach the status driver */
@@ -1671,5 +1671,5 @@
                 case StorageControllerType_LsiLogicSas:
                 {
-                    hrc = BusMgr->assignPciDevice("lsilogicsas", pCtlInst);                 H();
+                    hrc = BusMgr->assignPCIDevice("lsilogicsas", pCtlInst);                 H();
 
                     InsertConfigString(pCfg,  "ControllerType", "SAS1068");
@@ -1694,6 +1694,6 @@
 
             /* Builtin I/O cache - per device setting. */
-            BOOL fBuiltinIoCache = true;
-            hrc = pMachine->COMGETTER(IoCacheEnabled)(&fBuiltinIoCache);                    H();
+            BOOL fBuiltinIOCache = true;
+            hrc = pMachine->COMGETTER(IOCacheEnabled)(&fBuiltinIOCache);                    H();
 
 
@@ -1706,5 +1706,5 @@
                                             enmBus,
                                             !!fUseHostIOCache,
-                                            !!fBuiltinIoCache,
+                                            !!fBuiltinIOCache,
                                             false /* fSetupMerge */,
                                             0 /* uMergeSource */,
@@ -1789,19 +1789,19 @@
             /* the first network card gets the PCI ID 3, the next 3 gets 8..10,
              * next 4 get 16..19. */
-            int iPciDeviceNo;
+            int iPCIDeviceNo;
             switch (ulInstance)
             {
                 case 0:
-                    iPciDeviceNo = 3;
+                    iPCIDeviceNo = 3;
                     break;
                 case 1: case 2: case 3:
-                    iPciDeviceNo = ulInstance - 1 + 8;
+                    iPCIDeviceNo = ulInstance - 1 + 8;
                     break;
                 case 4: case 5: case 6: case 7:
-                    iPciDeviceNo = ulInstance - 4 + 16;
+                    iPCIDeviceNo = ulInstance - 4 + 16;
                     break;
                 default:
                     /* auto assignment */
-                    iPciDeviceNo = -1;
+                    iPCIDeviceNo = -1;
                     break;
             }
@@ -1811,14 +1811,14 @@
              * it assigns slot 11 to the first network controller.
              */
-            if (iPciDeviceNo == 3 && adapterType == NetworkAdapterType_I82545EM)
-            {
-                iPciDeviceNo = 0x11;
+            if (iPCIDeviceNo == 3 && adapterType == NetworkAdapterType_I82545EM)
+            {
+                iPCIDeviceNo = 0x11;
                 fSwapSlots3and11 = true;
             }
-            else if (iPciDeviceNo == 0x11 && fSwapSlots3and11)
-                iPciDeviceNo = 3;
+            else if (iPCIDeviceNo == 0x11 && fSwapSlots3and11)
+                iPCIDeviceNo = 3;
 #endif
-            PciBusAddress PciAddr = PciBusAddress(0, iPciDeviceNo, 0);
-            hrc = BusMgr->assignPciDevice(pszAdapterName, pInst, PciAddr);                  H();
+            PCIBusAddress PCIAddr = PCIBusAddress(0, iPCIDeviceNo, 0);
+            hrc = BusMgr->assignPCIDevice(pszAdapterName, pInst, PCIAddr);                  H();
 
             InsertConfigNode(pInst, "Config", &pCfg);
@@ -1836,5 +1836,5 @@
             nic.mInstance    = ulInstance;
             /* Could be updated by reference, if auto assigned */
-            nic.mPciAddress  = PciAddr;
+            nic.mPCIAddress  = PCIAddr;
 
             hrc = networkAdapter->COMGETTER(BootPriority)(&nic.mBootPrio);                  H();
@@ -1944,7 +1944,7 @@
                 InsertConfigNode(pNetBootCfg, achBootIdx, &pNetBtDevCfg);
                 InsertConfigInteger(pNetBtDevCfg, "NIC", it->mInstance);
-                InsertConfigInteger(pNetBtDevCfg, "PCIBusNo",      it->mPciAddress.miBus);
-                InsertConfigInteger(pNetBtDevCfg, "PCIDeviceNo",   it->mPciAddress.miDevice);
-                InsertConfigInteger(pNetBtDevCfg, "PCIFunctionNo", it->mPciAddress.miFn);
+                InsertConfigInteger(pNetBtDevCfg, "PCIBusNo",      it->mPCIAddress.miBus);
+                InsertConfigInteger(pNetBtDevCfg, "PCIDeviceNo",   it->mPCIAddress.miDevice);
+                InsertConfigInteger(pNetBtDevCfg, "PCIFunctionNo", it->mPCIAddress.miFn);
             }
         }
@@ -2053,5 +2053,5 @@
         InsertConfigNode(pInst,    "Config", &pCfg);
         InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
-        hrc = BusMgr->assignPciDevice("VMMDev", pInst);                                     H();
+        hrc = BusMgr->assignPCIDevice("VMMDev", pInst);                                     H();
 
         Bstr hwVersion;
@@ -2110,5 +2110,5 @@
                     InsertConfigNode(pDev,     "0", &pInst);
                     InsertConfigInteger(pInst, "Trusted",          1); /* boolean */
-                    hrc = BusMgr->assignPciDevice("ichac97", pInst);                        H();
+                    hrc = BusMgr->assignPCIDevice("ichac97", pInst);                        H();
                     InsertConfigNode(pInst,    "Config", &pCfg);
                     break;
@@ -2134,5 +2134,5 @@
                     InsertConfigNode(pDev,     "0", &pInst);
                     InsertConfigInteger(pInst, "Trusted",          1); /* boolean */
-                    hrc = BusMgr->assignPciDevice("hda", pInst);                            H();
+                    hrc = BusMgr->assignPCIDevice("hda", pInst);                            H();
                     InsertConfigNode(pInst,    "Config", &pCfg);
                 }
@@ -2233,5 +2233,5 @@
                 InsertConfigNode(pInst,    "Config", &pCfg);
                 InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
-                hrc = BusMgr->assignPciDevice("usb-ohci", pInst);                           H();
+                hrc = BusMgr->assignPCIDevice("usb-ohci", pInst);                           H();
                 InsertConfigNode(pInst,    "LUN#0", &pLunL0);
                 InsertConfigString(pLunL0, "Driver",               "VUSBRootHub");
@@ -2244,7 +2244,7 @@
 
 #ifdef VBOX_WITH_EHCI
-                BOOL fEhciEnabled;
-                hrc = USBCtlPtr->COMGETTER(EnabledEhci)(&fEhciEnabled);                     H();
-                if (fEhciEnabled)
+                BOOL fEHCIEnabled;
+                hrc = USBCtlPtr->COMGETTER(EnabledEHCI)(&fEHCIEnabled);                     H();
+                if (fEHCIEnabled)
                 {
                     /*
@@ -2265,5 +2265,5 @@
                         InsertConfigNode(pInst,    "Config", &pCfg);
                         InsertConfigInteger(pInst, "Trusted", 1); /* boolean */
-                        hrc = BusMgr->assignPciDevice("usb-ehci", pInst);                   H();
+                        hrc = BusMgr->assignPCIDevice("usb-ehci", pInst);                   H();
 
                         InsertConfigNode(pInst,    "LUN#0", &pLunL0);
@@ -2380,7 +2380,7 @@
 
                 /* Virtual USB Mouse/Tablet */
-                PointingHidType_T aPointingHid;
-                hrc = pMachine->COMGETTER(PointingHidType)(&aPointingHid);                  H();
-                if (aPointingHid == PointingHidType_USBMouse || aPointingHid == PointingHidType_USBTablet)
+                PointingHIDType_T aPointingHID;
+                hrc = pMachine->COMGETTER(PointingHIDType)(&aPointingHID);                  H();
+                if (aPointingHID == PointingHIDType_USBMouse || aPointingHID == PointingHIDType_USBTablet)
                 {
                     InsertConfigNode(pUsbDevices, "HidMouse", &pDev);
@@ -2388,5 +2388,5 @@
                     InsertConfigNode(pInst,    "Config", &pCfg);
 
-                    if (aPointingHid == PointingHidType_USBTablet)
+                    if (aPointingHID == PointingHIDType_USBTablet)
                     {
                         InsertConfigInteger(pCfg, "Absolute", 1);
@@ -2409,7 +2409,7 @@
 
                 /* Virtual USB Keyboard */
-                KeyboardHidType_T aKbdHid;
-                hrc = pMachine->COMGETTER(KeyboardHidType)(&aKbdHid);                       H();
-                if (aKbdHid == KeyboardHidType_USBKeyboard)
+                KeyboardHIDType_T aKbdHID;
+                hrc = pMachine->COMGETTER(KeyboardHIDType)(&aKbdHID);                       H();
+                if (aKbdHID == KeyboardHIDType_USBKeyboard)
                 {
                     InsertConfigNode(pUsbDevices, "HidKeyboard", &pDev);
@@ -2589,5 +2589,5 @@
             InsertConfigInteger(pInst, "Trusted", 1); /* boolean */
             InsertConfigNode(pInst,    "Config", &pCfg);
-            hrc = BusMgr->assignPciDevice("acpi", pInst);                                   H();
+            hrc = BusMgr->assignPCIDevice("acpi", pInst);                                   H();
 
             InsertConfigInteger(pCfg,  "RamSize",          cbRam);
@@ -2597,5 +2597,5 @@
             InsertConfigInteger(pCfg,  "IOAPIC", fIOAPIC);
             InsertConfigInteger(pCfg,  "FdcEnabled", fFdcEnabled);
-            InsertConfigInteger(pCfg,  "HpetEnabled", fHpetEnabled);
+            InsertConfigInteger(pCfg,  "HpetEnabled", fHPETEnabled);
             InsertConfigInteger(pCfg,  "SmcEnabled", fSmcEnabled);
             InsertConfigInteger(pCfg,  "ShowRtc",    fShowRtc);
@@ -2603,17 +2603,17 @@
             {
                 BootNic aNic = llBootNics.front();
-                uint32_t u32NicPciAddr = (aNic.mPciAddress.miDevice << 16) | aNic.mPciAddress.miFn;
-                InsertConfigInteger(pCfg, "NicPciAddress",    u32NicPciAddr);
+                uint32_t u32NicPCIAddr = (aNic.mPCIAddress.miDevice << 16) | aNic.mPCIAddress.miFn;
+                InsertConfigInteger(pCfg, "NicPciAddress",    u32NicPCIAddr);
             }
             if (fOsXGuest && fAudioEnabled)
             {
-                PciBusAddress Address;
-                if (BusMgr->findPciAddress("hda", 0, Address))
-                {
-                    uint32_t u32AudioPciAddr = (Address.miDevice << 16) | Address.miFn;
-                    InsertConfigInteger(pCfg, "AudioPciAddress",    u32AudioPciAddr);
-                }
-            }
-            InsertConfigInteger(pCfg,  "IocPciAddress", uIocPciAddress);
+                PCIBusAddress Address;
+                if (BusMgr->findPCIAddress("hda", 0, Address))
+                {
+                    uint32_t u32AudioPCIAddr = (Address.miDevice << 16) | Address.miFn;
+                    InsertConfigInteger(pCfg, "AudioPciAddress",    u32AudioPCIAddr);
+                }
+            }
+            InsertConfigInteger(pCfg,  "IocPciAddress", uIocPCIAddress);
             if (chipsetType == ChipsetType_ICH9)
             {
@@ -2621,5 +2621,5 @@
                 InsertConfigInteger(pCfg,  "McfgLength", cbMcfgLength);
             }
-            InsertConfigInteger(pCfg,  "HostBusPciAddress", uHbcPciAddress);
+            InsertConfigInteger(pCfg,  "HostBusPciAddress", uHbcPCIAddress);
             InsertConfigInteger(pCfg,  "ShowCpu", fShowCpu);
             InsertConfigInteger(pCfg,  "CpuHotPlug", fCpuHotPlug);
@@ -2941,5 +2941,5 @@
                                     StorageBus_T enmBus,
                                     bool fUseHostIOCache,
-                                    bool fBuiltinIoCache,
+                                    bool fBuiltinIOCache,
                                     bool fSetupMerge,
                                     unsigned uMergeSource,
@@ -3266,5 +3266,5 @@
                           lType,
                           fUseHostIOCache,
-                          fBuiltinIoCache,
+                          fBuiltinIOCache,
                           fSetupMerge,
                           uMergeSource,
@@ -3308,5 +3308,5 @@
                           DeviceType_T enmType,
                           bool fUseHostIOCache,
-                          bool fBuiltinIoCache,
+                          bool fBuiltinIOCache,
                           bool fSetupMerge,
                           unsigned uMergeSource,
@@ -3473,5 +3473,5 @@
                      * and just increases the overhead.
                      */
-                    if (   fBuiltinIoCache
+                    if (   fBuiltinIOCache
                         && (enmType == DeviceType_HardDisk))
                         InsertConfigInteger(pCfg, "BlockCache", 1);
@@ -3737,6 +3737,6 @@
             case NetworkAttachmentType_NAT:
             {
-                ComPtr<INATEngine> natDriver;
-                hrc = aNetworkAdapter->COMGETTER(NatDriver)(natDriver.asOutParam());        H();
+                ComPtr<INATEngine> natEngine;
+                hrc = aNetworkAdapter->COMGETTER(NATEngine)(natEngine.asOutParam());        H();
                 InsertConfigString(pLunL0, "Driver", "NAT");
                 InsertConfigNode(pLunL0, "Config", &pCfg);
@@ -3749,5 +3749,5 @@
                 InsertConfigString(pCfg, "BootFile", Utf8StrFmt("%ls.pxe", bstr.raw()));
 
-                hrc = natDriver->COMGETTER(Network)(bstr.asOutParam());                     H();
+                hrc = natEngine->COMGETTER(Network)(bstr.asOutParam());                     H();
                 if (!bstr.isEmpty())
                     InsertConfigString(pCfg, "Network", bstr);
@@ -3758,5 +3758,5 @@
                     InsertConfigString(pCfg, "Network", Utf8StrFmt("10.0.%d.0/24", uSlot+2));
                 }
-                hrc = natDriver->COMGETTER(HostIP)(bstr.asOutParam());                      H();
+                hrc = natEngine->COMGETTER(HostIP)(bstr.asOutParam());                      H();
                 if (!bstr.isEmpty())
                     InsertConfigString(pCfg, "BindIP", bstr);
@@ -3766,5 +3766,5 @@
                 ULONG tcpSnd = 0;
                 ULONG tcpRcv = 0;
-                hrc = natDriver->GetNetworkSettings(&mtu, &sockSnd, &sockRcv, &tcpSnd, &tcpRcv); H();
+                hrc = natEngine->GetNetworkSettings(&mtu, &sockSnd, &sockRcv, &tcpSnd, &tcpRcv); H();
                 if (mtu)
                     InsertConfigInteger(pCfg, "SlirpMTU", mtu);
@@ -3777,5 +3777,5 @@
                 if (tcpSnd)
                     InsertConfigInteger(pCfg, "TcpSnd", tcpSnd);
-                hrc = natDriver->COMGETTER(TftpPrefix)(bstr.asOutParam());                  H();
+                hrc = natEngine->COMGETTER(TFTPPrefix)(bstr.asOutParam());                  H();
                 if (!bstr.isEmpty())
                 {
@@ -3783,5 +3783,5 @@
                     InsertConfigString(pCfg, "TFTPPrefix", bstr);
                 }
-                hrc = natDriver->COMGETTER(TftpBootFile)(bstr.asOutParam());                H();
+                hrc = natEngine->COMGETTER(TFTPBootFile)(bstr.asOutParam());                H();
                 if (!bstr.isEmpty())
                 {
@@ -3789,22 +3789,22 @@
                     InsertConfigString(pCfg, "BootFile", bstr);
                 }
-                hrc = natDriver->COMGETTER(TftpNextServer)(bstr.asOutParam());              H();
+                hrc = natEngine->COMGETTER(TFTPNextServer)(bstr.asOutParam());              H();
                 if (!bstr.isEmpty())
                     InsertConfigString(pCfg, "NextServer", bstr);
-                BOOL fDnsFlag;
-                hrc = natDriver->COMGETTER(DnsPassDomain)(&fDnsFlag);                       H();
-                InsertConfigInteger(pCfg, "PassDomain", fDnsFlag);
-                hrc = natDriver->COMGETTER(DnsProxy)(&fDnsFlag);                            H();
-                InsertConfigInteger(pCfg, "DNSProxy", fDnsFlag);
-                hrc = natDriver->COMGETTER(DnsUseHostResolver)(&fDnsFlag);                  H();
-                InsertConfigInteger(pCfg, "UseHostResolver", fDnsFlag);
+                BOOL fDNSFlag;
+                hrc = natEngine->COMGETTER(DNSPassDomain)(&fDNSFlag);                       H();
+                InsertConfigInteger(pCfg, "PassDomain", fDNSFlag);
+                hrc = natEngine->COMGETTER(DNSProxy)(&fDNSFlag);                            H();
+                InsertConfigInteger(pCfg, "DNSProxy", fDNSFlag);
+                hrc = natEngine->COMGETTER(DNSUseHostResolver)(&fDNSFlag);                  H();
+                InsertConfigInteger(pCfg, "UseHostResolver", fDNSFlag);
 
                 ULONG aliasMode;
-                hrc = natDriver->COMGETTER(AliasMode)(&aliasMode);                          H();
+                hrc = natEngine->COMGETTER(AliasMode)(&aliasMode);                          H();
                 InsertConfigInteger(pCfg, "AliasMode", aliasMode);
 
                 /* port-forwarding */
                 SafeArray<BSTR> pfs;
-                hrc = natDriver->COMGETTER(Redirects)(ComSafeArrayAsOutParam(pfs));         H();
+                hrc = natEngine->COMGETTER(Redirects)(ComSafeArrayAsOutParam(pfs));         H();
                 PCFGMNODE pPF = NULL;          /* /Devices/Dev/.../Config/PF#0/ */
                 for (unsigned int i = 0; i < pfs.size(); ++i)
@@ -4492,8 +4492,8 @@
                                                    tmpMask.asOutParam());
                     if (SUCCEEDED(hrc) && !tmpMask.isEmpty())
-                        hrc = hostInterface->EnableStaticIpConfig(tmpAddr.raw(),
+                        hrc = hostInterface->EnableStaticIPConfig(tmpAddr.raw(),
                                                                   tmpMask.raw());
                     else
-                        hrc = hostInterface->EnableStaticIpConfig(tmpAddr.raw(),
+                        hrc = hostInterface->EnableStaticIPConfig(tmpAddr.raw(),
                                                                   Bstr(VBOXNET_IPV4MASK_DEFAULT).raw());
                 }
@@ -4501,5 +4501,5 @@
                 {
                     /* Grab the IP number from the 'vboxnetX' instance number (see netif.h) */
-                    hrc = hostInterface->EnableStaticIpConfig(getDefaultIPv4Address(Bstr(pszHostOnlyName)).raw(),
+                    hrc = hostInterface->EnableStaticIPConfig(getDefaultIPv4Address(Bstr(pszHostOnlyName)).raw(),
                                                               Bstr(VBOXNET_IPV4MASK_DEFAULT).raw());
                 }
@@ -4515,5 +4515,5 @@
                 if (SUCCEEDED(hrc) && !tmpAddr.isEmpty() && !tmpMask.isEmpty())
                 {
-                    hrc = hostInterface->EnableStaticIpConfigV6(tmpAddr.raw(),
+                    hrc = hostInterface->EnableStaticIPConfigV6(tmpAddr.raw(),
                                                                 Utf8Str(tmpMask).toUInt32());
                     ComAssertComRC(hrc); /** @todo r=bird: Why this isn't fatal? (H()) */
Index: trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp
===================================================================
--- trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp	(revision 42550)
+++ trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp	(revision 42551)
@@ -273,5 +273,5 @@
 }
 
-STDMETHODIMP GuestProcess::COMGETTER(Pid)(ULONG *aPID)
+STDMETHODIMP GuestProcess::COMGETTER(PID)(ULONG *aPID)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL
Index: trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp
===================================================================
--- trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp	(revision 42550)
+++ trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp	(revision 42551)
@@ -289,4 +289,32 @@
     LogFlowFuncLeaveRC(S_OK);
     return S_OK;
+#endif /* VBOX_WITH_GUEST_CONTROL */
+}
+
+STDMETHODIMP GuestSession::COMSETTER(Environment)(ComSafeArrayIn(IN_BSTR, aValues))
+{
+#ifndef VBOX_WITH_GUEST_CONTROL
+    ReturnComNotImplemented();
+#else
+    LogFlowThisFuncEnter();
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    com::SafeArray<IN_BSTR> environment(ComSafeArrayInArg(aValues));
+
+    int rc = VINF_SUCCESS;
+    for (size_t i = 0; i < environment.size() && RT_SUCCESS(rc); i++)
+    {
+        Utf8Str strEnv(environment[i]);
+        if (!strEnv.isEmpty()) /* Silently skip empty entries. */
+            rc = mData.mEnvironment.Set(strEnv);
+    }
+
+    HRESULT hr = RT_SUCCESS(rc) ? S_OK : VBOX_E_IPRT_ERROR;
+    LogFlowFuncLeaveRC(hr);
+    return hr;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }
@@ -1083,32 +1111,4 @@
 }
 
-STDMETHODIMP GuestSession::EnvironmentSetArray(ComSafeArrayIn(IN_BSTR, aValues))
-{
-#ifndef VBOX_WITH_GUEST_CONTROL
-    ReturnComNotImplemented();
-#else
-    LogFlowThisFuncEnter();
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    com::SafeArray<IN_BSTR> environment(ComSafeArrayInArg(aValues));
-
-    int rc = VINF_SUCCESS;
-    for (size_t i = 0; i < environment.size() && RT_SUCCESS(rc); i++)
-    {
-        Utf8Str strEnv(environment[i]);
-        if (!strEnv.isEmpty()) /* Silently skip empty entries. */
-            rc = mData.mEnvironment.Set(strEnv);
-    }
-
-    HRESULT hr = RT_SUCCESS(rc) ? S_OK : VBOX_E_IPRT_ERROR;
-    LogFlowFuncLeaveRC(hr);
-    return hr;
-#endif /* VBOX_WITH_GUEST_CONTROL */
-}
-
 STDMETHODIMP GuestSession::EnvironmentUnset(IN_BSTR aName)
 {
Index: trunk/src/VBox/Main/src-client/PCIRawDevImpl.cpp
===================================================================
--- trunk/src/VBox/Main/src-client/PCIRawDevImpl.cpp	(revision 42551)
+++ trunk/src/VBox/Main/src-client/PCIRawDevImpl.cpp	(revision 42551)
@@ -0,0 +1,229 @@
+/* $Id$ */
+/** @file
+ * VirtualBox Driver Interface to raw PCI device.
+ */
+
+/*
+ * Copyright (C) 2010-2012 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
+#include "Logging.h"
+#include "PCIRawDevImpl.h"
+#include "PCIDeviceAttachmentImpl.h"
+#include "ConsoleImpl.h"
+#include "MachineImpl.h"
+
+// generated header for events
+#include "VBoxEvents.h"
+
+/**
+ * PCI raw driver instance data.
+ */
+typedef struct DRVMAINPCIRAWDEV
+{
+    /** Pointer to the real PCI raw object. */
+    PCIRawDev                   *pPCIRawDev;
+    /** Pointer to the driver instance structure. */
+    PPDMDRVINS                  pDrvIns;
+    /** Our PCI device connector interface. */
+    PDMIPCIRAWCONNECTOR         IConnector;
+
+} DRVMAINPCIRAWDEV, *PDRVMAINPCIRAWDEV;
+
+//
+// constructor / destructor
+//
+PCIRawDev::PCIRawDev(Console *console)
+  : mpDrv(NULL),
+    mParent(console)
+{
+}
+
+PCIRawDev::~PCIRawDev()
+{
+}
+
+/**
+ * @interface_method_impl{PDMIBASE,pfnQueryInterface}
+ */
+DECLCALLBACK(void *) PCIRawDev::drvQueryInterface(PPDMIBASE pInterface, const char *pszIID)
+{
+    PPDMDRVINS         pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
+    PDRVMAINPCIRAWDEV  pThis   = PDMINS_2_DATA(pDrvIns, PDRVMAINPCIRAWDEV);
+
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE,            &pDrvIns->IBase);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIPCIRAWCONNECTOR, &pThis->IConnector);
+
+    return NULL;
+}
+
+
+/**
+ * @interface_method_impl{PDMIPCIRAWUP,pfnPciDeviceConstructComplete}
+ */
+DECLCALLBACK(int) PCIRawDev::drvDeviceConstructComplete(PPDMIPCIRAWCONNECTOR pInterface, const char *pcszName,
+                                                        uint32_t uHostPCIAddress, uint32_t uGuestPCIAddress,
+                                                        int rc)
+{
+    PDRVMAINPCIRAWDEV pThis = RT_FROM_CPP_MEMBER(pInterface, DRVMAINPCIRAWDEV, IConnector);
+    Console *pConsole = pThis->pPCIRawDev->getParent();
+    const ComPtr<IMachine>& machine = pConsole->machine();
+    ComPtr<IVirtualBox> vbox;
+
+    HRESULT hrc = machine->COMGETTER(Parent)(vbox.asOutParam());
+    Assert(SUCCEEDED(hrc));
+
+    ComPtr<IEventSource> es;
+    hrc = vbox->COMGETTER(EventSource)(es.asOutParam());
+    Assert(SUCCEEDED(hrc));
+
+    Bstr bstrId;
+    hrc = machine->COMGETTER(Id)(bstrId.asOutParam());
+    Assert(SUCCEEDED(hrc));
+
+    ComObjPtr<PCIDeviceAttachment> pda;
+    BstrFmt bstrName(pcszName);
+    pda.createObject();
+    pda->init(machine, bstrName, uHostPCIAddress, uGuestPCIAddress, TRUE);
+
+    Bstr msg("");
+    if (RT_FAILURE(rc))
+        msg = BstrFmt("runtime error %Rrc", rc);
+
+    fireHostPCIDevicePlugEvent(es, bstrId.raw(), true /* plugged */, RT_SUCCESS(rc) /* success */, pda, msg.raw());
+
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Destruct a PCI raw driver instance.
+ *
+ * @returns VBox status.
+ * @param   pDrvIns     The driver instance data.
+ */
+DECLCALLBACK(void) PCIRawDev::drvDestruct(PPDMDRVINS pDrvIns)
+{
+    PDRVMAINPCIRAWDEV pData = PDMINS_2_DATA(pDrvIns, PDRVMAINPCIRAWDEV);
+    PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
+
+    if (pData->pPCIRawDev)
+        pData->pPCIRawDev->mpDrv = NULL;
+}
+
+
+/**
+ * Reset notification.
+ *
+ * @returns VBox status.
+ * @param   pDrvIns     The driver instance data.
+ */
+DECLCALLBACK(void) PCIRawDev::drvReset(PPDMDRVINS pDrvIns)
+{
+}
+
+
+/**
+ * Construct a raw PCI driver instance.
+ *
+ * @copydoc FNPDMDRVCONSTRUCT
+ */
+DECLCALLBACK(int) PCIRawDev::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
+{
+    PDRVMAINPCIRAWDEV pData = PDMINS_2_DATA(pDrvIns, PDRVMAINPCIRAWDEV);
+    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
+
+    /*
+     * Validate configuration.
+     */
+    if (!CFGMR3AreValuesValid(pCfgHandle, "Object\0"))
+        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
+
+    AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER,
+                    ("Configuration error: Not possible to attach anything to this driver!\n"),
+                    VERR_PDM_DRVINS_NO_ATTACH);
+
+    /*
+     * IBase.
+     */
+    pDrvIns->IBase.pfnQueryInterface = PCIRawDev::drvQueryInterface;
+
+    /*
+     * IConnector.
+     */
+    pData->IConnector.pfnDeviceConstructComplete = PCIRawDev::drvDeviceConstructComplete;
+
+    /*
+     * Get the object pointer and update the mpDrv member.
+     */
+    void *pv;
+    int rc = CFGMR3QueryPtr(pCfgHandle, "Object", &pv);
+    if (RT_FAILURE(rc))
+    {
+        AssertMsgFailed(("Configuration error: No \"Object\" value! rc=%Rrc\n", rc));
+        return rc;
+    }
+
+    pData->pPCIRawDev = (PCIRawDev *)pv;
+    pData->pPCIRawDev->mpDrv = pData;
+
+    return VINF_SUCCESS;
+}
+
+/**
+ * Main raw PCI driver registration record.
+ */
+const PDMDRVREG PCIRawDev::DrvReg =
+{
+    /* u32Version */
+    PDM_DRVREG_VERSION,
+    /* szName */
+    "MainPciRaw",
+    /* szRCMod */
+    "",
+    /* szR0Mod */
+    "",
+    /* pszDescription */
+    "Main PCI raw driver (Main as in the API).",
+    /* fFlags */
+    PDM_DRVREG_FLAGS_HOST_BITS_DEFAULT,
+    /* fClass. */
+    PDM_DRVREG_CLASS_PCIRAW,
+    /* cMaxInstances */
+    ~0U,
+    /* cbInstance */
+    sizeof(DRVMAINPCIRAWDEV),
+    /* pfnConstruct */
+    PCIRawDev::drvConstruct,
+    /* pfnDestruct */
+    PCIRawDev::drvDestruct,
+    /* pfnRelocate */
+    NULL,
+    /* pfnIOCtl */
+    NULL,
+    /* pfnPowerOn */
+    NULL,
+    /* pfnReset */
+    PCIRawDev::drvReset,
+    /* pfnSuspend */
+    NULL,
+    /* pfnResume */
+    NULL,
+    /* pfnAttach */
+    NULL,
+    /* pfnDetach */
+    NULL,
+    /* pfnPowerOff */
+    NULL,
+    /* pfnSoftReset */
+    NULL,
+    /* u32EndVersion */
+    PDM_DRVREG_VERSION
+};
Index: trunk/src/VBox/Main/src-client/PciRawDevImpl.cpp
===================================================================
--- trunk/src/VBox/Main/src-client/PciRawDevImpl.cpp	(revision 42550)
+++ 	(revision )
@@ -1,229 +1,0 @@
-/* $Id$ */
-/** @file
- * VirtualBox Driver Interface to raw PCI device.
- */
-
-/*
- * Copyright (C) 2010-2011 Oracle Corporation
- *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- */
-#include "Logging.h"
-#include "PciRawDevImpl.h"
-#include "PciDeviceAttachmentImpl.h"
-#include "ConsoleImpl.h"
-#include "MachineImpl.h"
-
-// generated header for events
-#include "VBoxEvents.h"
-
-/**
- * PCI raw driver instance data.
- */
-typedef struct DRVMAINPCIRAWDEV
-{
-    /** Pointer to the real PCI raw object. */
-    PciRawDev                   *pPciRawDev;
-    /** Pointer to the driver instance structure. */
-    PPDMDRVINS                  pDrvIns;
-    /** Our PCI device connector interface. */
-    PDMIPCIRAWCONNECTOR         IConnector;
-
-} DRVMAINPCIRAWDEV, *PDRVMAINPCIRAWDEV;
-
-//
-// constructor / destructor
-//
-PciRawDev::PciRawDev(Console *console)
-  : mpDrv(NULL),
-    mParent(console)
-{
-}
-
-PciRawDev::~PciRawDev()
-{
-}
-
-/**
- * @interface_method_impl{PDMIBASE,pfnQueryInterface}
- */
-DECLCALLBACK(void *) PciRawDev::drvQueryInterface(PPDMIBASE pInterface, const char *pszIID)
-{
-    PPDMDRVINS         pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
-    PDRVMAINPCIRAWDEV  pThis   = PDMINS_2_DATA(pDrvIns, PDRVMAINPCIRAWDEV);
-
-    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE,            &pDrvIns->IBase);
-    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIPCIRAWCONNECTOR, &pThis->IConnector);
-
-    return NULL;
-}
-
-
-/**
- * @interface_method_impl{PDMIPCIRAWUP,pfnPciDeviceConstructComplete}
- */
-DECLCALLBACK(int) PciRawDev::drvDeviceConstructComplete(PPDMIPCIRAWCONNECTOR pInterface, const char *pcszName,
-                                                        uint32_t uHostPciAddress, uint32_t uGuestPciAddress,
-                                                        int rc)
-{
-    PDRVMAINPCIRAWDEV pThis = RT_FROM_CPP_MEMBER(pInterface, DRVMAINPCIRAWDEV, IConnector);
-    Console *pConsole = pThis->pPciRawDev->getParent();
-    const ComPtr<IMachine>& machine = pConsole->machine();
-    ComPtr<IVirtualBox> vbox;
-
-    HRESULT hrc = machine->COMGETTER(Parent)(vbox.asOutParam());
-    Assert(SUCCEEDED(hrc));
-
-    ComPtr<IEventSource> es;
-    hrc = vbox->COMGETTER(EventSource)(es.asOutParam());
-    Assert(SUCCEEDED(hrc));
-
-    Bstr bstrId;
-    hrc = machine->COMGETTER(Id)(bstrId.asOutParam());
-    Assert(SUCCEEDED(hrc));
-
-    ComObjPtr<PciDeviceAttachment> pda;
-    BstrFmt bstrName(pcszName);
-    pda.createObject();
-    pda->init(machine, bstrName, uHostPciAddress, uGuestPciAddress, TRUE);
-
-    Bstr msg("");
-    if (RT_FAILURE(rc))
-        msg = BstrFmt("runtime error %Rrc", rc);
-
-    fireHostPciDevicePlugEvent(es, bstrId.raw(), true /* plugged */, RT_SUCCESS(rc) /* success */, pda, msg.raw());
-
-    return VINF_SUCCESS;
-}
-
-
-/**
- * Destruct a PCI raw driver instance.
- *
- * @returns VBox status.
- * @param   pDrvIns     The driver instance data.
- */
-DECLCALLBACK(void) PciRawDev::drvDestruct(PPDMDRVINS pDrvIns)
-{
-    PDRVMAINPCIRAWDEV pData = PDMINS_2_DATA(pDrvIns, PDRVMAINPCIRAWDEV);
-    PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
-
-    if (pData->pPciRawDev)
-        pData->pPciRawDev->mpDrv = NULL;
-}
-
-
-/**
- * Reset notification.
- *
- * @returns VBox status.
- * @param   pDrvIns     The driver instance data.
- */
-DECLCALLBACK(void) PciRawDev::drvReset(PPDMDRVINS pDrvIns)
-{
-}
-
-
-/**
- * Construct a raw PCI driver instance.
- *
- * @copydoc FNPDMDRVCONSTRUCT
- */
-DECLCALLBACK(int) PciRawDev::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
-{
-    PDRVMAINPCIRAWDEV pData = PDMINS_2_DATA(pDrvIns, PDRVMAINPCIRAWDEV);
-    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
-
-    /*
-     * Validate configuration.
-     */
-    if (!CFGMR3AreValuesValid(pCfgHandle, "Object\0"))
-        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
-
-    AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER,
-                    ("Configuration error: Not possible to attach anything to this driver!\n"),
-                    VERR_PDM_DRVINS_NO_ATTACH);
-
-    /*
-     * IBase.
-     */
-    pDrvIns->IBase.pfnQueryInterface = PciRawDev::drvQueryInterface;
-
-    /*
-     * IConnector.
-     */
-    pData->IConnector.pfnDeviceConstructComplete = PciRawDev::drvDeviceConstructComplete;
-
-    /*
-     * Get the object pointer and update the mpDrv member.
-     */
-    void *pv;
-    int rc = CFGMR3QueryPtr(pCfgHandle, "Object", &pv);
-    if (RT_FAILURE(rc))
-    {
-        AssertMsgFailed(("Configuration error: No \"Object\" value! rc=%Rrc\n", rc));
-        return rc;
-    }
-
-    pData->pPciRawDev = (PciRawDev*)pv;
-    pData->pPciRawDev->mpDrv = pData;
-
-    return VINF_SUCCESS;
-}
-
-/**
- * Main raw PCI driver registration record.
- */
-const PDMDRVREG PciRawDev::DrvReg =
-{
-    /* u32Version */
-    PDM_DRVREG_VERSION,
-    /* szName */
-    "MainPciRaw",
-    /* szRCMod */
-    "",
-    /* szR0Mod */
-    "",
-    /* pszDescription */
-    "Main PCI raw driver (Main as in the API).",
-    /* fFlags */
-    PDM_DRVREG_FLAGS_HOST_BITS_DEFAULT,
-    /* fClass. */
-    PDM_DRVREG_CLASS_PCIRAW,
-    /* cMaxInstances */
-    ~0U,
-    /* cbInstance */
-    sizeof(DRVMAINPCIRAWDEV),
-    /* pfnConstruct */
-    PciRawDev::drvConstruct,
-    /* pfnDestruct */
-    PciRawDev::drvDestruct,
-    /* pfnRelocate */
-    NULL,
-    /* pfnIOCtl */
-    NULL,
-    /* pfnPowerOn */
-    NULL,
-    /* pfnReset */
-    PciRawDev::drvReset,
-    /* pfnSuspend */
-    NULL,
-    /* pfnResume */
-    NULL,
-    /* pfnAttach */
-    NULL,
-    /* pfnDetach */
-    NULL,
-    /* pfnPowerOff */
-    NULL,
-    /* pfnSoftReset */
-    NULL,
-    /* u32EndVersion */
-    PDM_DRVREG_VERSION
-};
Index: trunk/src/VBox/Main/src-client/VBoxDriversRegister.cpp
===================================================================
--- trunk/src/VBox/Main/src-client/VBoxDriversRegister.cpp	(revision 42550)
+++ trunk/src/VBox/Main/src-client/VBoxDriversRegister.cpp	(revision 42551)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -33,5 +33,5 @@
 #include "ConsoleImpl.h"
 #ifdef VBOX_WITH_PCI_PASSTHROUGH
-# include "PciRawDevImpl.h"
+# include "PCIRawDevImpl.h"
 #endif
 
@@ -90,5 +90,5 @@
 
 #ifdef VBOX_WITH_PCI_PASSTHROUGH
-    rc = pCallbacks->pfnRegister(pCallbacks, &PciRawDev::DrvReg);
+    rc = pCallbacks->pfnRegister(pCallbacks, &PCIRawDev::DrvReg);
     if (RT_FAILURE(rc))
         return rc;
Index: trunk/src/VBox/Main/src-server/BandwidthControlImpl.cpp
===================================================================
--- trunk/src/VBox/Main/src-server/BandwidthControlImpl.cpp	(revision 42550)
+++ trunk/src/VBox/Main/src-server/BandwidthControlImpl.cpp	(revision 42551)
@@ -529,5 +529,5 @@
 }
 
-HRESULT BandwidthControl::loadSettings(const settings::IoSettings &data)
+HRESULT BandwidthControl::loadSettings(const settings::IOSettings &data)
 {
     HRESULT rc = S_OK;
@@ -548,5 +548,5 @@
 }
 
-HRESULT BandwidthControl::saveSettings(settings::IoSettings &data)
+HRESULT BandwidthControl::saveSettings(settings::IOSettings &data)
 {
     AutoCaller autoCaller(this);
Index: trunk/src/VBox/Main/src-server/GuestOSTypeImpl.cpp
===================================================================
--- trunk/src/VBox/Main/src-server/GuestOSTypeImpl.cpp	(revision 42550)
+++ trunk/src/VBox/Main/src-server/GuestOSTypeImpl.cpp	(revision 42551)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -31,8 +31,8 @@
     , mNetworkAdapterType(NetworkAdapterType_Am79C973)
     , mNumSerialEnabled(0)
-    , mDvdStorageControllerType(StorageControllerType_PIIX3)
-    , mDvdStorageBusType(StorageBus_IDE)
-    , mHdStorageControllerType(StorageControllerType_PIIX3)
-    , mHdStorageBusType(StorageBus_IDE)
+    , mDVDStorageControllerType(StorageControllerType_PIIX3)
+    , mDVDStorageBusType(StorageBus_IDE)
+    , mHDStorageControllerType(StorageControllerType_PIIX3)
+    , mHDStorageBusType(StorageBus_IDE)
     , mChipsetType(ChipsetType_PIIX3)
     , mAudioControllerType(AudioControllerType_AC97)
@@ -79,8 +79,8 @@
                           NetworkAdapterType_T aNetworkAdapterType,
                           uint32_t aNumSerialEnabled,
-                          StorageControllerType_T aDvdStorageControllerType,
-                          StorageBus_T aDvdStorageBusType,
-                          StorageControllerType_T aHdStorageControllerType,
-                          StorageBus_T aHdStorageBusType,
+                          StorageControllerType_T aDVDStorageControllerType,
+                          StorageBus_T aDVDStorageBusType,
+                          StorageControllerType_T aHDStorageControllerType,
+                          StorageBus_T aHDStorageBusType,
                           ChipsetType_T aChipsetType
                           AudioControllerType_T aAudioControllerType*/
@@ -119,8 +119,8 @@
     unconst(mNetworkAdapterType)        = ostype.networkAdapterType;
     unconst(mNumSerialEnabled)          = ostype.numSerialEnabled;
-    unconst(mDvdStorageControllerType)  = ostype.dvdStorageControllerType;
-    unconst(mDvdStorageBusType)         = ostype.dvdStorageBusType;
-    unconst(mHdStorageControllerType)   = ostype.hdStorageControllerType;
-    unconst(mHdStorageBusType)          = ostype.hdStorageBusType;
+    unconst(mDVDStorageControllerType)  = ostype.dvdStorageControllerType;
+    unconst(mDVDStorageBusType)         = ostype.dvdStorageBusType;
+    unconst(mHDStorageControllerType)   = ostype.hdStorageControllerType;
+    unconst(mHDStorageBusType)          = ostype.hdStorageBusType;
     unconst(mChipsetType)               = ostype.chipsetType;
     unconst(mAudioControllerType)       = ostype.audioControllerType;
@@ -316,7 +316,7 @@
 }
 
-STDMETHODIMP GuestOSType::COMGETTER(RecommendedPae)(BOOL *aRecommendedPae)
-{
-    CheckComArgOutPointerValid(aRecommendedPae);
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedPAE)(BOOL *aRecommendedPAE)
+{
+    CheckComArgOutPointerValid(aRecommendedPAE);
 
     AutoCaller autoCaller(this);
@@ -324,5 +324,5 @@
 
     /* recommended PAE is constant during life time, no need to lock */
-    *aRecommendedPae = !!(mOSHint & VBOXOSHINT_PAE);
+    *aRecommendedPAE = !!(mOSHint & VBOXOSHINT_PAE);
 
     return S_OK;
@@ -345,5 +345,5 @@
 }
 
-STDMETHODIMP GuestOSType::COMGETTER(RecommendedDvdStorageController)(StorageControllerType_T * aStorageControllerType)
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedDVDStorageController)(StorageControllerType_T * aStorageControllerType)
 {
     CheckComArgOutPointerValid(aStorageControllerType);
@@ -353,10 +353,10 @@
 
     /* storage controller type is constant during life time, no need to lock */
-    *aStorageControllerType = mDvdStorageControllerType;
-
-    return S_OK;
-}
-
-STDMETHODIMP GuestOSType::COMGETTER(RecommendedDvdStorageBus)(StorageBus_T * aStorageBusType)
+    *aStorageControllerType = mDVDStorageControllerType;
+
+    return S_OK;
+}
+
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedDVDStorageBus)(StorageBus_T * aStorageBusType)
 {
     CheckComArgOutPointerValid(aStorageBusType);
@@ -366,10 +366,10 @@
 
     /* storage controller type is constant during life time, no need to lock */
-    *aStorageBusType = mDvdStorageBusType;
-
-    return S_OK;
-}
-
-STDMETHODIMP GuestOSType::COMGETTER(RecommendedHdStorageController)(StorageControllerType_T * aStorageControllerType)
+    *aStorageBusType = mDVDStorageBusType;
+
+    return S_OK;
+}
+
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedHDStorageController)(StorageControllerType_T * aStorageControllerType)
 {
     CheckComArgOutPointerValid(aStorageControllerType);
@@ -379,10 +379,10 @@
 
     /* storage controller type is constant during life time, no need to lock */
-    *aStorageControllerType = mHdStorageControllerType;
-
-    return S_OK;
-}
-
-STDMETHODIMP GuestOSType::COMGETTER(RecommendedHdStorageBus)(StorageBus_T * aStorageBusType)
+    *aStorageControllerType = mHDStorageControllerType;
+
+    return S_OK;
+}
+
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedHDStorageBus)(StorageBus_T * aStorageBusType)
 {
     CheckComArgOutPointerValid(aStorageBusType);
@@ -392,12 +392,12 @@
 
     /* storage controller type is constant during life time, no need to lock */
-    *aStorageBusType = mHdStorageBusType;
-
-    return S_OK;
-}
-
-STDMETHODIMP GuestOSType::COMGETTER(RecommendedUsbHid)(BOOL *aRecommendedUsbHid)
-{
-    CheckComArgOutPointerValid(aRecommendedUsbHid);
+    *aStorageBusType = mHDStorageBusType;
+
+    return S_OK;
+}
+
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedUSBHID)(BOOL *aRecommendedUSBHID)
+{
+    CheckComArgOutPointerValid(aRecommendedUSBHID);
 
     AutoCaller autoCaller(this);
@@ -405,12 +405,12 @@
 
     /* HID type is constant during life time, no need to lock */
-    *aRecommendedUsbHid = !!(mOSHint & VBOXOSHINT_USBHID);
-
-    return S_OK;
-}
-
-STDMETHODIMP GuestOSType::COMGETTER(RecommendedHpet)(BOOL *aRecommendedHpet)
-{
-    CheckComArgOutPointerValid(aRecommendedHpet);
+    *aRecommendedUSBHID = !!(mOSHint & VBOXOSHINT_USBHID);
+
+    return S_OK;
+}
+
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedHPET)(BOOL *aRecommendedHPET)
+{
+    CheckComArgOutPointerValid(aRecommendedHPET);
 
     AutoCaller autoCaller(this);
@@ -418,12 +418,12 @@
 
     /* HPET recommendation is constant during life time, no need to lock */
-    *aRecommendedHpet = !!(mOSHint & VBOXOSHINT_HPET);
-
-    return S_OK;
-}
-
-STDMETHODIMP GuestOSType::COMGETTER(RecommendedUsbTablet)(BOOL *aRecommendedUsbTablet)
-{
-    CheckComArgOutPointerValid(aRecommendedUsbTablet);
+    *aRecommendedHPET = !!(mOSHint & VBOXOSHINT_HPET);
+
+    return S_OK;
+}
+
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedUSBTablet)(BOOL *aRecommendedUSBTablet)
+{
+    CheckComArgOutPointerValid(aRecommendedUSBTablet);
 
     AutoCaller autoCaller(this);
@@ -431,12 +431,12 @@
 
     /* HID type is constant during life time, no need to lock */
-    *aRecommendedUsbTablet = !!(mOSHint & VBOXOSHINT_USBTABLET);
-
-    return S_OK;
-}
-
-STDMETHODIMP GuestOSType::COMGETTER(RecommendedRtcUseUtc)(BOOL *aRecommendedRtcUseUtc)
-{
-    CheckComArgOutPointerValid(aRecommendedRtcUseUtc);
+    *aRecommendedUSBTablet = !!(mOSHint & VBOXOSHINT_USBTABLET);
+
+    return S_OK;
+}
+
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedRTCUseUTC)(BOOL *aRecommendedRTCUseUTC)
+{
+    CheckComArgOutPointerValid(aRecommendedRTCUseUTC);
 
     AutoCaller autoCaller(this);
@@ -444,5 +444,5 @@
 
     /* Value is constant during life time, no need to lock */
-    *aRecommendedRtcUseUtc = !!(mOSHint & VBOXOSHINT_RTCUTC);
+    *aRecommendedRTCUseUTC = !!(mOSHint & VBOXOSHINT_RTCUTC);
 
     return S_OK;
@@ -487,7 +487,7 @@
 }
 
-STDMETHODIMP GuestOSType::COMGETTER(RecommendedUsb)(BOOL *aRecommendedUsb)
-{
-    CheckComArgOutPointerValid(aRecommendedUsb);
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedUSB)(BOOL *aRecommendedUSB)
+{
+    CheckComArgOutPointerValid(aRecommendedUSB);
 
     AutoCaller autoCaller(this);
@@ -495,5 +495,5 @@
 
     /* Value is constant during life time, no need to lock */
-    *aRecommendedUsb = !(mOSHint & VBOXOSHINT_NOUSB);
+    *aRecommendedUSB = !(mOSHint & VBOXOSHINT_NOUSB);
 
     return S_OK;
Index: trunk/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp
===================================================================
--- trunk/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp	(revision 42550)
+++ trunk/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp	(revision 42551)
@@ -7,5 +7,5 @@
 
 /*
- * Copyright (C) 2006-2008 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -48,5 +48,5 @@
 void HostNetworkInterface::FinalRelease()
 {
-    uninit ();
+    uninit();
     BaseFinalRelease();
 }
@@ -87,5 +87,5 @@
 #ifdef VBOX_WITH_HOSTNETIF_API
 
-HRESULT HostNetworkInterface::updateConfig ()
+HRESULT HostNetworkInterface::updateConfig()
 {
     NETIFINFO info;
@@ -123,5 +123,5 @@
  * @param   aGuid GUID of the host network interface
  */
-HRESULT HostNetworkInterface::init (Bstr aInterfaceName, HostNetworkInterfaceType_T ifType, PNETIFINFO pIf)
+HRESULT HostNetworkInterface::init(Bstr aInterfaceName, HostNetworkInterfaceType_T ifType, PNETIFINFO pIf)
 {
 //    LogFlowThisFunc(("aInterfaceName={%ls}, aGuid={%s}\n",
@@ -140,5 +140,5 @@
     if (pIf->szShortName[0])
         unconst(mNetworkName) = composeNetworkName(pIf->szShortName);
-    else 
+    else
         unconst(mNetworkName) = composeNetworkName(aInterfaceName);
     mIfType = ifType;
@@ -174,5 +174,5 @@
  * @param   aInterfaceName address of result pointer
  */
-STDMETHODIMP HostNetworkInterface::COMGETTER(Name) (BSTR *aInterfaceName)
+STDMETHODIMP HostNetworkInterface::COMGETTER(Name)(BSTR *aInterfaceName)
 {
     CheckComArgOutPointerValid(aInterfaceName);
@@ -192,5 +192,5 @@
  * @param   aGuid address of result pointer
  */
-STDMETHODIMP HostNetworkInterface::COMGETTER(Id) (BSTR *aGuid)
+STDMETHODIMP HostNetworkInterface::COMGETTER(Id)(BSTR *aGuid)
 {
     CheckComArgOutPointerValid(aGuid);
@@ -204,12 +204,12 @@
 }
 
-STDMETHODIMP HostNetworkInterface::COMGETTER(DhcpEnabled) (BOOL *aDhcpEnabled)
-{
-    CheckComArgOutPointerValid(aDhcpEnabled);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    *aDhcpEnabled = m.dhcpEnabled;
+STDMETHODIMP HostNetworkInterface::COMGETTER(DHCPEnabled)(BOOL *aDHCPEnabled)
+{
+    CheckComArgOutPointerValid(aDHCPEnabled);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    *aDHCPEnabled = m.dhcpEnabled;
 
     return S_OK;
@@ -223,5 +223,5 @@
  * @param   aIPAddress address of result pointer
  */
-STDMETHODIMP HostNetworkInterface::COMGETTER(IPAddress) (BSTR *aIPAddress)
+STDMETHODIMP HostNetworkInterface::COMGETTER(IPAddress)(BSTR *aIPAddress)
 {
     CheckComArgOutPointerValid(aIPAddress);
@@ -252,5 +252,5 @@
  * @param   aNetworkMask address of result pointer
  */
-STDMETHODIMP HostNetworkInterface::COMGETTER(NetworkMask) (BSTR *aNetworkMask)
+STDMETHODIMP HostNetworkInterface::COMGETTER(NetworkMask)(BSTR *aNetworkMask)
 {
     CheckComArgOutPointerValid(aNetworkMask);
@@ -275,5 +275,5 @@
 }
 
-STDMETHODIMP HostNetworkInterface::COMGETTER(IPV6Supported) (BOOL *aIPV6Supported)
+STDMETHODIMP HostNetworkInterface::COMGETTER(IPV6Supported)(BOOL *aIPV6Supported)
 {
     CheckComArgOutPointerValid(aIPV6Supported);
@@ -293,5 +293,5 @@
  * @param   aIPV6Address address of result pointer
  */
-STDMETHODIMP HostNetworkInterface::COMGETTER(IPV6Address) (BSTR *aIPV6Address)
+STDMETHODIMP HostNetworkInterface::COMGETTER(IPV6Address)(BSTR *aIPV6Address)
 {
     CheckComArgOutPointerValid(aIPV6Address);
@@ -311,5 +311,5 @@
  * @param   aIPV6Mask address of result pointer
  */
-STDMETHODIMP HostNetworkInterface::COMGETTER(IPV6NetworkMaskPrefixLength) (ULONG *aIPV6NetworkMaskPrefixLength)
+STDMETHODIMP HostNetworkInterface::COMGETTER(IPV6NetworkMaskPrefixLength)(ULONG *aIPV6NetworkMaskPrefixLength)
 {
     CheckComArgOutPointerValid(aIPV6NetworkMaskPrefixLength);
@@ -329,5 +329,5 @@
  * @param   aHardwareAddress address of result pointer
  */
-STDMETHODIMP HostNetworkInterface::COMGETTER(HardwareAddress) (BSTR *aHardwareAddress)
+STDMETHODIMP HostNetworkInterface::COMGETTER(HardwareAddress)(BSTR *aHardwareAddress)
 {
     CheckComArgOutPointerValid(aHardwareAddress);
@@ -347,5 +347,5 @@
  * @param   aType address of result pointer
  */
-STDMETHODIMP HostNetworkInterface::COMGETTER(MediumType) (HostNetworkInterfaceMediumType_T *aType)
+STDMETHODIMP HostNetworkInterface::COMGETTER(MediumType)(HostNetworkInterfaceMediumType_T *aType)
 {
     CheckComArgOutPointerValid(aType);
@@ -365,5 +365,5 @@
  * @param   aStatus address of result pointer
  */
-STDMETHODIMP HostNetworkInterface::COMGETTER(Status) (HostNetworkInterfaceStatus_T *aStatus)
+STDMETHODIMP HostNetworkInterface::COMGETTER(Status)(HostNetworkInterfaceStatus_T *aStatus)
 {
     CheckComArgOutPointerValid(aStatus);
@@ -383,5 +383,5 @@
  * @param   aType address of result pointer
  */
-STDMETHODIMP HostNetworkInterface::COMGETTER(InterfaceType) (HostNetworkInterfaceType_T *aType)
+STDMETHODIMP HostNetworkInterface::COMGETTER(InterfaceType)(HostNetworkInterfaceType_T *aType)
 {
     CheckComArgOutPointerValid(aType);
@@ -396,5 +396,5 @@
 }
 
-STDMETHODIMP HostNetworkInterface::COMGETTER(NetworkName) (BSTR *aNetworkName)
+STDMETHODIMP HostNetworkInterface::COMGETTER(NetworkName)(BSTR *aNetworkName)
 {
     CheckComArgOutPointerValid(aNetworkName);
@@ -408,5 +408,5 @@
 }
 
-STDMETHODIMP HostNetworkInterface::EnableStaticIpConfig (IN_BSTR aIPAddress, IN_BSTR aNetMask)
+STDMETHODIMP HostNetworkInterface::EnableStaticIPConfig(IN_BSTR aIPAddress, IN_BSTR aNetMask)
 {
 #ifndef VBOX_WITH_HOSTNETIF_API
@@ -452,5 +452,5 @@
                 m.realIPAddress   = ip;
                 m.realNetworkMask = mask;
-                if (FAILED(mVBox->SetExtraData(BstrFmt("HostOnly/%ls/IPAddress", mInterfaceName.raw()).raw(), 
+                if (FAILED(mVBox->SetExtraData(BstrFmt("HostOnly/%ls/IPAddress", mInterfaceName.raw()).raw(),
                                                        Bstr(aIPAddress).raw())))
                     return E_FAIL;
@@ -472,5 +472,5 @@
 }
 
-STDMETHODIMP HostNetworkInterface::EnableStaticIpConfigV6 (IN_BSTR aIPV6Address, ULONG aIPV6MaskPrefixLength)
+STDMETHODIMP HostNetworkInterface::EnableStaticIPConfigV6(IN_BSTR aIPV6Address, ULONG aIPV6MaskPrefixLength)
 {
 #ifndef VBOX_WITH_HOSTNETIF_API
@@ -513,5 +513,5 @@
 }
 
-STDMETHODIMP HostNetworkInterface::EnableDynamicIpConfig ()
+STDMETHODIMP HostNetworkInterface::EnableDynamicIPConfig()
 {
 #ifndef VBOX_WITH_HOSTNETIF_API
@@ -531,5 +531,5 @@
 }
 
-STDMETHODIMP HostNetworkInterface::DhcpRediscover ()
+STDMETHODIMP HostNetworkInterface::DHCPRediscover()
 {
 #ifndef VBOX_WITH_HOSTNETIF_API
Index: trunk/src/VBox/Main/src-server/MachineImpl.cpp
===================================================================
--- trunk/src/VBox/Main/src-server/MachineImpl.cpp	(revision 42550)
+++ trunk/src/VBox/Main/src-server/MachineImpl.cpp	(revision 42551)
@@ -131,5 +131,5 @@
     mGuestPropertiesModified   = FALSE;
 
-    mSession.mPid              = NIL_RTPROCESS;
+    mSession.mPID              = NIL_RTPROCESS;
     mSession.mState            = SessionState_Unlocked;
 }
@@ -187,5 +187,5 @@
 #endif
     mSyntheticCpu = false;
-    mHpetEnabled = false;
+    mHPETEnabled = false;
 
     /* default boot order: floppy - DVD - HDD */
@@ -201,6 +201,6 @@
 
     mFirmwareType = FirmwareType_BIOS;
-    mKeyboardHidType = KeyboardHidType_PS2Keyboard;
-    mPointingHidType = PointingHidType_PS2Mouse;
+    mKeyboardHIDType = KeyboardHIDType_PS2Keyboard;
+    mPointingHIDType = PointingHIDType_PS2Mouse;
     mChipsetType = ChipsetType_PIIX3;
     mEmulatedUSBCardReaderEnabled = FALSE;
@@ -209,6 +209,6 @@
         mCPUAttached[i] = false;
 
-    mIoCacheEnabled = true;
-    mIoCacheSize    = 5; /* 5MB */
+    mIOCacheEnabled = true;
+    mIOCacheSize    = 5; /* 5MB */
 
     /* Maximum CPU execution cap by default. */
@@ -1176,7 +1176,7 @@
 }
 
-STDMETHODIMP Machine::COMGETTER(KeyboardHidType)(KeyboardHidType_T *aKeyboardHidType)
-{
-    CheckComArgOutPointerValid(aKeyboardHidType);
+STDMETHODIMP Machine::COMGETTER(KeyboardHIDType)(KeyboardHIDType_T *aKeyboardHIDType)
+{
+    CheckComArgOutPointerValid(aKeyboardHIDType);
 
     AutoCaller autoCaller(this);
@@ -1185,10 +1185,10 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    *aKeyboardHidType = mHWData->mKeyboardHidType;
-
-    return S_OK;
-}
-
-STDMETHODIMP Machine::COMSETTER(KeyboardHidType)(KeyboardHidType_T  aKeyboardHidType)
+    *aKeyboardHIDType = mHWData->mKeyboardHIDType;
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMSETTER(KeyboardHIDType)(KeyboardHIDType_T  aKeyboardHIDType)
 {
     AutoCaller autoCaller(this);
@@ -1201,12 +1201,12 @@
     setModified(IsModified_MachineData);
     mHWData.backup();
-    mHWData->mKeyboardHidType = aKeyboardHidType;
-
-    return S_OK;
-}
-
-STDMETHODIMP Machine::COMGETTER(PointingHidType)(PointingHidType_T *aPointingHidType)
-{
-    CheckComArgOutPointerValid(aPointingHidType);
+    mHWData->mKeyboardHIDType = aKeyboardHIDType;
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMGETTER(PointingHIDType)(PointingHIDType_T *aPointingHIDType)
+{
+    CheckComArgOutPointerValid(aPointingHIDType);
 
     AutoCaller autoCaller(this);
@@ -1215,10 +1215,10 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    *aPointingHidType = mHWData->mPointingHidType;
-
-    return S_OK;
-}
-
-STDMETHODIMP Machine::COMSETTER(PointingHidType)(PointingHidType_T  aPointingHidType)
+    *aPointingHIDType = mHWData->mPointingHIDType;
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMSETTER(PointingHIDType)(PointingHIDType_T  aPointingHIDType)
 {
     AutoCaller autoCaller(this);
@@ -1231,5 +1231,5 @@
     setModified(IsModified_MachineData);
     mHWData.backup();
-    mHWData->mPointingHidType = aPointingHidType;
+    mHWData->mPointingHIDType = aPointingHIDType;
 
     return S_OK;
@@ -1626,5 +1626,5 @@
 }
 
-STDMETHODIMP Machine::COMGETTER(HpetEnabled)(BOOL *enabled)
+STDMETHODIMP Machine::COMGETTER(HPETEnabled)(BOOL *enabled)
 {
     CheckComArgOutPointerValid(enabled);
@@ -1634,10 +1634,10 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    *enabled = mHWData->mHpetEnabled;
-
-    return S_OK;
-}
-
-STDMETHODIMP Machine::COMSETTER(HpetEnabled)(BOOL enabled)
+    *enabled = mHWData->mHPETEnabled;
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMSETTER(HPETEnabled)(BOOL enabled)
 {
     HRESULT rc = S_OK;
@@ -1653,5 +1653,5 @@
     mHWData.backup();
 
-    mHWData->mHpetEnabled = enabled;
+    mHWData->mHPETEnabled = enabled;
 
     return rc;
@@ -2439,7 +2439,7 @@
 }
 
-STDMETHODIMP Machine::COMGETTER(SessionPid)(ULONG *aSessionPid)
-{
-    CheckComArgOutPointerValid(aSessionPid);
+STDMETHODIMP Machine::COMGETTER(SessionPID)(ULONG *aSessionPID)
+{
+    CheckComArgOutPointerValid(aSessionPID);
 
     AutoCaller autoCaller(this);
@@ -2448,5 +2448,5 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    *aSessionPid = mData->mSession.mPid;
+    *aSessionPID = mData->mSession.mPID;
 
     return S_OK;
@@ -3063,5 +3063,5 @@
 }
 
-STDMETHODIMP Machine::COMGETTER(IoCacheEnabled)(BOOL *aEnabled)
+STDMETHODIMP Machine::COMGETTER(IOCacheEnabled)(BOOL *aEnabled)
 {
     CheckComArgOutPointerValid(aEnabled);
@@ -3072,10 +3072,10 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    *aEnabled = mHWData->mIoCacheEnabled;
-
-    return S_OK;
-}
-
-STDMETHODIMP Machine::COMSETTER(IoCacheEnabled)(BOOL aEnabled)
+    *aEnabled = mHWData->mIOCacheEnabled;
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMSETTER(IOCacheEnabled)(BOOL aEnabled)
 {
     AutoCaller autoCaller(this);
@@ -3089,12 +3089,12 @@
     setModified(IsModified_MachineData);
     mHWData.backup();
-    mHWData->mIoCacheEnabled = aEnabled;
-
-    return S_OK;
-}
-
-STDMETHODIMP Machine::COMGETTER(IoCacheSize)(ULONG *aIoCacheSize)
-{
-    CheckComArgOutPointerValid(aIoCacheSize);
+    mHWData->mIOCacheEnabled = aEnabled;
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMGETTER(IOCacheSize)(ULONG *aIOCacheSize)
+{
+    CheckComArgOutPointerValid(aIOCacheSize);
 
     AutoCaller autoCaller(this);
@@ -3103,10 +3103,10 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    *aIoCacheSize = mHWData->mIoCacheSize;
-
-    return S_OK;
-}
-
-STDMETHODIMP Machine::COMSETTER(IoCacheSize)(ULONG  aIoCacheSize)
+    *aIOCacheSize = mHWData->mIOCacheSize;
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMSETTER(IOCacheSize)(ULONG  aIOCacheSize)
 {
     AutoCaller autoCaller(this);
@@ -3120,5 +3120,5 @@
     setModified(IsModified_MachineData);
     mHWData.backup();
-    mHWData->mIoCacheSize = aIoCacheSize;
+    mHWData->mIOCacheSize = aIOCacheSize;
 
     return S_OK;
@@ -3263,12 +3263,12 @@
             // LaunchVMProcess()
 
-            LogFlowThisFunc(("mSession.mPid=%d(0x%x)\n", mData->mSession.mPid, mData->mSession.mPid));
+            LogFlowThisFunc(("mSession.mPID=%d(0x%x)\n", mData->mSession.mPID, mData->mSession.mPID));
             LogFlowThisFunc(("session.pid=%d(0x%x)\n", pid, pid));
 
-            if (mData->mSession.mPid != pid)
+            if (mData->mSession.mPID != pid)
                 return setError(E_ACCESSDENIED,
                                 tr("An unexpected process (PID=0x%08X) has tried to lock the "
                                    "machine '%s', while only the process started by LaunchVMProcess (PID=0x%08X) is allowed"),
-                                pid, mUserData->s.strName.c_str(), mData->mSession.mPid);
+                                pid, mUserData->s.strName.c_str(), mData->mSession.mPID);
         }
 
@@ -3368,5 +3368,5 @@
              *        around here.  */
 
-            /* We don't reset mSession.mPid here because it is necessary for
+            /* We don't reset mSession.mPID here because it is necessary for
              * SessionMachine::uninit() to reap the child process later. */
 
@@ -3392,5 +3392,5 @@
             /* memorize PID of the directly opened session */
             if (SUCCEEDED(rc))
-                mData->mSession.mPid = pid;
+                mData->mSession.mPID = pid;
         }
 
@@ -3535,6 +3535,6 @@
 
         /* forcibly terminate the VM process */
-        if (mData->mSession.mPid != NIL_RTPROCESS)
-            RTProcTerminate(mData->mSession.mPid);
+        if (mData->mSession.mPID != NIL_RTPROCESS)
+            RTProcTerminate(mData->mSession.mPID);
 
         /* signal the client watcher thread, as most likely the client has
@@ -6443,5 +6443,5 @@
  * just makes sure it's plugged on next VM start.
  */
-STDMETHODIMP Machine::AttachHostPciDevice(LONG hostAddress, LONG desiredGuestAddress, BOOL /*tryToUnbind*/)
+STDMETHODIMP Machine::AttachHostPCIDevice(LONG hostAddress, LONG desiredGuestAddress, BOOL /*tryToUnbind*/)
 {
     AutoCaller autoCaller(this);
@@ -6465,10 +6465,10 @@
 
         // check if device with this host PCI address already attached
-        for (HWData::PciDeviceAssignmentList::iterator it =  mHWData->mPciDeviceAssignments.begin();
-             it !=  mHWData->mPciDeviceAssignments.end();
+        for (HWData::PCIDeviceAssignmentList::iterator it =  mHWData->mPCIDeviceAssignments.begin();
+             it !=  mHWData->mPCIDeviceAssignments.end();
              ++it)
         {
             LONG iHostAddress = -1;
-            ComPtr<PciDeviceAttachment> pAttach;
+            ComPtr<PCIDeviceAttachment> pAttach;
             pAttach = *it;
             pAttach->COMGETTER(HostAddress)(&iHostAddress);
@@ -6478,5 +6478,5 @@
         }
 
-        ComObjPtr<PciDeviceAttachment> pda;
+        ComObjPtr<PCIDeviceAttachment> pda;
         char name[32];
 
@@ -6487,5 +6487,5 @@
         setModified(IsModified_MachineData);
         mHWData.backup();
-        mHWData->mPciDeviceAssignments.push_back(pda);
+        mHWData->mPCIDeviceAssignments.push_back(pda);
     }
 
@@ -6497,10 +6497,10 @@
  * just makes sure it's not plugged on next VM start.
  */
-STDMETHODIMP Machine::DetachHostPciDevice(LONG hostAddress)
-{
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    ComObjPtr<PciDeviceAttachment> pAttach;
+STDMETHODIMP Machine::DetachHostPCIDevice(LONG hostAddress)
+{
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    ComObjPtr<PCIDeviceAttachment> pAttach;
     bool fRemoved = false;
     HRESULT rc;
@@ -6513,6 +6513,6 @@
         if (FAILED(rc)) return rc;
 
-        for (HWData::PciDeviceAssignmentList::iterator it =  mHWData->mPciDeviceAssignments.begin();
-             it !=  mHWData->mPciDeviceAssignments.end();
+        for (HWData::PCIDeviceAssignmentList::iterator it =  mHWData->mPCIDeviceAssignments.begin();
+             it !=  mHWData->mPCIDeviceAssignments.end();
              ++it)
         {
@@ -6524,5 +6524,5 @@
                 setModified(IsModified_MachineData);
                 mHWData.backup();
-                mHWData->mPciDeviceAssignments.remove(pAttach);
+                mHWData->mPCIDeviceAssignments.remove(pAttach);
                 fRemoved = true;
                 break;
@@ -6542,5 +6542,5 @@
         rc = this->COMGETTER(Id)(mid.asOutParam());
         Assert(SUCCEEDED(rc));
-        fireHostPciDevicePlugEvent(es, mid.raw(), false /* unplugged */, true /* success */, pAttach, NULL);
+        fireHostPCIDevicePlugEvent(es, mid.raw(), false /* unplugged */, true /* success */, pAttach, NULL);
     }
 
@@ -6551,5 +6551,5 @@
 }
 
-STDMETHODIMP Machine::COMGETTER(PciDeviceAssignments)(ComSafeArrayOut(IPciDeviceAttachment *, aAssignments))
+STDMETHODIMP Machine::COMGETTER(PCIDeviceAssignments)(ComSafeArrayOut(IPCIDeviceAttachment *, aAssignments))
 {
     CheckComArgOutSafeArrayPointerValid(aAssignments);
@@ -6560,5 +6560,5 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    SafeIfaceArray<IPciDeviceAttachment> assignments(mHWData->mPciDeviceAssignments);
+    SafeIfaceArray<IPCIDeviceAttachment> assignments(mHWData->mPCIDeviceAssignments);
     assignments.detachTo(ComSafeArrayOutArg(aAssignments));
 
@@ -7298,8 +7298,8 @@
 
     /* attach launch data to the machine */
-    Assert(mData->mSession.mPid == NIL_RTPROCESS);
+    Assert(mData->mSession.mPID == NIL_RTPROCESS);
     mData->mSession.mRemoteControls.push_back(aControl);
     mData->mSession.mProgress = aProgress;
-    mData->mSession.mPid = pid;
+    mData->mSession.mPID = pid;
     mData->mSession.mState = SessionState_Spawning;
     mData->mSession.mType = strType;
@@ -7400,6 +7400,6 @@
         if (aPID != NULL)
         {
-            AssertReturn(mData->mSession.mPid != NIL_RTPROCESS, false);
-            *aPID = mData->mSession.mPid;
+            AssertReturn(mData->mSession.mPID != NIL_RTPROCESS, false);
+            *aPID = mData->mSession.mPID;
         }
 #endif
@@ -7456,9 +7456,9 @@
 
     /* PID not yet initialized, skip check. */
-    if (mData->mSession.mPid == NIL_RTPROCESS)
+    if (mData->mSession.mPID == NIL_RTPROCESS)
         return false;
 
     RTPROCSTATUS status;
-    int vrc = ::RTProcWait(mData->mSession.mPid, RTPROCWAIT_FLAGS_NOBLOCK,
+    int vrc = ::RTProcWait(mData->mSession.mPID, RTPROCWAIT_FLAGS_NOBLOCK,
                            &status);
 
@@ -7508,6 +7508,6 @@
         }
 
-        mParent->addProcessToReap(mData->mSession.mPid);
-        mData->mSession.mPid = NIL_RTPROCESS;
+        mParent->addProcessToReap(mData->mSession.mPID);
+        mData->mSession.mPID = NIL_RTPROCESS;
 
         mParent->onSessionStateChange(mData->mUuid, SessionState_Unlocked);
@@ -8420,9 +8420,9 @@
         mHWData->mAccelerate2DVideoEnabled = data.fAccelerate2DVideo;
         mHWData->mFirmwareType = data.firmwareType;
-        mHWData->mPointingHidType = data.pointingHidType;
-        mHWData->mKeyboardHidType = data.keyboardHidType;
+        mHWData->mPointingHIDType = data.pointingHIDType;
+        mHWData->mKeyboardHIDType = data.keyboardHIDType;
         mHWData->mChipsetType = data.chipsetType;
         mHWData->mEmulatedUSBCardReaderEnabled = data.fEmulatedUSBCardReader;
-        mHWData->mHpetEnabled = data.fHpetEnabled;
+        mHWData->mHPETEnabled = data.fHPETEnabled;
 
         /* VRDEServer */
@@ -8534,18 +8534,18 @@
 
         // IO settings
-        mHWData->mIoCacheEnabled = data.ioSettings.fIoCacheEnabled;
-        mHWData->mIoCacheSize = data.ioSettings.ulIoCacheSize;
+        mHWData->mIOCacheEnabled = data.ioSettings.fIOCacheEnabled;
+        mHWData->mIOCacheSize = data.ioSettings.ulIOCacheSize;
 
         // Host PCI devices
-        for (settings::HostPciDeviceAttachmentList::const_iterator it = data.pciAttachments.begin();
+        for (settings::HostPCIDeviceAttachmentList::const_iterator it = data.pciAttachments.begin();
              it != data.pciAttachments.end();
              ++it)
         {
-            const settings::HostPciDeviceAttachment &hpda = *it;
-            ComObjPtr<PciDeviceAttachment> pda;
+            const settings::HostPCIDeviceAttachment &hpda = *it;
+            ComObjPtr<PCIDeviceAttachment> pda;
 
             pda.createObject();
             pda->loadSettings(this, hpda);
-            mHWData->mPciDeviceAssignments.push_back(pda);
+            mHWData->mPCIDeviceAssignments.push_back(pda);
         }
 
@@ -9594,6 +9594,6 @@
 
         // HID
-        data.pointingHidType = mHWData->mPointingHidType;
-        data.keyboardHidType = mHWData->mKeyboardHidType;
+        data.pointingHIDType = mHWData->mPointingHIDType;
+        data.keyboardHIDType = mHWData->mKeyboardHIDType;
 
         // chipset
@@ -9603,5 +9603,5 @@
 
         // HPET
-        data.fHpetEnabled = !!mHWData->mHpetEnabled;
+        data.fHPETEnabled = !!mHWData->mHPETEnabled;
 
         // boot order
@@ -9710,6 +9710,6 @@
 
         // IO settings
-        data.ioSettings.fIoCacheEnabled = !!mHWData->mIoCacheEnabled;
-        data.ioSettings.ulIoCacheSize = mHWData->mIoCacheSize;
+        data.ioSettings.fIOCacheEnabled = !!mHWData->mIOCacheEnabled;
+        data.ioSettings.ulIOCacheSize = mHWData->mIOCacheSize;
 
         /* BandwidthControl (required) */
@@ -9718,10 +9718,10 @@
 
         /* Host PCI devices */
-        for (HWData::PciDeviceAssignmentList::const_iterator it = mHWData->mPciDeviceAssignments.begin();
-             it != mHWData->mPciDeviceAssignments.end();
+        for (HWData::PCIDeviceAssignmentList::const_iterator it = mHWData->mPCIDeviceAssignments.begin();
+             it != mHWData->mPCIDeviceAssignments.end();
              ++it)
         {
-            ComObjPtr<PciDeviceAttachment> pda = *it;
-            settings::HostPciDeviceAttachment hpda;
+            ComObjPtr<PCIDeviceAttachment> pda = *it;
+            settings::HostPCIDeviceAttachment hpda;
 
             rc = pda->saveSettings(hpda);
@@ -11709,9 +11709,9 @@
          * need to queue the PID to reap the process (and avoid zombies on
          * Linux). */
-        Assert(mData->mSession.mPid != NIL_RTPROCESS);
-        mParent->addProcessToReap(mData->mSession.mPid);
-    }
-
-    mData->mSession.mPid = NIL_RTPROCESS;
+        Assert(mData->mSession.mPID != NIL_RTPROCESS);
+        mParent->addProcessToReap(mData->mSession.mPID);
+    }
+
+    mData->mSession.mPID = NIL_RTPROCESS;
 
     if (aReason == Uninit::Unexpected)
@@ -11959,5 +11959,5 @@
          * object. Doing it earlier wouldn't be safe. */
         registerMetrics(mParent->performanceCollector(), mPeer,
-                        mData->mSession.mPid);
+                        mData->mSession.mPID);
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
     }
Index: trunk/src/VBox/Main/src-server/MediumImpl.cpp
===================================================================
--- trunk/src/VBox/Main/src-server/MediumImpl.cpp	(revision 42550)
+++ trunk/src/VBox/Main/src-server/MediumImpl.cpp	(revision 42551)
@@ -1947,5 +1947,5 @@
 }
 
-STDMETHODIMP Medium::SetIDs(BOOL aSetImageId,
+STDMETHODIMP Medium::SetIds(BOOL aSetImageId,
                             IN_BSTR aImageId,
                             BOOL aSetParentId,
Index: trunk/src/VBox/Main/src-server/NATEngineImpl.cpp
===================================================================
--- trunk/src/VBox/Main/src-server/NATEngineImpl.cpp	(revision 42550)
+++ trunk/src/VBox/Main/src-server/NATEngineImpl.cpp	(revision 42551)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -60,5 +60,5 @@
     Log(("init that:%p this:%p\n", aThat, this));
 
-    AutoCaller thatCaller (aThat);
+    AutoCaller thatCaller(aThat);
     AssertComRCReturnRC(thatCaller.rc());
 
@@ -79,5 +79,5 @@
 }
 
-HRESULT NATEngine::initCopy (Machine *aParent, INetworkAdapter *aAdapter, NATEngine *aThat)
+HRESULT NATEngine::initCopy(Machine *aParent, INetworkAdapter *aAdapter, NATEngine *aThat)
 {
     AutoInitSpan autoInitSpan(this);
@@ -86,5 +86,5 @@
     Log(("initCopy that:%p this:%p\n", aThat, this));
 
-    AutoCaller thatCaller (aThat);
+    AutoCaller thatCaller(aThat);
     AssertComRCReturnRC(thatCaller.rc());
 
@@ -133,5 +133,5 @@
 {
     AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), false);
+    AssertComRCReturn(autoCaller.rc(), false);
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -151,9 +151,9 @@
 {
     AutoCaller autoCaller(this);
-    AssertComRCReturnVoid (autoCaller.rc());
+    AssertComRCReturnVoid(autoCaller.rc());
 
     /* sanity too */
-    AutoCaller peerCaller (mPeer);
-    AssertComRCReturnVoid (peerCaller.rc());
+    AutoCaller peerCaller(mPeer);
+    AssertComRCReturnVoid(peerCaller.rc());
 
     /* lock both for writing since we modify both (mPeer is "master" so locked
@@ -165,5 +165,5 @@
         if (mPeer)
         {
-            mPeer->mData.attach (mData);
+            mPeer->mData.attach(mData);
             mPeer->mNATRules.clear();
             NATRuleMap::iterator it;
@@ -358,11 +358,11 @@
     mData->mTcpSnd = data.u32TcpSnd;
     /* TFTP */
-    mData->mTftpPrefix = data.strTftpPrefix;
-    mData->mTftpBootFile = data.strTftpBootFile;
-    mData->mTftpNextServer = data.strTftpNextServer;
+    mData->mTFTPPrefix = data.strTFTPPrefix;
+    mData->mTFTPBootFile = data.strTFTPBootFile;
+    mData->mTFTPNextServer = data.strTFTPNextServer;
     /* DNS */
-    mData->mDnsPassDomain = data.fDnsPassDomain;
-    mData->mDnsProxy = data.fDnsProxy;
-    mData->mDnsUseHostResolver = data.fDnsUseHostResolver;
+    mData->mDNSPassDomain = data.fDNSPassDomain;
+    mData->mDNSProxy = data.fDNSProxy;
+    mData->mDNSUseHostResolver = data.fDNSUseHostResolver;
     /* Alias */
     mData->mAliasMode  = (data.fAliasUseSamePorts ? NATAliasMode_AliasUseSamePorts : 0);
@@ -396,11 +396,11 @@
     data.u32TcpSnd = mData->mTcpSnd;
     /* TFTP */
-    data.strTftpPrefix = mData->mTftpPrefix;
-    data.strTftpBootFile = mData->mTftpBootFile;
-    data.strTftpNextServer = mData->mTftpNextServer;
+    data.strTFTPPrefix = mData->mTFTPPrefix;
+    data.strTFTPBootFile = mData->mTFTPBootFile;
+    data.strTFTPNextServer = mData->mTFTPNextServer;
     /* DNS */
-    data.fDnsPassDomain = !!mData->mDnsPassDomain;
-    data.fDnsProxy = !!mData->mDnsProxy;
-    data.fDnsUseHostResolver = !!mData->mDnsUseHostResolver;
+    data.fDNSPassDomain = !!mData->mDNSPassDomain;
+    data.fDNSProxy = !!mData->mDNSProxy;
+    data.fDNSUseHostResolver = !!mData->mDNSUseHostResolver;
     /* Alias */
     data.fAliasLog = !!(mData->mAliasMode & NATAliasMode_AliasLog);
@@ -420,5 +420,5 @@
 {
     AutoCaller autoCaller(this);
-    AssertComRCReturnRC (autoCaller.rc());
+    AssertComRCReturnRC(autoCaller.rc());
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
     if (Bstr(mData->mNetwork) != aNetwork)
@@ -449,8 +449,8 @@
 
 STDMETHODIMP
-NATEngine::COMSETTER(HostIP) (IN_BSTR aBindIP)
-{
-    AutoCaller autoCaller(this);
-    AssertComRCReturnRC (autoCaller.rc());
+NATEngine::COMSETTER(HostIP)(IN_BSTR aBindIP)
+{
+    AutoCaller autoCaller(this);
+    AssertComRCReturnRC(autoCaller.rc());
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
     if (Bstr(mData->mBindIP) != aBindIP)
@@ -463,5 +463,5 @@
     return S_OK;
 }
-STDMETHODIMP NATEngine::COMGETTER(HostIP) (BSTR *aBindIP)
+STDMETHODIMP NATEngine::COMGETTER(HostIP)(BSTR *aBindIP)
 {
     AutoCaller autoCaller(this);
@@ -476,92 +476,92 @@
 
 STDMETHODIMP
-NATEngine::COMSETTER(TftpPrefix)(IN_BSTR aTftpPrefix)
-{
-    AutoCaller autoCaller(this);
-    AssertComRCReturnRC (autoCaller.rc());
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-    if (Bstr(mData->mTftpPrefix) != aTftpPrefix)
-    {
-        mData.backup();
-        mData->mTftpPrefix = aTftpPrefix;
-        mParent->setModified(Machine::IsModified_NetworkAdapters);
-        m_fModified = true;
-    }
-    return S_OK;
-}
-
-STDMETHODIMP
-NATEngine::COMGETTER(TftpPrefix)(BSTR *aTftpPrefix)
-{
-    AutoCaller autoCaller(this);
-    AssertComRCReturnRC(autoCaller.rc());
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-    if (!mData->mTftpPrefix.isEmpty())
-    {
-        mData->mTftpPrefix.cloneTo(aTftpPrefix);
-        Log(("Getter (this:%p) TftpPrefix: %s\n", this, mData->mTftpPrefix.c_str()));
-    }
-    return S_OK;
-}
-
-STDMETHODIMP
-NATEngine::COMSETTER(TftpBootFile)(IN_BSTR aTftpBootFile)
-{
-    AutoCaller autoCaller(this);
-    AssertComRCReturnRC (autoCaller.rc());
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-    if (Bstr(mData->mTftpBootFile) != aTftpBootFile)
-    {
-        mData.backup();
-        mData->mTftpBootFile = aTftpBootFile;
-        mParent->setModified(Machine::IsModified_NetworkAdapters);
-        m_fModified = true;
-    }
-    return S_OK;
-}
-
-STDMETHODIMP
-NATEngine::COMGETTER(TftpBootFile)(BSTR *aTftpBootFile)
-{
-    AutoCaller autoCaller(this);
-    AssertComRCReturnRC(autoCaller.rc());
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-    if (!mData->mTftpBootFile.isEmpty())
-    {
-        mData->mTftpBootFile.cloneTo(aTftpBootFile);
-        Log(("Getter (this:%p) BootFile: %s\n", this, mData->mTftpBootFile.c_str()));
-    }
-    return S_OK;
-}
-
-STDMETHODIMP
-NATEngine::COMSETTER(TftpNextServer)(IN_BSTR aTftpNextServer)
-{
-    AutoCaller autoCaller(this);
-    AssertComRCReturnRC (autoCaller.rc());
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-    if (Bstr(mData->mTftpNextServer) != aTftpNextServer)
-    {
-        mData.backup();
-        mData->mTftpNextServer = aTftpNextServer;
-        mParent->setModified(Machine::IsModified_NetworkAdapters);
-        m_fModified = true;
-    }
-    return S_OK;
-}
-
-STDMETHODIMP
-NATEngine::COMGETTER(TftpNextServer)(BSTR *aTftpNextServer)
-{
-    AutoCaller autoCaller(this);
-    AssertComRCReturnRC(autoCaller.rc());
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-    if (!mData->mTftpNextServer.isEmpty())
-    {
-        mData->mTftpNextServer.cloneTo(aTftpNextServer);
-        Log(("Getter (this:%p) NextServer: %s\n", this, mData->mTftpNextServer.c_str()));
+NATEngine::COMSETTER(TFTPPrefix)(IN_BSTR aTFTPPrefix)
+{
+    AutoCaller autoCaller(this);
+    AssertComRCReturnRC(autoCaller.rc());
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    if (Bstr(mData->mTFTPPrefix) != aTFTPPrefix)
+    {
+        mData.backup();
+        mData->mTFTPPrefix = aTFTPPrefix;
+        mParent->setModified(Machine::IsModified_NetworkAdapters);
+        m_fModified = true;
+    }
+    return S_OK;
+}
+
+STDMETHODIMP
+NATEngine::COMGETTER(TFTPPrefix)(BSTR *aTFTPPrefix)
+{
+    AutoCaller autoCaller(this);
+    AssertComRCReturnRC(autoCaller.rc());
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    if (!mData->mTFTPPrefix.isEmpty())
+    {
+        mData->mTFTPPrefix.cloneTo(aTFTPPrefix);
+        Log(("Getter (this:%p) TFTPPrefix: %s\n", this, mData->mTFTPPrefix.c_str()));
+    }
+    return S_OK;
+}
+
+STDMETHODIMP
+NATEngine::COMSETTER(TFTPBootFile)(IN_BSTR aTFTPBootFile)
+{
+    AutoCaller autoCaller(this);
+    AssertComRCReturnRC(autoCaller.rc());
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    if (Bstr(mData->mTFTPBootFile) != aTFTPBootFile)
+    {
+        mData.backup();
+        mData->mTFTPBootFile = aTFTPBootFile;
+        mParent->setModified(Machine::IsModified_NetworkAdapters);
+        m_fModified = true;
+    }
+    return S_OK;
+}
+
+STDMETHODIMP
+NATEngine::COMGETTER(TFTPBootFile)(BSTR *aTFTPBootFile)
+{
+    AutoCaller autoCaller(this);
+    AssertComRCReturnRC(autoCaller.rc());
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    if (!mData->mTFTPBootFile.isEmpty())
+    {
+        mData->mTFTPBootFile.cloneTo(aTFTPBootFile);
+        Log(("Getter (this:%p) BootFile: %s\n", this, mData->mTFTPBootFile.c_str()));
+    }
+    return S_OK;
+}
+
+STDMETHODIMP
+NATEngine::COMSETTER(TFTPNextServer)(IN_BSTR aTFTPNextServer)
+{
+    AutoCaller autoCaller(this);
+    AssertComRCReturnRC(autoCaller.rc());
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    if (Bstr(mData->mTFTPNextServer) != aTFTPNextServer)
+    {
+        mData.backup();
+        mData->mTFTPNextServer = aTFTPNextServer;
+        mParent->setModified(Machine::IsModified_NetworkAdapters);
+        m_fModified = true;
+    }
+    return S_OK;
+}
+
+STDMETHODIMP
+NATEngine::COMGETTER(TFTPNextServer)(BSTR *aTFTPNextServer)
+{
+    AutoCaller autoCaller(this);
+    AssertComRCReturnRC(autoCaller.rc());
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    if (!mData->mTFTPNextServer.isEmpty())
+    {
+        mData->mTFTPNextServer.cloneTo(aTFTPNextServer);
+        Log(("Getter (this:%p) NextServer: %s\n", this, mData->mTFTPNextServer.c_str()));
     }
     return S_OK;
@@ -569,83 +569,83 @@
 /* DNS */
 STDMETHODIMP
-NATEngine::COMSETTER(DnsPassDomain) (BOOL aDnsPassDomain)
-{
-    AutoCaller autoCaller(this);
-    AssertComRCReturnRC (autoCaller.rc());
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    if (mData->mDnsPassDomain != aDnsPassDomain)
-    {
-        mData.backup();
-        mData->mDnsPassDomain = aDnsPassDomain;
-        mParent->setModified(Machine::IsModified_NetworkAdapters);
-        m_fModified = true;
-    }
-    return S_OK;
-}
-STDMETHODIMP
-NATEngine::COMGETTER(DnsPassDomain)(BOOL *aDnsPassDomain)
-{
-    AutoCaller autoCaller(this);
-    AssertComRCReturnRC(autoCaller.rc());
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-    *aDnsPassDomain = mData->mDnsPassDomain;
-    return S_OK;
-}
-STDMETHODIMP
-NATEngine::COMSETTER(DnsProxy)(BOOL aDnsProxy)
-{
-    AutoCaller autoCaller(this);
-    AssertComRCReturnRC (autoCaller.rc());
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    if (mData->mDnsProxy != aDnsProxy)
-    {
-        mData.backup();
-        mData->mDnsProxy = aDnsProxy;
-        mParent->setModified(Machine::IsModified_NetworkAdapters);
-        m_fModified = true;
-    }
-    return S_OK;
-}
-STDMETHODIMP
-NATEngine::COMGETTER(DnsProxy)(BOOL *aDnsProxy)
-{
-    AutoCaller autoCaller(this);
-    AssertComRCReturnRC(autoCaller.rc());
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-    *aDnsProxy = mData->mDnsProxy;
-    return S_OK;
-}
-STDMETHODIMP
-NATEngine::COMGETTER(DnsUseHostResolver)(BOOL *aDnsUseHostResolver)
-{
-    AutoCaller autoCaller(this);
-    AssertComRCReturnRC (autoCaller.rc());
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-    *aDnsUseHostResolver = mData->mDnsUseHostResolver;
-    return S_OK;
-}
-STDMETHODIMP
-NATEngine::COMSETTER(DnsUseHostResolver)(BOOL aDnsUseHostResolver)
-{
-    AutoCaller autoCaller(this);
-    AssertComRCReturnRC(autoCaller.rc());
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    if (mData->mDnsUseHostResolver != aDnsUseHostResolver)
-    {
-        mData.backup();
-        mData->mDnsUseHostResolver = aDnsUseHostResolver;
-        mParent->setModified(Machine::IsModified_NetworkAdapters);
-        m_fModified = true;
-    }
-    return S_OK;
-}
-
-STDMETHODIMP NATEngine::COMSETTER(AliasMode) (ULONG aAliasMode)
+NATEngine::COMSETTER(DNSPassDomain) (BOOL aDNSPassDomain)
+{
+    AutoCaller autoCaller(this);
+    AssertComRCReturnRC(autoCaller.rc());
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    if (mData->mDNSPassDomain != aDNSPassDomain)
+    {
+        mData.backup();
+        mData->mDNSPassDomain = aDNSPassDomain;
+        mParent->setModified(Machine::IsModified_NetworkAdapters);
+        m_fModified = true;
+    }
+    return S_OK;
+}
+STDMETHODIMP
+NATEngine::COMGETTER(DNSPassDomain)(BOOL *aDNSPassDomain)
+{
+    AutoCaller autoCaller(this);
+    AssertComRCReturnRC(autoCaller.rc());
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    *aDNSPassDomain = mData->mDNSPassDomain;
+    return S_OK;
+}
+STDMETHODIMP
+NATEngine::COMSETTER(DNSProxy)(BOOL aDNSProxy)
+{
+    AutoCaller autoCaller(this);
+    AssertComRCReturnRC(autoCaller.rc());
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    if (mData->mDNSProxy != aDNSProxy)
+    {
+        mData.backup();
+        mData->mDNSProxy = aDNSProxy;
+        mParent->setModified(Machine::IsModified_NetworkAdapters);
+        m_fModified = true;
+    }
+    return S_OK;
+}
+STDMETHODIMP
+NATEngine::COMGETTER(DNSProxy)(BOOL *aDNSProxy)
+{
+    AutoCaller autoCaller(this);
+    AssertComRCReturnRC(autoCaller.rc());
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    *aDNSProxy = mData->mDNSProxy;
+    return S_OK;
+}
+STDMETHODIMP
+NATEngine::COMGETTER(DNSUseHostResolver)(BOOL *aDNSUseHostResolver)
+{
+    AutoCaller autoCaller(this);
+    AssertComRCReturnRC(autoCaller.rc());
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    *aDNSUseHostResolver = mData->mDNSUseHostResolver;
+    return S_OK;
+}
+STDMETHODIMP
+NATEngine::COMSETTER(DNSUseHostResolver)(BOOL aDNSUseHostResolver)
+{
+    AutoCaller autoCaller(this);
+    AssertComRCReturnRC(autoCaller.rc());
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    if (mData->mDNSUseHostResolver != aDNSUseHostResolver)
+    {
+        mData.backup();
+        mData->mDNSUseHostResolver = aDNSUseHostResolver;
+        mParent->setModified(Machine::IsModified_NetworkAdapters);
+        m_fModified = true;
+    }
+    return S_OK;
+}
+
+STDMETHODIMP NATEngine::COMSETTER(AliasMode)(ULONG aAliasMode)
 {
     AutoCaller autoCaller(this);
@@ -664,8 +664,8 @@
 }
 
-STDMETHODIMP NATEngine::COMGETTER(AliasMode) (ULONG *aAliasMode)
-{
-    AutoCaller autoCaller(this);
-    AssertComRCReturnRC (autoCaller.rc());
+STDMETHODIMP NATEngine::COMGETTER(AliasMode)(ULONG *aAliasMode)
+{
+    AutoCaller autoCaller(this);
+    AssertComRCReturnRC(autoCaller.rc());
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
     *aAliasMode = mData->mAliasMode;
Index: trunk/src/VBox/Main/src-server/NetworkAdapterImpl.cpp
===================================================================
--- trunk/src/VBox/Main/src-server/NetworkAdapterImpl.cpp	(revision 42550)
+++ trunk/src/VBox/Main/src-server/NetworkAdapterImpl.cpp	(revision 42551)
@@ -1,9 +1,9 @@
 /* $Id$ */
 /** @file
- * Implementation of INetworkAdaptor in VBoxSVC.
+ * Implementation of INetworkAdapter in VBoxSVC.
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -956,14 +956,14 @@
 }
 
-STDMETHODIMP NetworkAdapter::COMGETTER(NatDriver)(INATEngine **aNatDriver)
-{
-    CheckComArgOutPointerValid(aNatDriver);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    mNATEngine.queryInterfaceTo(aNatDriver);
+STDMETHODIMP NetworkAdapter::COMGETTER(NATEngine)(INATEngine **aNATEngine)
+{
+    CheckComArgOutPointerValid(aNATEngine);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    mNATEngine.queryInterfaceTo(aNATEngine);
 
     return S_OK;
Index: trunk/src/VBox/Main/src-server/USBControllerImpl.cpp
===================================================================
--- trunk/src/VBox/Main/src-server/USBControllerImpl.cpp	(revision 42550)
+++ trunk/src/VBox/Main/src-server/USBControllerImpl.cpp	(revision 42551)
@@ -308,5 +308,5 @@
 }
 
-STDMETHODIMP USBController::COMGETTER(EnabledEhci)(BOOL *aEnabled)
+STDMETHODIMP USBController::COMGETTER(EnabledEHCI)(BOOL *aEnabled)
 {
     CheckComArgOutPointerValid(aEnabled);
@@ -322,5 +322,5 @@
 }
 
-STDMETHODIMP USBController::COMSETTER(EnabledEhci)(BOOL aEnabled)
+STDMETHODIMP USBController::COMSETTER(EnabledEHCI)(BOOL aEnabled)
 {
     LogFlowThisFunc(("aEnabled=%RTbool\n", aEnabled));
Index: trunk/src/VBox/Main/xml/Settings.cpp
===================================================================
--- trunk/src/VBox/Main/xml/Settings.cpp	(revision 42550)
+++ trunk/src/VBox/Main/xml/Settings.cpp	(revision 42551)
@@ -1603,5 +1603,5 @@
           cCPUs(1),
           fCpuHotPlug(false),
-          fHpetEnabled(false),
+          fHPETEnabled(false),
           ulCpuExecutionCap(100),
           ulMemorySizeMB((uint32_t)-1),
@@ -1611,6 +1611,6 @@
           fAccelerate2DVideo(false),
           firmwareType(FirmwareType_BIOS),
-          pointingHidType(PointingHidType_PS2Mouse),
-          keyboardHidType(KeyboardHidType_PS2Keyboard),
+          pointingHIDType(PointingHIDType_PS2Mouse),
+          keyboardHIDType(KeyboardHIDType_PS2Keyboard),
           chipsetType(ChipsetType_PIIX3),
           fEmulatedUSBCardReader(false),
@@ -1665,5 +1665,5 @@
                   && (fCpuHotPlug               == h.fCpuHotPlug)
                   && (ulCpuExecutionCap         == h.ulCpuExecutionCap)
-                  && (fHpetEnabled              == h.fHpetEnabled)
+                  && (fHPETEnabled              == h.fHPETEnabled)
                   && (llCpus                    == h.llCpus)
                   && (llCpuIdLeafs              == h.llCpuIdLeafs)
@@ -1675,6 +1675,6 @@
                   && (fAccelerate2DVideo        == h.fAccelerate2DVideo)
                   && (firmwareType              == h.firmwareType)
-                  && (pointingHidType           == h.pointingHidType)
-                  && (keyboardHidType           == h.keyboardHidType)
+                  && (pointingHIDType           == h.pointingHIDType)
+                  && (keyboardHIDType           == h.keyboardHIDType)
                   && (chipsetType               == h.chipsetType)
                   && (fEmulatedUSBCardReader    == h.fEmulatedUSBCardReader)
@@ -1779,10 +1779,10 @@
 
 /**
- * IoSettings constructor.
- */
-IoSettings::IoSettings()
-{
-    fIoCacheEnabled  = true;
-    ulIoCacheSize    = 5;
+ * IOSettings constructor.
+ */
+IOSettings::IOSettings()
+{
+    fIOCacheEnabled  = true;
+    ulIOCacheSize    = 5;
 }
 
@@ -2047,7 +2047,7 @@
         if ((pelmDNS = elmMode.findChildElement("DNS")))
         {
-            pelmDNS->getAttributeValue("pass-domain", nic.nat.fDnsPassDomain);
-            pelmDNS->getAttributeValue("use-proxy", nic.nat.fDnsProxy);
-            pelmDNS->getAttributeValue("use-host-resolver", nic.nat.fDnsUseHostResolver);
+            pelmDNS->getAttributeValue("pass-domain", nic.nat.fDNSPassDomain);
+            pelmDNS->getAttributeValue("use-proxy", nic.nat.fDNSProxy);
+            pelmDNS->getAttributeValue("use-host-resolver", nic.nat.fDNSUseHostResolver);
         }
         const xml::ElementNode *pelmAlias;
@@ -2061,7 +2061,7 @@
         if ((pelmTFTP = elmMode.findChildElement("TFTP")))
         {
-            pelmTFTP->getAttributeValue("prefix", nic.nat.strTftpPrefix);
-            pelmTFTP->getAttributeValue("boot-file", nic.nat.strTftpBootFile);
-            pelmTFTP->getAttributeValue("next-server", nic.nat.strTftpNextServer);
+            pelmTFTP->getAttributeValue("prefix", nic.nat.strTFTPPrefix);
+            pelmTFTP->getAttributeValue("boot-file", nic.nat.strTFTPBootFile);
+            pelmTFTP->getAttributeValue("next-server", nic.nat.strTFTPNextServer);
         }
         xml::ElementNodesList plstNatPF;
@@ -2445,38 +2445,38 @@
         else if (pelmHwChild->nameEquals("HID"))
         {
-            Utf8Str strHidType;
-            if (pelmHwChild->getAttributeValue("Keyboard", strHidType))
-            {
-                if (strHidType == "None")
-                    hw.keyboardHidType = KeyboardHidType_None;
-                else if (strHidType == "USBKeyboard")
-                    hw.keyboardHidType = KeyboardHidType_USBKeyboard;
-                else if (strHidType == "PS2Keyboard")
-                    hw.keyboardHidType = KeyboardHidType_PS2Keyboard;
-                else if (strHidType == "ComboKeyboard")
-                    hw.keyboardHidType = KeyboardHidType_ComboKeyboard;
+            Utf8Str strHIDType;
+            if (pelmHwChild->getAttributeValue("Keyboard", strHIDType))
+            {
+                if (strHIDType == "None")
+                    hw.keyboardHIDType = KeyboardHIDType_None;
+                else if (strHIDType == "USBKeyboard")
+                    hw.keyboardHIDType = KeyboardHIDType_USBKeyboard;
+                else if (strHIDType == "PS2Keyboard")
+                    hw.keyboardHIDType = KeyboardHIDType_PS2Keyboard;
+                else if (strHIDType == "ComboKeyboard")
+                    hw.keyboardHIDType = KeyboardHIDType_ComboKeyboard;
                 else
                     throw ConfigFileError(this,
                                           pelmHwChild,
                                           N_("Invalid value '%s' in HID/Keyboard/@type"),
-                                          strHidType.c_str());
-            }
-            if (pelmHwChild->getAttributeValue("Pointing", strHidType))
-            {
-                 if (strHidType == "None")
-                    hw.pointingHidType = PointingHidType_None;
-                else if (strHidType == "USBMouse")
-                    hw.pointingHidType = PointingHidType_USBMouse;
-                else if (strHidType == "USBTablet")
-                    hw.pointingHidType = PointingHidType_USBTablet;
-                else if (strHidType == "PS2Mouse")
-                    hw.pointingHidType = PointingHidType_PS2Mouse;
-                else if (strHidType == "ComboMouse")
-                    hw.pointingHidType = PointingHidType_ComboMouse;
+                                          strHIDType.c_str());
+            }
+            if (pelmHwChild->getAttributeValue("Pointing", strHIDType))
+            {
+                 if (strHIDType == "None")
+                    hw.pointingHIDType = PointingHIDType_None;
+                else if (strHIDType == "USBMouse")
+                    hw.pointingHIDType = PointingHIDType_USBMouse;
+                else if (strHIDType == "USBTablet")
+                    hw.pointingHIDType = PointingHIDType_USBTablet;
+                else if (strHIDType == "PS2Mouse")
+                    hw.pointingHIDType = PointingHIDType_PS2Mouse;
+                else if (strHIDType == "ComboMouse")
+                    hw.pointingHIDType = PointingHIDType_ComboMouse;
                 else
                     throw ConfigFileError(this,
                                           pelmHwChild,
                                           N_("Invalid value '%s' in HID/Pointing/@type"),
-                                          strHidType.c_str());
+                                          strHIDType.c_str());
             }
         }
@@ -2499,5 +2499,5 @@
         else if (pelmHwChild->nameEquals("HPET"))
         {
-            pelmHwChild->getAttributeValue("enabled", hw.fHpetEnabled);
+            pelmHwChild->getAttributeValue("enabled", hw.fHPETEnabled);
         }
         else if (pelmHwChild->nameEquals("Boot"))
@@ -2793,10 +2793,10 @@
         {
             const xml::ElementNode *pelmBwGroups;
-            const xml::ElementNode *pelmIoChild;
-
-            if ((pelmIoChild = pelmHwChild->findChildElement("IoCache")))
-            {
-                pelmIoChild->getAttributeValue("enabled", hw.ioSettings.fIoCacheEnabled);
-                pelmIoChild->getAttributeValue("size", hw.ioSettings.ulIoCacheSize);
+            const xml::ElementNode *pelmIOChild;
+
+            if ((pelmIOChild = pelmHwChild->findChildElement("IoCache")))
+            {
+                pelmIOChild->getAttributeValue("enabled", hw.ioSettings.fIOCacheEnabled);
+                pelmIOChild->getAttributeValue("size", hw.ioSettings.ulIOCacheSize);
             }
 
@@ -2841,5 +2841,5 @@
                 while ((pelmDevice = nl2.forAllNodes()))
                 {
-                    HostPciDeviceAttachment hpda;
+                    HostPCIDeviceAttachment hpda;
 
                     if (!pelmDevice->getAttributeValue("host", hpda.uHostAddress))
@@ -3624,27 +3624,27 @@
        )
     {
-         xml::ElementNode *pelmHid = pelmHardware->createChild("HID");
-         const char *pcszHid;
-
-         switch (hw.pointingHidType)
+         xml::ElementNode *pelmHID = pelmHardware->createChild("HID");
+         const char *pcszHID;
+
+         switch (hw.pointingHIDType)
          {
-            case PointingHidType_USBMouse:      pcszHid = "USBMouse";   break;
-            case PointingHidType_USBTablet:     pcszHid = "USBTablet";  break;
-            case PointingHidType_PS2Mouse:      pcszHid = "PS2Mouse";   break;
-            case PointingHidType_ComboMouse:    pcszHid = "ComboMouse"; break;
-            case PointingHidType_None:          pcszHid = "None";       break;
-            default:            Assert(false);  pcszHid = "PS2Mouse";   break;
+            case PointingHIDType_USBMouse:      pcszHID = "USBMouse";   break;
+            case PointingHIDType_USBTablet:     pcszHID = "USBTablet";  break;
+            case PointingHIDType_PS2Mouse:      pcszHID = "PS2Mouse";   break;
+            case PointingHIDType_ComboMouse:    pcszHID = "ComboMouse"; break;
+            case PointingHIDType_None:          pcszHID = "None";       break;
+            default:            Assert(false);  pcszHID = "PS2Mouse";   break;
          }
-         pelmHid->setAttribute("Pointing", pcszHid);
-
-         switch (hw.keyboardHidType)
+         pelmHID->setAttribute("Pointing", pcszHID);
+
+         switch (hw.keyboardHIDType)
          {
-            case KeyboardHidType_USBKeyboard:   pcszHid = "USBKeyboard";   break;
-            case KeyboardHidType_PS2Keyboard:   pcszHid = "PS2Keyboard";   break;
-            case KeyboardHidType_ComboKeyboard: pcszHid = "ComboKeyboard"; break;
-            case KeyboardHidType_None:          pcszHid = "None";          break;
-            default:            Assert(false);  pcszHid = "PS2Keyboard";   break;
+            case KeyboardHIDType_USBKeyboard:   pcszHID = "USBKeyboard";   break;
+            case KeyboardHIDType_PS2Keyboard:   pcszHID = "PS2Keyboard";   break;
+            case KeyboardHIDType_ComboKeyboard: pcszHID = "ComboKeyboard"; break;
+            case KeyboardHIDType_None:          pcszHID = "None";          break;
+            default:            Assert(false);  pcszHID = "PS2Keyboard";   break;
          }
-         pelmHid->setAttribute("Keyboard", pcszHid);
+         pelmHID->setAttribute("Keyboard", pcszHID);
     }
 
@@ -3652,6 +3652,6 @@
        )
     {
-         xml::ElementNode *pelmHpet = pelmHardware->createChild("HPET");
-         pelmHpet->setAttribute("enabled", hw.fHpetEnabled);
+         xml::ElementNode *pelmHPET = pelmHardware->createChild("HPET");
+         pelmHPET->setAttribute("enabled", hw.fHPETEnabled);
     }
 
@@ -4105,14 +4105,14 @@
     if (m->sv >= SettingsVersion_v1_10)
     {
-        xml::ElementNode *pelmIo = pelmHardware->createChild("IO");
-        xml::ElementNode *pelmIoCache;
-
-        pelmIoCache = pelmIo->createChild("IoCache");
-        pelmIoCache->setAttribute("enabled", hw.ioSettings.fIoCacheEnabled);
-        pelmIoCache->setAttribute("size", hw.ioSettings.ulIoCacheSize);
+        xml::ElementNode *pelmIO = pelmHardware->createChild("IO");
+        xml::ElementNode *pelmIOCache;
+
+        pelmIOCache = pelmIO->createChild("IoCache");
+        pelmIOCache->setAttribute("enabled", hw.ioSettings.fIOCacheEnabled);
+        pelmIOCache->setAttribute("size", hw.ioSettings.ulIOCacheSize);
 
         if (m->sv >= SettingsVersion_v1_11)
         {
-            xml::ElementNode *pelmBandwidthGroups = pelmIo->createChild("BandwidthGroups");
+            xml::ElementNode *pelmBandwidthGroups = pelmIO->createChild("BandwidthGroups");
             for (BandwidthGroupList::const_iterator it = hw.ioSettings.llBandwidthGroups.begin();
                  it != hw.ioSettings.llBandwidthGroups.end();
@@ -4139,14 +4139,14 @@
     if (m->sv >= SettingsVersion_v1_12)
     {
-        xml::ElementNode *pelmPci = pelmHardware->createChild("HostPci");
-        xml::ElementNode *pelmPciDevices = pelmPci->createChild("Devices");
-
-        for (HostPciDeviceAttachmentList::const_iterator it = hw.pciAttachments.begin();
+        xml::ElementNode *pelmPCI = pelmHardware->createChild("HostPci");
+        xml::ElementNode *pelmPCIDevices = pelmPCI->createChild("Devices");
+
+        for (HostPCIDeviceAttachmentList::const_iterator it = hw.pciAttachments.begin();
              it != hw.pciAttachments.end();
              ++it)
         {
-            const HostPciDeviceAttachment &hpda = *it;
-
-            xml::ElementNode *pelmThis = pelmPciDevices->createChild("Device");
+            const HostPCIDeviceAttachment &hpda = *it;
+
+            xml::ElementNode *pelmThis = pelmPCIDevices->createChild("Device");
 
             pelmThis->setAttribute("host",  hpda.uHostAddress);
@@ -4218,7 +4218,7 @@
             xml::ElementNode *pelmDNS;
             pelmDNS = pelmNAT->createChild("DNS");
-            pelmDNS->setAttribute("pass-domain", nic.nat.fDnsPassDomain);
-            pelmDNS->setAttribute("use-proxy", nic.nat.fDnsProxy);
-            pelmDNS->setAttribute("use-host-resolver", nic.nat.fDnsUseHostResolver);
+            pelmDNS->setAttribute("pass-domain", nic.nat.fDNSPassDomain);
+            pelmDNS->setAttribute("use-proxy", nic.nat.fDNSProxy);
+            pelmDNS->setAttribute("use-host-resolver", nic.nat.fDNSUseHostResolver);
 
             xml::ElementNode *pelmAlias;
@@ -4228,16 +4228,16 @@
             pelmAlias->setAttribute("use-same-ports", nic.nat.fAliasUseSamePorts);
 
-            if (   nic.nat.strTftpPrefix.length()
-                || nic.nat.strTftpBootFile.length()
-                || nic.nat.strTftpNextServer.length())
+            if (   nic.nat.strTFTPPrefix.length()
+                || nic.nat.strTFTPBootFile.length()
+                || nic.nat.strTFTPNextServer.length())
             {
                 xml::ElementNode *pelmTFTP;
                 pelmTFTP = pelmNAT->createChild("TFTP");
-                if (nic.nat.strTftpPrefix.length())
-                    pelmTFTP->setAttribute("prefix", nic.nat.strTftpPrefix);
-                if (nic.nat.strTftpBootFile.length())
-                    pelmTFTP->setAttribute("boot-file", nic.nat.strTftpBootFile);
-                if (nic.nat.strTftpNextServer.length())
-                    pelmTFTP->setAttribute("next-server", nic.nat.strTftpNextServer);
+                if (nic.nat.strTFTPPrefix.length())
+                    pelmTFTP->setAttribute("prefix", nic.nat.strTFTPPrefix);
+                if (nic.nat.strTFTPBootFile.length())
+                    pelmTFTP->setAttribute("boot-file", nic.nat.strTFTPBootFile);
+                if (nic.nat.strTFTPNextServer.length())
+                    pelmTFTP->setAttribute("next-server", nic.nat.strTFTPNextServer);
             }
             for (NATRuleList::const_iterator rule = nic.nat.llRules.begin();
@@ -5074,6 +5074,6 @@
     if (m->sv < SettingsVersion_v1_10)
     {
-        if (   (hardwareMachine.ioSettings.fIoCacheEnabled != true)
-            || (hardwareMachine.ioSettings.ulIoCacheSize != 5)
+        if (   (hardwareMachine.ioSettings.fIOCacheEnabled != true)
+            || (hardwareMachine.ioSettings.ulIOCacheSize != 5)
                 // and page fusion
             || (hardwareMachine.fPageFusionEnabled)
@@ -5081,7 +5081,7 @@
             || machineUserData.fRTCUseUTC
             || hardwareMachine.fCpuHotPlug
-            || hardwareMachine.pointingHidType != PointingHidType_PS2Mouse
-            || hardwareMachine.keyboardHidType != KeyboardHidType_PS2Keyboard
-            || hardwareMachine.fHpetEnabled
+            || hardwareMachine.pointingHIDType != PointingHIDType_PS2Mouse
+            || hardwareMachine.keyboardHIDType != KeyboardHIDType_PS2Keyboard
+            || hardwareMachine.fHPETEnabled
            )
             m->sv = SettingsVersion_v1_10;
@@ -5113,13 +5113,13 @@
                           || netit->nat.u32TcpRcv != 0
                           || netit->nat.u32TcpSnd != 0
-                          || !netit->nat.fDnsPassDomain
-                          || netit->nat.fDnsProxy
-                          || netit->nat.fDnsUseHostResolver
+                          || !netit->nat.fDNSPassDomain
+                          || netit->nat.fDNSProxy
+                          || netit->nat.fDNSUseHostResolver
                           || netit->nat.fAliasLog
                           || netit->nat.fAliasProxyOnly
                           || netit->nat.fAliasUseSamePorts
-                          || netit->nat.strTftpPrefix.length()
-                          || netit->nat.strTftpBootFile.length()
-                          || netit->nat.strTftpNextServer.length()
+                          || netit->nat.strTFTPPrefix.length()
+                          || netit->nat.strTFTPBootFile.length()
+                          || netit->nat.strTFTPNextServer.length()
                           || netit->nat.llRules.size()
                          )
