diff --git a/targets/ramips-mt7620 b/targets/ramips-mt7620
index 1cb61e5f..347df37c 100644
--- a/targets/ramips-mt7620
+++ b/targets/ramips-mt7620
@@ -1,6 +1,6 @@
 -- ASUS
 
-device('asus-rt-ac51u', 'rt-ac51u', {
+device('asus-rt-ac51u', 'asus_rt-ac51u', {
 	factory = false,
 	broken = true, -- no 5GHz usable, LEDs not fully supported
 })
@@ -8,21 +8,21 @@ device('asus-rt-ac51u', 'rt-ac51u', {
 
 -- GL.iNet
 
-device('gl-mt300a', 'gl-mt300a', {
+device('gl-mt300a', 'glinet_gl-mt300a', {
 	factory = false,
 })
 
-device('gl-mt300n', 'gl-mt300n', {
+device('gl-mt300n', 'glinet_gl-mt300n', {
 	factory = false,
 })
 
-device('gl-mt750', 'gl-mt750', {
+device('gl-mt750', 'glinet_gl-mt750', {
 	factory = false,
 })
 
 -- Netgear
 
-device('netgear-ex3700', 'ex3700-ex3800', {
+device('netgear-ex3700', 'netgear_ex3700', {
 	aliases = {
 		'netgear-ex3800',
 	},
@@ -32,7 +32,7 @@ device('netgear-ex3700', 'ex3700-ex3800', {
 
 -- Nexx
 
-device('nexx-wt3020-8m', 'wt3020-8M', {
+device('nexx-wt3020-8m', 'nexx_wt3020-8m', {
 	aliases = {
 		'nexx-wt3020ad',
 		'nexx-wt3020f',
@@ -47,23 +47,24 @@ if (env.GLUON_REGION or '') ~= '' then
 	tplink_region_suffix = '-' .. env.GLUON_REGION
 end
 
-device('tp-link-archer-c2-v1', 'tplink_c2-v1', {
+device('tp-link-archer-c2-v1', 'tplink_archer-c2-v1', {
 	factory = false,
 })
 
-device('tp-link-archer-c20-v1', 'tplink_c20-v1', {
+device('tp-link-archer-c20-v1', 'tplink_archer-c20-v1', {
 	factory = false,
 })
 
-device('tp-link-archer-c20i', 'ArcherC20i')
+device('tp-link-archer-c20i', 'tplink_archer-c20i')
 
-device('tp-link-archer-c50', 'ArcherC50v1', {
+device('tp-link-archer-c50-v1', 'tplink_archer-c50-v1', {
 	factory = '-squashfs-factory' .. tplink_region_suffix,
+	manifest_aliases = {'tp-link-archer-c50'},
 })
 
 
 -- Xiaomi
 
-device('xiaomi-miwifi-mini', 'miwifi-mini', {
+device('xiaomi-miwifi-mini', 'xiaomi_miwifi-mini', {
 	factory = false,
 })
diff --git a/targets/ramips-mt7621 b/targets/ramips-mt7621
index 978eb619..528bd361 100644
--- a/targets/ramips-mt7621
+++ b/targets/ramips-mt7621
@@ -7,7 +7,7 @@ device('asus-rt-ac57u', 'asus_rt-ac57u', {
 
 -- D-Link
 
-device('d-link-dir-860l-b1', 'dir-860l-b1')
+device('d-link-dir-860l-b1', 'dlink_dir-860l-b1')
 
 
 -- Netgear
@@ -16,27 +16,35 @@ device('netgear-ex6150', 'netgear_ex6150', {
 	factory_ext = '.chk',
 })
 
-device('netgear-r6220', 'r6220', {
+device('netgear-r6220', 'netgear_r6220', {
 	factory_ext = '.img',
 })
 
-device('netgear-wndr3700v5', 'wndr3700v5', {
+device('netgear-wndr3700-v5', 'netgear_wndr3700-v5', {
 	factory = false,
 	broken = true, -- untested
+	manifest_aliases = {
+		'netgear-wndr3700v5',
+	},
 })
 
 
 -- ZBT
 
-device('zbt-wg3526-16m', 'zbt-wg3526-16M', {
+device('zbtlink-zbt-wg3526-16m', 'zbtlink_zbt-wg3526-16m', {
 	factory = false,
 	manifest_aliases = {
 		'zbt-wg3526',
+		'zbt-wg3526-16m',
 	},
 })
 
-device('zbt-wg3526-32m', 'zbt-wg3526-32M', {
+device('zbtlink-zbt-wg3526-32m', 'zbtlink_zbt-wg3526-32m', {
 	factory = false,
+	manifest_aliases = {
+		'zbt-wg3526-32m',
+	},
+
 })
 
 
@@ -44,12 +52,18 @@ device('zbt-wg3526-32m', 'zbt-wg3526-32M', {
 
 -- Ubiquiti
 
-device('ubnt-erx', 'ubnt-erx', {
+device('ubiquiti-edgerouter-x', 'ubnt_edgerouter-x', {
 	factory = false,
 	packages = {'-hostapd-mini'},
+	manifest_aliases = {
+		'ubnt-erx',
+	},
 })
 
-device('ubnt-erx-sfp', 'ubnt-erx-sfp', {
+device('ubiquiti-edgerouter-x-sfp', 'ubnt_edgerouter-x-sfp', {
 	factory = false,
 	packages = {'-hostapd-mini'},
+	manifest_aliases = {
+		'ubnt-erx-sfp',
+	},
 })
diff --git a/targets/ramips-mt76x8 b/targets/ramips-mt76x8
index 1af12e5c..4a0bf711 100644
--- a/targets/ramips-mt76x8
+++ b/targets/ramips-mt76x8
@@ -5,7 +5,7 @@ device('cudy-wr1000', 'cudy_wr1000')
 
 -- GL.iNet
 
-device('gl-mt300n-v2', 'gl-mt300n-v2', {
+device('gl-mt300n-v2', 'glinet_gl-mt300n-v2', {
 	factory = false,
 })
 
@@ -23,14 +23,14 @@ device('netgear-r6120', 'netgear_r6120', {
 
 -- TP-Link
 
-device('tp-link-archer-c50-v3', 'tplink_c50-v3', {
+device('tp-link-archer-c50-v3', 'tplink_archer-c50-v3', {
 	factory = false,
 	extra_images = {
 		{'-squashfs-tftp-recovery', '-bootloader', '.bin'},
 	},
 })
 
-device('tp-link-archer-c50-v4', 'tplink_c50-v4', {
+device('tp-link-archer-c50-v4', 'tplink_archer-c50-v4', {
 	factory = false,
 })
 
@@ -55,7 +55,7 @@ device('tp-link-tl-wa801nd-v5', 'tplink_tl-wa801nd-v5', {
 	},
 })
 
-device('tp-link-tl-wr841n-v13', 'tl-wr841n-v13', {
+device('tp-link-tl-wr841n-v13', 'tplink_tl-wr841n-v13', {
 	factory = false,
 	extra_images = {
 		{'-squashfs-tftp-recovery', '-bootloader', '.bin'},
@@ -71,13 +71,13 @@ device('tp-link-tl-wr902ac-v3', 'tplink_tl-wr902ac-v3', {
 
 -- VoCore 2
 
-device('vocore2', 'vocore2', {
+device('vocore2', 'vocore_vocore2', {
 	factory = false,
 })
 
 
 -- Xiaomi
 
-device('xiaomi-mi-router-4a-100m-edition', 'xiaomi_mir4a-100m', {
+device('xiaomi-mi-router-4a-100m-edition', 'xiaomi_mi-router-4a-100m', {
 	factory = false,
 })
diff --git a/targets/ramips-rt305x b/targets/ramips-rt305x
index 8678f12e..a2d24d85 100644
--- a/targets/ramips-rt305x
+++ b/targets/ramips-rt305x
@@ -16,7 +16,7 @@ local STRIP_USB_PACKAGES = {
 
 -- A5
 
-device('a5-v11', 'a5-v11', {
+device('a5-v11', 'unbranded_a5-v11', {
 	deprecated = true, -- 4/32
 	packages = STRIP_USB_PACKAGES,
 })
@@ -24,12 +24,12 @@ device('a5-v11', 'a5-v11', {
 
 -- D-Link
 
-device('d-link-dir-615-h1', 'dir-615-h1', {
+device('d-link-dir-615-h1', 'dlink_dir-615-h1', {
 	deprecated = true, -- 4/32
 	packages = STRIP_USB_PACKAGES,
 })
 
-device('d-link-dir-615-d', 'dir-615-d', {
+device('d-link-dir-615-d', 'dlink_dir-615-d', {
 	aliases = {
 		'd-link-dir-615-d1',
 		'd-link-dir-615-d2',
@@ -43,10 +43,10 @@ device('d-link-dir-615-d', 'dir-615-d', {
 
 -- VoCore
 
-device('vocore-8M', 'vocore-8M', {
+device('vocore-8M', 'vocore_vocore-8m', {
 	factory = false,
 })
 
-device('vocore-16M', 'vocore-16M', {
+device('vocore-16M', 'vocore_vocore-16m', {
 	factory = false,
 })