diff --git a/target/linux/ramips/base-files/etc/uci-defaults/09_fix-checksum b/target/linux/ramips/base-files/etc/uci-defaults/09_fix-checksum
index 48ffcdd01f8..113cf17b928 100644
--- a/target/linux/ramips/base-files/etc/uci-defaults/09_fix-checksum
+++ b/target/linux/ramips/base-files/etc/uci-defaults/09_fix-checksum
@@ -14,9 +14,9 @@ fix_checksum() {
 board=$(board_name)
 
 case "$board" in
-cy-swr1100 | \
+samsung,cy-swr1100|\
 dlink,dch-m225|\
-dir-645 | \
+dlink,dir-645|\
 dlink,dir-860l-b1)
 	fix_checksum seama
 	;;
diff --git a/target/linux/ramips/dts/AR670W.dts b/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts
similarity index 100%
rename from target/linux/ramips/dts/AR670W.dts
rename to target/linux/ramips/dts/rt2880_airlink101_ar670w.dts
diff --git a/target/linux/ramips/dts/AR725W.dts b/target/linux/ramips/dts/rt2880_airlink101_ar725w.dts
similarity index 100%
rename from target/linux/ramips/dts/AR725W.dts
rename to target/linux/ramips/dts/rt2880_airlink101_ar725w.dts
diff --git a/target/linux/ramips/dts/RT-N15.dts b/target/linux/ramips/dts/rt2880_asus_rt-n15.dts
similarity index 100%
rename from target/linux/ramips/dts/RT-N15.dts
rename to target/linux/ramips/dts/rt2880_asus_rt-n15.dts
diff --git a/target/linux/ramips/dts/F5D8235_V1.dts b/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts
similarity index 100%
rename from target/linux/ramips/dts/F5D8235_V1.dts
rename to target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts
diff --git a/target/linux/ramips/dts/WLI-TX4-AG300N.dts b/target/linux/ramips/dts/rt2880_buffalo_wli-tx4-ag300n.dts
similarity index 100%
rename from target/linux/ramips/dts/WLI-TX4-AG300N.dts
rename to target/linux/ramips/dts/rt2880_buffalo_wli-tx4-ag300n.dts
diff --git a/target/linux/ramips/dts/WZR-AGL300NH.dts b/target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts
similarity index 100%
rename from target/linux/ramips/dts/WZR-AGL300NH.dts
rename to target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts
diff --git a/target/linux/ramips/dts/DAP-1522-A1.dts b/target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts
similarity index 100%
rename from target/linux/ramips/dts/DAP-1522-A1.dts
rename to target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts
diff --git a/target/linux/ramips/dts/V11STFE.dts b/target/linux/ramips/dts/rt2880_ralink_v11st-fe.dts
similarity index 100%
rename from target/linux/ramips/dts/V11STFE.dts
rename to target/linux/ramips/dts/rt2880_ralink_v11st-fe.dts
diff --git a/target/linux/ramips/dts/RT-N56U.dts b/target/linux/ramips/dts/rt3883_asus_rt-n56u.dts
similarity index 100%
rename from target/linux/ramips/dts/RT-N56U.dts
rename to target/linux/ramips/dts/rt3883_asus_rt-n56u.dts
diff --git a/target/linux/ramips/dts/F9K1109V1.dts b/target/linux/ramips/dts/rt3883_belkin_f9k1109v1.dts
similarity index 97%
rename from target/linux/ramips/dts/F9K1109V1.dts
rename to target/linux/ramips/dts/rt3883_belkin_f9k1109v1.dts
index cdd2b6b7142..172a7996321 100644
--- a/target/linux/ramips/dts/F9K1109V1.dts
+++ b/target/linux/ramips/dts/rt3883_belkin_f9k1109v1.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "F9K110x.dtsi"
+#include "rt3883_belkin_f9k110x.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
diff --git a/target/linux/ramips/dts/F9K110x.dtsi b/target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi
similarity index 100%
rename from target/linux/ramips/dts/F9K110x.dtsi
rename to target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi
diff --git a/target/linux/ramips/dts/DIR-645.dts b/target/linux/ramips/dts/rt3883_dlink_dir-645.dts
similarity index 100%
rename from target/linux/ramips/dts/DIR-645.dts
rename to target/linux/ramips/dts/rt3883_dlink_dir-645.dts
diff --git a/target/linux/ramips/dts/BR-6475ND.dts b/target/linux/ramips/dts/rt3883_edimax_br-6475nd.dts
similarity index 100%
rename from target/linux/ramips/dts/BR-6475ND.dts
rename to target/linux/ramips/dts/rt3883_edimax_br-6475nd.dts
diff --git a/target/linux/ramips/dts/WMDR-143N.dts b/target/linux/ramips/dts/rt3883_loewe_wmdr-143n.dts
similarity index 100%
rename from target/linux/ramips/dts/WMDR-143N.dts
rename to target/linux/ramips/dts/rt3883_loewe_wmdr-143n.dts
diff --git a/target/linux/ramips/dts/HPM.dts b/target/linux/ramips/dts/rt3883_omnima_hpm.dts
similarity index 100%
rename from target/linux/ramips/dts/HPM.dts
rename to target/linux/ramips/dts/rt3883_omnima_hpm.dts
diff --git a/target/linux/ramips/dts/CY-SWR1100.dts b/target/linux/ramips/dts/rt3883_samsung_cy-swr1100.dts
similarity index 100%
rename from target/linux/ramips/dts/CY-SWR1100.dts
rename to target/linux/ramips/dts/rt3883_samsung_cy-swr1100.dts
diff --git a/target/linux/ramips/dts/WLR-6000.dts b/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts
similarity index 100%
rename from target/linux/ramips/dts/WLR-6000.dts
rename to target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts
diff --git a/target/linux/ramips/dts/TEW-691GR.dts b/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts
similarity index 100%
rename from target/linux/ramips/dts/TEW-691GR.dts
rename to target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts
diff --git a/target/linux/ramips/dts/TEW-692GR.dts b/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts
similarity index 100%
rename from target/linux/ramips/dts/TEW-692GR.dts
rename to target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts
diff --git a/target/linux/ramips/image/rt288x.mk b/target/linux/ramips/image/rt288x.mk
index fe6764ce59a..e8e51adc31d 100644
--- a/target/linux/ramips/image/rt288x.mk
+++ b/target/linux/ramips/image/rt288x.mk
@@ -10,7 +10,7 @@ define Build/gemtek-header
 endef
 
 define Device/airlink101_ar670w
