diff --git a/reactos/boot/bootdata/hivesys_i386.inf b/reactos/boot/bootdata/hivesys_i386.inf
index cb767b8ca6e..3e6c03acfd8 100644
--- a/reactos/boot/bootdata/hivesys_i386.inf
+++ b/reactos/boot/bootdata/hivesys_i386.inf
@@ -1240,21 +1240,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ImagePath",0x00020000,"system32\dr
 HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Start",0x00010001,0x00000001
 HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Type",0x00010001,0x00000001
 
-; ATAPI miniport driver
-HKLM,"SYSTEM\CurrentControlSet\Services\atapi","ErrorControl",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\atapi","Group",0x00000000,"SCSI Miniport"
-HKLM,"SYSTEM\CurrentControlSet\Services\atapi","ImagePath",0x00020000,"system32\drivers\atapi.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\atapi","Start",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\atapi","Type",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\atapi","Tag",0x00010001,0x00000010
-
-; UNIATA miniport driver
+; UniATA/Atapi miniport driver
 HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ErrorControl",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Group",0x00000000,"SCSI Miniport"
+HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Group",0x00000000,"System Bus Extender"
 HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ImagePath",0x00020000,"system32\drivers\uniata.sys"
 HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Start",0x00010001,0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Type",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Tag",0x00010001,0x00000020
+HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Tag",0x00010001,0x00000010
 
 ; Audio Service
 HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","DisplayName",0x00000000,"Audio Service"
diff --git a/reactos/boot/bootdata/txtsetup.sif b/reactos/boot/bootdata/txtsetup.sif
index 48b02129f0e..af9351a03f3 100644
--- a/reactos/boot/bootdata/txtsetup.sif
+++ b/reactos/boot/bootdata/txtsetup.sif
@@ -17,9 +17,8 @@ FreeSysPartDiskSpace=350
 
 [SourceDisksFiles]
 acpi.sys=,,,,,,,,,,,,4
-atapi.sys=,,,,,,x,,,,,,4
-uniata.sys=,,,,,,x,,,,,,4
 nmidebug.sys=,,,,,,x,,,,,,4
+uniata.sys=,,,,,,x,,,,,,4
 buslogic.sys=,,,,,,x,,,,,,4
 blue.sys=,,,,,,x,,,,,,4
 bootvid.dll=,,,,,,,,,,,,2
@@ -71,7 +70,7 @@ PCI\CC_0101 = pciide
 PCI\CC_0104 = uniata
 PCI\CC_0105 = uniata
 PCI\CC_0106 = uniata
-*PNP0600 = atapi
+*PNP0600 = uniata
 ;USB\CLASS_09 = usbhub
 USB\ROOT_HUB = usbhub
 USB\ROOT_HUB20 = usbhub
diff --git a/reactos/media/inf/hdc.inf b/reactos/media/inf/hdc.inf
index 2c03f93fa79..b747e6da5d9 100644
Binary files a/reactos/media/inf/hdc.inf and b/reactos/media/inf/hdc.inf differ