diff --git a/docs/user/supported_devices.rst b/docs/user/supported_devices.rst
index c5a7b6247b30ef0c0bc90de77dc8575626db1bd9..aa2df8d5732b0ca51387a04d0321914ac13412fb 100644
--- a/docs/user/supported_devices.rst
+++ b/docs/user/supported_devices.rst
@@ -71,7 +71,7 @@ ath79-generic
 
   - LibreRouter v1 [#missing_radios]_
 
-* Netgear
+* NETGEAR
 
   - WNDR3700 (v1, v2)
   - WNDR3800
@@ -178,7 +178,7 @@ ath79-nand
   - GL-AR750S
   - GL-XE300
 
-* Netgear
+* NETGEAR
 
   - WNDR3700 (v4)
   - WNDR4300 (v1)
@@ -245,7 +245,7 @@ ipq40xx-generic
   - PA1200
   - PA2200
 
-* ZyXEL
+* Zyxel
 
   - NBG6617
 
@@ -317,7 +317,7 @@ mediatek-filogic
 
   - UniFi 6 Plus
 
-* ZyXEL
+* Zyxel
 
   - NWA50AX Pro
 
@@ -432,7 +432,7 @@ ramips-mt7621
 
   - GL-MT1300
 
-* Mercusys
+* MERCUSYS
 
   - MR70X (v1)
 
@@ -465,12 +465,12 @@ ramips-mt7621
   - Xiaomi Mi Router 3G (v1, v2)
   - Xiaomi Mi Router 4A (Gigabit Edition v1, v2)
 
-* ZBT
+* Zbtlink
 
   - WG3526-16M
   - WG3526-32M
 
-* ZyXEL
+* Zyxel
 
   - NWA50AX
   - WSM20
diff --git a/targets/ath79-generic b/targets/ath79-generic
index 093a9757b02e6d3f4d26924e20952dec7186daf0..d10c961e8000664f04fc7f51509f70a836e3dd62 100644
--- a/targets/ath79-generic
+++ b/targets/ath79-generic
@@ -37,12 +37,14 @@ local ATH10K_PACKAGES_SMALLBUFFERS_QCA9887 = {
 
 local ATH10K_PACKAGES_QCA9888 = {}
 
--- ALFA NETWORK
+
+-- ALFA Network
 
 device('alfa-network-ap121f', 'alfa-network_ap121f', {
 	factory = false,
 })
 
+
 -- AVM
 
 device('avm-fritz-box-4020', 'avm_fritz4020', {
@@ -64,9 +66,11 @@ device('avm-fritz-wlan-repeater-1750e', 'avm_fritz1750e', {
 	class = 'tiny', -- 64M ath9k + ath10k
 })
 
+
 -- Buffalo
 
 device('buffalo-wzr-hp-ag300h', 'buffalo_wzr-hp-ag300h')
+
 device('buffalo-wzr-600dhp', 'buffalo_wzr-600dhp')
 
 device('buffalo-wzr-hp-g300nh-rtl8366s', 'buffalo_wzr-hp-g300nh-s', {
@@ -111,6 +115,7 @@ device('devolo-wifi-pro-1750x', 'devolo_dvl1750x', {
 -- D-Link
 
 device('d-link-dap-1330-a1', 'dlink_dap-1330-a1')
+
 device('d-link-dap-1365-a1', 'dlink_dap-1365-a1')
 
 device('d-link-dap-2660-a1', 'dlink_dap-2660-a1', {
@@ -176,13 +181,15 @@ device('gl.inet-gl-usb150', 'glinet_gl-usb150', {
 	factory = false,
 })
 
--- JOY-IT
+
+-- Joy-IT
 
 device('joy-it-jt-or750i', 'joyit_jt-or750i', {
 	packages = ATH10K_PACKAGES_QCA9887,
 	factory = false,
 })
 
+
 -- LibreRouter
 
 -- lacks support for additional radios
@@ -190,7 +197,8 @@ device('librerouter-v1', 'librerouter_librerouter-v1', {
 	factory = false,
 })
 
--- Netgear
+
+-- NETGEAR
 
 device('netgear-wndr3700', 'netgear_wndr3700', {
 	factory_ext = '.img',
@@ -238,6 +246,7 @@ device('ocedo-raccoon', 'ocedo_raccoon', {
 	factory = false,
 })
 
+
 -- Onion
 
 -- modular/optional "ethernet expansion board" recommended for config mode
@@ -381,6 +390,7 @@ device('siemens-ws-ap3610', 'siemens_ws-ap3610', {
 	factory = false,
 })
 
+
 -- Sophos
 
 device('sophos-ap15', 'sophos_ap15', {
@@ -509,6 +519,7 @@ device('tp-link-cpe510-v1', 'tplink_cpe510-v1', {
 	},
 })
 device('tp-link-cpe510-v2', 'tplink_cpe510-v2')
+
 device('tp-link-cpe510-v3', 'tplink_cpe510-v3')
 
 device('tp-link-cpe710-v1', 'tplink_cpe710-v1')
@@ -522,7 +533,9 @@ device('tp-link-eap225-outdoor-v3', 'tplink_eap225-outdoor-v3', {
 })
 
 device('tp-link-tl-wdr3500-v1', 'tplink_tl-wdr3500-v1')
+
 device('tp-link-tl-wdr3600-v1', 'tplink_tl-wdr3600-v1')
+
 device('tp-link-tl-wdr4300-v1', 'tplink_tl-wdr4300-v1')
 
 device('tp-link-tl-wr810n-v1', 'tplink_tl-wr810n-v1')
@@ -620,7 +633,6 @@ device('ubiquiti-unifi-ap-outdoor+', 'ubnt_unifi-ap-outdoor-plus', {
 
 device('ubiquiti-unifi-ap-pro', 'ubnt_unifi-ap-pro')
 
-
 device('ubiquiti-unifi-swiss-army-knife-ultra', 'ubnt_uk-ultra', {
 	factory = false,
 	packages = ATH10K_PACKAGES_QCA9880,
diff --git a/targets/ath79-nand b/targets/ath79-nand
index 172f8271639f1cbfbe978a26db36782eddaf6b33..5ee65151e5e449ccb77fca1ae70f6ad1418b2cbb 100644
--- a/targets/ath79-nand
+++ b/targets/ath79-nand
@@ -41,7 +41,7 @@ device('gl.inet-gl-xe300', 'glinet_gl-xe300', {
 })
 
 
--- Netgear
+-- NETGEAR
 
 device('netgear-wndr3700-v4', 'netgear_wndr3700-v4', {
 	factory_ext = '.img',
diff --git a/targets/ipq40xx-generic b/targets/ipq40xx-generic
index 068f538be97299f7df8c3f7f03ea8beaaa4b264c..669f7ad026e87203765e916c410ee1a16742001a 100644
--- a/targets/ipq40xx-generic
+++ b/targets/ipq40xx-generic
@@ -128,7 +128,7 @@ device('zte-mf289f', 'zte_mf289f', {
 })
 
 
--- ZyXEL
+-- Zyxel
 
 device('zyxel-nbg6617', 'zyxel_nbg6617')
 
diff --git a/targets/lantiq-xrx200 b/targets/lantiq-xrx200
index f54cd87f58a9d71efd59bcda2b2f24200f34c503..1e34259e84756c388c14c1694c836e208d87a6eb 100644
--- a/targets/lantiq-xrx200
+++ b/targets/lantiq-xrx200
@@ -12,6 +12,8 @@ packages {
 }
 
 
+-- AVM
+
 device('avm-fritz-box-3370-rev-2-hynix-nand', 'avm_fritz3370-rev2-hynix', {
 	factory = false,
 	extra_images = {
@@ -52,6 +54,7 @@ device('arcadyan-vgv7510kw22', 'arcadyan_vgv7510kw22-nor', {
 	aliases = {'o2-box-6431'},
 })
 
+
 -- TP-Link
 
 -- CAVEAT: These devices don't have a dedicated WAN port.
diff --git a/targets/lantiq-xway b/targets/lantiq-xway
index d551538cf8f060aef28abdc6edde5461ff10568e..1774b4143dbc2843024eec61fd119b6982671a39 100644
--- a/targets/lantiq-xway
+++ b/targets/lantiq-xway
@@ -8,10 +8,16 @@ packages {
 	'-kmod-ltq-deu-ar9'
 }
 
+
+-- AVM
+
 device('avm-fritz-box-7312', 'avm_fritz7312', {
 	factory = false,
 })
 
+
+-- NETGEAR
+
 device('netgear-dgn3500b', 'netgear_dgn3500b', {
 	factory_ext = '.img',
 })
diff --git a/targets/mediatek-filogic b/targets/mediatek-filogic
index 4b1a87c18eb8801019b2ac560b2e80a807fc580e..9962ed5ef8a88a59b7ed013840cd25f0222f12f3 100644
--- a/targets/mediatek-filogic
+++ b/targets/mediatek-filogic
@@ -33,6 +33,6 @@ device('ubiquiti-unifi-6-plus', 'ubnt_unifi-6-plus', {
 })
 
 
--- ZyXEL
+-- Zyxel
 
 device('zyxel-nwa50ax-pro', 'zyxel_nwa50ax-pro')
diff --git a/targets/mediatek-mt7622 b/targets/mediatek-mt7622
index 8376c39723f7e2aad91b5aef45176682e1297a1f..c70b1707d13bda0fa65aebc9f4d31c99551e48bb 100644
--- a/targets/mediatek-mt7622
+++ b/targets/mediatek-mt7622
@@ -6,14 +6,16 @@ device('linksys-e8450-ubi', 'linksys_e8450-ubi', {
 })
 
 
+-- Ubiquiti
+
 device('ubiquiti-unifi-6-lr-v1', 'ubnt_unifi-6-lr-v1', {
 	factory = false,
 	manifest_aliases = {'ubiquiti-unifi-6-lr'},
 })
 
+
 -- Xiaomi
 
 device('xiaomi-redmi-router-ax6s', 'xiaomi_redmi-router-ax6s', {
 	factory = false,
 })
-
diff --git a/targets/mpc85xx-p1010 b/targets/mpc85xx-p1010
index ff90fc39c1a07ce31ba4dc50de3c55a47ff892ac..dbbbb39b91ee0418693bd226fcb2dd23427f1277 100644
--- a/targets/mpc85xx-p1010
+++ b/targets/mpc85xx-p1010
@@ -15,4 +15,3 @@ device('sophos-red-15w-rev.1', 'sophos_red-15w-rev1', {
 -- TP-Link
 
 device('tp-link-tl-wdr4900-v1', 'tplink_tl-wdr4900-v1')
-
diff --git a/targets/mpc85xx-p1020 b/targets/mpc85xx-p1020
index cf8dfa7c1aefc70ee6614ffcfcfa58dffbf36a80..d468d6e7599d5ee7068230eb01ec267cb92c12ff 100644
--- a/targets/mpc85xx-p1020
+++ b/targets/mpc85xx-p1020
@@ -6,6 +6,7 @@ local ATH10K_PACKAGES_QCA9880 = {
 	'-ath10k-firmware-qca988x-ct',
 }
 
+
 -- Aerohive
 
 device('aerohive-hiveap-330', 'aerohive_hiveap-330', {
@@ -38,4 +39,3 @@ device('hewlett-packard-msm460', 'hpe_msm460')
 device('ocedo-panda', 'ocedo_panda', {
 	factory = false,
 })
-
diff --git a/targets/ramips-mt7620 b/targets/ramips-mt7620
index 9d1d327618c6b2ca88edc54b8d86a9eb0e12eae9..cf70ceacfa21c791aaba40b66d3bd21a2b9a9f73 100644
--- a/targets/ramips-mt7620
+++ b/targets/ramips-mt7620
@@ -19,7 +19,8 @@ device('gl-mt750', 'glinet_gl-mt750', {
 	factory = false,
 })
 
--- Netgear
+
+-- NETGEAR
 
 device('netgear-ex3700', 'netgear_ex3700', {
 	aliases = {
@@ -33,7 +34,6 @@ device('netgear-ex6130', 'netgear_ex6130', {
 	factory_ext = '.chk',
 })
 
-
 -- Nexx
 
 device('nexx-wt3020-8m', 'nexx_wt3020-8m', {
@@ -44,6 +44,7 @@ device('nexx-wt3020-8m', 'nexx_wt3020-8m', {
 	},
 })
 
+
 -- TP-Link
 
 local tplink_region_suffix = ''
diff --git a/targets/ramips-mt7621 b/targets/ramips-mt7621
index 79ae7a707a924540f53698f6636c4201585356a2..759f96c751283773a869babef27774a37a65fe7c 100644
--- a/targets/ramips-mt7621
+++ b/targets/ramips-mt7621
@@ -9,6 +9,7 @@ device('asus-rt-ac57u-v1', 'asus_rt-ac57u-v1', {
 
 device('asus-rt-ax53u', 'asus_rt-ax53u')
 
+
 -- Cudy
 
 device('cudy-wr1300-v1', 'cudy_wr1300-v1', {
@@ -51,12 +52,12 @@ device('gl.inet-gl-mt1300', 'glinet_gl-mt1300', {
 })
 
 
--- Mercusys
+-- MERCUSYS
 
 device('mercusys-mr70x-v1', 'mercusys_mr70x-v1')
 
 
--- Netgear
+-- NETGEAR
 
 device('netgear-ex6150', 'netgear_ex6150', {
 	factory_ext = '.chk',
@@ -133,7 +134,7 @@ device('xiaomi-mi-router-3g-v2', 'xiaomi_mi-router-3g-v2', {
 })
 
 
--- ZBT
+-- Zbtlink
 
 device('zbtlink-zbt-wg3526-16m', 'zbtlink_zbt-wg3526-16m', {
 	factory = false,
@@ -152,9 +153,10 @@ device('zbtlink-zbt-wg3526-32m', 'zbtlink_zbt-wg3526-32m', {
 })
 
 
--- ZyXEL
+-- Zyxel
 
 device('zyxel-nwa50ax', 'zyxel_nwa50ax')
+
 device('zyxel-nwa55axe', 'zyxel_nwa55axe', {
 	broken = true, -- Missing LED / Reset button
 })
diff --git a/targets/ramips-mt76x8 b/targets/ramips-mt76x8
index ec7067e3d79eaa73bd988b9474b35e7dae45dd6c..ca5b528d4b12c9214d3aab68c7f35b3ec96680ec 100644
--- a/targets/ramips-mt76x8
+++ b/targets/ramips-mt76x8
@@ -18,7 +18,7 @@ device('gl.inet-vixmini', 'glinet_vixmini', {
 })
 
 
--- Netgear
+-- NETGEAR
 
 device('netgear-r6020', 'netgear_r6020', {
 	factory_ext = '.img',