diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass
index cdfbb97e3..63a10f303 100644
--- a/classes/image_types_fsl.bbclass
+++ b/classes/image_types_fsl.bbclass
@@ -13,9 +13,9 @@ do_image_uboot_mxsboot_sdcard[depends] += "u-boot-mxsboot-native:do_populate_sys
                                            u-boot:do_deploy"
 IMAGE_CMD:uboot-mxsboot-sdcard() {
     mxsboot sd ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \
-               ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot-mxsboot-sdcard
-    ln -sf ${IMAGE_NAME}.rootfs.uboot-mxsboot-sdcard \
-           ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.uboot-mxsboot-sdcard
+               ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.uboot-mxsboot-sdcard
+    ln -sf ${IMAGE_NAME}.uboot-mxsboot-sdcard \
+           ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.uboot-mxsboot-sdcard
 }
 
 # U-Boot mxsboot generation for NAND
@@ -24,9 +24,9 @@ do_image_uboot_mxsboot_nand[depends] += "u-boot-mxsboot-native:do_populate_sysro
 IMAGE_CMD:uboot-mxsboot-nand() {
     mxsboot ${MXSBOOT_NAND_ARGS} nand \
             ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \
-            ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot-mxsboot-nand
-    ln -sf ${IMAGE_NAME}.rootfs.uboot-mxsboot-nand \
-           ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.uboot-mxsboot-nand
+            ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.uboot-mxsboot-nand
+    ln -sf ${IMAGE_NAME}.uboot-mxsboot-nand \
+           ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.uboot-mxsboot-nand
 }
 
 # In case we are building for i.MX23 or i.MX28 we need to have the
@@ -40,5 +40,5 @@ do_image_wic[depends] += " \
 IMAGE_CMD:wic:append:mxs-generic-bsp() {
 	# Change partition type for mxs processor family
 	bbnote "Setting partition type to 0x53 as required for mxs' SoC family."
-	echo -n S | dd of=$out${IMAGE_NAME_SUFFIX}.wic bs=1 count=1 seek=450 conv=notrunc
+	echo -n S | dd of=$out.wic bs=1 count=1 seek=450 conv=notrunc
 }