diff --git a/eclass/nas-kernel.eclass b/eclass/nas-kernel.eclass
index d5b8257..3c105dd 100644
--- a/eclass/nas-kernel.eclass
+++ b/eclass/nas-kernel.eclass
@@ -255,43 +255,43 @@ _kernel_src_compile() {
 	ARCH=${OLDARCH}
 	if [ "${K_NASKERNEL_NAME}" = "buffalo_ls_pro_live" ]; then
 		devio > foo 'wl 0xe3a01c06,4' 'wl 0xe3811031,4' # Linkstation Pro/Live (2.6.26)
-		cat foo "${WORKDIR}"/boot/kernel-genkernel-${kern_arch}-${KV_FULL} > zImage.new
-		mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n 'uImage-genkernel-${kern_arch}-${KV_FULL}' \
-			-d zImage.new "${WORKDIR}"/boot/uImage-genkernel-${kern_arch}-${KV_FULL}.buffalo
+		cat foo "${WORKDIR}"/boot/kernel-genkernel-${ARCH}-${KV_FULL} > zImage.new
+		mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n uImage-genkernel-${ARCH}-${KV_FULL} \
+			-d zImage.new "${WORKDIR}"/boot/uImage-genkernel-${ARCH}-${KV_FULL}.buffalo
 		rm foo zImage.new
-		mkimage -A arm -O linux -T ramdisk -C gzip -a 0x00000000 -e 0x00000000 -n 'initrd-genkernel-${kern_arch}-${KV_FULL}' \
-			-d "${WORKDIR}"/boot/initramfs-genkernel-${kern_arch}-${KV_FULL} "${WORKDIR}"/boot/initrd-genkernel-${kern_arch}-${KV_FULL}.buffalo
-		rm "${WORKDIR}"/boot/kernel-genkernel-${kern_arch}-${KV_FULL} "${WORKDIR}"/boot/initramfs-genkernel-${kern_arch}-${KV_FULL}
+		mkimage -A arm -O linux -T ramdisk -C gzip -a 0x00000000 -e 0x00000000 -n initrd-genkernel-${ARCH}-${KV_FULL} \
+			-d "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${KV_FULL} "${WORKDIR}"/boot/initrd-genkernel-${ARCH}-${KV_FULL}.buffalo
+		rm "${WORKDIR}"/boot/kernel-genkernel-${ARCH}-${KV_FULL} "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${KV_FULL}
         fi
 	if [ "${K_NASKERNEL_NAME}" = "buffalo_ls_pro_duo" ]; then
 		devio > foo 'wl 0xe3a01c07,4' 'wl 0xe3811027,4' # Linkstation Pro Duo (2.6.30)
-		cat foo "${WORKDIR}"/boot/kernel-genkernel-${kern_arch}-${KV_FULL} > zImage.new
-		mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n 'uImage-genkernel-${kern_arch}-${KV_FULL}' \
-			-d zImage.new "${WORKDIR}"/boot/uImage-genkernel-${kern_arch}-${KV_FULL}.buffalo
+		cat foo "${WORKDIR}"/boot/kernel-genkernel-${ARCH}-${KV_FULL} > zImage.new
+		mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n uImage-genkernel-${ARCH}-${KV_FULL} \
+			-d zImage.new "${WORKDIR}"/boot/uImage-genkernel-${ARCH}-${KV_FULL}.buffalo
 		rm foo zImage.new
-		mkimage -A arm -O linux -T ramdisk -C gzip -a 0x00000000 -e 0x00000000 -n 'initrd-genkernel-${kern_arch}-${KV_FULL}' \
-			-d "${WORKDIR}"/boot/initramfs-genkernel-${kern_arch}-${KV_FULL} "${WORKDIR}"/boot/initrd-genkernel-${kern_arch}-${KV_FULL}.buffalo
-		rm "${WORKDIR}"/boot/kernel-genkernel-${kern_arch}-${KV_FULL} "${WORKDIR}"/boot/initramfs-genkernel-${kern_arch}-${KV_FULL}
+		mkimage -A arm -O linux -T ramdisk -C gzip -a 0x00000000 -e 0x00000000 -n initrd-genkernel-${ARCH}-${KV_FULL} \
+			-d "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${KV_FULL} "${WORKDIR}"/boot/initrd-genkernel-${ARCH}-${KV_FULL}.buffalo
+		rm "${WORKDIR}"/boot/kernel-genkernel-${ARCH}-${KV_FULL} "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${KV_FULL}
         fi
 	if [ "${K_NASKERNEL_NAME}" = "buffalo_ls_xhl" ]; then
 		devio > foo 'wl 0xe3a01c0a,4' 'wl 0xe3811067,4' # Linkstation XHL/CHLv2 (2.6.30)
-		cat foo "${WORKDIR}"/boot/kernel-genkernel-${kern_arch}-${KV_FULL} > zImage.new
-		mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n 'uImage-genkernel-${kern_arch}-${KV_FULL}' \
-			-d zImage.new "${WORKDIR}"/boot/uImage-genkernel-${kern_arch}-${KV_FULL}.buffalo
+		cat foo "${WORKDIR}"/boot/kernel-genkernel-${ARCH}-${KV_FULL} > zImage.new
+		mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n uImage-genkernel-${ARCH}-${KV_FULL} \
+			-d zImage.new "${WORKDIR}"/boot/uImage-genkernel-${ARCH}-${KV_FULL}.buffalo
 		rm foo zImage.new
-		mkimage -A arm -O linux -T ramdisk -C gzip -a 0x00000000 -e 0x00000000 -n 'initrd-genkernel-${kern_arch}-${KV_FULL}' \
-			-d "${WORKDIR}"/boot/initramfs-genkernel-${kern_arch}-${KV_FULL} "${WORKDIR}"/boot/initrd-genkernel-${kern_arch}-${KV_FULL}.buffalo
-		rm "${WORKDIR}"/boot/kernel-genkernel-${kern_arch}-${KV_FULL} "${WORKDIR}"/boot/initramfs-genkernel-${kern_arch}-${KV_FULL}
+		mkimage -A arm -O linux -T ramdisk -C gzip -a 0x00000000 -e 0x00000000 -n initrd-genkernel-${ARCH}-${KV_FULL} \
+			-d "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${KV_FULL} "${WORKDIR}"/boot/initrd-genkernel-${ARCH}-${KV_FULL}.buffalo
+		rm "${WORKDIR}"/boot/kernel-genkernel-${ARCH}-${KV_FULL} "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${KV_FULL}
         fi
 	if [ "${K_NASKERNEL_NAME}" = "buffalo_ls_wxl" ]; then
 		devio > foo 'wl 0xe3a01c0c,4' 'wl 0xe381108a,4' # Linkstation WXL (2.6.30)
-		cat foo "${WORKDIR}"/boot/kernel-genkernel-${kern_arch}-${KV_FULL} > zImage.new
-		mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n 'uImage-genkernel-${kern_arch}-${KV_FULL}' \
-			-d zImage.new "${WORKDIR}"/boot/uImage-genkernel-${kern_arch}-${KV_FULL}.buffalo
+		cat foo "${WORKDIR}"/boot/kernel-genkernel-${ARCH}-${KV_FULL} > zImage.new
+		mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n uImage-genkernel-${ARCH}-${KV_FULL} \
+			-d zImage.new "${WORKDIR}"/boot/uImage-genkernel-${ARCH}-${KV_FULL}.buffalo
 		rm foo zImage.new
-		mkimage -A arm -O linux -T ramdisk -C gzip -a 0x00000000 -e 0x00000000 -n 'initrd-genkernel-${kern_arch}-${KV_FULL}' \
-			-d "${WORKDIR}"/boot/initramfs-genkernel-${kern_arch}-${KV_FULL} "${WORKDIR}"/boot/initrd-genkernel-${kern_arch}-${KV_FULL}.buffalo
-		rm "${WORKDIR}"/boot/kernel-genkernel-${kern_arch}-${KV_FULL} "${WORKDIR}"/boot/initramfs-genkernel-${kern_arch}-${KV_FULL}
+		mkimage -A arm -O linux -T ramdisk -C gzip -a 0x00000000 -e 0x00000000 -n initrd-genkernel-${ARCH}-${KV_FULL} \
+			-d "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${KV_FULL} "${WORKDIR}"/boot/initrd-genkernel-${ARCH}-${KV_FULL}.buffalo
+		rm "${WORKDIR}"/boot/kernel-genkernel-${ARCH}-${KV_FULL} "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${KV_FULL}
         fi
 
 }