diff --git a/xtoskrnl/includes/mm/amd64/paging.hh b/xtoskrnl/includes/mm/amd64/paging.hh
index a010825..613c70c 100644
--- a/xtoskrnl/includes/mm/amd64/paging.hh
+++ b/xtoskrnl/includes/mm/amd64/paging.hh
@@ -31,16 +31,16 @@ namespace MM
             STATIC XTAPI PMMPTE GetNextPte(IN PMMPTE Pte);
             STATIC XTAPI BOOLEAN GetOneEntry(IN PMMPTE Pte);
             STATIC XTAPI PMMPDE GetP5eAddress(IN PVOID Address);
-            STATIC XTAPI PVOID GetP5eVirtualAddress(IN PMMPTE P5ePointer);
+            STATIC XTAPI PVOID GetP5eVirtualAddress(IN PMMP5E P5ePointer);
             STATIC XTAPI USHORT GetPageMapLevel();
             STATIC XTAPI PFN_NUMBER GetPageFrameNumber(IN PMMPTE Pte);
             STATIC XTAPI PMMPDE GetPdeAddress(IN PVOID Address);
-            STATIC XTAPI PVOID GetPdeVirtualAddress(IN PMMPXE PdePointer);
+            STATIC XTAPI PVOID GetPdeVirtualAddress(IN PMMPDE PdePointer);
             STATIC XTAPI PMMPPE GetPpeAddress(IN PVOID Address);
-            STATIC XTAPI PVOID GetPpeVirtualAddress(IN PMMPXE PpePointer);
+            STATIC XTAPI PVOID GetPpeVirtualAddress(IN PMMPPE PpePointer);
             STATIC XTAPI PMMPTE GetPteAddress(IN PVOID Address);
             STATIC XTAPI ULONG GetPteSize(VOID);
-            STATIC XTAPI PVOID GetPteVirtualAddress(IN PMMPXE PtePointer);
+            STATIC XTAPI PVOID GetPteVirtualAddress(IN PMMPTE PtePointer);
             STATIC XTAPI PMMPXE GetPxeAddress(IN PVOID Address);
             STATIC XTAPI PVOID GetPxeVirtualAddress(IN PMMPXE PxePointer);
             STATIC XTAPI VOID InitializePageMapSupport(VOID);
diff --git a/xtoskrnl/includes/mm/i686/paging.hh b/xtoskrnl/includes/mm/i686/paging.hh
index 9d2cdaa..97c099e 100644
--- a/xtoskrnl/includes/mm/i686/paging.hh
+++ b/xtoskrnl/includes/mm/i686/paging.hh
@@ -33,12 +33,12 @@ namespace MM
             STATIC XTAPI USHORT GetPageMapLevel();
             STATIC XTAPI PFN_NUMBER GetPageFrameNumber(IN PMMPTE Pte);
             STATIC XTAPI PMMPDE GetPdeAddress(IN PVOID Address);
-            STATIC XTAPI PVOID GetPdeVirtualAddress(IN PMMPXE PdePointer);
+            STATIC XTAPI PVOID GetPdeVirtualAddress(IN PMMPDE PdePointer);
             STATIC XTAPI PMMPPE GetPpeAddress(IN PVOID Address);
-            STATIC XTAPI PVOID GetPpeVirtualAddress(IN PMMPXE PpePointer);
+            STATIC XTAPI PVOID GetPpeVirtualAddress(IN PMMPPE PpePointer);
             STATIC XTAPI PMMPTE GetPteAddress(IN PVOID Address);
             STATIC XTAPI ULONG GetPteSize(VOID);
-            STATIC XTAPI PVOID GetPteVirtualAddress(IN PMMPXE PtePointer);
+            STATIC XTAPI PVOID GetPteVirtualAddress(IN PMMPTE PtePointer);
             STATIC XTAPI VOID InitializePageMapSupport(VOID);
             STATIC XTAPI BOOLEAN PteValid(IN PMMPTE PtePointer);
             STATIC XTAPI VOID SetNextEntry(IN PMMPTE Pte,