diff --git a/reactos/subsys/csr/csrsrv/process.c b/reactos/subsys/csr/csrsrv/process.c
index 6ccaa24ac36..2ff3413c3b8 100644
--- a/reactos/subsys/csr/csrsrv/process.c
+++ b/reactos/subsys/csr/csrsrv/process.c
@@ -68,7 +68,7 @@ NTSTATUS STDCALL CsrCreateProcess (PCSR_SESSION pCsrSession, PCSR_PROCESS * ppCs
 	{
 		Status = STATUS_NO_MEMORY;
 	} else {
-		pCsrProcess->CsrSession = pCsrSession;
+		pCsrProcess->NtSession = pCsrSession;
 		if (NULL != ppCsrProcess)
 		{
 			*ppCsrProcess = pCsrProcess;
diff --git a/reactos/subsys/csr/csrsrv/thread.c b/reactos/subsys/csr/csrsrv/thread.c
index c4dddef54b7..c06c539e694 100644
--- a/reactos/subsys/csr/csrsrv/thread.c
+++ b/reactos/subsys/csr/csrsrv/thread.c
@@ -53,7 +53,7 @@ NTSTATUS STDCALL CsrCreateThread (PCSR_PROCESS pCsrProcess, PCSR_THREAD *ppCsrTh
 	{
 		return STATUS_INVALID_PARAMETER;
 	}
-	pCsrSession = pCsrProcess->CsrSession;
+	pCsrSession = pCsrProcess->NtSession;
 	pCsrThread = RtlAllocateHeap (pCsrSession->Heap,
 					HEAP_ZERO_MEMORY,
 					sizeof (CSR_THREAD));
@@ -62,8 +62,7 @@ NTSTATUS STDCALL CsrCreateThread (PCSR_PROCESS pCsrProcess, PCSR_THREAD *ppCsrTh
 		DPRINT1("CSRSRV:%s: out of memory!\n", __FUNCTION__);
 		return STATUS_NO_MEMORY;
 	}
-	pCsrThread->CsrSession = pCsrSession;
-	pCsrThread->CsrProcess = pCsrProcess;	
+	pCsrThread->Process = pCsrProcess;	
 	return Status;
 }