:: commit ece02695e8577e6ca5a4070fb75215480a665b10

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 51cc1884..424acc0b 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -43,7 +43,7 @@ override BUILD_UEFI_AARCH64 := @BUILD_UEFI_AARCH64@
 override BUILD_UEFI_RISCV64 := @BUILD_UEFI_RISCV64@
 override BUILD_UEFI_CD := @BUILD_UEFI_CD@
 override BUILD_BIOS_PXE := @BUILD_BIOS_PXE@
-override BUILD_CD := @BUILD_CD@
+override BUILD_BIOS_CD := @BUILD_BIOS_CD@
 
 override DEFAULT_CC := @CC@
 $(eval $(call DEFAULT_VAR,CC,$(DEFAULT_CC)))
@@ -150,8 +150,8 @@ install: all
 ifeq ($(BUILD_BIOS),limine-bios)
 	$(INSTALL_DATA) '$(call SHESCAPE,$(BINDIR))/limine.sys' '$(call SHESCAPE,$(DESTDIR)$(datarootdir))/limine/'
 endif
-ifneq ($(BUILD_CD),no)
-	$(INSTALL_DATA) '$(call SHESCAPE,$(BINDIR))/limine-cd.bin' '$(call SHESCAPE,$(DESTDIR)$(datarootdir))/limine/'
+ifneq ($(BUILD_BIOS_CD),no)
+	$(INSTALL_DATA) '$(call SHESCAPE,$(BINDIR))/limine-bios-cd.bin' '$(call SHESCAPE,$(DESTDIR)$(datarootdir))/limine/'
 endif
 ifneq ($(BUILD_UEFI_CD),no)
 	$(INSTALL_DATA) '$(call SHESCAPE,$(BINDIR))/limine-uefi-cd.bin' '$(call SHESCAPE,$(DESTDIR)$(datarootdir))/limine/'
@@ -195,8 +195,8 @@ uninstall:
 $(call MKESCAPE,$(BUILDDIR))/stage1.stamp: $(STAGE1_FILES) $(call MKESCAPE,$(BUILDDIR))/decompressor-build/decompressor.bin $(call MKESCAPE,$(BUILDDIR))/common-bios/stage2.bin.gz
 	$(MKDIR_P) '$(call SHESCAPE,$(BINDIR))'
 	cd '$(call SHESCAPE,$(SRCDIR))/stage1/hdd' && nasm bootsect.asm -Wall $(WERROR_FLAG) -fbin -DBUILDDIR="'"'$(call NASMESCAPE,$(BUILDDIR))'"'" -o '$(call SHESCAPE,$(BINDIR))/limine-hdd.bin'
-ifneq ($(BUILD_CD),no)
-	cd '$(call SHESCAPE,$(SRCDIR))/stage1/cd'  && nasm bootsect.asm -Wall $(WERROR_FLAG) -fbin -DBUILDDIR="'"'$(call NASMESCAPE,$(BUILDDIR))'"'" -o '$(call SHESCAPE,$(BINDIR))/limine-cd.bin'
+ifneq ($(BUILD_BIOS_CD),no)
+	cd '$(call SHESCAPE,$(SRCDIR))/stage1/cd'  && nasm bootsect.asm -Wall $(WERROR_FLAG) -fbin -DBUILDDIR="'"'$(call NASMESCAPE,$(BUILDDIR))'"'" -o '$(call SHESCAPE,$(BINDIR))/limine-bios-cd.bin'
 endif
 ifneq ($(BUILD_BIOS_PXE),no)
 	cd '$(call SHESCAPE,$(SRCDIR))/stage1/pxe' && nasm bootsect.asm -Wall $(WERROR_FLAG) -fbin -DBUILDDIR="'"'$(call NASMESCAPE,$(BUILDDIR))'"'" -o '$(call SHESCAPE,$(BINDIR))/limine-bios-pxe.bin'
diff --git a/README.md b/README.md
index d26413e7..6d5ea365 100644
--- a/README.md
+++ b/README.md
@@ -183,10 +183,10 @@ partitions, formatted with a supported file system.
 
 ### BIOS/UEFI hybrid ISO creation
 In order to create a hybrid ISO with Limine, place the
-`limine-uefi-cd.bin`, `limine-cd.bin`, `limine.sys`, and `limine.cfg` files
+`limine-uefi-cd.bin`, `limine-bios-cd.bin`, `limine.sys`, and `limine.cfg` files
 into a directory which will serve as the root of the created ISO.
 (`limine.sys` and `limine.cfg` must either be in the root, `limine`, `boot`, or
-`boot/limine` directory; `limine-uefi-cd.bin` and `limine-cd.bin` can reside
+`boot/limine` directory; `limine-uefi-cd.bin` and `limine-bios-cd.bin` can reside
 anywhere).
 
 After that, create a `<ISO root directory>/EFI/BOOT` directory and copy the
@@ -195,7 +195,7 @@ relevant Limine EFI executables over (such as `BOOTX64.EFI`).
 Place any other file you want to be on the final ISO in said directory, then
 run:
 ```
-xorriso -as mkisofs -b <relative path of limine-cd.bin> \
+xorriso -as mkisofs -b <relative path of limine-bios-cd.bin> \
         -no-emul-boot -boot-load-size 4 -boot-info-table \
         --efi-boot <relative path of limine-uefi-cd.bin> \
         -efi-boot-part --efi-boot-image --protective-msdos-label \
@@ -209,10 +209,10 @@ And do not forget to also run `limine bios-install` on the generated image:
 limine bios-install image.iso
 ```
 