-  DTS := AR670W
+  MTK_SOC := rt2880
   BLOCKSIZE := 64k
   DEVICE_VENDOR := Airlink
   DEVICE_MODEL := AR670W
@@ -24,7 +24,7 @@ endef
 TARGET_DEVICES += airlink101_ar670w
 
 define Device/airlink101_ar725w
-  DTS := AR725W
+  MTK_SOC := rt2880
   DEVICE_VENDOR := Airlink
   DEVICE_MODEL := AR725W
   IMAGES += factory.bin
@@ -35,7 +35,7 @@ endef
 TARGET_DEVICES += airlink101_ar725w
 
 define Device/dlink_dap-1522-a1
-  DTS := DAP-1522-A1
+  MTK_SOC := rt2880
   BLOCKSIZE := 64k
   IMAGE_SIZE := 3801088
   DEVICE_VENDOR := D-Link
@@ -53,7 +53,7 @@ endef
 TARGET_DEVICES += dlink_dap-1522-a1
 
 define Device/belkin_f5d8235-v1
-  DTS := F5D8235_V1
+  MTK_SOC := rt2880
   IMAGE_SIZE := 7744k
   DEVICE_VENDOR := Belkin
   DEVICE_MODEL := F5D8235
@@ -65,7 +65,7 @@ endef
 TARGET_DEVICES += belkin_f5d8235-v1
 
 define Device/asus_rt-n15
-  DTS := RT-N15
+  MTK_SOC := rt2880
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Asus
@@ -76,7 +76,7 @@ endef
 TARGET_DEVICES += asus_rt-n15
 
 define Device/ralink_v11st-fe
-  DTS := V11STFE
+  MTK_SOC := rt2880
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Ralink
@@ -86,7 +86,7 @@ endef
 TARGET_DEVICES += ralink_v11st-fe
 
 define Device/buffalo_wli-tx4-ag300n
