diff --git a/etc/archboot/aarch64-init.conf b/etc/archboot/aarch64-init.conf
index 680596e51..545c7d988 100644
--- a/etc/archboot/aarch64-init.conf
+++ b/etc/archboot/aarch64-init.conf
@@ -11,15 +11,15 @@ _HOOKS=(common_modules block_modules init)
 # COMPRESSION
 # Use this to compress the initramfs image. By default, gzip compression
 # is used. Use 'cat' to create an uncompressed image.
-_COMPRESSION="zstd"
-#_COMPRESSION="gzip"
-#_COMPRESSION="bzip2"
-#_COMPRESSION="lzma"
-#_COMPRESSION="xz"
-#_COMPRESSION="lzop"
-#_COMPRESSION="lz4"
+_COMP="zstd"
+#_COMP="gzip"
+#_COMP="bzip2"
+#_COMP="lzma"
+#_COMP="xz"
+#_COMP="lzop"
+#_COMP="lz4"
 
-# COMPRESSION_OPTIONS
+# COMPRESSION_OPTS
 # Additional options for the compressor
-_COMPRESSION_OPTIONS=(-19)
+_COMP_OPTS=(-19)
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/etc/archboot/aarch64-latest.conf b/etc/archboot/aarch64-latest.conf
index 7804db82b..969d75f41 100644
--- a/etc/archboot/aarch64-latest.conf
+++ b/etc/archboot/aarch64-latest.conf
@@ -12,15 +12,15 @@ kexec licenses)
 # COMPRESSION
 # Use this to compress the initramfs image. By default, gzip compression
 # is used. Use 'cat' to create an uncompressed image.
-_COMPRESSION="zstd"
-#_COMPRESSION="gzip"
-#_COMPRESSION="bzip2"
-#_COMPRESSION="lzma"
-#_COMPRESSION="xz"
-#_COMPRESSION="lzop"
-#_COMPRESSION="lz4"
+_COMP="zstd"
+#_COMP="gzip"
+#_COMP="bzip2"
+#_COMP="lzma"
+#_COMP="xz"
+#_COMP="lzop"
+#_COMP="lz4"
 
-# COMPRESSION_OPTIONS
+# COMPRESSION_OPTS
 # Additional options for the compressor
-COMPRESSION_OPTIONS=(-19)
+COMPRESSION_OPTS=(-19)
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/etc/archboot/aarch64-local.conf b/etc/archboot/aarch64-local.conf
index 79cd8b2fe..9b009d0bb 100644
--- a/etc/archboot/aarch64-local.conf
+++ b/etc/archboot/aarch64-local.conf
@@ -11,15 +11,15 @@ _HOOKS=(common_modules kms base_common base_latest installer_common kexec licens
 # COMPRESSION
 # Use this to compress the initramfs image. By default, gzip compression
 # is used. Use 'cat' to create an uncompressed image.
-_COMPRESSION="zstd"
-#_COMPRESSION="gzip"
-#_COMPRESSION="bzip2"
-#_COMPRESSION="lzma"
-#_COMPRESSION="xz"
-#_COMPRESSION="lzop"
-#_COMPRESSION="lz4"
+_COMP="zstd"
+#_COMP="gzip"
+#_COMP="bzip2"
+#_COMP="lzma"
+#_COMP="xz"
+#_COMP="lzop"
+#_COMP="lz4"
 
-# COMPRESSION_OPTIONS
+# COMPRESSION_OPTS
 # Additional options for the compressor
-_COMPRESSION_OPTIONS=(-19)
+_COMP_OPTS=(-19)
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/etc/archboot/aarch64-update_installer.conf b/etc/archboot/aarch64-update_installer.conf
index 8625fd3ad..b62a5e7a1 100644
--- a/etc/archboot/aarch64-update_installer.conf
+++ b/etc/archboot/aarch64-update_installer.conf
@@ -15,15 +15,15 @@ kexec efibootmgr pciutils usbutils smartmontools licenses neovim secure_boot efi
 # COMPRESSION
 # Use this to compress the initramfs image. By default, gzip compression
 # is used. Use 'cat' to create an uncompressed image.
-_COMPRESSION="zstd"
-#_COMPRESSION="gzip"
-#_COMPRESSION="bzip2"
-#_COMPRESSION="lzma"
-#_COMPRESSION="xz"
-#_COMPRESSION="lzop"
-#_COMPRESSION="lz4"
+_COMP="zstd"
+#_COMP="gzip"
+#_COMP="bzip2"
+#_COMP="lzma"
+#_COMP="xz"
+#_COMP="lzop"
+#_COMP="lz4"
 
-# COMPRESSION_OPTIONS
+# COMPRESSION_OPTS
 # Additional options for the compressor
-#_COMPRESSION_OPTIONS=()
+#_COMP_OPTS=()
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/etc/archboot/aarch64.conf b/etc/archboot/aarch64.conf
index 995e76181..0a969314c 100644
--- a/etc/archboot/aarch64.conf
+++ b/etc/archboot/aarch64.conf
@@ -14,15 +14,15 @@ neovim platform hypervisor secure_boot efivar lshw)
 # COMPRESSION
 # Use this to compress the initramfs image. By default, gzip compression
 # is used. Use 'cat' to create an uncompressed image.
