diff --git a/conf/machine/beaglev-starlight-jh7100.conf b/conf/machine/beaglev-starlight-jh7100.conf
index ca160a0..b86af9e 100644
--- a/conf/machine/beaglev-starlight-jh7100.conf
+++ b/conf/machine/beaglev-starlight-jh7100.conf
@@ -9,13 +9,13 @@ MACHINE_FEATURES = "screen keyboard ext2 ext3 serial"
 
 KERNEL_IMAGETYPE = "Image"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-beaglev"
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-beaglev"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-starfive"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-starfive"
 
 PREFERRED_VERSION_openocd-native = "riscv"
 PREFERRED_VERSION_openocd = "riscv"
 
-EXTRA_IMAGEDEPENDS += "opensbi-beaglev"
+EXTRA_IMAGEDEPENDS += "opensbi-starfive"
 RISCV_SBI_PLAT = "starfive/vic7100"
 
 ## This sets u-boot as the default OpenSBI payload
@@ -33,7 +33,7 @@ KERNEL_DEVICETREE ?= "sifive/${RISCV_SBI_FDT}"
 ## Do not update fstab file when using wic images
 WIC_CREATE_EXTRA_ARGS ?= "--no-fstab-update"
 
-EXTRA_IMAGEDEPENDS += "u-boot-beaglev"
+EXTRA_IMAGEDEPENDS += "u-boot-starfive"
 UBOOT_MACHINE = "starfive_vic7100_beagle_v_smode_defconfig"
 
 UBOOT_ENTRYPOINT = "0x80200000"
@@ -41,7 +41,7 @@ UBOOT_DTB_LOADADDRESS = "0x82200000"
 
 ## wic default support
 WKS_FILE_DEPENDS ?= " \
-    opensbi-beaglev \
+    opensbi-starfive \
     e2fsprogs-native \
     bmap-tools-native \
 "
diff --git a/recipes-bsp/opensbi/opensbi-beaglev_0.8.0.bb b/recipes-bsp/opensbi/opensbi-starfive_0.8.0.bb
similarity index 100%
rename from recipes-bsp/opensbi/opensbi-beaglev_0.8.0.bb
rename to recipes-bsp/opensbi/opensbi-starfive_0.8.0.bb
diff --git a/recipes-bsp/u-boot/u-boot-beaglev/0001-include-configs-starfive-vic7100-adjust-fdt_addr_r.patch b/recipes-bsp/u-boot/u-boot-starfive/0001-include-configs-starfive-vic7100-adjust-fdt_addr_r.patch
similarity index 100%
rename from recipes-bsp/u-boot/u-boot-beaglev/0001-include-configs-starfive-vic7100-adjust-fdt_addr_r.patch
rename to recipes-bsp/u-boot/u-boot-starfive/0001-include-configs-starfive-vic7100-adjust-fdt_addr_r.patch
diff --git a/recipes-bsp/u-boot/u-boot-beaglev_v2021.04.bb b/recipes-bsp/u-boot/u-boot-starfive_v2021.04.bb
similarity index 100%
rename from recipes-bsp/u-boot/u-boot-beaglev_v2021.04.bb
rename to recipes-bsp/u-boot/u-boot-starfive_v2021.04.bb
diff --git a/recipes-kernel/linux/linux-beaglev/0001-sync-beaglev-dts-from-u-boot.patch b/recipes-kernel/linux/linux-starfive/0001-sync-beaglev-dts-from-u-boot.patch
similarity index 100%
rename from recipes-kernel/linux/linux-beaglev/0001-sync-beaglev-dts-from-u-boot.patch
rename to recipes-kernel/linux/linux-starfive/0001-sync-beaglev-dts-from-u-boot.patch
diff --git a/recipes-kernel/linux/linux-beaglev_5.10.bb b/recipes-kernel/linux/linux-starfive_5.10.bb
similarity index 100%
rename from recipes-kernel/linux/linux-beaglev_5.10.bb
rename to recipes-kernel/linux/linux-starfive_5.10.bb