diff --git a/reactos/ntoskrnl/include/internal/mm.h b/reactos/ntoskrnl/include/internal/mm.h
index 71335a6838c..cfb3faeb7d0 100644
--- a/reactos/ntoskrnl/include/internal/mm.h
+++ b/reactos/ntoskrnl/include/internal/mm.h
@@ -377,11 +377,11 @@ MmCreateMemoryArea(
    PHYSICAL_ADDRESS BoundaryAddressMultiple OPTIONAL);
 
 PMEMORY_AREA STDCALL
-MmOpenMemoryAreaByAddress(
+MmLocateMemoryAreaByAddress(
    PMADDRESS_SPACE AddressSpace, 
    PVOID Address);
 
-ULONG STDCALL
+ULONG_PTR STDCALL
 MmFindGapAtAddress(
    PMADDRESS_SPACE AddressSpace, 
    PVOID Address);
@@ -404,7 +404,7 @@ VOID STDCALL
 MmDumpMemoryAreas(PMADDRESS_SPACE AddressSpace);
 
 PMEMORY_AREA STDCALL
-MmOpenMemoryAreaByRegion(
+MmLocateMemoryAreaByRegion(
    PMADDRESS_SPACE AddressSpace, 
    PVOID Address,
    ULONG_PTR Length);
diff --git a/reactos/ntoskrnl/mm/anonmem.c b/reactos/ntoskrnl/mm/anonmem.c
index c0924094f07..8310bb68231 100644
--- a/reactos/ntoskrnl/mm/anonmem.c
+++ b/reactos/ntoskrnl/mm/anonmem.c
@@ -580,8 +580,7 @@ NtAllocateVirtualMemory(IN HANDLE ProcessHandle,
 
    if (PBaseAddress != 0)
    {
-      MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace,
-                                             BaseAddress);
+      MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress);
 
       if (MemoryArea != NULL)
       {
@@ -813,8 +812,7 @@ NtFreeVirtualMemory(IN HANDLE ProcessHandle,
    AddressSpace = &Process->AddressSpace;
 
    MmLockAddressSpace(AddressSpace);
-   MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace,
-                                          BaseAddress);
+   MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress);
    if (MemoryArea == NULL)
    {
       MmUnlockAddressSpace(AddressSpace);
diff --git a/reactos/ntoskrnl/mm/drvlck.c b/reactos/ntoskrnl/mm/drvlck.c
index c2a70708fc7..550307e213a 100644
--- a/reactos/ntoskrnl/mm/drvlck.c
+++ b/reactos/ntoskrnl/mm/drvlck.c
@@ -50,7 +50,7 @@ PVOID
 MmLockPagableCodeSection(IN PVOID AddressWithinSection)
 {
    PVOID Handle;
-   Handle = MmOpenMemoryAreaByAddress(NULL,AddressWithinSection);
+   Handle = MmLocateMemoryAreaByAddress(NULL,AddressWithinSection);
    MmLockPagableSectionByHandle(Handle);
    return(Handle);
 }
@@ -64,7 +64,7 @@ PVOID STDCALL
 MmLockPagableDataSection(IN PVOID AddressWithinSection)
 {
    PVOID Handle;
-   Handle = MmOpenMemoryAreaByAddress(NULL, AddressWithinSection);
+   Handle = MmLocateMemoryAreaByAddress(NULL, AddressWithinSection);
    MmLockPagableSectionByHandle(Handle);
    return(Handle);
 }
diff --git a/reactos/ntoskrnl/mm/marea.c b/reactos/ntoskrnl/mm/marea.c
index 3e48cf3e8eb..c5c85ef6bd4 100644
--- a/reactos/ntoskrnl/mm/marea.c
+++ b/reactos/ntoskrnl/mm/marea.c
@@ -197,13 +197,13 @@ MmDumpMemoryAreas(PMADDRESS_SPACE AddressSpace)
 }
 
 PMEMORY_AREA STDCALL
-MmOpenMemoryAreaByAddress(
+MmLocateMemoryAreaByAddress(
    PMADDRESS_SPACE AddressSpace,
    PVOID Address)
 {
    PMEMORY_AREA Node = AddressSpace->MemoryAreaRoot;
 
-   DPRINT("MmOpenMemoryAreaByAddress(AddressSpace %x, Address %x)\n",
+   DPRINT("MmLocateMemoryAreaByAddress(AddressSpace %x, Address %x)\n",
            AddressSpace, Address);
 
    if (!(KdDebugState & KD_DEBUG_SCREEN))
@@ -217,18 +217,18 @@ MmOpenMemoryAreaByAddress(
          Node = Node->RightChild;
       else
       {
-         DPRINT("MmOpenMemoryAreaByAddress(%x): %x [%x - %x]\n",
+         DPRINT("MmLocateMemoryAreaByAddress(%x): %x [%x - %x]\n",
                 Address, Node, Node->StartingAddress, Node->EndingAddress);
          return Node;
       }
    }
 
-   DPRINT("MmOpenMemoryAreaByAddress(%x): 0\n", Address);
+   DPRINT("MmLocateMemoryAreaByAddress(%x): 0\n", Address);
    return NULL;
 }
 
 PMEMORY_AREA STDCALL
-MmOpenMemoryAreaByRegion(
+MmLocateMemoryAreaByRegion(
    PMADDRESS_SPACE AddressSpace,
    PVOID Address,
    ULONG_PTR Length)
@@ -250,7 +250,7 @@ MmOpenMemoryAreaByRegion(
       if (Node->StartingAddress >= Address &&
           Node->StartingAddress < Extent)
       {
-         DPRINT("MmOpenMemoryAreaByRegion(%x - %x): %x - %x\n",
+         DPRINT("MmLocateMemoryAreaByRegion(%x - %x): %x - %x\n",
                 Address, Address + Length, Node->StartingAddress,
                 Node->EndingAddress);
          return Node;
@@ -258,7 +258,7 @@ MmOpenMemoryAreaByRegion(
       if (Node->EndingAddress > Address &&
           Node->EndingAddress < Extent)
       {
-         DPRINT("MmOpenMemoryAreaByRegion(%x - %x): %x - %x\n",
+         DPRINT("MmLocateMemoryAreaByRegion(%x - %x): %x - %x\n",
                 Address, Address + Length, Node->StartingAddress,
                 Node->EndingAddress);
          return Node;
@@ -266,14 +266,14 @@ MmOpenMemoryAreaByRegion(
       if (Node->StartingAddress <= Address &&
           Node->EndingAddress >= Extent)
       {
-         DPRINT("MmOpenMemoryAreaByRegion(%x - %x): %x - %x\n",
+         DPRINT("MmLocateMemoryAreaByRegion(%x - %x): %x - %x\n",
                 Address, Address + Length, Node->StartingAddress,
                 Node->EndingAddress);
          return Node;
       }
       if (Node->StartingAddress >= Extent)
       {
-         DPRINT("Finished MmOpenMemoryAreaByRegion() = NULL\n");
+         DPRINT("Finished MmLocateMemoryAreaByRegion() = NULL\n");
          return NULL;
       }
    }
@@ -866,14 +866,14 @@ MmFreeMemoryAreaByPtr(
 {
    PMEMORY_AREA MemoryArea;
 
-   DPRINT("MmFreeMemoryArea(AddressSpace %x, BaseAddress %x, Length %x,"
-          "FreePageContext %d)\n",AddressSpace,BaseAddress,Length,
+   DPRINT("MmFreeMemoryArea(AddressSpace %x, BaseAddress %x, "
+          "FreePageContext %d)\n", AddressSpace, BaseAddress,
           FreePageContext);
 
    MmVerifyMemoryAreas(AddressSpace);
 
-   MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace,
-                                          BaseAddress);
+   MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace,
+                                            BaseAddress);
    if (MemoryArea == NULL)
    {
       KEBUGCHECK(0);
@@ -974,9 +974,9 @@ MmCreateMemoryArea(PEPROCESS Process,
          ASSERT(((ULONG_PTR)*BaseAddress/BoundaryAddressMultiple.QuadPart) == ((DWORD_PTR)EndAddress/BoundaryAddressMultiple.QuadPart));
       }
 
-      if (MmOpenMemoryAreaByRegion(AddressSpace,
-                                   *BaseAddress,
-                                   tmpLength)!=NULL)
+      if (MmLocateMemoryAreaByRegion(AddressSpace,
+                                     *BaseAddress,
+                                     tmpLength) != NULL)
       {
          DPRINT("Memory area already occupied\n");
          return STATUS_CONFLICTING_ADDRESSES;
@@ -1016,7 +1016,7 @@ MmReleaseMemoryAreaIfDecommitted(PEPROCESS Process,
   
    MmVerifyMemoryAreas(AddressSpace);
 
-   MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, BaseAddress);
+   MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress);
    if (MemoryArea != NULL)
    {
       Entry = MemoryArea->Data.VirtualMemoryData.RegionListHead.Flink;
diff --git a/reactos/ntoskrnl/mm/mdl.c b/reactos/ntoskrnl/mm/mdl.c
index 3811043f96f..9724c8b205f 100644
--- a/reactos/ntoskrnl/mm/mdl.c
+++ b/reactos/ntoskrnl/mm/mdl.c
@@ -409,7 +409,7 @@ MmUnmapLockedPages(PVOID BaseAddress, PMDL Mdl)
       
       ASSERT(Mdl->Process == PsGetCurrentProcess());
 
-      Marea = MmOpenMemoryAreaByAddress( &Mdl->Process->AddressSpace, BaseAddress );
+      Marea = MmLocateMemoryAreaByAddress( &Mdl->Process->AddressSpace, BaseAddress );
       if (Marea == NULL)
       {
          DPRINT1( "Couldn't open memory area when unmapping user-space pages!\n" );
diff --git a/reactos/ntoskrnl/mm/mm.c b/reactos/ntoskrnl/mm/mm.c
index 6a132217b30..13c2011e3b2 100644
--- a/reactos/ntoskrnl/mm/mm.c
+++ b/reactos/ntoskrnl/mm/mm.c
@@ -187,8 +187,8 @@ BOOLEAN STDCALL MmIsAddressValid(PVOID VirtualAddress)
    }
 
    MmLockAddressSpace(AddressSpace);
-   MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace,
-                                          VirtualAddress);
+   MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace,
+                                            VirtualAddress);
 
    if (MemoryArea == NULL || MemoryArea->DeleteInProgress)
    {
@@ -247,7 +247,7 @@ NTSTATUS MmAccessFault(KPROCESSOR_MODE Mode,
    }
    do
    {
-      MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, (PVOID)Address);
+      MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, (PVOID)Address);
       if (MemoryArea == NULL || MemoryArea->DeleteInProgress)
       {
          if (!FromMdl)
@@ -374,7 +374,7 @@ NTSTATUS MmNotPresentFault(KPROCESSOR_MODE Mode,
     */
    do
    {
-      MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, (PVOID)Address);
+      MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, (PVOID)Address);
       if (MemoryArea == NULL || MemoryArea->DeleteInProgress)
       {
          if (!FromMdl)
diff --git a/reactos/ntoskrnl/mm/rmap.c b/reactos/ntoskrnl/mm/rmap.c
index ee1198081b8..4302fb376b4 100644
--- a/reactos/ntoskrnl/mm/rmap.c
+++ b/reactos/ntoskrnl/mm/rmap.c
@@ -117,7 +117,7 @@ MmWritePagePhysicalAddress(PFN_TYPE Page)
     * freed or paged out after we read the rmap entry.) 
     */
    MmLockAddressSpace(AddressSpace);
-   MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, Address);
+   MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, Address);
    if (MemoryArea == NULL || MemoryArea->DeleteInProgress)
    {
       MmUnlockAddressSpace(AddressSpace);
@@ -242,7 +242,7 @@ MmPageOutPhysicalAddress(PFN_TYPE Page)
    }
 
    MmLockAddressSpace(AddressSpace);
-   MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, Address);
+   MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, Address);
    if (MemoryArea == NULL || MemoryArea->DeleteInProgress)
    {
       MmUnlockAddressSpace(AddressSpace);
diff --git a/reactos/ntoskrnl/mm/section.c b/reactos/ntoskrnl/mm/section.c
index f40ea824952..9040d979dc3 100644
--- a/reactos/ntoskrnl/mm/section.c
+++ b/reactos/ntoskrnl/mm/section.c
@@ -1829,7 +1829,7 @@ MmAlterViewAttributes(PMADDRESS_SPACE AddressSpace,
    BOOL DoCOW = FALSE;
    ULONG i;
 
-   MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, BaseAddress);
+   MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress);
    Segment = MemoryArea->Data.SectionData.Segment;
 
    if ((Segment->WriteCopy || MemoryArea->Data.SectionData.WriteCopyView) &&
@@ -3688,8 +3688,8 @@ MmUnmapViewOfSegment(PMADDRESS_SPACE AddressSpace,
    PMM_REGION CurrentRegion;
    PLIST_ENTRY RegionListHead;
 
-   MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace,
-                                          BaseAddress);
+   MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace,
+                                            BaseAddress);
    if (MemoryArea == NULL)
    {
       return(STATUS_UNSUCCESSFUL);
@@ -3749,8 +3749,8 @@ MmUnmapViewOfSection(PEPROCESS Process,
    ASSERT(Process);
 
    AddressSpace = &Process->AddressSpace;
-   MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace,
-                                          BaseAddress);
+   MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace,
+                                            BaseAddress);
    if (MemoryArea == NULL ||
        MemoryArea->Type != MEMORY_AREA_SECTION_VIEW ||
        MemoryArea->DeleteInProgress)
@@ -4209,8 +4209,8 @@ MmMapViewOfSection(IN PVOID SectionObject,
       }
 
       /* Check there is enough space to map the section at that point. */
-      if (MmOpenMemoryAreaByRegion(AddressSpace, (PVOID)ImageBase,
-                                   PAGE_ROUND_UP(ImageSize)) != NULL)
+      if (MmLocateMemoryAreaByRegion(AddressSpace, (PVOID)ImageBase,
+                                     PAGE_ROUND_UP(ImageSize)) != NULL)
       {
          /* Fail if the user requested a fixed base address. */
          if ((*BaseAddress) != NULL)
diff --git a/reactos/ntoskrnl/mm/virtual.c b/reactos/ntoskrnl/mm/virtual.c
index 0dcd39a5765..b92ed3b0040 100644
--- a/reactos/ntoskrnl/mm/virtual.c
+++ b/reactos/ntoskrnl/mm/virtual.c
@@ -160,8 +160,7 @@ MiQueryVirtualMemory (IN HANDLE ProcessHandle,
       AddressSpace = MmGetKernelAddressSpace();
    }
    MmLockAddressSpace(AddressSpace);
-   MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace,
-                                          Address);
+   MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, Address);
    switch(VirtualMemoryInformationClass)
    {
       case MemoryBasicInformation:
@@ -405,8 +404,7 @@ NtProtectVirtualMemory(IN HANDLE ProcessHandle,
    AddressSpace = &Process->AddressSpace;
 
    MmLockAddressSpace(AddressSpace);
-   MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace,
-                                          BaseAddress);
+   MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress);
    if (MemoryArea == NULL)
    {
       MmUnlockAddressSpace(AddressSpace);