Index: /trunk/src/VBox/VMM/include/HMInternal.h
===================================================================
--- /trunk/src/VBox/VMM/include/HMInternal.h	(revision 43494)
+++ /trunk/src/VBox/VMM/include/HMInternal.h	(revision 43495)
@@ -143,9 +143,9 @@
     RTR0MEMOBJ          hMemObj;
     /** Current ASID (AMD-V) / VPID (Intel). */
-    uint32_t            uCurrentASID;
+    uint32_t            uCurrentAsid;
     /** TLB flush count. */
-    uint32_t            cTLBFlushes;
+    uint32_t            cTlbFlushes;
     /** Whether to flush each new ASID/VPID before use. */
-    bool                fFlushASIDBeforeUse;
+    bool                fFlushAsidBeforeUse;
     /** Configured for VT-x or AMD-V. */
     bool                fConfigured;
@@ -260,5 +260,5 @@
 
     /** Maximum ASID allowed. */
-    uint32_t                    uMaxASID;
+    uint32_t                    uMaxAsid;
 
     /** The maximum number of resumes loops allowed in ring-0 (safety precaution).
@@ -308,8 +308,8 @@
 
         /** Set if VPID is supported. */
-        bool                        fVPID;
+        bool                        fVpid;
 
         /** Set if VT-x VPID is allowed. */
-        bool                        fAllowVPID;
+        bool                        fAllowVpid;
 
         /** Set if unrestricted guest execution is allowed (real and protected mode without paging). */
@@ -342,5 +342,5 @@
 #endif
         /** Ring 0 handlers for VT-x. */
-        DECLR0CALLBACKMEMBER(void, pfnSetupTaggedTLB, (PVM pVM, PVMCPU pVCpu));
+        DECLR0CALLBACKMEMBER(void, pfnSetupTaggedTlb, (PVM pVM, PVMCPU pVCpu));
 
 #if HC_ARCH_BITS == 32 && defined(VBOX_ENABLE_64_BITS_GUESTS)
@@ -373,6 +373,6 @@
 
         /** Flush types for invept & invvpid; they depend on capabilities. */
-        VMX_FLUSH_EPT               enmFlushEPT;
-        VMX_FLUSH_VPID              enmFlushVPID;
+        VMX_FLUSH_EPT               enmFlushEpt;
+        VMX_FLUSH_VPID              enmFlushVpid;
     } vmx;
 
@@ -396,6 +396,6 @@
         R0PTRTYPE(void *)           pvIOBitmap;
 
-        /* HWCR msr (for diagnostics) */
-        uint64_t                    msrHWCR;
+        /* HWCR MSR (for diagnostics) */
+        uint64_t                    msrHwcr;
 
         /** SVM revision. */
@@ -537,13 +537,13 @@
 
     /** TLB flush count */
-    uint32_t                    cTLBFlushes;
+    uint32_t                    cTlbFlushes;
 
     /** Current ASID in use by the VM */
-    uint32_t                    uCurrentASID;
+    uint32_t                    uCurrentAsid;
 
     uint32_t                    u32Alignment;
 
     /* Host's TSC_AUX MSR (used when RDTSCP doesn't cause VM-exits). */
-    uint64_t                    u64HostTSCAux;
+    uint64_t                    u64HostTscAux;
 
     struct
@@ -666,9 +666,9 @@
 
         /** R0 memory object for the MSR bitmap (8kb). */
-        RTR0MEMOBJ                  hMemObjMSRBitmap;
+        RTR0MEMOBJ                  hMemObjMsrBitmap;
         /** Physical address of the MSR bitmap (8kb). */
-        RTHCPHYS                    HCPhysMSRBitmap;
+        RTHCPHYS                    HCPhysMsrBitmap;
         /** Virtual address of the MSR bitmap. */
-        R0PTRTYPE(void *)           pvMSRBitmap;
+        R0PTRTYPE(void *)           pvMsrBitmap;
     } svm;
 
@@ -784,5 +784,5 @@
     STAMCOUNTER             StatExitRdmsr;
     STAMCOUNTER             StatExitWrmsr;
-    STAMCOUNTER             StatExitCLTS;
+    STAMCOUNTER             StatExitClts;
     STAMCOUNTER             StatExitHlt;
     STAMCOUNTER             StatExitMwait;
@@ -796,5 +796,5 @@
     STAMCOUNTER             StatExitMaxResume;
     STAMCOUNTER             StatExitPreemptPending;
-    STAMCOUNTER             StatExitMTF;
+    STAMCOUNTER             StatExitMtf;
     STAMCOUNTER             StatIntReinject;
     STAMCOUNTER             StatPendingHostIrq;
@@ -809,7 +809,7 @@
     STAMCOUNTER             StatNoFlushTLBWorldSwitch;
     STAMCOUNTER             StatFlushTLBCRxChange;
-    STAMCOUNTER             StatFlushASID;
-    STAMCOUNTER             StatFlushNP;
-    STAMCOUNTER             StatFlushTLBInvlpga;
+    STAMCOUNTER             StatFlushAsid;
+    STAMCOUNTER             StatFlushNestedPaging;
+    STAMCOUNTER             StatFlushTlbInvlpga;
     STAMCOUNTER             StatTlbShootdown;
     STAMCOUNTER             StatTlbShootdownFlush;