diff --git a/classes-recipe/genimage.bbclass b/classes-recipe/genimage.bbclass
index ed423d2..2bbb491 100644
--- a/classes-recipe/genimage.bbclass
+++ b/classes-recipe/genimage.bbclass
@@ -101,7 +101,7 @@ do_genimage[vardeps] += "GENIMAGE_VARIABLES"
 do_genimage[depends] += "${@'${GENIMAGE_ROOTFS_IMAGE}:do_image_complete' if '${GENIMAGE_ROOTFS_IMAGE}' else ''}"
 
 GENIMAGE_CREATE_BMAP ?= "0"
-do_genimage[depends] += "${@'bmap-tools-native:do_populate_sysroot' if d.getVar('GENIMAGE_CREATE_BMAP') == '1' else ''}"
+do_genimage[depends] += "${@'bmaptool-native:do_populate_sysroot' if d.getVar('GENIMAGE_CREATE_BMAP') == '1' else ''}"
 
 GENIMAGE_TMPDIR  = "${WORKDIR}/genimage-tmp"
 GENIMAGE_ROOTDIR  = "${WORKDIR}/root"
diff --git a/conf/layer.conf b/conf/layer.conf
index 602ef98..718a102 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -11,4 +11,4 @@ BBFILE_PRIORITY_ptx = "6"
 
 LAYERDEPENDS_ptx = "core"
 
-LAYERSERIES_COMPAT_ptx = "nanbield scarthgap"
+LAYERSERIES_COMPAT_ptx = "scarthgap"