diff --git a/conf/machine/am335x-nbhw16.conf b/conf/machine/am335x-nbhw16.conf
index c10ec6d..0e0322c 100644
--- a/conf/machine/am335x-nbhw16.conf
+++ b/conf/machine/am335x-nbhw16.conf
@@ -24,3 +24,4 @@ PV_pn-linux-netmodule = "4.14.78-${SRCPV}"
 SRC_URI_pn-linux-netmodule ?= "git://git.netmodule.intranet/nmrouter/linux.git;protocol=ssh;user=gitea;branch=4.14/standard/nmhw21"
 SRCREV_pn-linux-netmodule ?= "${AUTOREV}"
 
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-nrhw16-v2"
diff --git a/recipes-bsp/u-boot/u-boot-am335x-nbhw16-v1_git.bb b/recipes-bsp/u-boot/u-boot-am335x-nrhw16-v1_git.bb
similarity index 100%
rename from recipes-bsp/u-boot/u-boot-am335x-nbhw16-v1_git.bb
rename to recipes-bsp/u-boot/u-boot-am335x-nrhw16-v1_git.bb
diff --git a/recipes-bsp/u-boot/u-boot-am335x-nbhw16-v2_git.bb b/recipes-bsp/u-boot/u-boot-am335x-nrhw16-v2_git.bb
similarity index 78%
rename from recipes-bsp/u-boot/u-boot-am335x-nbhw16-v2_git.bb
rename to recipes-bsp/u-boot/u-boot-am335x-nrhw16-v2_git.bb
index 01579a8..2501d6d 100644
--- a/recipes-bsp/u-boot/u-boot-am335x-nbhw16-v2_git.bb
+++ b/recipes-bsp/u-boot/u-boot-am335x-nrhw16-v2_git.bb
@@ -1,4 +1,4 @@
-require u-boot-am335x-nbhw16-v1_git.bb
+require u-boot-am335x-nrhw16-v1_git.bb
 
 # Force machine configuration for this recipe
 UBOOT_MACHINE = "am335x_nbhw16_v2_defconfig"