diff --git a/subsystems/win32/csrsrv/api/process.c b/subsystems/win32/csrsrv/api/process.c
index 7d82c06f616..46c4ce92dcd 100644
--- a/subsystems/win32/csrsrv/api/process.c
+++ b/subsystems/win32/csrsrv/api/process.c
@@ -23,7 +23,14 @@ extern NTSTATUS CallProcessCreated(PCSR_PROCESS, PCSR_PROCESS);
  *	CSRSS API
  *********************************************************************/
 
-CSR_API(CsrSrvCreateProcess)
+/***
+ *** Some APIs from here will go to basesrv.dll, some others to winsrv.dll.
+ *** Furthermore, this structure uses the old definition of APIs list.
+ *** The new one is in fact three arrays, one of APIs pointers, one other of
+ *** corresponding indexes, and the third one of names (not very efficient...).
+ ***/
+
+CSR_API(BaseSrvCreateProcess)
 {
      NTSTATUS Status;
      HANDLE ProcessHandle, ThreadHandle;
@@ -135,7 +142,7 @@ CSR_API(CsrSrvCreateProcess)
     return Status;
 }
 
-CSR_API(CsrSrvCreateThread)
+CSR_API(BaseSrvCreateThread)
 {
     PCSR_THREAD CurrentThread;
     HANDLE ThreadHandle;
@@ -191,7 +198,7 @@ CSR_API(CsrSrvCreateThread)
     return Status;
 }
 
-CSR_API(CsrTerminateProcess)
+CSR_API(BaseSrvExitProcess)
 {
     PCSR_THREAD CsrThread = CsrGetClientThread();
     ASSERT(CsrThread != NULL);
@@ -204,12 +211,7 @@ CSR_API(CsrTerminateProcess)
                              (NTSTATUS)ApiMessage->Data.TerminateProcessRequest.uExitCode);
 }
 
-CSR_API(CsrConnectProcess)
-{
-    return STATUS_SUCCESS;
-}
-
-CSR_API(CsrGetShutdownParameters)
+CSR_API(BaseSrvGetProcessShutdownParam)
 {
     PCSR_THREAD CsrThread = CsrGetClientThread();
     ASSERT(CsrThread);
@@ -220,7 +222,7 @@ CSR_API(CsrGetShutdownParameters)
     return STATUS_SUCCESS;
 }
 
-CSR_API(CsrSetShutdownParameters)
+CSR_API(BaseSrvSetProcessShutdownParam)
 {
     PCSR_THREAD CsrThread = CsrGetClientThread();
     ASSERT(CsrThread);
diff --git a/subsystems/win32/csrsrv/api/user.c b/subsystems/win32/csrsrv/api/user.c
index 1ba4fb38acb..770e5194d84 100644
--- a/subsystems/win32/csrsrv/api/user.c
+++ b/subsystems/win32/csrsrv/api/user.c
@@ -23,7 +23,7 @@ static ULONG_PTR ServicesProcessId;
 
 /* FUNCTIONS *****************************************************************/
 
-CSR_API(CsrRegisterServicesProcess)
+CSR_API(SrvRegisterServicesProcess)
 {
   if (ServicesProcessIdValid == TRUE)
     {
diff --git a/subsystems/win32/csrsrv/include/api.h b/subsystems/win32/csrsrv/include/api.h
index 1466370513d..a621d9cad36 100644
--- a/subsystems/win32/csrsrv/include/api.h
+++ b/subsystems/win32/csrsrv/include/api.h
@@ -71,11 +71,11 @@ NTSTATUS NTAPI CsrServerInitialization(ULONG ArgumentCount, PCHAR Arguments[]);
 
 /* api/process.c */
 CSR_API(CsrConnectProcess);
-CSR_API(CsrSrvCreateProcess);
-CSR_API(CsrTerminateProcess);
-CSR_API(CsrSrvCreateThread);
-CSR_API(CsrGetShutdownParameters);
-CSR_API(CsrSetShutdownParameters);
+CSR_API(BaseSrvCreateProcess);
+CSR_API(BaseSrvExitProcess);
+CSR_API(BaseSrvCreateThread);
+CSR_API(BaseSrvGetProcessShutdownParam);
+CSR_API(BaseSrvSetProcessShutdownParam);
 
 VOID
 NTAPI
@@ -263,6 +263,6 @@ CsrLoadServerDll(IN PCHAR DllString,
                  IN ULONG ServerId);
 
 /* api/user.c */
-CSR_API(CsrRegisterServicesProcess);
+CSR_API(SrvRegisterServicesProcess);
 
 /* EOF */
diff --git a/subsystems/win32/csrsrv/init.c b/subsystems/win32/csrsrv/init.c
index af7f76a2746..ea5db55bea4 100644
--- a/subsystems/win32/csrsrv/init.c
+++ b/subsystems/win32/csrsrv/init.c
@@ -94,13 +94,12 @@ CallProcessCreated(IN PCSR_PROCESS SourceProcessData,
  ***/
 CSRSS_API_DEFINITION NativeDefinitions[] =
 {
-    CSRSS_DEFINE_API(CREATE_PROCESS,               CsrSrvCreateProcess),
-    CSRSS_DEFINE_API(CREATE_THREAD,                CsrSrvCreateThread),
-    CSRSS_DEFINE_API(TERMINATE_PROCESS,            CsrTerminateProcess),
-    CSRSS_DEFINE_API(CONNECT_PROCESS,              CsrConnectProcess),
-    CSRSS_DEFINE_API(REGISTER_SERVICES_PROCESS,    CsrRegisterServicesProcess),
-    CSRSS_DEFINE_API(GET_SHUTDOWN_PARAMETERS,      CsrGetShutdownParameters),
-    CSRSS_DEFINE_API(SET_SHUTDOWN_PARAMETERS,      CsrSetShutdownParameters),
+    CSRSS_DEFINE_API(CREATE_PROCESS,               BaseSrvCreateProcess),
+    CSRSS_DEFINE_API(CREATE_THREAD,                BaseSrvCreateThread),
+    CSRSS_DEFINE_API(TERMINATE_PROCESS,            BaseSrvExitProcess),
+    CSRSS_DEFINE_API(REGISTER_SERVICES_PROCESS,    SrvRegisterServicesProcess),
+    CSRSS_DEFINE_API(GET_SHUTDOWN_PARAMETERS,      BaseSrvGetProcessShutdownParam),
+    CSRSS_DEFINE_API(SET_SHUTDOWN_PARAMETERS,      BaseSrvSetProcessShutdownParam),
     { 0, 0, NULL }
 };