-_COMPRESSION="zstd"
-#_COMPRESSION="gzip"
-#_COMPRESSION="bzip2"
-#_COMPRESSION="lzma"
-#_COMPRESSION="xz"
-#_COMPRESSION="lzop"
-#_COMPRESSION="lz4"
+_COMP="zstd"
+#_COMP="gzip"
+#_COMP="bzip2"
+#_COMP="lzma"
+#_COMP="xz"
+#_COMP="lzop"
+#_COMP="lz4"
 
-# COMPRESSION_OPTIONS
+# COMPRESSION_OPTS
 # Additional options for the compressor
-_COMPRESSION_OPTIONS=(-19)
+_COMP_OPTS=(-19)
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/etc/archboot/riscv64-init.conf b/etc/archboot/riscv64-init.conf
index f11de7011..47f3e0b2e 100644
--- a/etc/archboot/riscv64-init.conf
+++ b/etc/archboot/riscv64-init.conf
@@ -11,15 +11,15 @@ _HOOKS=(common_modules block_modules init)
 # COMPRESSION
 # Use this to compress the initramfs image. By default, gzip compression
 # is used. Use 'cat' to create an uncompressed image.
-_COMPRESSION="zstd"
-#_COMPRESSION="gzip"
-#_COMPRESSION="bzip2"
-#_COMPRESSION="lzma"
-#_COMPRESSION="xz"
-#_COMPRESSION="lzop"
-#_COMPRESSION="lz4"
+_COMP="zstd"
+#_COMP="gzip"
+#_COMP="bzip2"
+#_COMP="lzma"
+#_COMP="xz"
+#_COMP="lzop"
+#_COMP="lz4"
 
-# COMPRESSION_OPTIONS
+# COMPRESSION_OPTS
 # Additional options for the compressor
-_COMPRESSION_OPTIONS=(-19)
+_COMP_OPTS=(-19)
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/etc/archboot/riscv64.conf b/etc/archboot/riscv64.conf
index eec6dc30a..9973fcbb7 100644
--- a/etc/archboot/riscv64.conf
+++ b/etc/archboot/riscv64.conf
@@ -14,15 +14,15 @@ platform hypervisor secure_boot efivar lshw)
 # COMPRESSION
 # Use this to compress the initramfs image. By default, gzip compression
 # is used. Use 'cat' to create an uncompressed image.
-_COMPRESSION="zstd"
-#_COMPRESSION="gzip"
-#_COMPRESSION="bzip2"
-#_COMPRESSION="lzma"
-#_COMPRESSION="xz"
-#_COMPRESSION="lzop"
-#_COMPRESSION="lz4"
+_COMP="zstd"
+#_COMP="gzip"
+#_COMP="bzip2"
+#_COMP="lzma"
+#_COMP="xz"
+#_COMP="lzop"
+#_COMP="lz4"
 
-# COMPRESSION_OPTIONS
+# COMPRESSION_OPTS
 # Additional options for the compressor
-_COMPRESSION_OPTIONS=(-19)
+_COMP_OPTS=(-19)
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/etc/archboot/x86_64-init.conf b/etc/archboot/x86_64-init.conf
index 509ceaa5f..14bd2a8b9 100644
--- a/etc/archboot/x86_64-init.conf
+++ b/etc/archboot/x86_64-init.conf
@@ -11,15 +11,15 @@ _HOOKS=(common_modules block_modules init)
 # COMPRESSION
 # Use this to compress the initramfs image. By default, gzip compression
 # is used. Use 'cat' to create an uncompressed image.
-_COMPRESSION="zstd"
-#_COMPRESSION="gzip"
-#_COMPRESSION="bzip2"
-#_COMPRESSION="lzma"
-#_COMPRESSION="xz"
-#_COMPRESSION="lzop"
-#_COMPRESSION="lz4"
+_COMP="zstd"
+#_COMP="gzip"
+#_COMP="bzip2"
+#_COMP="lzma"
+#_COMP="xz"
+#_COMP="lzop"
+#_COMP="lz4"
 
-# COMPRESSION_OPTIONS
+# COMPRESSION_OPTS
 # Additional options for the compressor
-COMPRESSION_OPTIONS=(-19)
+COMPRESSION_OPTS=(-19)
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/etc/archboot/x86_64-latest.conf b/etc/archboot/x86_64-latest.conf
index 241b4d39d..30c3e8828 100644
--- a/etc/archboot/x86_64-latest.conf
+++ b/etc/archboot/x86_64-latest.conf
@@ -12,15 +12,15 @@ kexec licenses)
 # COMPRESSION
 # Use this to compress the initramfs image. By default, gzip compression
 # is used. Use 'cat' to create an uncompressed image.
