Index: /trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredProvUtils.cpp
===================================================================
--- /trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredProvUtils.cpp	(revision 50322)
+++ /trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredProvUtils.cpp	(revision 50323)
@@ -22,5 +22,5 @@
 #include <iprt/string.h>
 #include <VBox/log.h>
-#include <VBox/VboxGuestLib.h>
+#include <VBox/VBoxGuestLib.h>
 
 
Index: /trunk/src/VBox/Additions/WINNT/VBoxGINA/Dialog.cpp
===================================================================
--- /trunk/src/VBox/Additions/WINNT/VBoxGINA/Dialog.cpp	(revision 50322)
+++ /trunk/src/VBox/Additions/WINNT/VBoxGINA/Dialog.cpp	(revision 50323)
@@ -20,5 +20,5 @@
 #include <stdio.h>      /* Needed for swprintf() */
 
-#include <VBox/VboxGuestLib.h>
+#include <VBox/VBoxGuestLib.h>
 
 #include "Dialog.h"
Index: /trunk/src/VBox/Additions/WINNT/VBoxGINA/Helper.cpp
===================================================================
--- /trunk/src/VBox/Additions/WINNT/VBoxGINA/Helper.cpp	(revision 50322)
+++ /trunk/src/VBox/Additions/WINNT/VBoxGINA/Helper.cpp	(revision 50323)
@@ -27,5 +27,5 @@
 
 #include <VBox/log.h>
