diff --git a/reactos/boot/freeldr/freeldr/windows/winldr.c b/reactos/boot/freeldr/freeldr/windows/winldr.c
index 4bd5ee5002f..5b2976e033b 100644
--- a/reactos/boot/freeldr/freeldr/windows/winldr.c
+++ b/reactos/boot/freeldr/freeldr/windows/winldr.c
@@ -332,16 +332,16 @@ WinLdrLoadBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock,
 
 	while (NextBd != &LoaderBlock->BootDriverListHead)
 	{
-		BootDriver = CONTAINING_RECORD(NextBd, BOOT_DRIVER_LIST_ENTRY, ListEntry);
+		BootDriver = CONTAINING_RECORD(NextBd, BOOT_DRIVER_LIST_ENTRY, Link);
 
 		DbgPrint((DPRINT_WINDOWS, "BootDriver %wZ DTE %08X RegPath: %wZ\n", &BootDriver->FilePath,
-			BootDriver->DataTableEntry, &BootDriver->RegistryPath));
+			BootDriver->LdrEntry, &BootDriver->RegistryPath));
 
 		// Paths are relative (FIXME: Are they always relative?)
 
 		// Load it
 		Status = WinLdrLoadDeviceDriver(LoaderBlock, BootPath, &BootDriver->FilePath,
-			0, &BootDriver->DataTableEntry);
+			0, &BootDriver->LdrEntry);
 
 		// If loading failed - cry loudly
 		//FIXME: Maybe remove it from the list and try to continue?
@@ -353,9 +353,9 @@ WinLdrLoadBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock,
 
 		// Convert the RegistryPath and DTE addresses to VA since we are not going to use it anymore
 		BootDriver->RegistryPath.Buffer = PaToVa(BootDriver->RegistryPath.Buffer);
-		BootDriver->DataTableEntry = PaToVa(BootDriver->DataTableEntry);
+		BootDriver->LdrEntry = PaToVa(BootDriver->LdrEntry);
 
-		NextBd = BootDriver->ListEntry.Flink;
+		NextBd = BootDriver->Link.Flink;
 	}
 
 	return TRUE;
@@ -620,12 +620,12 @@ WinLdrpDumpBootDriver(PLOADER_PARAMETER_BLOCK LoaderBlock)
 
 	while (NextBd != &LoaderBlock->BootDriverListHead)
 	{
-		BootDriver = CONTAINING_RECORD(NextBd, BOOT_DRIVER_LIST_ENTRY, ListEntry);
+		BootDriver = CONTAINING_RECORD(NextBd, BOOT_DRIVER_LIST_ENTRY, Link);
 
 		DbgPrint((DPRINT_WINDOWS, "BootDriver %wZ DTE %08X RegPath: %wZ\n", &BootDriver->FilePath,
-			BootDriver->DataTableEntry, &BootDriver->RegistryPath));
+			BootDriver->LdrEntry, &BootDriver->RegistryPath));
 
-		NextBd = BootDriver->ListEntry.Flink;
+		NextBd = BootDriver->Link.Flink;
 	}
 }
 
diff --git a/reactos/boot/freeldr/freeldr/windows/wlregistry.c b/reactos/boot/freeldr/freeldr/windows/wlregistry.c
index 026b61050cb..20693ed0e2d 100644
--- a/reactos/boot/freeldr/freeldr/windows/wlregistry.c
+++ b/reactos/boot/freeldr/freeldr/windows/wlregistry.c
@@ -685,7 +685,7 @@ WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead,
 		return FALSE;
 
 	// DTE will be filled during actual load of the driver
-	BootDriverEntry->DataTableEntry = NULL;
+	BootDriverEntry->LdrEntry = NULL;
 
 	// Check - if we have a valid ImagePath, if not - we need to build it
 	// like "System32\\Drivers\\blah.sys"
@@ -768,7 +768,7 @@ WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead,
 		return FALSE;
 
 	// Insert entry at top of the list
-	InsertTailList(BootDriverListHead, &BootDriverEntry->ListEntry);
+	InsertTailList(BootDriverListHead, &BootDriverEntry->Link);
 
 	return TRUE;
 }
diff --git a/reactos/include/reactos/arc/arc.h b/reactos/include/reactos/arc/arc.h
index b57001bae81..1e3f7d738f0 100644
--- a/reactos/include/reactos/arc/arc.h
+++ b/reactos/include/reactos/arc/arc.h
@@ -118,10 +118,10 @@ typedef struct _MEMORY_ALLOCATION_DESCRIPTOR
 
 typedef struct _BOOT_DRIVER_LIST_ENTRY
 {
-    LIST_ENTRY ListEntry;
+    LIST_ENTRY Link;
     UNICODE_STRING FilePath;
     UNICODE_STRING RegistryPath;
-    struct _LDR_DATA_TABLE_ENTRY *DataTableEntry;
+    struct _LDR_DATA_TABLE_ENTRY *LdrEntry;
 } BOOT_DRIVER_LIST_ENTRY, *PBOOT_DRIVER_LIST_ENTRY;
 
 typedef struct _ARC_DISK_SIGNATURE