diff --git a/win32ss/user/consrv/coninput.c b/win32ss/user/consrv/coninput.c
index d3e9b799309..8b4e3b89f99 100644
--- a/win32ss/user/consrv/coninput.c
+++ b/win32ss/user/consrv/coninput.c
@@ -312,7 +312,7 @@ WaitBeforeReading(IN PGET_INPUT_INFO InputInfo,
     {
         PGET_INPUT_INFO CapturedInputInfo;
 
-        CapturedInputInfo = HeapAlloc(ConSrvHeap, 0, sizeof(GET_INPUT_INFO));
+        CapturedInputInfo = RtlAllocateHeap(ConSrvHeap, 0, sizeof(GET_INPUT_INFO));
         if (!CapturedInputInfo) return STATUS_NO_MEMORY;
 
         memmove(CapturedInputInfo, InputInfo, sizeof(GET_INPUT_INFO));
@@ -324,7 +324,7 @@ WaitBeforeReading(IN PGET_INPUT_INFO InputInfo,
                            CapturedInputInfo,
                            NULL))
         {
-            HeapFree(ConSrvHeap, 0, CapturedInputInfo);
+            RtlFreeHeap(ConSrvHeap, 0, CapturedInputInfo);
             return STATUS_NO_MEMORY;
         }
     }