-#include <VBox/VboxGuestLib.h>
+#include <VBox/VBoxGuestLib.h>
 
 /** Flag indicating whether remote sessions (over MSRDP) should be
Index: /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp
===================================================================
--- /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp	(revision 50322)
+++ /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp	(revision 50323)
@@ -612,5 +612,5 @@
 int VBoxClipboardInit(const VBOXSERVICEENV *pEnv, void **ppInstance, bool *pfStartThread)
 {
-    Log(("VBoxTray: VboxClipboardInit\n"));
+    Log(("VBoxTray: VBoxClipboardInit\n"));
     if (gCtx.pEnv)
     {
Index: /trunk/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
===================================================================
--- /trunk/src/VBox/Additions/common/crOpenGL/fakedri_drv.c	(revision 50322)
+++ /trunk/src/VBox/Additions/common/crOpenGL/fakedri_drv.c	(revision 50323)
@@ -361,5 +361,5 @@
 #ifndef VBOX_NO_MESA_PATCH_REPORTS
     crDebug("Mesa Entry: %p, start: %p(%s:%s), size: %li", pMesaEntry, dlip.dli_saddr, dlip.dli_fname, dlip.dli_sname, sym->st_size);
-    crDebug("Vbox code: start: %p, end %p, size: %li", pStart, pEnd, pEnd-pStart);
+    crDebug("VBox code: start: %p, end %p, size: %li", pStart, pEnd, pEnd-pStart);
 #endif
 
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageAppliance.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageAppliance.cpp	(revision 50322)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageAppliance.cpp	(revision 50323)
@@ -375,5 +375,5 @@
                 com::SafeArray<BSTR> aRefs;
                 com::SafeArray<BSTR> aOvfValues;
-                com::SafeArray<BSTR> aVboxValues;
+                com::SafeArray<BSTR> aVBoxValues;
                 com::SafeArray<BSTR> aExtraConfigValues;
                 CHECK_ERROR_BREAK(aVirtualSystemDescriptions[i],
@@ -381,5 +381,5 @@
                                                  ComSafeArrayAsOutParam(aRefs),
                                                  ComSafeArrayAsOutParam(aOvfValues),
-                                                 ComSafeArrayAsOutParam(aVboxValues),
+                                                 ComSafeArrayAsOutParam(aVBoxValues),
                                                  ComSafeArrayAsOutParam(aExtraConfigValues)));
 
@@ -402,5 +402,5 @@
                     Utf8Str strOverride;
 
-                    Bstr bstrFinalValue = aVboxValues[a];
+                    Bstr bstrFinalValue = aVBoxValues[a];
 
                     bool fIgnoreThis = mapIgnoresMapsPerVsys[i][a];
@@ -438,25 +438,25 @@
                         case VirtualSystemDescriptionType_Product:
                             RTPrintf("%2u: Product (ignored): %ls\n",
-                                     a, aVboxValues[a]);
+                                     a, aVBoxValues[a]);
                         break;
 
                         case VirtualSystemDescriptionType_ProductUrl:
                             RTPrintf("%2u: ProductUrl (ignored): %ls\n",
-                                     a, aVboxValues[a]);
+                                     a, aVBoxValues[a]);
                         break;
 
                         case VirtualSystemDescriptionType_Vendor:
                             RTPrintf("%2u: Vendor (ignored): %ls\n",
-                                     a, aVboxValues[a]);
+                                     a, aVBoxValues[a]);
                         break;
 
                         case VirtualSystemDescriptionType_VendorUrl:
                             RTPrintf("%2u: VendorUrl (ignored): %ls\n",
-                                     a, aVboxValues[a]);
+                                     a, aVBoxValues[a]);
                         break;
 
                         case VirtualSystemDescriptionType_Version:
                             RTPrintf("%2u: Version (ignored): %ls\n",
-                                     a, aVboxValues[a]);
+                                     a, aVBoxValues[a]);
                         break;
 
@@ -551,5 +551,5 @@
                                 RTPrintf("%2u: IDE controller, type %ls -- disabled\n",
                                          a,
-                                         aVboxValues[a]);
+                                         aVBoxValues[a]);
                                 aEnabled[a] = false;
                             }
@@ -558,5 +558,5 @@
                                          "\n    (disable with \"--vsys %u --unit %u --ignore\")\n",
                                          a,
-                                         aVboxValues[a],
+                                         aVBoxValues[a],
                                          i, a);
                         break;
@@ -567,5 +567,5 @@
                                 RTPrintf("%2u: SATA controller, type %ls -- disabled\n",
                                          a,
-                                         aVboxValues[a]);
+                                         aVBoxValues[a]);
                                 aEnabled[a] = false;
                             }
@@ -574,5 +574,5 @@
                                         "\n    (disable with \"--vsys %u --unit %u --ignore\")\n",
                                         a,
-                                        aVboxValues[a],
+                                        aVBoxValues[a],
                                         i, a);
                         break;
@@ -583,5 +583,5 @@
                                 RTPrintf("%2u: SAS controller, type %ls -- disabled\n",
                                          a,
-                                         aVboxValues[a]);
+                                         aVBoxValues[a]);
                                 aEnabled[a] = false;
                             }
@@ -590,5 +590,5 @@
                                         "\n    (disable with \"--vsys %u --unit %u --ignore\")\n",
                                         a,
-                                        aVboxValues[a],
+                                        aVBoxValues[a],
                                         i, a);
                         break;
@@ -599,5 +599,5 @@
                                 RTPrintf("%2u: SCSI controller, type %ls -- disabled\n",
                                          a,
-                                         aVboxValues[a]);
+                                         aVBoxValues[a]);
                                 aEnabled[a] = false;
                             }
@@ -618,5 +618,5 @@
                                             "\n    disable with \"--vsys %u --unit %u --ignore\")\n",
                                             a,
-                                            aVboxValues[a],
+                                            aVBoxValues[a],
                                             i, a, i, a);
                             }
@@ -672,5 +672,5 @@
                                             a,
                                             aOvfValues[a],
-                                            aVboxValues[a],
+                                            aVBoxValues[a],
                                             aExtraConfigValues[a]);
                                 }
@@ -682,5 +682,5 @@
                                             a,
                                             aOvfValues[a],
-                                            aVboxValues[a],
+                                            aVBoxValues[a],
                                             aExtraConfigValues[a],
                                             i, a, i, a);
@@ -718,5 +718,5 @@
                                      a,
                                      aOvfValues[a],
-                                     aVboxValues[a],
+                                     aVBoxValues[a],
                                      aExtraConfigValues[a]);
                         break;
Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.h
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.h	(revision 50322)
+++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.h	(revision 50323)
@@ -15,6 +15,6 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
-#ifndef ___VboxNetFltNobj_h___
-#define ___VboxNetFltNobj_h___
+#ifndef ___VBoxNetFltNobj_h___
+#define ___VBoxNetFltNobj_h___
 
 #include <windows.h>
@@ -71,3 +71,3 @@
 };
 
-#endif /* #ifndef ___VboxNetFltNobj_h___ */
+#endif /* #ifndef ___VBoxNetFltNobj_h___ */
Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobjRc.h
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobjRc.h	(revision 50322)
+++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobjRc.h	(revision 50323)
@@ -15,9 +15,9 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
-#ifndef ___VboxNetFltNobjRc_h___
-#define ___VboxNetFltNobjRc_h___
+#ifndef ___VBoxNetFltNobjRc_h___
+#define ___VBoxNetFltNobjRc_h___
 
 /* registry script rc ID */
 #define IDR_VBOXNETFLT_NOBJ 101
 
-#endif /* #ifndef ___VboxNetFltNobjRc_h___ */
+#endif /* #ifndef ___VBoxNetFltNobjRc_h___ */