-`<relative path of limine-cd.bin>` is the relative path of
-`limine-cd.bin` inside the root directory.
-For example, if it was copied in `<root directory>/boot/limine-cd.bin`,
-it would be `boot/limine-cd.bin`.
+`<relative path of limine-bios-cd.bin>` is the relative path of
+`limine-bios-cd.bin` inside the root directory.
+For example, if it was copied in `<root directory>/boot/limine-bios-cd.bin`,
+it would be `boot/limine-bios-cd.bin`.
 
 `<relative path of limine-uefi-cd.bin>` is the relative path of
 `limine-uefi-cd.bin` inside the root directory.
diff --git a/configure.ac b/configure.ac
index 7a9e0290..3aa961fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,13 +69,13 @@ AC_ARG_ENABLE([all],
     [AS_HELP_STRING([--enable-all], [enable ALL ports and targets])],
     [BUILD_ALL="$enableval"])
 
-BUILD_CD="$BUILD_ALL"
+BUILD_BIOS_CD="$BUILD_ALL"
 
 AC_ARG_ENABLE([bios-cd],
     [AS_HELP_STRING([--enable-bios-cd], [enable building the x86 BIOS CD image])],
-    [BUILD_CD="$enableval"])
+    [BUILD_BIOS_CD="$enableval"])
 
-AC_SUBST([BUILD_CD])
+AC_SUBST([BUILD_BIOS_CD])
 
 BUILD_BIOS_PXE="$BUILD_ALL"
 
@@ -92,7 +92,7 @@ AC_ARG_ENABLE([bios],
     [BUILD_BIOS="$enableval"])
 
 if test "x$BUILD_BIOS" = "xno"; then
-    if test "x$BUILD_CD" = "xyes"; then
+    if test "x$BUILD_BIOS_CD" = "xyes"; then
         BUILD_BIOS="yes"
     fi
     if test "x$BUILD_BIOS_PXE" = "xyes"; then
diff --git a/host/Makefile b/host/Makefile
index 5bea29aa..31541bb9 100644
--- a/host/Makefile
+++ b/host/Makefile
@@ -14,7 +14,7 @@ install: all
 	$(INSTALL) -d '$(DESTDIR)$(PREFIX)/share'
 	$(INSTALL) -d '$(DESTDIR)$(PREFIX)/share/limine'
 	$(INSTALL) -m 644 limine.sys '$(DESTDIR)$(PREFIX)/share/limine/'
-	$(INSTALL) -m 644 limine-cd.bin '$(DESTDIR)$(PREFIX)/share/limine/'
+	$(INSTALL) -m 644 limine-bios-cd.bin '$(DESTDIR)$(PREFIX)/share/limine/'
 	$(INSTALL) -m 644 limine-uefi-cd.bin '$(DESTDIR)$(PREFIX)/share/limine/'
 	$(INSTALL) -m 644 limine-bios-pxe.bin '$(DESTDIR)$(PREFIX)/share/limine/'
 	$(INSTALL) -m 644 BOOTX64.EFI '$(DESTDIR)$(PREFIX)/share/limine/'
diff --git a/test.mk b/test.mk
index 29fc586e..5f786279 100644
--- a/test.mk
+++ b/test.mk
@@ -158,7 +158,7 @@ iso9660-test:
 	$(MKDIR_P) test_image/boot
 	sudo cp -rv $(BINDIR)/* test_image/boot/
 	sudo cp -rv test/* test_image/boot/
-	xorriso -as mkisofs -b boot/limine-cd.bin -no-emul-boot -boot-load-size 4 -boot-info-table test_image/ -o test.iso
+	xorriso -as mkisofs -b boot/limine-bios-cd.bin -no-emul-boot -boot-load-size 4 -boot-info-table test_image/ -o test.iso
 	qemu-system-x86_64 -net none -smp 4   -cdrom test.iso -debugcon stdio
 
 .PHONY: full-hybrid-test
@@ -172,7 +172,7 @@ full-hybrid-test:
 	$(MKDIR_P) test_image/boot
 	sudo cp -rv $(BINDIR)/* test_image/boot/
 	sudo cp -rv test/* test_image/boot/
-	xorriso -as mkisofs -b boot/limine-cd.bin -no-emul-boot -boot-load-size 4 -boot-info-table --efi-boot boot/limine-uefi-cd.bin -efi-boot-part --efi-boot-image --protective-msdos-label test_image/ -o test.iso
+	xorriso -as mkisofs -b boot/limine-bios-cd.bin -no-emul-boot -boot-load-size 4 -boot-info-table --efi-boot boot/limine-uefi-cd.bin -efi-boot-part --efi-boot-image --protective-msdos-label test_image/ -o test.iso
 	$(BINDIR)/limine bios-install test.iso
 	qemu-system-x86_64 -m 512M -M q35 -bios ovmf-x64/OVMF.fd -net none -smp 4   -cdrom test.iso -debugcon stdio
 	qemu-system-x86_64 -m 512M -M q35 -bios ovmf-x64/OVMF.fd -net none -smp 4   -hda test.iso -debugcon stdio