diff --git a/bsp/board_ar71xx.bsp b/bsp/ar71xx-tiny.bsp
similarity index 99%
rename from bsp/board_ar71xx.bsp
rename to bsp/ar71xx-tiny.bsp
index 344e2e5..0cf426c 100644
--- a/bsp/board_ar71xx.bsp
+++ b/bsp/ar71xx-tiny.bsp
@@ -1,4 +1,4 @@
-machine=ar71xx
+machine=ar71xx-tiny
 chipset=ar71xx
 subtarget=tiny
 images=("openwrt-${chipset}-${subtarget}-archer-c25-v1-squashfs-*"
diff --git a/bsp/ar71xx/.config b/bsp/ar71xx-tiny/.config
similarity index 100%
rename from bsp/ar71xx/.config
rename to bsp/ar71xx-tiny/.config
diff --git a/bsp/board_ipq806x.bsp b/bsp/ipq806x-generic.bsp
similarity index 83%
rename from bsp/board_ipq806x.bsp
rename to bsp/ipq806x-generic.bsp
index 194049a..405f8d0 100644
--- a/bsp/board_ipq806x.bsp
+++ b/bsp/ipq806x-generic.bsp
@@ -1,4 +1,4 @@
-machine=ipq806x
+machine=ipq806x-generic
 chipset=ipq806x
 subtarget=generic
 
diff --git a/bsp/ipq806x/.config b/bsp/ipq806x-generic/.config
similarity index 100%
rename from bsp/ipq806x/.config
rename to bsp/ipq806x-generic/.config
diff --git a/bsp/board_mpc85xx.bsp b/bsp/mpc85xx-generic.bsp
similarity index 83%
rename from bsp/board_mpc85xx.bsp
rename to bsp/mpc85xx-generic.bsp
index 6e10035..1d3658f 100644
--- a/bsp/board_mpc85xx.bsp
+++ b/bsp/mpc85xx-generic.bsp
@@ -1,4 +1,4 @@
-machine=mpc85xx
+machine=mpc85xx-generic
 chipset=mpc85xx
 subtarget=generic
 
diff --git a/bsp/mpc85xx/.config b/bsp/mpc85xx-generic/.config
similarity index 100%
rename from bsp/mpc85xx/.config
rename to bsp/mpc85xx-generic/.config
diff --git a/bsp/board_mt7621.bsp b/bsp/ramips-mt7621.bsp
similarity index 87%
rename from bsp/board_mt7621.bsp
rename to bsp/ramips-mt7621.bsp
index aef3800..8a5c69e 100644
--- a/bsp/board_mt7621.bsp
+++ b/bsp/ramips-mt7621.bsp
@@ -1,4 +1,4 @@
-machine=mt7621
+machine=mt7621-generic
 chipset=ramips
 subtarget=mt7621
 
diff --git a/bsp/mt7621/.config b/bsp/ramips-mt7621/.config
similarity index 100%
rename from bsp/mt7621/.config
rename to bsp/ramips-mt7621/.config
diff --git a/bsp/board_mt76x8.bsp b/bsp/ramips-mt76x8.bsp
similarity index 88%
rename from bsp/board_mt76x8.bsp
rename to bsp/ramips-mt76x8.bsp
index 54f331f..ee9d1c3 100644
--- a/bsp/board_mt76x8.bsp
+++ b/bsp/ramips-mt76x8.bsp
@@ -1,4 +1,4 @@
-machine=mt76x8
+machine=ramips-mt76x8
 chipset=ramips
 subtarget=mt76x8
 images=("openwrt-${chipset}-${subtarget}-tplink_c50-v3-squashfs-*"
diff --git a/bsp/mt76x8/.config b/bsp/ramips-mt76x8/.config
similarity index 100%
rename from bsp/mt76x8/.config
rename to bsp/ramips-mt76x8/.config