-_COMPRESSION="zstd"
-#_COMPRESSION="gzip"
-#_COMPRESSION="bzip2"
-#_COMPRESSION="lzma"
-#_COMPRESSION="xz"
-#_COMPRESSION="lzop"
-#_COMPRESSION="lz4"
+_COMP="zstd"
+#_COMP="gzip"
+#_COMP="bzip2"
+#_COMP="lzma"
+#_COMP="xz"
+#_COMP="lzop"
+#_COMP="lz4"
 
-# COMPRESSION_OPTIONS
+# COMPRESSION_OPTS
 # Additional options for the compressor
-_COMPRESSION_OPTIONS=(-19)
+_COMP_OPTS=(-19)
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/etc/archboot/x86_64-local.conf b/etc/archboot/x86_64-local.conf
index 68bdf4faa..20abd22ae 100644
--- a/etc/archboot/x86_64-local.conf
+++ b/etc/archboot/x86_64-local.conf
@@ -12,15 +12,15 @@ licenses cache)
 # COMPRESSION
 # Use this to compress the initramfs image. By default, gzip compression
 # is used. Use 'cat' to create an uncompressed image.
-_COMPRESSION="zstd"
-#_COMPRESSION="gzip"
-#_COMPRESSION="bzip2"
-#_COMPRESSION="lzma"
-#_COMPRESSION="xz"
-#_COMPRESSION="lzop"
-#_COMPRESSION="lz4"
+_COMP="zstd"
+#_COMP="gzip"
+#_COMP="bzip2"
+#_COMP="lzma"
+#_COMP="xz"
+#_COMP="lzop"
+#_COMP="lz4"
 
-# COMPRESSION_OPTIONS
+# COMPRESSION_OPTS
 # Additional options for the compressor
-_COMPRESSION_OPTIONS=(-19)
+_COMP_OPTS=(-19)
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/etc/archboot/x86_64-update_installer.conf b/etc/archboot/x86_64-update_installer.conf
index 95c5af614..9fce24f1b 100644
--- a/etc/archboot/x86_64-update_installer.conf
+++ b/etc/archboot/x86_64-update_installer.conf
@@ -16,15 +16,15 @@ secure_boot efivar lshw)
 # COMPRESSION
 # Use this to compress the initramfs image. By default, gzip compression
 # is used. Use 'cat' to create an uncompressed image.
-_COMPRESSION="zstd"
-#_COMPRESSION="gzip"
-#_COMPRESSION="bzip2"
-#_COMPRESSION="lzma"
-#_COMPRESSION="xz"
-#_COMPRESSION="lzop"
-#_COMPRESSION="lz4"
+_COMP="zstd"
+#_COMP="gzip"
+#_COMP="bzip2"
+#_COMP="lzma"
+#_COMP="xz"
+#_COMP="lzop"
+#_COMP="lz4"
 
-# COMPRESSION_OPTIONS
+# COMPRESSION_OPTS
 # Additional options for the compressor
-#_COMPRESSION_OPTIONS=()
+#_COMP_OPTS=()
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/etc/archboot/x86_64.conf b/etc/archboot/x86_64.conf
index e7fcb149d..64a40fb8e 100644
--- a/etc/archboot/x86_64.conf
+++ b/etc/archboot/x86_64.conf
@@ -14,15 +14,15 @@ neovim platform hypervisor dmidecode secure_boot efivar lshw)
 # COMPRESSION
 # Use this to compress the initramfs image. By default, gzip compression
 # is used. Use 'cat' to create an uncompressed image.
-_COMPRESSION="zstd"
-#_COMPRESSION="gzip"
-#_COMPRESSION="bzip2"
-#_COMPRESSION="lzma"
-#_COMPRESSION="xz"
-#_COMPRESSION="lzop"
-#_COMPRESSION="lz4"
+_COMP="zstd"
+#_COMP="gzip"
+#_COMP="bzip2"
+#_COMP="lzma"
+#_COMP="xz"
+#_COMP="lzop"
+#_COMP="lz4"
 
-# COMPRESSION_OPTIONS
+# COMPRESSION_OPTS
 # Additional options for the compressor
-_COMPRESSION_OPTIONS=(-19)
+_COMP_OPTS=(-19)
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/usr/lib/archboot/cpio/cpio.sh b/usr/lib/archboot/cpio/cpio.sh
index 81a9ef0fa..e87e5887c 100644
--- a/usr/lib/archboot/cpio/cpio.sh
+++ b/usr/lib/archboot/cpio/cpio.sh
@@ -78,7 +78,6 @@ _map() {
     return "${_R}"
 }
 
-
 _filter_modules() {
     # Add modules to the initcpio, filtered by grep.
     #   $@: filter arguments to grep