diff --git a/target/linux/x86/image/64.mk b/target/linux/x86/image/64.mk
index d5033f932a57a61aeb5e381983adfade7a732093..f54858d0b74687c54a877dd7ea007f0e14d526d7 100644
--- a/target/linux/x86/image/64.mk
+++ b/target/linux/x86/image/64.mk
@@ -1,5 +1,6 @@
 define Device/generic
-  DEVICE_TITLE := Generic x86/64
+  DEVICE_VENDOR := Generic
+  DEVICE_MODEL := x86/64
   DEVICE_PACKAGES += kmod-amazon-ena kmod-bnx2 kmod-e1000e kmod-e1000 \
 	kmod-forcedeth kmod-igb kmod-ixgbe kmod-amd-xgbe kmod-r8169 kmod-fs-vfat
   GRUB2_VARIANT := generic
diff --git a/target/linux/x86/image/generic.mk b/target/linux/x86/image/generic.mk
index 81cccd30b078043b9a63450893bed9de81f935c1..e9545fbf319123100f27e8368b380f8304ef83e4 100644
--- a/target/linux/x86/image/generic.mk
+++ b/target/linux/x86/image/generic.mk
@@ -1,5 +1,6 @@
 define Device/generic
-  DEVICE_TITLE := Generic x86
+  DEVICE_VENDOR := Generic
+  DEVICE_MODEL := x86
   DEVICE_PACKAGES += kmod-3c59x kmod-8139too kmod-e100 kmod-e1000 kmod-natsemi \
 	kmod-ne2k-pci kmod-pcnet32 kmod-r8169 kmod-sis900 kmod-tg3 \
 	kmod-via-rhine kmod-via-velocity kmod-forcedeth kmod-fs-vfat
diff --git a/target/linux/x86/image/geode.mk b/target/linux/x86/image/geode.mk
index 2ed2245f7defafee422d26fae57254c707022dd5..6cea887926db963638f727f22df78134e49c7d3e 100644
--- a/target/linux/x86/image/geode.mk
+++ b/target/linux/x86/image/geode.mk
@@ -1,5 +1,6 @@
 define Device/generic
-  DEVICE_TITLE := Generic x86/Geode
+  DEVICE_VENDOR := Generic
+  DEVICE_MODEL := x86/Geode
   DEVICE_PACKAGES += kmod-crypto-cbc kmod-crypto-hw-geode kmod-ledtrig-gpio
   GRUB2_VARIANT := legacy
 endef
@@ -7,7 +8,8 @@ TARGET_DEVICES += generic
 
 define Device/geos
   $(call Device/generic)
-  DEVICE_TITLE := Traverse Technologies Geos
+  DEVICE_VENDOR := Traverse Technologies
+  DEVICE_MODEL := Geos
   DEVICE_PACKAGES += br2684ctl flashrom kmod-hwmon-lm90 kmod-mppe kmod-pppoa \
 	kmod-usb-ohci-pci linux-atm ppp-mod-pppoa pppdump pppstats soloscli tc
 endef
diff --git a/target/linux/x86/image/legacy.mk b/target/linux/x86/image/legacy.mk
index 5c13f95157d2b19bddeb010889f31fdf5df75e83..6c0d8e78f9ab579fb33b9ccca6a2a302686dc0bf 100644
--- a/target/linux/x86/image/legacy.mk
+++ b/target/linux/x86/image/legacy.mk
@@ -1,5 +1,6 @@
 define Device/generic
-  DEVICE_TITLE := Generic x86/legacy
+  DEVICE_VENDOR := Generic
+  DEVICE_MODEL := x86/legacy
   DEVICE_PACKAGES += kmod-3c59x kmod-8139too kmod-e100 kmod-e1000 \
 	kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-r8169 kmod-sis900 \
 	kmod-tg3 kmod-via-rhine kmod-via-velocity kmod-forcedeth