diff --git a/reactos/include/ndk/sefuncs.h b/reactos/include/ndk/sefuncs.h
index a5b9e3368cf..a06756527c3 100644
--- a/reactos/include/ndk/sefuncs.h
+++ b/reactos/include/ndk/sefuncs.h
@@ -57,7 +57,7 @@ NTSTATUS
 NTAPI
 SeCreateAccessState(
     PACCESS_STATE AccessState,
-    PAUX_DATA AuxData,
+    PAUX_ACCESS_DATA AuxData,
     ACCESS_MASK Access,
     PGENERIC_MAPPING GenericMapping
 );
diff --git a/reactos/include/ndk/setypes.h b/reactos/include/ndk/setypes.h
index 6d36d7b22cb..7f124ffe0f0 100644
--- a/reactos/include/ndk/setypes.h
+++ b/reactos/include/ndk/setypes.h
@@ -160,12 +160,12 @@ typedef struct _TOKEN
     ULONG VariablePart;                               /* 0xA0 */
 } TOKEN, *PTOKEN;
 
-typedef struct _AUX_DATA
+typedef struct _AUX_ACCESS_DATA
 {
     PPRIVILEGE_SET PrivilegeSet;
     GENERIC_MAPPING GenericMapping;
     ULONG Reserved;
-} AUX_DATA, *PAUX_DATA;
+} AUX_ACCESS_DATA, *PAUX_ACCESS_DATA;
 
 //
 // External SRM Data
diff --git a/reactos/ntoskrnl/include/internal/ob.h b/reactos/ntoskrnl/include/internal/ob.h
index 7449e213163..98b8ad2e00e 100644
--- a/reactos/ntoskrnl/include/internal/ob.h
+++ b/reactos/ntoskrnl/include/internal/ob.h
@@ -154,7 +154,7 @@ typedef struct _OB_TEMP_BUFFER
     ACCESS_STATE LocalAccessState;
     OBJECT_CREATE_INFORMATION ObjectCreateInfo;
     OBP_LOOKUP_CONTEXT LookupContext;
-    AUX_DATA AuxData;
+    AUX_ACCESS_DATA AuxData;
 } OB_TEMP_BUFFER, *POB_TEMP_BUFFER;
 
 //
diff --git a/reactos/ntoskrnl/include/internal/se.h b/reactos/ntoskrnl/include/internal/se.h
index 27af7647547..5ab71dcc74c 100644
--- a/reactos/ntoskrnl/include/internal/se.h
+++ b/reactos/ntoskrnl/include/internal/se.h
@@ -139,7 +139,7 @@ SeCreateAccessStateEx(
     IN PETHREAD Thread,
     IN PEPROCESS Process,
     IN OUT PACCESS_STATE AccessState,
-    IN PAUX_DATA AuxData,
+    IN PAUX_ACCESS_DATA AuxData,
     IN ACCESS_MASK Access,
     IN PGENERIC_MAPPING GenericMapping
 );
