diff --git a/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf
index 9902314..6085221 100644
--- a/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf
+++ b/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf
@@ -1,6 +1,6 @@
 title   CachyOS x86_64 UEFI Default
-linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos-bmq
+linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos
 initrd  /%INSTALL_DIR%/boot/intel-ucode.img
 initrd  /%INSTALL_DIR%/boot/amd-ucode.img
-initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-bmq.img
+initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img
 options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G i915.modeset=1 radeon.modeset=1 nvidia.blacklist=yes modprobe.blacklist=nvidia nouveau.modeset=1 nouveau
diff --git a/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf b/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf
index b481fd0..6971a63 100644
--- a/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf
+++ b/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf
@@ -1,6 +1,6 @@
 title   CachyOS x86_64 UEFI NVIDIA (latest cards only)
-linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos-bmq
+linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos
 initrd  /%INSTALL_DIR%/boot/intel-ucode.img
 initrd  /%INSTALL_DIR%/boot/amd-ucode.img
-initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-bmq.img
+initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img
 options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G nvidia nouveau.modeset=0 nouveau.blacklist=yes modprobe.blacklist=nouveau i915.modeset=1 radeon.modeset=1
diff --git a/archiso/packages.x86_64 b/archiso/packages.x86_64
index 4c5e2e7..292f685 100644
--- a/archiso/packages.x86_64
+++ b/archiso/packages.x86_64
@@ -47,7 +47,7 @@ less
 lftp
 libfido2
 libusb-compat
-linux-cachyos-bmq
+linux-cachyos
 linux-atm
 linux-firmware
 lsscsi
@@ -232,7 +232,7 @@ base-devel
 
 ##### want to have linux-headers
 
-linux-cachyos-bmq-headers
+linux-cachyos-headers
 
 
 
diff --git a/archiso/syslinux/archiso_pxe-linux.cfg b/archiso/syslinux/archiso_pxe-linux.cfg
index 1e4205f..d74d67d 100644
--- a/archiso/syslinux/archiso_pxe-linux.cfg
+++ b/archiso/syslinux/archiso_pxe-linux.cfg
@@ -4,8 +4,8 @@ Boot the CachyOS install medium using NBD.
 It allows you to install CachyOS or perform system maintenance.
 ENDTEXT
 MENU LABEL CachyOS install medium (x86_64, NBD)
-LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos-bmq
-INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-bmq.img
+LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} checksum verify
 SYSAPPEND 3
 
@@ -15,8 +15,8 @@ Boot the CachyOS live medium using NFS.
 It allows you to install CachyOS or perform system maintenance.
 ENDTEXT
 MENU LABEL CachyOS install medium (x86_64, NFS)
-LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos-bmq
-INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-bmq.img
+LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img
 APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt checksum verify
 SYSAPPEND 3
 
@@ -26,7 +26,7 @@ Boot the CachyOS live medium using HTTP.
 It allows you to install CachyOS or perform system maintenance.
 ENDTEXT
 MENU LABEL CachyOS install medium (x86_64, HTTP)
-LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos-bmq
-INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-bmq.img
+LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img
 APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ checksum verify
 SYSAPPEND 3
diff --git a/archiso/syslinux/archiso_sys-linux.cfg b/archiso/syslinux/archiso_sys-linux.cfg
index 02257d6..e124431 100644
--- a/archiso/syslinux/archiso_sys-linux.cfg
+++ b/archiso/syslinux/archiso_sys-linux.cfg
@@ -4,8 +4,8 @@ Boot the CachyOS install medium on BIOS.
 It allows you to install CachyOS or perform system maintenance.
 ENDTEXT
 MENU LABEL CachyOS default (x86_64, BIOS)
-LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos-bmq
-INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-bmq.img
+LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G nouveau.modeset=1 nouveau i915.modeset=1 radeon.modeset=1 modprobe.blacklist=nvidia
 
 # Nvidia propritary (Non-Free)
@@ -15,6 +15,6 @@ Boot the CachyOS install medium on Bios NVIDIA-NONFREE driver LATEST-CARDS NO-LE
 It allows you to install CachyOS or perform system maintenance.
 ENDTEXT
 MENU LABEL CachyOS NVIDIA (latest cards, x86_64, BIOS)
-LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos-bmq
-INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-bmq.img
+LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G nouveau.modeset=0 modprobe.blacklist=nouveau nvidia i915.modeset=1 radeon.modeset=1