diff --git a/classes/image_types_tegra.bbclass b/classes/image_types_tegra.bbclass
index 6504d55a..4f36709a 100644
--- a/classes/image_types_tegra.bbclass
+++ b/classes/image_types_tegra.bbclass
@@ -1,4 +1,4 @@
-inherit image_types image_types_cboot image_types_esp python3native perlnative kernel-artifact-names
+inherit image_types image_types_cboot image_types_tegra_esp python3native perlnative kernel-artifact-names
 
 IMAGE_TYPES += "tegraflash"
 
diff --git a/classes/image_types_esp.bbclass b/classes/image_types_tegra_esp.bbclass
similarity index 87%
rename from classes/image_types_esp.bbclass
rename to classes/image_types_tegra_esp.bbclass
index df389fa5..5355171b 100644
--- a/classes/image_types_esp.bbclass
+++ b/classes/image_types_tegra_esp.bbclass
@@ -1,5 +1,4 @@
-require conf/image-uefi.conf
-
+# Adapted from oe_mkext234fs in image_types.bbclass
 oe_mkespfs() {
 	fstype="$1"
 	extra_imagecmd=""
@@ -13,7 +12,7 @@ oe_mkespfs() {
 	bbdebug 1 Executing "dd if=/dev/zero of=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype seek=65536 count=0 bs=1024"
 	dd if=/dev/zero of=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype seek=65536 count=0 bs=1024
 	bbdebug 1 "Actual Rootfs size:  `du -s ${IMAGE_ROOTFS}`"
-	bbdebug 1 "Actual Partion size: `stat -c '%s' ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype`"
+	bbdebug 1 "Actual Partition size: `stat -c '%s' ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype`"
 	bbdebug 1 Executing "mkfs.vfat -F 32 -I $extra_imagecmd ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype "
 	mkfs.vfat -F 32 -I $extra_imagecmd ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype
 	mcopy -i ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype -s ${IMAGE_ROOTFS}/* ::/