@@ -361,7 +361,7 @@ ReadInputBufferThread(IN PLIST_ENTRY WaitList,
     if (Status != STATUS_PENDING)
     {
         WaitApiMessage->Status = Status;
-        HeapFree(ConSrvHeap, 0, InputInfo);
+        RtlFreeHeap(ConSrvHeap, 0, InputInfo);
     }
 
     return (Status == STATUS_PENDING ? FALSE : TRUE);
@@ -418,7 +418,7 @@ ReadInputBuffer(IN PGET_INPUT_INFO InputInfo,
             if (Wait) // TRUE --> Read, we remove inputs from the buffer ; FALSE --> Peek, we keep inputs.
             {
                 RemoveEntryList(&Input->ListEntry);
-                HeapFree(ConSrvHeap, 0, Input);
+                RtlFreeHeap(ConSrvHeap, 0, Input);
             }
         }
 
@@ -457,7 +457,7 @@ ReadCharsThread(IN PLIST_ENTRY WaitList,
     if (Status != STATUS_PENDING)
     {
         WaitApiMessage->Status = Status;
-        HeapFree(ConSrvHeap, 0, InputInfo);
+        RtlFreeHeap(ConSrvHeap, 0, InputInfo);
     }
 
     return (Status == STATUS_PENDING ? FALSE : TRUE);
@@ -485,7 +485,7 @@ ReadChars(IN PGET_INPUT_INFO InputInfo,
         {
             /* Starting a new line */
             InputInfo->Console->LineMaxSize = max(256, nNumberOfCharsToRead);
-            InputInfo->Console->LineBuffer = HeapAlloc(ConSrvHeap, 0, InputInfo->Console->LineMaxSize * sizeof(WCHAR));
+            InputInfo->Console->LineBuffer = RtlAllocateHeap(ConSrvHeap, 0, InputInfo->Console->LineMaxSize * sizeof(WCHAR));
             if (InputInfo->Console->LineBuffer == NULL)
             {
                 return STATUS_NO_MEMORY;
@@ -528,7 +528,7 @@ ReadChars(IN PGET_INPUT_INFO InputInfo,
                 LineInputKeyDown(InputInfo->Console, &Input->InputEvent.Event.KeyEvent);
                 ReadConsoleRequest->ControlKeyState = Input->InputEvent.Event.KeyEvent.dwControlKeyState;
             }
-            HeapFree(ConSrvHeap, 0, Input);
+            RtlFreeHeap(ConSrvHeap, 0, Input);
         }
 
         /* Check if we have a complete line to read from */
@@ -556,7 +556,7 @@ ReadChars(IN PGET_INPUT_INFO InputInfo,
             if (InputInfo->Console->LinePos == InputInfo->Console->LineSize)
             {
                 /* Entire line has been read */
-                HeapFree(ConSrvHeap, 0, InputInfo->Console->LineBuffer);
+                RtlFreeHeap(ConSrvHeap, 0, InputInfo->Console->LineBuffer);
                 InputInfo->Console->LineBuffer = NULL;
             }
 
@@ -600,7 +600,7 @@ ReadChars(IN PGET_INPUT_INFO InputInfo,
                 /* Did read something */
                 WaitForMoreToRead = FALSE;
             }
-            HeapFree(ConSrvHeap, 0, Input);
+            RtlFreeHeap(ConSrvHeap, 0, Input);
         }
     }
 
@@ -773,7 +773,7 @@ CSR_API(SrvFlushConsoleInputBuffer)
         CurrentEntry = RemoveHeadList(&Console->InputEvents);
         Input = CONTAINING_RECORD(CurrentEntry, ConsoleInput, ListEntry);
         /* Destroy the event */
-        HeapFree(ConSrvHeap, 0, Input);
+        RtlFreeHeap(ConSrvHeap, 0, Input);
     }
     ResetEvent(Console->ActiveEvent);
 
diff --git a/win32ss/user/consrv/conoutput.c b/win32ss/user/consrv/conoutput.c
index 3b5043ec0f0..8d3d77dc422 100644
--- a/win32ss/user/consrv/conoutput.c
+++ b/win32ss/user/consrv/conoutput.c
@@ -69,7 +69,7 @@ CsrInitConsoleScreenBuffer(PCONSOLE Console,
     Buffer->ShowX = 0;
     Buffer->ShowY = 0;
     Buffer->VirtualY = 0;
-    Buffer->Buffer = HeapAlloc(ConSrvHeap, HEAP_ZERO_MEMORY, Buffer->MaxX * Buffer->MaxY * 2);
+    Buffer->Buffer = RtlAllocateHeap(ConSrvHeap, HEAP_ZERO_MEMORY, Buffer->MaxX * Buffer->MaxY * 2);
     if (NULL == Buffer->Buffer)
     {
         return STATUS_INSUFFICIENT_RESOURCES;
@@ -379,8 +379,8 @@ ConioDeleteScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer)
         }
     }
 
-    HeapFree(ConSrvHeap, 0, Buffer->Buffer);
-    HeapFree(ConSrvHeap, 0, Buffer);
+    RtlFreeHeap(ConSrvHeap, 0, Buffer->Buffer);
+    RtlFreeHeap(ConSrvHeap, 0, Buffer);
 }
 
 VOID FASTCALL
@@ -506,7 +506,7 @@ DoWriteConsole(IN PCSR_API_MESSAGE ApiMessage,
                                          (PWCHAR)WriteConsoleRequest->Buffer,
                                          WriteConsoleRequest->NrCharactersToWrite,
                                          NULL, 0, NULL, NULL);
-            Buffer = RtlAllocateHeap(GetProcessHeap(), 0, Length);
+            Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length);
             if (Buffer)
             {
                 WideCharToMultiByte(Console->OutputCodePage, 0,
@@ -537,7 +537,7 @@ DoWriteConsole(IN PCSR_API_MESSAGE ApiMessage,
             }
             if (WriteConsoleRequest->Unicode)
             {
-                RtlFreeHeap(GetProcessHeap(), 0, Buffer);
+                RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer);
             }
         }
 
@@ -931,7 +931,7 @@ CSR_API(SrvWriteConsoleOutputString)
                                          (PWCHAR)WriteOutputCodeRequest->pCode.UnicodeChar,
                                          WriteOutputCodeRequest->Length,
                                          NULL, 0, NULL, NULL);
