diff --git a/eclass/sablink-kernel.eclass b/eclass/sablink-kernel.eclass
index 688aa85..3d335c0 100644
--- a/eclass/sablink-kernel.eclass
+++ b/eclass/sablink-kernel.eclass
@@ -799,7 +799,7 @@ _kernel_src_compile() {
 				-d zImage.new "${WORKDIR}"/boot/uImage-genkernel-${ARCH}-${KV_FULL}.buffalo
 			einfo "Create uInitrd with correct start address"
 			mkimage -A arm -O linux -T ramdisk -C none -a 0x00000000 -e 0x00000000 -n initrd-${KV_FULL} \
-				-d "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${ORIGINAL_KV_FULL} "${WORKDIR}"/boot/uInitramfs-genkernel-${ARCH}-${KV_FULL}.buffalo
+				-d "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${PV}-${K_SABKERNEL_NAME} "${WORKDIR}"/boot/uInitramfs-genkernel-${ARCH}-${KV_FULL}.buffalo
 		else
 			einfo "Append the device-tree-blob to the Kenel Image"
 			cat "${WORKDIR}"/boot/kernel-genkernel-${ARCH}-${KV_FULL} "${S}"/${K_SABKERNEL_DTB} > zImage.new
@@ -809,21 +809,24 @@ _kernel_src_compile() {
 				-d zImage.new "${WORKDIR}"/boot/uImage-genkernel-${ARCH}-${KV_FULL}.buffalo
 			einfo "Create uInitrd with correct start address"
 			mkimage -A arm -O linux -T ramdisk -C none -a 0x00000000 -e 0x00000000 -n initrd-${KV_FULL} \
-				-d "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${ORIGINAL_KV_FULL} "${WORKDIR}"/boot/uInitramfs-genkernel-${ARCH}-${KV_FULL}.buffalo
+				-d "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${PV}-${K_SABKERNEL_NAME} "${WORKDIR}"/boot/uInitramfs-genkernel-${ARCH}-${KV_FULL}.buffalo
 		fi
 	fi
 
 	if [ "${K_SABKERNEL_TYPE}" = "default" ]; then
 		einfo "Rename Kernel Image for consistency"
-		mv "${WORKDIR}"/boot/kernel-genkernel-${ARCH}-${ORIGINAL_KV_FULL} "${WORKDIR}"/boot/uImage-genkernel-${ARCH}-${KV_FULL}
+		mv "${WORKDIR}"/boot/kernel-genkernel-${ARCH}-${PV}-${K_SABKERNEL_NAME} "${WORKDIR}"/boot/uImage-genkernel-${ARCH}-${KV_FULL}
 		einfo "Create uInitrd with correct start address"
 		mkimage -A arm -O linux -T ramdisk -C none -a 0x00000000 -e 0x00000000 -n initrd-${KV_FULL} \
-			-d "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${ORIGINAL_KV_FULL} "${WORKDIR}"/boot/uInitramfs-genkernel-${ARCH}-${KV_FULL}
+			-d "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${PV}-${K_SABKERNEL_NAME} "${WORKDIR}"/boot/uInitramfs-genkernel-${ARCH}-${KV_FULL}
 	fi
 
+	# move System.map for filname consistency
+	mv "${WORKDIR}"/boot/System.map-genkernel-${ARCH}-${PV}-${K_SABKERNEL_NAME} "${WORKDIR}"/boot/System.map-genkernel-${ARCH}-${KV_FULL}
+
 	# cleanup
 	rm -rf foo zImage.new ${K_SABKERNEL_DTB}
-	rm "${WORKDIR}"/boot/kernel-genkernel-${ARCH}-${ORIGINAL_KV_FULL} "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${ORIGINAL_KV_FULL}
+	rm "${WORKDIR}"/boot/kernel-genkernel-${ARCH}-${PV}-${K_SABKERNEL_NAME} "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${PV}-${K_SABKERNEL_NAME}
 }
 
 _setup_mkimage_ramdisk() {