diff --git a/base/system/diskpart/diskpart.h b/base/system/diskpart/diskpart.h
index c7a453ed241..b961e1e7f37 100644
--- a/base/system/diskpart/diskpart.h
+++ b/base/system/diskpart/diskpart.h
@@ -152,8 +152,9 @@ typedef struct _DISKENTRY
 
     ULONG DiskNumber;
     USHORT Port;
-    USHORT Bus;
-    USHORT Id;
+    USHORT PathId;
+    USHORT TargetId;
+    USHORT Lun;
 
     /* Has the partition list been modified? */
     BOOLEAN Dirty;
diff --git a/base/system/diskpart/partlist.c b/base/system/diskpart/partlist.c
index 2113373ce83..6d91e385571 100644
--- a/base/system/diskpart/partlist.c
+++ b/base/system/diskpart/partlist.c
@@ -936,8 +936,9 @@ AddDiskToList(
 
     DiskEntry->DiskNumber = DiskNumber;
     DiskEntry->Port = ScsiAddress.PortNumber;
-    DiskEntry->Bus = ScsiAddress.PathId;
-    DiskEntry->Id = ScsiAddress.TargetId;
+    DiskEntry->PathId = ScsiAddress.PathId;
+    DiskEntry->TargetId = ScsiAddress.TargetId;
+    DiskEntry->Lun = ScsiAddress.Lun;
 
     GetDriverName(DiskEntry);