-            tmpString = String = RtlAllocateHeap(GetProcessHeap(), 0, Length);
+            tmpString = String = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length);
             if (String)
             {
                 WideCharToMultiByte(Console->OutputCodePage, 0,
@@ -996,7 +996,7 @@ CSR_API(SrvWriteConsoleOutputString)
 
     if (tmpString)
     {
-        RtlFreeHeap(GetProcessHeap(), 0, tmpString);
+        RtlFreeHeap(RtlGetProcessHeap(), 0, tmpString);
     }
 
     ConioUnlockScreenBuffer(Buff);
@@ -1235,7 +1235,7 @@ CSR_API(SrvCreateConsoleScreenBuffer)
         return Status;
     }
 
-    Buff = HeapAlloc(ConSrvHeap, HEAP_ZERO_MEMORY, sizeof(CONSOLE_SCREEN_BUFFER));
+    Buff = RtlAllocateHeap(ConSrvHeap, HEAP_ZERO_MEMORY, sizeof(CONSOLE_SCREEN_BUFFER));
     if (Buff != NULL)
     {
         if (Console->ActiveBuffer)
diff --git a/win32ss/user/consrv/console.c b/win32ss/user/consrv/console.c
index 6c90bc65da0..ee63a6cd72c 100644
--- a/win32ss/user/consrv/console.c
+++ b/win32ss/user/consrv/console.c
@@ -102,7 +102,7 @@ CsrInitConsole(PCONSOLE* NewConsole, int ShowCmd, PCSR_PROCESS ConsoleLeaderProc
     *NewConsole = NULL;
 
     /* Allocate a console structure */
-    Console = HeapAlloc(ConSrvHeap, HEAP_ZERO_MEMORY, sizeof(CONSOLE));
+    Console = RtlAllocateHeap(ConSrvHeap, HEAP_ZERO_MEMORY, sizeof(CONSOLE));
     if (NULL == Console)
     {
         DPRINT1("Not enough memory for console creation.\n");
@@ -146,7 +146,7 @@ CsrInitConsole(PCONSOLE* NewConsole, int ShowCmd, PCSR_PROCESS ConsoleLeaderProc
     if (NULL == Console->ActiveEvent)
     {
         RtlFreeUnicodeString(&Console->Title);
-        HeapFree(ConSrvHeap, 0, Console);
+        RtlFreeHeap(ConSrvHeap, 0, Console);
         return STATUS_UNSUCCESSFUL;
     }
     Console->PrivateData = NULL;
@@ -155,13 +155,13 @@ CsrInitConsole(PCONSOLE* NewConsole, int ShowCmd, PCSR_PROCESS ConsoleLeaderProc
     GuiMode = DtbgIsDesktopVisible();
 
     /* allocate console screen buffer */
-    NewBuffer = HeapAlloc(ConSrvHeap, HEAP_ZERO_MEMORY, sizeof(CONSOLE_SCREEN_BUFFER));
+    NewBuffer = RtlAllocateHeap(ConSrvHeap, HEAP_ZERO_MEMORY, sizeof(CONSOLE_SCREEN_BUFFER));
     if (NULL == NewBuffer)
     {
         RtlFreeUnicodeString(&Console->Title);
         DeleteCriticalSection(&Console->Lock);
         CloseHandle(Console->ActiveEvent);
-        HeapFree(ConSrvHeap, 0, Console);
+        RtlFreeHeap(ConSrvHeap, 0, Console);
         return STATUS_INSUFFICIENT_RESOURCES;
     }
     /* init screen buffer with defaults */
@@ -200,12 +200,12 @@ CsrInitConsole(PCONSOLE* NewConsole, int ShowCmd, PCSR_PROCESS ConsoleLeaderProc
         Status = GuiInitConsole(Console, ShowCmd);
         if (!NT_SUCCESS(Status))
         {
-            HeapFree(ConSrvHeap,0, NewBuffer);
+            RtlFreeHeap(ConSrvHeap,0, NewBuffer);
             RtlFreeUnicodeString(&Console->Title);
             DeleteCriticalSection(&Console->Lock);
             CloseHandle(Console->ActiveEvent);
             DPRINT1("GuiInitConsole: failed, Status = 0x%08lx\n", Status);
-            HeapFree(ConSrvHeap, 0, Console);
+            RtlFreeHeap(ConSrvHeap, 0, Console);
             return Status;
         }
     }
@@ -217,9 +217,9 @@ CsrInitConsole(PCONSOLE* NewConsole, int ShowCmd, PCSR_PROCESS ConsoleLeaderProc
         RtlFreeUnicodeString(&Console->Title);
         DeleteCriticalSection(&Console->Lock);
         CloseHandle(Console->ActiveEvent);
-        HeapFree(ConSrvHeap, 0, NewBuffer);
+        RtlFreeHeap(ConSrvHeap, 0, NewBuffer);
         DPRINT1("CsrInitConsoleScreenBuffer: failed\n");
-        HeapFree(ConSrvHeap, 0, Console);
+        RtlFreeHeap(ConSrvHeap, 0, Console);
         return Status;
     }
 
@@ -594,7 +594,7 @@ ConioDeleteConsole(PCONSOLE Console)
         Event = (ConsoleInput *) Console->InputEvents.Flink;
         Console->InputEvents.Flink = Console->InputEvents.Flink->Flink;
         Console->InputEvents.Flink->Flink->Blink = &Console->InputEvents;
-        HeapFree(ConSrvHeap, 0, Event);
+        RtlFreeHeap(ConSrvHeap, 0, Event);
     }
 
     ConioCleanupConsole(Console);
@@ -614,7 +614,7 @@ ConioDeleteConsole(PCONSOLE Console)
     DeleteCriticalSection(&Console->Lock);
     RtlFreeUnicodeString(&Console->Title);
     IntDeleteAllAliases(Console->Aliases);
-    HeapFree(ConSrvHeap, 0, Console);
+    RtlFreeHeap(ConSrvHeap, 0, Console);
 }
 
 VOID WINAPI
diff --git a/win32ss/user/consrv/guiconsole.c b/win32ss/user/consrv/guiconsole.c
index 925220aaf15..c5dabe6970e 100644
--- a/win32ss/user/consrv/guiconsole.c
+++ b/win32ss/user/consrv/guiconsole.c
@@ -710,7 +710,7 @@ GuiConsoleHandleNcCreate(HWND hWnd, LPCREATESTRUCTW Create)
 
     if (NULL == GuiData)
     {
-        DPRINT1("GuiConsoleNcCreate: HeapAlloc failed\n");
+        DPRINT1("GuiConsoleNcCreate: RtlAllocateHeap failed\n");
         return FALSE;
     }
 
@@ -743,7 +743,7 @@ GuiConsoleHandleNcCreate(HWND hWnd, LPCREATESTRUCTW Create)
     {
         DPRINT1("GuiConsoleNcCreate: CreateFont failed\n");
         DeleteCriticalSection(&GuiData->Lock);
-        HeapFree(ConSrvHeap, 0, GuiData);
+        RtlFreeHeap(ConSrvHeap, 0, GuiData);
         return FALSE;
     }
     Dc = GetDC(hWnd);
@@ -752,7 +752,7 @@ GuiConsoleHandleNcCreate(HWND hWnd, LPCREATESTRUCTW Create)
         DPRINT1("GuiConsoleNcCreate: GetDC failed\n");
         DeleteObject(GuiData->Font);
         DeleteCriticalSection(&GuiData->Lock);
-        HeapFree(ConSrvHeap, 0, GuiData);
+        RtlFreeHeap(ConSrvHeap, 0, GuiData);
         return FALSE;
     }
     OldFont = SelectObject(Dc, GuiData->Font);
@@ -762,7 +762,7 @@ GuiConsoleHandleNcCreate(HWND hWnd, LPCREATESTRUCTW Create)
         ReleaseDC(hWnd, Dc);
         DeleteObject(GuiData->Font);
         DeleteCriticalSection(&GuiData->Lock);
-        HeapFree(ConSrvHeap, 0, GuiData);
+        RtlFreeHeap(ConSrvHeap, 0, GuiData);
         return FALSE;
     }
     if (! GetTextMetricsW(Dc, &Metrics))
@@ -772,7 +772,7 @@ GuiConsoleHandleNcCreate(HWND hWnd, LPCREATESTRUCTW Create)
         ReleaseDC(hWnd, Dc);
         DeleteObject(GuiData->Font);
         DeleteCriticalSection(&GuiData->Lock);
-        HeapFree(ConSrvHeap, 0, GuiData);
+        RtlFreeHeap(ConSrvHeap, 0, GuiData);
         return FALSE;
     }
     GuiData->CharWidth = Metrics.tmMaxCharWidth;
@@ -1312,7 +1312,7 @@ GuiConsoleHandleNcDestroy(HWND hWnd)
     if (GuiData->ConsoleLibrary)
         FreeLibrary(GuiData->ConsoleLibrary);
 
-    HeapFree(ConSrvHeap, 0, GuiData);
+    RtlFreeHeap(ConSrvHeap, 0, GuiData);
 }
 
 static COORD