diff --git a/reactos/ntoskrnl/ob/obhandle.c b/reactos/ntoskrnl/ob/obhandle.c
index dfed3f1796d..d7e8aeb74ad 100644
--- a/reactos/ntoskrnl/ob/obhandle.c
+++ b/reactos/ntoskrnl/ob/obhandle.c
@@ -1449,7 +1449,7 @@ ObpCreateHandle(IN OB_OPEN_REASON OpenReason,
     PVOID HandleTable;
     NTSTATUS Status;
     ACCESS_MASK DesiredAccess, GrantedAccess;
-    PAUX_DATA AuxData;
+    PAUX_ACCESS_DATA AuxData;
     PAGED_CODE();
 
     /* Get the object header and type */
@@ -2097,7 +2097,7 @@ ObDuplicateObject(IN PEPROCESS SourceProcess,
     ACCESS_MASK TargetAccess, SourceAccess;
     ACCESS_STATE AccessState;
     PACCESS_STATE PassedAccessState = NULL;
-    AUX_DATA AuxData;
+    AUX_ACCESS_DATA AuxData;
     PHANDLE_TABLE HandleTable;
     OBJECT_HANDLE_INFORMATION HandleInformation;
     ULONG AuditMask;
@@ -2590,7 +2590,7 @@ ObOpenObjectByPointer(IN PVOID Object,
     POBJECT_HEADER Header;
     NTSTATUS Status;
     ACCESS_STATE AccessState;
-    AUX_DATA AuxData;
+    AUX_ACCESS_DATA AuxData;
     PAGED_CODE();
 
     /* Assume failure */
@@ -2789,7 +2789,7 @@ ObInsertObject(IN PVOID Object,
     POBJECT_HEADER_NAME_INFO ObjectNameInfo;
     OBP_LOOKUP_CONTEXT Context;
     ACCESS_STATE LocalAccessState;
-    AUX_DATA AuxData;
+    AUX_ACCESS_DATA AuxData;
     OB_OPEN_REASON OpenReason;
     KPROCESSOR_MODE PreviousMode;
     NTSTATUS Status = STATUS_SUCCESS, RealStatus;
diff --git a/reactos/ntoskrnl/ob/obref.c b/reactos/ntoskrnl/ob/obref.c
index da20c254944..e19a50539fd 100644
--- a/reactos/ntoskrnl/ob/obref.c
+++ b/reactos/ntoskrnl/ob/obref.c
@@ -388,7 +388,7 @@ ObReferenceObjectByName(IN PUNICODE_STRING ObjectPath,
     UNICODE_STRING ObjectName;
     NTSTATUS Status;
     OBP_LOOKUP_CONTEXT Context;
-    AUX_DATA AuxData;
+    AUX_ACCESS_DATA AuxData;
     ACCESS_STATE AccessState;
     PAGED_CODE();
 
diff --git a/reactos/ntoskrnl/ob/obsecure.c b/reactos/ntoskrnl/ob/obsecure.c
index 5698283ab44..6d4653804a0 100644
--- a/reactos/ntoskrnl/ob/obsecure.c
+++ b/reactos/ntoskrnl/ob/obsecure.c
@@ -352,7 +352,7 @@ ObpCheckObjectReference(IN PVOID Object,
                                     &AccessState->SubjectSecurityContext,
                                     AccessState->RemainingDesiredAccess |
                                     AccessState->PreviouslyGrantedAccess,
-                                    ((PAUX_DATA)(AccessState->AuxData))->
+                                    ((PAUX_ACCESS_DATA)(AccessState->AuxData))->
                                     PrivilegeSet,
                                     Result,
                                     AccessMode);
diff --git a/reactos/ntoskrnl/ps/process.c b/reactos/ntoskrnl/ps/process.c
index ed964a4ab7a..035efcc02d8 100644
--- a/reactos/ntoskrnl/ps/process.c
+++ b/reactos/ntoskrnl/ps/process.c
@@ -374,7 +374,7 @@ PspCreateProcess(OUT PHANDLE ProcessHandle,
     ULONG MinWs, MaxWs;
     ACCESS_STATE LocalAccessState;
     PACCESS_STATE AccessState = &LocalAccessState;
-    AUX_DATA AuxData;
+    AUX_ACCESS_DATA AuxData;
     UCHAR Quantum;
     BOOLEAN Result, SdAllocated;
     PSECURITY_DESCRIPTOR SecurityDescriptor;
@@ -1334,7 +1334,7 @@ NtOpenProcess(OUT PHANDLE ProcessHandle,
     PEPROCESS Process = NULL;
     NTSTATUS Status = STATUS_SUCCESS;
     ACCESS_STATE AccessState;
-    AUX_DATA AuxData;
+    AUX_ACCESS_DATA AuxData;
     PAGED_CODE();
     PSTRACE(PS_PROCESS_DEBUG,
             "ClientId: %p Attributes: %p\n", ClientId, ObjectAttributes);
diff --git a/reactos/ntoskrnl/ps/thread.c b/reactos/ntoskrnl/ps/thread.c
index 2fc851ebbf9..627221631e4 100644
--- a/reactos/ntoskrnl/ps/thread.c
+++ b/reactos/ntoskrnl/ps/thread.c
@@ -193,7 +193,7 @@ PspCreateThread(OUT PHANDLE ThreadHandle,
     HANDLE_TABLE_ENTRY CidEntry;
     ACCESS_STATE LocalAccessState;
     PACCESS_STATE AccessState = &LocalAccessState;
-    AUX_DATA AuxData;
+    AUX_ACCESS_DATA AuxData;
     BOOLEAN Result, SdAllocated;
     PSECURITY_DESCRIPTOR SecurityDescriptor;
     SECURITY_SUBJECT_CONTEXT SubjectContext;
@@ -952,7 +952,7 @@ NtOpenThread(OUT PHANDLE ThreadHandle,
     PETHREAD Thread;
     BOOLEAN HasObjectName = FALSE;
     ACCESS_STATE AccessState;
-    AUX_DATA AuxData;
+    AUX_ACCESS_DATA AuxData;
     PAGED_CODE();
     PSTRACE(PS_THREAD_DEBUG,
             "ClientId: %p ObjectAttributes: %p\n", ClientId, ObjectAttributes);
diff --git a/reactos/ntoskrnl/se/access.c b/reactos/ntoskrnl/se/access.c
index 9f756da24cf..291d37aec99 100644
--- a/reactos/ntoskrnl/se/access.c
+++ b/reactos/ntoskrnl/se/access.c
@@ -121,7 +121,7 @@ NTAPI
 SeCreateAccessStateEx(IN PETHREAD Thread,
                       IN PEPROCESS Process,
                       IN OUT PACCESS_STATE AccessState,
-                      IN PAUX_DATA AuxData,
+                      IN PAUX_ACCESS_DATA AuxData,
                       IN ACCESS_MASK Access,
                       IN PGENERIC_MAPPING GenericMapping)
 {
@@ -177,7 +177,7 @@ SeCreateAccessStateEx(IN PETHREAD Thread,
 NTSTATUS
 STDCALL
 SeCreateAccessState(IN OUT PACCESS_STATE AccessState,
-                    IN PAUX_DATA AuxData,
+                    IN PAUX_ACCESS_DATA AuxData,
                     IN ACCESS_MASK Access,
                     IN PGENERIC_MAPPING GenericMapping)
 {
@@ -199,7 +199,7 @@ VOID
 STDCALL
 SeDeleteAccessState(IN PACCESS_STATE AccessState)
 {
-    PAUX_DATA AuxData;
+    PAUX_ACCESS_DATA AuxData;
     PAGED_CODE();
 
     /* Get the Auxiliary Data */
@@ -233,7 +233,7 @@ SeSetAccessStateGenericMapping(IN PACCESS_STATE AccessState,
     PAGED_CODE();
 
     /* Set the Generic Mapping */
-    ((PAUX_DATA)AccessState->AuxData)->GenericMapping = *GenericMapping;
+    ((PAUX_ACCESS_DATA)AccessState->AuxData)->GenericMapping = *GenericMapping;
 }
 
 /*