diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 6c70babc56..e14271df53 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -13,11 +13,11 @@ KERNEL_LOADADDR = 0x80060000
 DEVICE_VARS += BOARDNAME CMDLINE CONSOLE IMAGE_SIZE LOADER_TYPE
 
 ifeq ($(SUBTARGET),generic)
-include ./tp-link.mk
-include ./ubnt.mk
 include ./generic.mk
-include ./legacy-devices.mk
-include ./senao.mk
+include ./generic-legacy-devices.mk
+include ./generic-senao.mk
+include ./generic-tp-link.mk
+include ./generic-ubnt.mk
 endif
 ifeq ($(SUBTARGET),nand)
 include ./nand.mk
diff --git a/target/linux/ar71xx/image/legacy-devices.mk b/target/linux/ar71xx/image/generic-legacy-devices.mk
similarity index 100%
rename from target/linux/ar71xx/image/legacy-devices.mk
rename to target/linux/ar71xx/image/generic-legacy-devices.mk
diff --git a/target/linux/ar71xx/image/senao.mk b/target/linux/ar71xx/image/generic-senao.mk
similarity index 100%
rename from target/linux/ar71xx/image/senao.mk
rename to target/linux/ar71xx/image/generic-senao.mk
diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/generic-tp-link.mk
similarity index 100%
rename from target/linux/ar71xx/image/tp-link.mk
rename to target/linux/ar71xx/image/generic-tp-link.mk
diff --git a/target/linux/ar71xx/image/ubnt.mk b/target/linux/ar71xx/image/generic-ubnt.mk
similarity index 100%
rename from target/linux/ar71xx/image/ubnt.mk
rename to target/linux/ar71xx/image/generic-ubnt.mk