@@ -1768,7 +1768,7 @@ GuiResizeBuffer(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer, COORD Siz
     if (Size.X == ScreenBuffer->MaxX && Size.Y == ScreenBuffer->MaxY)
         return STATUS_SUCCESS;
 
-    Buffer = HeapAlloc(ConSrvHeap, 0, Size.X * Size.Y * 2);
+    Buffer = RtlAllocateHeap(ConSrvHeap, 0, Size.X * Size.Y * 2);
     if (!Buffer)
         return STATUS_NO_MEMORY;
 
@@ -1819,7 +1819,7 @@ GuiResizeBuffer(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer, COORD Siz
     }
 
     (void)InterlockedExchangePointer((PVOID volatile  *)&ScreenBuffer->Buffer, Buffer);
-    HeapFree(ConSrvHeap, 0, OldBuffer);
+    RtlFreeHeap(ConSrvHeap, 0, OldBuffer);
     ScreenBuffer->MaxX = Size.X;
     ScreenBuffer->MaxY = Size.Y;
     ScreenBuffer->VirtualY = 0;
@@ -2081,8 +2081,8 @@ GuiConsoleNotifyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
         SetWindowLongW(hWnd, GWL_USERDATA, 0);
         return 0;
     case PM_CREATE_CONSOLE:
-        Buffer = HeapAlloc(ConSrvHeap, 0,
-                           Console->Title.Length + sizeof(WCHAR));
+        Buffer = RtlAllocateHeap(ConSrvHeap, 0,
+                                 Console->Title.Length + sizeof(WCHAR));
         if (NULL != Buffer)
         {
             memcpy(Buffer, Console->Title.Buffer, Console->Title.Length);
@@ -2107,7 +2107,7 @@ GuiConsoleNotifyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
                                     (PVOID)Console);
         if (NULL != Buffer)
         {
-            HeapFree(ConSrvHeap, 0, Buffer);
+            RtlFreeHeap(ConSrvHeap, 0, Buffer);
         }
         if (NULL != NewWindow)
         {
@@ -2247,8 +2247,8 @@ GuiChangeTitle(PCONSOLE Console)
 {
     PWCHAR Buffer, Title;
 
-    Buffer = HeapAlloc(ConSrvHeap, 0,
-                       Console->Title.Length + sizeof(WCHAR));
+    Buffer = RtlAllocateHeap(ConSrvHeap, 0,
+                             Console->Title.Length + sizeof(WCHAR));
     if (NULL != Buffer)
     {
         memcpy(Buffer, Console->Title.Buffer, Console->Title.Length);
@@ -2264,7 +2264,7 @@ GuiChangeTitle(PCONSOLE Console)
 
     if (NULL != Buffer)
     {
-        HeapFree(ConSrvHeap, 0, Buffer);
+        RtlFreeHeap(ConSrvHeap, 0, Buffer);
     }
 
     return TRUE;
@@ -2350,8 +2350,8 @@ GuiInitConsole(PCONSOLE Console, int ShowCmd)
             return STATUS_UNSUCCESSFUL;
         }
     }
-    GuiData = HeapAlloc(ConSrvHeap, HEAP_ZERO_MEMORY,
-                        sizeof(GUI_CONSOLE_DATA));
+    GuiData = RtlAllocateHeap(ConSrvHeap, HEAP_ZERO_MEMORY,
+                              sizeof(GUI_CONSOLE_DATA));
     if (!GuiData)
     {
         DPRINT1("Win32Csr: Failed to create GUI_CONSOLE_DATA\n");
diff --git a/win32ss/user/consrv/lineinput.c b/win32ss/user/consrv/lineinput.c
index 536ce773ca0..d65a3bdf1ad 100644
--- a/win32ss/user/consrv/lineinput.c
+++ b/win32ss/user/consrv/lineinput.c
@@ -42,15 +42,15 @@ HistoryCurrentBuffer(PCONSOLE Console)
     }
 
     /* Couldn't find the buffer, create a new one */
-    Hist = HeapAlloc(ConSrvHeap, 0, sizeof(HISTORY_BUFFER) + ExeName.Length);
+    Hist = RtlAllocateHeap(ConSrvHeap, 0, sizeof(HISTORY_BUFFER) + ExeName.Length);
     if (!Hist)
         return NULL;
     Hist->MaxEntries = Console->HistoryBufferSize;
     Hist->NumEntries = 0;
-    Hist->Entries = HeapAlloc(ConSrvHeap, 0, Hist->MaxEntries * sizeof(UNICODE_STRING));
+    Hist->Entries = RtlAllocateHeap(ConSrvHeap, 0, Hist->MaxEntries * sizeof(UNICODE_STRING));
     if (!Hist->Entries)
     {
-        HeapFree(ConSrvHeap, 0, Hist);
+        RtlFreeHeap(ConSrvHeap, 0, Hist);
         return NULL;
     }
     Hist->ExeName.Length = Hist->ExeName.MaximumLength = ExeName.Length;
@@ -144,9 +144,9 @@ HistoryDeleteBuffer(PHISTORY_BUFFER Hist)
         return;
     while (Hist->NumEntries != 0)
         RtlFreeUnicodeString(&Hist->Entries[--Hist->NumEntries]);
-    HeapFree(ConSrvHeap, 0, Hist->Entries);
+    RtlFreeHeap(ConSrvHeap, 0, Hist->Entries);
     RemoveEntryList(&Hist->ListEntry);
-    HeapFree(ConSrvHeap, 0, Hist);
+    RtlFreeHeap(ConSrvHeap, 0, Hist);
 }
 
 CSR_API(SrvGetConsoleCommandHistoryLength)
@@ -281,8 +281,8 @@ CSR_API(SrvSetConsoleNumberOfCommands)
         if (Hist)
         {
             OldEntryList = Hist->Entries;
-            NewEntryList = HeapAlloc(ConSrvHeap, 0,
-                                     MaxEntries * sizeof(UNICODE_STRING));
+            NewEntryList = RtlAllocateHeap(ConSrvHeap, 0,
+                                           MaxEntries * sizeof(UNICODE_STRING));
             if (!NewEntryList)
             {
                 Status = STATUS_NO_MEMORY;
@@ -299,7 +299,7 @@ CSR_API(SrvSetConsoleNumberOfCommands)
                 Hist->MaxEntries = MaxEntries;
                 Hist->Entries = memcpy(NewEntryList, Hist->Entries,
                                        Hist->NumEntries * sizeof(UNICODE_STRING));
-                HeapFree(ConSrvHeap, 0, OldEntryList);
+                RtlFreeHeap(ConSrvHeap, 0, OldEntryList);
             }
         }
         ConioUnlockConsole(Console);