-  DTS := WLI-TX4-AG300N
+  MTK_SOC := rt2880
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Buffalo
@@ -97,7 +97,7 @@ endef
 TARGET_DEVICES += buffalo_wli-tx4-ag300n
 
 define Device/buffalo_wzr-agl300nh
-  DTS := WZR-AGL300NH
+  MTK_SOC := rt2880
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   DEVICE_VENDOR := Buffalo
diff --git a/target/linux/ramips/image/rt3883.mk b/target/linux/ramips/image/rt3883.mk
index 9e1d928603a..0adb39eab17 100644
--- a/target/linux/ramips/image/rt3883.mk
+++ b/target/linux/ramips/image/rt3883.mk
@@ -6,7 +6,7 @@ define Build/mkrtn56uimg
 endef
 
 define Device/edimax_br-6475nd
-  DTS := BR-6475ND
+  MTK_SOC := rt3883
   BLOCKSIZE := 64k
   IMAGE_SIZE := 7744k
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
@@ -21,7 +21,7 @@ TARGET_DEVICES += edimax_br-6475nd
 
 define Device/samsung_cy-swr1100
   $(Device/seama)
-  DTS := CY-SWR1100
+  MTK_SOC := rt3883
   BLOCKSIZE := 64k
   KERNEL := $(KERNEL_DTB)
   SEAMA_SIGNATURE := wrgnd10_samsung_ss815
@@ -35,7 +35,7 @@ TARGET_DEVICES += samsung_cy-swr1100
 
 define Device/dlink_dir-645
   $(Device/seama)
-  DTS := DIR-645
+  MTK_SOC := rt3883
   BLOCKSIZE := 4k
   KERNEL := $(KERNEL_DTB)
   SEAMA_SIGNATURE := wrgn39_dlob.hans_dir645
@@ -48,7 +48,7 @@ TARGET_DEVICES += dlink_dir-645
 
 
 define Device/belkin_f9k1109v1
-  DTS := F9K1109V1
+  MTK_SOC := rt3883
   BLOCKSIZE := 64k
   DEVICE_VENDOR := Belkin
   DEVICE_MODEL := F9K1109
@@ -62,7 +62,7 @@ endef
 TARGET_DEVICES += belkin_f9k1109v1
 
 define Device/omnima_hpm
-  DTS := HPM
+  MTK_SOC := rt3883
   BLOCKSIZE := 64k
   IMAGE_SIZE := 16064k
   DEVICE_VENDOR := Omnima
@@ -74,7 +74,7 @@ TARGET_DEVICES += omnima_hpm
 
 
 define Device/asus_rt-n56u
-  DTS := RT-N56U
+  MTK_SOC := rt3883
   BLOCKSIZE := 64k
   IMAGE/sysupgrade.bin += | mkrtn56uimg -s
   DEVICE_VENDOR := Asus
@@ -86,7 +86,7 @@ TARGET_DEVICES += asus_rt-n56u
 
 
 define Device/trendnet_tew-691gr
-  DTS := TEW-691GR
+  MTK_SOC := rt3883
   BLOCKSIZE := 64k
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@@ -100,7 +100,7 @@ TARGET_DEVICES += trendnet_tew-691gr
 
 
 define Device/trendnet_tew-692gr
-  DTS := TEW-692GR
+  MTK_SOC := rt3883
   BLOCKSIZE := 64k
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
@@ -114,7 +114,7 @@ TARGET_DEVICES += trendnet_tew-692gr
 
 
 define Device/sitecom_wlr-6000
-  DTS := WLR-6000
+  MTK_SOC := rt3883
   BLOCKSIZE := 4k
   IMAGE_SIZE := 7244k
   IMAGES += factory.dlf
@@ -129,7 +129,7 @@ TARGET_DEVICES += sitecom_wlr-6000
 
 
 define Device/loewe_wmdr-143n
-  DTS := WMDR-143N
+  MTK_SOC := rt3883
   BLOCKSIZE := 64k
   DEVICE_VENDOR := Loewe
   DEVICE_MODEL := WMDR-143N